diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2019-04-14 20:59:53 +0100 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2019-04-14 20:59:53 +0100 |
| commit | 50591ef0ce170b46770592d44dfab01766bd2992 (patch) | |
| tree | 2b3907b107232d5ffd1c1ef22a5cb8550d9cf396 /media-libs/libbluray/files | |
| parent | media-libs/glm: Version bump to 0.9.9.5 (diff) | |
| download | gentoo-50591ef0ce170b46770592d44dfab01766bd2992.tar.gz gentoo-50591ef0ce170b46770592d44dfab01766bd2992.tar.bz2 gentoo-50591ef0ce170b46770592d44dfab01766bd2992.zip | |
media-libs/libbluray: Bump to 1.1.1, EAPI 7, fix versioned jars issue
Closes: https://bugs.gentoo.org/639284
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'media-libs/libbluray/files')
| -rw-r--r-- | media-libs/libbluray/files/libbluray-jars.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/media-libs/libbluray/files/libbluray-jars.patch b/media-libs/libbluray/files/libbluray-jars.patch new file mode 100644 index 000000000000..f313bf22a210 --- /dev/null +++ b/media-libs/libbluray/files/libbluray-jars.patch @@ -0,0 +1,46 @@ +diff -Naur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2019-04-05 09:34:16.000000000 +0100 ++++ b/Makefile.am 2019-04-14 20:30:19.570385252 +0100 +@@ -239,10 +239,10 @@ + awt_src = java-$(BDJ_TYPE) + endif + +-jardir=$(datadir)/java/ ++jardir=$(datadir)/libbluray/lib/ + jar_DATA = \ +- $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar \ +- $(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-$(VERSION).jar ++ $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-gentoo.jar \ ++ $(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-gentoo.jar + + $(jar_DATA): all-local + +@@ -253,13 +253,13 @@ + -Dsrc_awt=:$(awt_src) \ + $(java_versions) \ + -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" \ +- -Dversion='$(BDJ_TYPE)-$(VERSION)' ++ -Dversion='$(BDJ_TYPE)-gentoo' + + clean-local: + ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ + -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \ + -Ddist='$(abs_builddir)/.libs' \ +- -Dversion='$(BDJ_TYPE)-$(VERSION)' \ ++ -Dversion='$(BDJ_TYPE)-gentoo' \ + clean + endif + +diff -Naur a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c +--- a/src/libbluray/bdj/bdj.c 2019-04-05 09:34:16.000000000 +0100 ++++ b/src/libbluray/bdj/bdj.c 2019-04-14 20:21:01.927193454 +0100 +@@ -22,6 +22,9 @@ + #include "config.h" + #endif + ++#undef VERSION ++#define VERSION "gentoo" ++ + #include "bdj.h" + + #include "native/register_native.h" |