public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/oxine/
@ 2016-12-12 23:17 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2016-12-12 23:17 UTC (permalink / raw
  To: gentoo-commits

commit:     eb8abfeb1f0ef1893d249dfe7f84edad00454995
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 23:16:24 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 23:16:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8abfeb

media-video/oxine: Fix building with GCC 5

Gentoo-bug: 590946
* EAPI=6

Package-Manager: portage-2.3.3

 media-video/oxine/oxine-0.7.1-r1.ebuild | 67 ---------------------------
 media-video/oxine/oxine-0.7.1-r2.ebuild | 82 +++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 67 deletions(-)

diff --git a/media-video/oxine/oxine-0.7.1-r1.ebuild b/media-video/oxine/oxine-0.7.1-r1.ebuild
deleted file mode 100644
index 5682433..00000000
--- a/media-video/oxine/oxine-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WANT_AUTOMAKE="1.9"
-inherit eutils
-
-DESCRIPTION="OSD frontend for Xine"
-HOMEPAGE="http://oxine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-SLOT="0"
-IUSE="X curl debug dvb exif joystick jpeg lirc nls png v4l"
-
-COMMON_DEPEND="media-libs/xine-lib[v4l?,X,imagemagick]
-	dvb? ( media-libs/xine-lib[v4l] )
-	dev-libs/libcdio
-	curl? ( net-misc/curl )
-	joystick? ( media-libs/libjsw )
-	jpeg? ( media-gfx/imagemagick
-		media-libs/netpbm[jpeg,zlib]
-		media-video/mjpegtools )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl
-		sys-devel/gettext )
-	png? ( media-gfx/imagemagick
-		media-libs/netpbm[png,zlib]
-		media-video/mjpegtools )
-	X? ( x11-libs/libXext
-		x11-libs/libX11 )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/eject"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	# Note on images: Image support will be automatically disabled if
-	# netpbm, imagemagick or mjpegtools is not installed, irregardless
-	# of what the USE flags are set to.
-
-	# If one of the image USE flags is unset, disable image support
-	if use !png && use !jpeg ; then
-		myconf="${myconf} --disable-images"
-	fi
-
-	econf ${myconf} \
-		$( use_with X x ) \
-		$( use_with curl ) \
-		$( use_enable debug ) \
-		$( use_enable dvb ) \
-		$( use_enable exif ) \
-		--disable-hal \
-		$( use_enable joystick ) \
-		$( use_enable lirc ) \
-		$( use_enable nls ) \
-		$( use_enable v4l ) \
-		--disable-extractor \
-		--disable-rpath || die "econf died"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install died"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dohtml doc/README.html doc/keymapping.pdf
-}

diff --git a/media-video/oxine/oxine-0.7.1-r2.ebuild b/media-video/oxine/oxine-0.7.1-r2.ebuild
new file mode 100644
index 00000000..b9ed6a6
--- /dev/null
+++ b/media-video/oxine/oxine-0.7.1-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="OSD frontend for Xine"
+HOMEPAGE="http://oxine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="curl debug dvb exif joystick jpeg lirc nls png v4l X"
+
+COMMON_DEPEND="
+	dev-libs/libcdio
+	media-libs/xine-lib[v4l?,X,imagemagick]
+	curl? ( net-misc/curl )
+	dvb? ( media-libs/xine-lib[v4l] )
+	joystick? ( media-libs/libjsw )
+	jpeg? (
+		media-gfx/imagemagick
+		media-libs/netpbm[jpeg,zlib]
+		media-video/mjpegtools
+	)
+	lirc? ( app-misc/lirc )
+	nls? (
+		virtual/libintl
+		sys-devel/gettext
+	)
+	png? (
+		media-gfx/imagemagick
+		media-libs/netpbm[png,zlib]
+		media-video/mjpegtools
+	)
+	X? (
+		x11-libs/libXext
+		x11-libs/libX11
+	)"
+RDEPEND="${COMMON_DEPEND}
+	virtual/eject"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+HTML_DOCS=( doc/README.html )
+
+src_configure() {
+	# Fix underlinking by falling back to
+	# GNU89 inline semantics, bug 590946
+	append-cflags -std=gnu89
+
+	# Note on images: Image support will be automatically disabled if
+	# netpbm, imagemagick or mjpegtools is not installed, regardless
+	# of what the USE flags are set to.
+	# If one of the image USE flags is unset, disable image support
+	local myconf=()
+	if use !png || use !jpeg; then
+		myconf+=( --disable-images )
+	fi
+
+	econf \
+		--disable-hal \
+		--disable-rpath \
+		--disable-extractor \
+		$(use_with curl) \
+		$(use_enable debug) \
+		$(use_enable dvb) \
+		$(use_enable exif) \
+		$(use_enable joystick) \
+		$(use_enable lirc) \
+		$(use_enable nls) \
+		$(use_enable v4l) \
+		$(use_with X x) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc doc/keymapping.pdf
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/oxine/
@ 2021-05-14 17:57 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-05-14 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     1bb409b304a5fbfb1cb9db8ab95da940edbd0f3a
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri May 14 17:57:16 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 14 17:57:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb409b3

media-video/oxine: depend on sys-apps/util-linux directly, sort, r3

Package-Manager: Portage-3.0.18, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-video/oxine/{oxine-0.7.1-r2.ebuild => oxine-0.7.1-r3.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/oxine/oxine-0.7.1-r2.ebuild b/media-video/oxine/oxine-0.7.1-r3.ebuild
similarity index 96%
rename from media-video/oxine/oxine-0.7.1-r2.ebuild
rename to media-video/oxine/oxine-0.7.1-r3.ebuild
index 1f5259e238f..877be6611ff 100644
--- a/media-video/oxine/oxine-0.7.1-r2.ebuild
+++ b/media-video/oxine/oxine-0.7.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ COMMON_DEPEND="
 		x11-libs/libX11
 	)"
 RDEPEND="${COMMON_DEPEND}
-	virtual/eject"
+	sys-apps/util-linux"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/oxine/
@ 2021-08-22  3:17 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-08-22  3:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b7b5a7c687cc4025c508993424ef328f32f7e8b9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 22 03:12:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 03:17:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b5a7c6

media-video/oxine: add missing libcrypt dependency

Closes: https://bugs.gentoo.org/808819
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/oxine/{oxine-0.7.1-r3.ebuild => oxine-0.7.1-r4.ebuild} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-video/oxine/oxine-0.7.1-r3.ebuild b/media-video/oxine/oxine-0.7.1-r4.ebuild
similarity index 98%
rename from media-video/oxine/oxine-0.7.1-r3.ebuild
rename to media-video/oxine/oxine-0.7.1-r4.ebuild
index 877be6611ff..c827c4ee220 100644
--- a/media-video/oxine/oxine-0.7.1-r3.ebuild
+++ b/media-video/oxine/oxine-0.7.1-r4.ebuild
@@ -8,14 +8,16 @@ inherit flag-o-matic
 DESCRIPTION="OSD frontend for Xine"
 HOMEPAGE="http://oxine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="curl debug dvb exif joystick jpeg lirc nls png v4l X"
 
 COMMON_DEPEND="
 	dev-libs/libcdio
 	media-libs/xine-lib[v4l?,X,imagemagick]
+	virtual/libcrypt:=
 	curl? ( net-misc/curl )
 	dvb? ( media-libs/xine-lib[v4l] )
 	joystick? ( media-libs/libjsw )


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/oxine/
@ 2021-10-20  1:14 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-10-20  1:14 UTC (permalink / raw
  To: gentoo-commits

commit:     0f61774e6803ca34273a6090e0c745b76f57a5ef
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Fri Oct  1 17:04:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 01:12:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f61774e

media-video/oxine: use a dependency default flag

media-libs/netpbm is dropping zlib USE flag, so add it with (+).

Closes: https://bugs.gentoo.org/801445
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21581
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/oxine/{oxine-0.7.1-r4.ebuild => oxine-0.7.1-r5.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/oxine/oxine-0.7.1-r4.ebuild b/media-video/oxine/oxine-0.7.1-r5.ebuild
similarity index 96%
rename from media-video/oxine/oxine-0.7.1-r4.ebuild
rename to media-video/oxine/oxine-0.7.1-r5.ebuild
index c827c4ee220..6cbda902137 100644
--- a/media-video/oxine/oxine-0.7.1-r4.ebuild
+++ b/media-video/oxine/oxine-0.7.1-r5.ebuild
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	joystick? ( media-libs/libjsw )
 	jpeg? (
 		media-gfx/imagemagick
-		media-libs/netpbm[jpeg,zlib]
+		media-libs/netpbm[jpeg,zlib(+)]
 		media-video/mjpegtools
 	)
 	lirc? ( app-misc/lirc )
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	)
 	png? (
 		media-gfx/imagemagick
-		media-libs/netpbm[png,zlib]
+		media-libs/netpbm[png,zlib(+)]
 		media-video/mjpegtools
 	)
 	X? (


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/oxine/
@ 2022-07-16 22:44 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-07-16 22:44 UTC (permalink / raw
  To: gentoo-commits

commit:     5cb35fc0c3efaa29d8c334b20eb3fa31bc22868a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 21:16:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 22:44:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb35fc0

media-video/oxine: depend on imagemagick-tools

Closes: https://bugs.gentoo.org/314343
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/oxine/oxine-0.7.1-r5.ebuild | 60 ++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/media-video/oxine/oxine-0.7.1-r5.ebuild b/media-video/oxine/oxine-0.7.1-r5.ebuild
index 6cbda902137b..0232ae70dec6 100644
--- a/media-video/oxine/oxine-0.7.1-r5.ebuild
+++ b/media-video/oxine/oxine-0.7.1-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit flag-o-matic
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="curl debug dvb exif joystick jpeg lirc nls png v4l X"
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/libcdio
 	media-libs/xine-lib[v4l?,X,imagemagick]
 	virtual/libcrypt:=
@@ -22,9 +22,9 @@ COMMON_DEPEND="
 	dvb? ( media-libs/xine-lib[v4l] )
 	joystick? ( media-libs/libjsw )
 	jpeg? (
-		media-gfx/imagemagick
 		media-libs/netpbm[jpeg,zlib(+)]
 		media-video/mjpegtools
+		virtual/imagemagick-tools[jpeg]
 	)
 	lirc? ( app-misc/lirc )
 	nls? (
@@ -32,52 +32,56 @@ COMMON_DEPEND="
 		sys-devel/gettext
 	)
 	png? (
-		media-gfx/imagemagick
 		media-libs/netpbm[png,zlib(+)]
 		media-video/mjpegtools
+		virtual/imagemagick-tools[png]
 	)
 	X? (
 		x11-libs/libXext
 		x11-libs/libX11
-	)"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/util-linux"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+	)
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/util-linux
+"
+BDEPEND="virtual/pkgconfig"
 
 HTML_DOCS=( doc/README.html )
 
 src_configure() {
 	# Fix underlinking by falling back to
-	# GNU89 inline semantics, bug 590946
+	# GNU89 inline semantics, bug #590946
 	append-cflags -std=gnu89
 
+	local myeconfargs=(
+		--disable-hal
+		--disable-rpath
+		--disable-extractor
+		$(use_with curl)
+		$(use_enable debug)
+		$(use_enable dvb)
+		$(use_enable exif)
+		$(use_enable joystick)
+		$(use_enable lirc)
+		$(use_enable nls)
+		$(use_enable v4l)
+		$(use_with X x)
+	)
+
 	# Note on images: Image support will be automatically disabled if
 	# netpbm, imagemagick or mjpegtools is not installed, regardless
 	# of what the USE flags are set to.
 	# If one of the image USE flags is unset, disable image support
-	local myconf=()
-	if use !png || use !jpeg; then
-		myconf+=( --disable-images )
+	if ! use png || ! use jpeg; then
+		myeconfargs+=( --disable-images )
 	fi
 
-	econf \
-		--disable-hal \
-		--disable-rpath \
-		--disable-extractor \
-		$(use_with curl) \
-		$(use_enable debug) \
-		$(use_enable dvb) \
-		$(use_enable exif) \
-		$(use_enable joystick) \
-		$(use_enable lirc) \
-		$(use_enable nls) \
-		$(use_enable v4l) \
-		$(use_with X x) \
-		"${myconf[@]}"
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
+
 	dodoc doc/keymapping.pdf
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/oxine/
@ 2022-07-17 14:23 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-07-17 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     9ed70a839f873b6b348d3ad3b1fc2acb5b156fbd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 14:22:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 14:22:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ed70a83

media-video/oxine: revbump for IM dep change

Bug: https://bugs.gentoo.org/314343
Fixes: 5cb35fc0c3efaa29d8c334b20eb3fa31bc22868a
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/oxine/{oxine-0.7.1-r5.ebuild => oxine-0.7.1-r6.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-video/oxine/oxine-0.7.1-r5.ebuild b/media-video/oxine/oxine-0.7.1-r6.ebuild
similarity index 100%
rename from media-video/oxine/oxine-0.7.1-r5.ebuild
rename to media-video/oxine/oxine-0.7.1-r6.ebuild


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-07-17 14:23 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-17 14:23 [gentoo-commits] repo/gentoo:master commit in: media-video/oxine/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-07-16 22:44 Sam James
2021-10-20  1:14 Sam James
2021-08-22  3:17 Sam James
2021-05-14 17:57 David Seifert
2016-12-12 23:17 David Seifert

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