| 1 |
commit: 50591ef0ce170b46770592d44dfab01766bd2992 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 14 19:59:53 2019 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 14 19:59:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50591ef0 |
| 7 |
|
| 8 |
media-libs/libbluray: Bump to 1.1.1, EAPI 7, fix versioned jars issue |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/639284 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/libbluray/Manifest | 1 + |
| 15 |
media-libs/libbluray/files/libbluray-jars.patch | 46 ++++++++++++++++++++++ |
| 16 |
...ibbluray-9999.ebuild => libbluray-1.1.1.ebuild} | 44 ++++++++++----------- |
| 17 |
media-libs/libbluray/libbluray-9999.ebuild | 44 ++++++++++----------- |
| 18 |
4 files changed, 89 insertions(+), 46 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest |
| 21 |
index a6b4ab1d997..f0f4a53f1b2 100644 |
| 22 |
--- a/media-libs/libbluray/Manifest |
| 23 |
+++ b/media-libs/libbluray/Manifest |
| 24 |
@@ -1 +1,2 @@ |
| 25 |
DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484b858fb03aaf3bda6824181d072050625d37280cf011574c07316ef83103b334f654de1a6219e3a33343532cfe986 SHA512 e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b |
| 26 |
+DIST libbluray-1.1.1.tar.bz2 746034 BLAKE2B 031d9c4f5ed85cb9128ec6f9b0c4232e889578ca03e131024ce2bc7049ff7990ef1936aa5a525266f8d5402e58d9c2a92b14338259c37dfaebb50c6b9745ca1e SHA512 0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839 |
| 27 |
|
| 28 |
diff --git a/media-libs/libbluray/files/libbluray-jars.patch b/media-libs/libbluray/files/libbluray-jars.patch |
| 29 |
new file mode 100644 |
| 30 |
index 00000000000..f313bf22a21 |
| 31 |
--- /dev/null |
| 32 |
+++ b/media-libs/libbluray/files/libbluray-jars.patch |
| 33 |
@@ -0,0 +1,46 @@ |
| 34 |
+diff -Naur a/Makefile.am b/Makefile.am |
| 35 |
+--- a/Makefile.am 2019-04-05 09:34:16.000000000 +0100 |
| 36 |
++++ b/Makefile.am 2019-04-14 20:30:19.570385252 +0100 |
| 37 |
+@@ -239,10 +239,10 @@ |
| 38 |
+ awt_src = java-$(BDJ_TYPE) |
| 39 |
+ endif |
| 40 |
+ |
| 41 |
+-jardir=$(datadir)/java/ |
| 42 |
++jardir=$(datadir)/libbluray/lib/ |
| 43 |
+ jar_DATA = \ |
| 44 |
+- $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar \ |
| 45 |
+- $(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-$(VERSION).jar |
| 46 |
++ $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-gentoo.jar \ |
| 47 |
++ $(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-gentoo.jar |
| 48 |
+ |
| 49 |
+ $(jar_DATA): all-local |
| 50 |
+ |
| 51 |
+@@ -253,13 +253,13 @@ |
| 52 |
+ -Dsrc_awt=:$(awt_src) \ |
| 53 |
+ $(java_versions) \ |
| 54 |
+ -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" \ |
| 55 |
+- -Dversion='$(BDJ_TYPE)-$(VERSION)' |
| 56 |
++ -Dversion='$(BDJ_TYPE)-gentoo' |
| 57 |
+ |
| 58 |
+ clean-local: |
| 59 |
+ ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ |
| 60 |
+ -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \ |
| 61 |
+ -Ddist='$(abs_builddir)/.libs' \ |
| 62 |
+- -Dversion='$(BDJ_TYPE)-$(VERSION)' \ |
| 63 |
++ -Dversion='$(BDJ_TYPE)-gentoo' \ |
| 64 |
+ clean |
| 65 |
+ endif |
| 66 |
+ |
| 67 |
+diff -Naur a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c |
| 68 |
+--- a/src/libbluray/bdj/bdj.c 2019-04-05 09:34:16.000000000 +0100 |
| 69 |
++++ b/src/libbluray/bdj/bdj.c 2019-04-14 20:21:01.927193454 +0100 |
| 70 |
+@@ -22,6 +22,9 @@ |
| 71 |
+ #include "config.h" |
| 72 |
+ #endif |
| 73 |
+ |
| 74 |
++#undef VERSION |
| 75 |
++#define VERSION "gentoo" |
| 76 |
++ |
| 77 |
+ #include "bdj.h" |
| 78 |
+ |
| 79 |
+ #include "native/register_native.h" |
| 80 |
|
| 81 |
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-1.1.1.ebuild |
| 82 |
similarity index 72% |
| 83 |
copy from media-libs/libbluray/libbluray-9999.ebuild |
| 84 |
copy to media-libs/libbluray/libbluray-1.1.1.ebuild |
| 85 |
index 81159745968..4a5301a677d 100644 |
| 86 |
--- a/media-libs/libbluray/libbluray-9999.ebuild |
| 87 |
+++ b/media-libs/libbluray/libbluray-1.1.1.ebuild |
| 88 |
@@ -1,7 +1,7 @@ |
| 89 |
-# Copyright 1999-2018 Gentoo Foundation |
| 90 |
+# Copyright 1999-2019 Gentoo Authors |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
|
| 93 |
-EAPI=6 |
| 94 |
+EAPI=7 |
| 95 |
|
| 96 |
if [[ "${PV#9999}" != "${PV}" ]] ; then |
| 97 |
inherit git-r3 |
| 98 |
@@ -33,6 +33,9 @@ RDEPEND=" |
| 99 |
" |
| 100 |
DEPEND=" |
| 101 |
${COMMON_DEPEND} |
| 102 |
+ java? ( >=virtual/jdk-1.6 ) |
| 103 |
+" |
| 104 |
+BDEPEND=" |
| 105 |
java? ( |
| 106 |
>=virtual/jdk-1.6 |
| 107 |
dev-java/ant-core |
| 108 |
@@ -40,24 +43,23 @@ DEPEND=" |
| 109 |
virtual/pkgconfig |
| 110 |
" |
| 111 |
|
| 112 |
-DOCS=( ChangeLog README.txt ) |
| 113 |
+PATCHES=( |
| 114 |
+ "${FILESDIR}"/${PN}-jars.patch |
| 115 |
+) |
| 116 |
+ |
| 117 |
+DOCS=( |
| 118 |
+ ChangeLog |
| 119 |
+ README.txt |
| 120 |
+) |
| 121 |
|
| 122 |
src_prepare() { |
| 123 |
default |
| 124 |
- unset JDK_HOME #621992 |
| 125 |
- if use java ; then |
| 126 |
- export JDK_HOME="$(java-config -g JAVA_HOME)" |
| 127 |
- |
| 128 |
- # don't install a duplicate jar file |
| 129 |
- sed -i '/^jar_DATA/d' Makefile.am || die |
| 130 |
- |
| 131 |
- java-pkg-opt-2_src_prepare |
| 132 |
- fi |
| 133 |
- |
| 134 |
eautoreconf |
| 135 |
} |
| 136 |
|
| 137 |
multilib_src_configure() { |
| 138 |
+ use java || unset JDK_HOME # Bug #621992. |
| 139 |
+ |
| 140 |
ECONF_SOURCE="${S}" econf \ |
| 141 |
--disable-optimizations \ |
| 142 |
$(multilib_native_use_enable utils examples) \ |
| 143 |
@@ -70,18 +72,14 @@ multilib_src_configure() { |
| 144 |
|
| 145 |
multilib_src_install() { |
| 146 |
emake DESTDIR="${D}" install |
| 147 |
+ multilib_is_native_abi || return |
| 148 |
|
| 149 |
- if multilib_is_native_abi && use utils; then |
| 150 |
- cd .libs/ || die |
| 151 |
- dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump |
| 152 |
- if use java; then |
| 153 |
- dobin bdj_test |
| 154 |
- fi |
| 155 |
- fi |
| 156 |
+ use utils && |
| 157 |
+ find .libs/ -type f -executable ! -name "${PN}.*" \ |
| 158 |
+ $(use java || echo '! -name bdj_test') -exec dobin {} + |
| 159 |
|
| 160 |
- if multilib_is_native_abi && use java; then |
| 161 |
- java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}{,-awt}-j2se-*.jar |
| 162 |
- fi |
| 163 |
+ use java && |
| 164 |
+ java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar |
| 165 |
} |
| 166 |
|
| 167 |
multilib_src_install_all() { |
| 168 |
|
| 169 |
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild |
| 170 |
index 81159745968..4a5301a677d 100644 |
| 171 |
--- a/media-libs/libbluray/libbluray-9999.ebuild |
| 172 |
+++ b/media-libs/libbluray/libbluray-9999.ebuild |
| 173 |
@@ -1,7 +1,7 @@ |
| 174 |
-# Copyright 1999-2018 Gentoo Foundation |
| 175 |
+# Copyright 1999-2019 Gentoo Authors |
| 176 |
# Distributed under the terms of the GNU General Public License v2 |
| 177 |
|
| 178 |
-EAPI=6 |
| 179 |
+EAPI=7 |
| 180 |
|
| 181 |
if [[ "${PV#9999}" != "${PV}" ]] ; then |
| 182 |
inherit git-r3 |
| 183 |
@@ -33,6 +33,9 @@ RDEPEND=" |
| 184 |
" |
| 185 |
DEPEND=" |
| 186 |
${COMMON_DEPEND} |
| 187 |
+ java? ( >=virtual/jdk-1.6 ) |
| 188 |
+" |
| 189 |
+BDEPEND=" |
| 190 |
java? ( |
| 191 |
>=virtual/jdk-1.6 |
| 192 |
dev-java/ant-core |
| 193 |
@@ -40,24 +43,23 @@ DEPEND=" |
| 194 |
virtual/pkgconfig |
| 195 |
" |
| 196 |
|
| 197 |
-DOCS=( ChangeLog README.txt ) |
| 198 |
+PATCHES=( |
| 199 |
+ "${FILESDIR}"/${PN}-jars.patch |
| 200 |
+) |
| 201 |
+ |
| 202 |
+DOCS=( |
| 203 |
+ ChangeLog |
| 204 |
+ README.txt |
| 205 |
+) |
| 206 |
|
| 207 |
src_prepare() { |
| 208 |
default |
| 209 |
- unset JDK_HOME #621992 |
| 210 |
- if use java ; then |
| 211 |
- export JDK_HOME="$(java-config -g JAVA_HOME)" |
| 212 |
- |
| 213 |
- # don't install a duplicate jar file |
| 214 |
- sed -i '/^jar_DATA/d' Makefile.am || die |
| 215 |
- |
| 216 |
- java-pkg-opt-2_src_prepare |
| 217 |
- fi |
| 218 |
- |
| 219 |
eautoreconf |
| 220 |
} |
| 221 |
|
| 222 |
multilib_src_configure() { |
| 223 |
+ use java || unset JDK_HOME # Bug #621992. |
| 224 |
+ |
| 225 |
ECONF_SOURCE="${S}" econf \ |
| 226 |
--disable-optimizations \ |
| 227 |
$(multilib_native_use_enable utils examples) \ |
| 228 |
@@ -70,18 +72,14 @@ multilib_src_configure() { |
| 229 |
|
| 230 |
multilib_src_install() { |
| 231 |
emake DESTDIR="${D}" install |
| 232 |
+ multilib_is_native_abi || return |
| 233 |
|
| 234 |
- if multilib_is_native_abi && use utils; then |
| 235 |
- cd .libs/ || die |
| 236 |
- dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump |
| 237 |
- if use java; then |
| 238 |
- dobin bdj_test |
| 239 |
- fi |
| 240 |
- fi |
| 241 |
+ use utils && |
| 242 |
+ find .libs/ -type f -executable ! -name "${PN}.*" \ |
| 243 |
+ $(use java || echo '! -name bdj_test') -exec dobin {} + |
| 244 |
|
| 245 |
- if multilib_is_native_abi && use java; then |
| 246 |
- java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}{,-awt}-j2se-*.jar |
| 247 |
- fi |
| 248 |
+ use java && |
| 249 |
+ java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar |
| 250 |
} |
| 251 |
|
| 252 |
multilib_src_install_all() { |
Archives