[gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/
Date: Thu,  3 Dec 2015 09:24:04 +0000 (UTC)	[thread overview]
Message-ID: <1449134624.0b0f666451daa8976d6b9494d1db7665a05d475b.aballier@gentoo> (raw)

commit:     0b0f666451daa8976d6b9494d1db7665a05d475b
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 09:23:44 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 09:23:44 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0f6664

media-libs/libbluray: sync release & live ebuild, bug #553780

Package-Manager: portage-2.2.26
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 media-libs/libbluray/libbluray-0.9.1.ebuild | 17 +++++++++++++----
 media-libs/libbluray/libbluray-9999.ebuild  | 24 +++++++++++++++++-------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/media-libs/libbluray/libbluray-0.9.1.ebuild b/media-libs/libbluray/libbluray-0.9.1.ebuild
index 805d248..7c96b47 100644
--- a/media-libs/libbluray/libbluray-0.9.1.ebuild
+++ b/media-libs/libbluray/libbluray-0.9.1.ebuild
@@ -4,15 +4,24 @@
 
 EAPI=5
 
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
+if [ "${PV#9999}" != "${PV}" ] ; then
+	VCSECLASS="git-r3"
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
+	SRC_URI=""
+else
+	VCSECLASS=""
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal
 
 DESCRIPTION="Blu-ray playback libraries"
 HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
 
 COMMON_DEPEND="
@@ -76,7 +85,7 @@ multilib_src_install() {
 	if multilib_is_native_abi && use utils; then
 		dobin index_dump mobj_dump mpls_dump
 		cd .libs/
-		dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
+		dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
 		if use java; then
 			dobin bdj_test
 		fi

diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 5aae52e..7c96b47 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -3,15 +3,25 @@
 # $Id$
 
 EAPI=5
-inherit autotools java-pkg-opt-2 git-r3 flag-o-matic eutils multilib-minimal
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	VCSECLASS="git-r3"
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
+	SRC_URI=""
+else
+	VCSECLASS=""
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal
 
 DESCRIPTION="Blu-ray playback libraries"
 HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
 
 COMMON_DEPEND="
@@ -41,10 +51,11 @@ src_prepare() {
 		export JDK_HOME="$(java-config -g JAVA_HOME)"
 
 		# don't install a duplicate jar file
-		sed -i '/^jar_DATA/d' src/Makefile.am || die
+		sed -i '/^jar_DATA/d' Makefile.am || die
 
 		java-pkg-opt-2_src_prepare
 	fi
+
 	eautoreconf
 }
 
@@ -72,17 +83,16 @@ multilib_src_install() {
 	emake DESTDIR="${D}" install
 
 	if multilib_is_native_abi && use utils; then
-		cd src
 		dobin index_dump mobj_dump mpls_dump
 		cd .libs/
-		dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
+		dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
 		if use java; then
 			dobin bdj_test
 		fi
 	fi
 
 	if multilib_is_native_abi && use java; then
-		java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}-j2se-${PV}.jar
+		java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-${PV}.jar
 		doenvd "${FILESDIR}"/90${PN}
 	fi
 }

next             reply	other threads:[~2015-12-03  9:24 UTC|newest]

Thread overview: 90+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-03  9:24 Alexis Ballier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-03  5:00 [gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/ Sam James
2025-10-03  5:00 Sam James
2025-10-03  5:00 Sam James
2025-08-22 12:59 Michał Górny
2024-04-02 18:03 Conrad Kostecki
2024-04-02 18:03 Conrad Kostecki
2023-12-05 20:38 Arthur Zamarin
2023-09-28  6:17 Sam James
2023-09-27 13:22 Joonas Niilola
2023-09-27 10:11 Joonas Niilola
2023-09-27  6:05 Sam James
2023-09-27  6:05 Sam James
2023-03-22  5:30 Sam James
2022-12-18 12:15 Sam James
2022-12-18 12:15 Sam James
2022-11-29 15:58 WANG Xuerui
2022-10-27 12:30 Alexis Ballier
2022-09-18 20:30 Arthur Zamarin
2022-09-18 16:25 Arthur Zamarin
2022-09-18 16:11 Arthur Zamarin
2022-09-18 16:11 Arthur Zamarin
2022-09-18 16:11 Arthur Zamarin
2022-09-18  0:19 Sam James
2022-09-18  0:19 Sam James
2022-08-17  1:22 Sam James
2022-04-17 19:24 Sam James
2022-03-13  5:54 Sam James
2022-03-13  5:28 Sam James
2021-08-21  8:44 Marek Szuba
2021-06-03  0:43 Sam James
2021-06-02 10:39 Sam James
2021-05-28 19:39 Agostino Sarubbo
2021-05-28 14:40 Sergei Trofimovich
2021-05-25 19:10 Agostino Sarubbo
2021-05-25 18:58 Agostino Sarubbo
2021-05-25 11:56 Sam James
2021-04-25  9:18 Sergei Trofimovich
2021-04-20 17:06 Sergei Trofimovich
2021-04-19  0:18 Sam James
2021-04-18 23:05 Sam James
2021-02-27  5:16 Sam James
2021-01-07 11:33 Sam James
2021-01-06  8:09 Sam James
2021-01-03 21:10 Sam James
2021-01-02 11:52 Sergei Trofimovich
2021-01-01  5:46 Sam James
2021-01-01  3:13 Sam James
2020-03-24 11:38 James Le Cuirot
2019-09-13 19:43 Andreas Sturmlechner
2019-09-13 17:39 Mikle Kolyada
2019-08-13 10:32 Agostino Sarubbo
2019-08-13 10:30 Agostino Sarubbo
2019-08-10  7:58 Sergei Trofimovich
2019-08-08  7:43 Agostino Sarubbo
2019-08-06 22:27 Aaron Bauman
2019-07-27 12:54 Aaron Bauman
2019-06-25 19:24 Lars Wendler
2019-05-05 19:05 Mike Gilbert
2018-09-21 19:48 James Le Cuirot
2018-09-21 18:21 James Le Cuirot
2018-09-21 18:21 James Le Cuirot
2018-09-15  2:31 Andreas Sturmlechner
2018-07-10  4:58 Markus Meier
2018-05-25 23:58 Thomas Deutschmann
2018-05-24 14:31 Agostino Sarubbo
2018-05-24  6:19 Sergei Trofimovich
2017-12-16  5:40 Craig Andrews
2017-12-09 18:41 Craig Andrews
2017-12-09 18:41 Craig Andrews
2017-12-04 18:15 Pacho Ramos
2017-08-31 17:38 Tim Harder
2017-06-22 11:48 Alexis Ballier
2017-06-15  8:49 Alexis Ballier
2017-04-01 11:50 Michael Weber
2017-04-01 11:19 Michael Weber
2017-03-04 13:37 Alexis Ballier
2017-01-06 13:16 Aaron Bauman
2016-12-09  7:11 Tim Harder
2016-08-08 15:53 Tim Harder
2016-05-23 11:09 Alexis Ballier
2015-12-03  9:52 Alexis Ballier
2015-12-03  9:49 Alexis Ballier
2015-12-03  9:41 Alexis Ballier
2015-12-03  9:35 Alexis Ballier
2015-12-03  9:35 Alexis Ballier
2015-12-03  9:29 Alexis Ballier
2015-11-07 18:58 Alexis Ballier
2015-10-06  9:16 Alexis Ballier
2015-10-06  9:16 Alexis Ballier

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:805d248 dfblob:7c96b47 dfblob:5aae52e dfblob:7c96b47 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449134624.0b0f666451daa8976d6b9494d1db7665a05d475b.aballier@gentoo \
    --to=aballier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox