| 1 |
commit: 0b0f666451daa8976d6b9494d1db7665a05d475b |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 3 09:23:44 2015 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 3 09:23:44 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0f6664 |
| 7 |
|
| 8 |
media-libs/libbluray: sync release & live ebuild, bug #553780 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/libbluray/libbluray-0.9.1.ebuild | 17 +++++++++++++---- |
| 14 |
media-libs/libbluray/libbluray-9999.ebuild | 24 +++++++++++++++++------- |
| 15 |
2 files changed, 30 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/libbluray/libbluray-0.9.1.ebuild b/media-libs/libbluray/libbluray-0.9.1.ebuild |
| 18 |
index 805d248..7c96b47 100644 |
| 19 |
--- a/media-libs/libbluray/libbluray-0.9.1.ebuild |
| 20 |
+++ b/media-libs/libbluray/libbluray-0.9.1.ebuild |
| 21 |
@@ -4,15 +4,24 @@ |
| 22 |
|
| 23 |
EAPI=5 |
| 24 |
|
| 25 |
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal |
| 26 |
+if [ "${PV#9999}" != "${PV}" ] ; then |
| 27 |
+ VCSECLASS="git-r3" |
| 28 |
+ KEYWORDS="" |
| 29 |
+ EGIT_REPO_URI="git://git.videolan.org/libbluray.git" |
| 30 |
+ SRC_URI="" |
| 31 |
+else |
| 32 |
+ VCSECLASS="" |
| 33 |
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
| 34 |
+ SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" |
| 35 |
+fi |
| 36 |
+ |
| 37 |
+inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal |
| 38 |
|
| 39 |
DESCRIPTION="Blu-ray playback libraries" |
| 40 |
HOMEPAGE="http://www.videolan.org/developers/libbluray.html" |
| 41 |
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" |
| 42 |
|
| 43 |
LICENSE="LGPL-2.1" |
| 44 |
SLOT="0" |
| 45 |
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
| 46 |
IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml" |
| 47 |
|
| 48 |
COMMON_DEPEND=" |
| 49 |
@@ -76,7 +85,7 @@ multilib_src_install() { |
| 50 |
if multilib_is_native_abi && use utils; then |
| 51 |
dobin index_dump mobj_dump mpls_dump |
| 52 |
cd .libs/ |
| 53 |
- dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump |
| 54 |
+ dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump |
| 55 |
if use java; then |
| 56 |
dobin bdj_test |
| 57 |
fi |
| 58 |
|
| 59 |
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild |
| 60 |
index 5aae52e..7c96b47 100644 |
| 61 |
--- a/media-libs/libbluray/libbluray-9999.ebuild |
| 62 |
+++ b/media-libs/libbluray/libbluray-9999.ebuild |
| 63 |
@@ -3,15 +3,25 @@ |
| 64 |
# $Id$ |
| 65 |
|
| 66 |
EAPI=5 |
| 67 |
-inherit autotools java-pkg-opt-2 git-r3 flag-o-matic eutils multilib-minimal |
| 68 |
+ |
| 69 |
+if [ "${PV#9999}" != "${PV}" ] ; then |
| 70 |
+ VCSECLASS="git-r3" |
| 71 |
+ KEYWORDS="" |
| 72 |
+ EGIT_REPO_URI="git://git.videolan.org/libbluray.git" |
| 73 |
+ SRC_URI="" |
| 74 |
+else |
| 75 |
+ VCSECLASS="" |
| 76 |
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
| 77 |
+ SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" |
| 78 |
+fi |
| 79 |
+ |
| 80 |
+inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal |
| 81 |
|
| 82 |
DESCRIPTION="Blu-ray playback libraries" |
| 83 |
HOMEPAGE="http://www.videolan.org/developers/libbluray.html" |
| 84 |
-EGIT_REPO_URI="git://git.videolan.org/libbluray.git" |
| 85 |
|
| 86 |
LICENSE="LGPL-2.1" |
| 87 |
SLOT="0" |
| 88 |
-KEYWORDS="" |
| 89 |
IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml" |
| 90 |
|
| 91 |
COMMON_DEPEND=" |
| 92 |
@@ -41,10 +51,11 @@ src_prepare() { |
| 93 |
export JDK_HOME="$(java-config -g JAVA_HOME)" |
| 94 |
|
| 95 |
# don't install a duplicate jar file |
| 96 |
- sed -i '/^jar_DATA/d' src/Makefile.am || die |
| 97 |
+ sed -i '/^jar_DATA/d' Makefile.am || die |
| 98 |
|
| 99 |
java-pkg-opt-2_src_prepare |
| 100 |
fi |
| 101 |
+ |
| 102 |
eautoreconf |
| 103 |
} |
| 104 |
|
| 105 |
@@ -72,17 +83,16 @@ multilib_src_install() { |
| 106 |
emake DESTDIR="${D}" install |
| 107 |
|
| 108 |
if multilib_is_native_abi && use utils; then |
| 109 |
- cd src |
| 110 |
dobin index_dump mobj_dump mpls_dump |
| 111 |
cd .libs/ |
| 112 |
- dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump |
| 113 |
+ dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump |
| 114 |
if use java; then |
| 115 |
dobin bdj_test |
| 116 |
fi |
| 117 |
fi |
| 118 |
|
| 119 |
if multilib_is_native_abi && use java; then |
| 120 |
- java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}-j2se-${PV}.jar |
| 121 |
+ java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-${PV}.jar |
| 122 |
doenvd "${FILESDIR}"/90${PN} |
| 123 |
fi |
| 124 |
} |
Archives