public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2015-10-16 20:11 Christian Ruppert
  0 siblings, 0 replies; 19+ messages in thread
From: Christian Ruppert @ 2015-10-16 20:11 UTC (permalink / raw
  To: gentoo-commits

commit:     b66c99006d161fbe84cdbc0cd9a6a70f9114e71b
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 19:16:08 2015 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 20:10:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b66c9900

media-plugins/vdr-xineliboutput: doinit -> doinitd

Package-Manager: portage-2.2.23

 .../vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild          | 2 +-
 .../vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild          | 2 +-
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
index 98efcd1..1838c03 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
@@ -127,7 +127,7 @@ src_install() {
 		fi
 
 		if use xine; then
-			doinit "${FILESDIR}"/vdr-frontend
+			doinitd "${FILESDIR}"/vdr-frontend
 
 			insinto $XINE_PLUGIN_DIR
 			doins xineplug_inp_xvdr.so

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
index a64f98d..637c1dc 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
@@ -117,7 +117,7 @@ src_install() {
 		fi
 
 		if use xine; then
-			doinit "${FILESDIR}"/vdr-frontend
+			doinitd "${FILESDIR}"/vdr-frontend
 
 			insinto $XINE_PLUGIN_DIR
 			doins xineplug_inp_xvdr.so

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index 9811633..ca97a9d 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -131,7 +131,7 @@ src_install() {
 		fi
 
 		if use xine; then
-			doinit "${FILESDIR}"/vdr-frontend
+			doinitd "${FILESDIR}"/vdr-frontend
 
 			insinto $XINE_PLUGIN_DIR
 			doins xineplug_inp_xvdr.so


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2016-04-20 15:00 Ian Stakenvicius
  0 siblings, 0 replies; 19+ messages in thread
From: Ian Stakenvicius @ 2016-04-20 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     66ab533a6c2e2e7a7af54df1f8ea4c3045661f13
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 14:59:55 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 14:59:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ab533a

media-plugins/vdr-xineliboutput: fix <pkg/> references in metadata.xml

Package-Manager: portage-2.2.26

 media-plugins/vdr-xineliboutput/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-plugins/vdr-xineliboutput/metadata.xml b/media-plugins/vdr-xineliboutput/metadata.xml
index 6bc9f96..413a682 100644
--- a/media-plugins/vdr-xineliboutput/metadata.xml
+++ b/media-plugins/vdr-xineliboutput/metadata.xml
@@ -11,7 +11,7 @@
 	<use>
 		<flag name="cec">Enable CEC support through <pkg>dev-libs/libcec</pkg></flag>
 		<flag name="bluray">Enable BluRay metadata support through <pkg>media-libs/libbluray</pkg></flag>
-		<flag name="libextractor">Use <pkg>media-libs/libextract</pkg> to gather
+		<flag name="libextractor">Use <pkg>media-libs/libextractor</pkg> to gather
 			files' metadata in media-player</flag>
 		<flag name="vdr">Compile the vdr output plugin to use local or remote xine as output</flag>
 		<flag name="xine">Compile the xine input plugin for displaying vdr video and OSD</flag>


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2017-01-06 12:25 Christian Ruppert
  0 siblings, 0 replies; 19+ messages in thread
From: Christian Ruppert @ 2017-01-06 12:25 UTC (permalink / raw
  To: gentoo-commits

commit:     433ecc122b762628221550a9366e72306ce43f91
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 12:25:17 2017 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 12:25:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433ecc12

media-plugins/vdr-xineliboutput: Remove myself as maintainer

Package-Manager: portage-2.3.2

 media-plugins/vdr-xineliboutput/metadata.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/metadata.xml b/media-plugins/vdr-xineliboutput/metadata.xml
index 413a682..cbac814 100644
--- a/media-plugins/vdr-xineliboutput/metadata.xml
+++ b/media-plugins/vdr-xineliboutput/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>idl0r@gentoo.org</email>
-		<name>Christian Ruppert</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Video Disk Recorder Xinelib PlugIn ( VDR )
 	</longdescription>


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2017-07-03 19:37 Matthias Schwarzott
  0 siblings, 0 replies; 19+ messages in thread
From: Matthias Schwarzott @ 2017-07-03 19:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b97cd6bf29233c0d0b8cb63e61d8e4a564e5c1e8
Author:     Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 19:26:31 2017 +0000
Commit:     Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 19:32:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97cd6bf

media-plugins/vdr-xineliboutput: Fix wrong versions for snapshot versions

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 ..._p20130821.ebuild => vdr-xineliboutput-2.0.0_pre20130821.ebuild} | 6 ++++--
 ..._p20150220.ebuild => vdr-xineliboutput-2.0.0_pre20150220.ebuild} | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
similarity index 95%
rename from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
rename to media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
index 8ea44029c98..ba800d6eb61 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,9 @@ GENTOO_VDR_CONDITIONAL=yes
 
 DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="http://vdr.websitec.de/download/${PN}/xineliboutput-2.0.0_p20130821.tar.bz2"
+MY_P=${PN#vdr-}-${PV/_pre/_p}
+SRC_URI="http://vdr.websitec.de/download/${PN}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-2"

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
similarity index 94%
rename from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
rename to media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
index 537dd92935a..6f0aac3f5d5 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,9 @@ GENTOO_VDR_CONDITIONAL=yes
 
 DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.xz"
+MY_PV=${PV/_pre/_p}
+SRC_URI="http://vdr.websitec.de/download/${PN}/${PN}-${MY_PV}.tar.xz"
+S="${WORKDIR}/${VDRPLUGIN}-${MY_PV}"
 
 SLOT="0"
 LICENSE="GPL-2"


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2017-07-03 19:51 Matthias Schwarzott
  0 siblings, 0 replies; 19+ messages in thread
From: Matthias Schwarzott @ 2017-07-03 19:51 UTC (permalink / raw
  To: gentoo-commits

commit:     bf5232967553666d0484d9b0de9908b583b6a992
Author:     Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 19:49:45 2017 +0000
Commit:     Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 19:49:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf523296

media-plugins/vdr-xineliboutput: set vdr project as maintainer

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-plugins/vdr-xineliboutput/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-plugins/vdr-xineliboutput/metadata.xml b/media-plugins/vdr-xineliboutput/metadata.xml
index cbac814dc69..9377b8a46e1 100644
--- a/media-plugins/vdr-xineliboutput/metadata.xml
+++ b/media-plugins/vdr-xineliboutput/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 	<longdescription>
 		Video Disk Recorder Xinelib PlugIn ( VDR )
 	</longdescription>


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2017-08-06  9:27 Matthias Schwarzott
  0 siblings, 0 replies; 19+ messages in thread
From: Matthias Schwarzott @ 2017-08-06  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     6a9cbc75c8b56dc7000eb8ca0017313666b4087a
Author:     Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  6 09:14:48 2017 +0000
Commit:     Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 09:24:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9cbc75

media-plugins/vdr-xineliboutput: bump to version 2.0.0

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-plugins/vdr-xineliboutput/Manifest           |   1 +
 .../vdr-xineliboutput-2.0.0.ebuild                 | 143 +++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 96e6f45f3b6..5caf5ecf72e 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,3 +1,4 @@
 DIST vdr-xineliboutput-1.1.0.tgz 404820 SHA256 bddebfbf77e956a50faea1baa44513a31122961357bc502b588c521358da77d3 SHA512 255ae698c1dc9d9098847e62c386a6bd24ec1dc822fb695600ef944e18d0febfac0d5b487de57a17ea9f9bd3935d1d11763a06a5daa527ce95f9557a408c264d WHIRLPOOL be47aeb039bb69e85a0f964940b3173f4371ae911d58df76c6e0135b9843471cd21b27efdfc95001216a508c0bbdc1e4957cb0d50da1a3c49e7c4ba7dd24e55c
+DIST vdr-xineliboutput-2.0.0.tgz 413085 SHA256 d406bd9efbcdde92c6d28131210c508e0a1cd218d57318a3d20978065107656b SHA512 9410072bcd8ae71196e3417c12dc810da109f155748d58b3b0b422cd6d8cd29b3f8a7d0cbffada9dd22af679161ffeb096e952f620ed1c7f1122b46bf111f9ee WHIRLPOOL 6d073611eb9fbb8198bf75a2b36cc571630fbdf8b500a5b3d6df75ab58cb84cd37e3dea1d2f27850245f3b99063fa44655da00bc4aba9c1e7e4e586c325f68ac
 DIST vdr-xineliboutput-2.0.0_p20150220.tar.xz 326520 SHA256 5fac9ed279ab2d5a9a4697a1745560901887fd60a9b1dbdd04f6d8ee5d2dccbf SHA512 8e3a6fe4dad4875b1e2d2c6667e1c5d8f4542742fb74c40148aa5dc403b86743c32a49e1fb0979a59c312aaff4c038347f934105b0ca8d3097b61c59021966f3 WHIRLPOOL cb8958ec5bc2ff76544791e2362b3f89ed9cb4f9e905052fb6b7f42f341399d8ed112694a69205c1759b49f23b1416892e7f70a73816f9d630004d7aebf6fcfa
 DIST xineliboutput-2.0.0_p20130821.tar.bz2 356633 SHA256 3ccff26c1112267e12858bbacd1d9081c999881da77c0da91f1fcc525cc225e9 SHA512 ee25447749dc5b8fe93da3c021823f8dd552619d64575525918c15447135af0d6684e613b20a1aa99a1fd8bd5334344ea03962ab75bbbffb0204d92adf36f9ed WHIRLPOOL 1feabc1f333593fb194065d1a62a0da80374a6c9714c8e1af4623e047ed4f0ef6c5433e8401f072e7c4a460830c2d1b902ce2a78f7ecad5e8533b159eda6db00

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
new file mode 100644
index 00000000000..570df0c7c24
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+GENTOO_VDR_CONDITIONAL=yes
+
+DESCRIPTION="VDR Plugin: Xinelib PlugIn"
+HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
+
+COMMON_DEPEND="
+	vdr? (
+		>=media-video/vdr-1.6.0
+		libextractor? ( >=media-libs/libextractor-0.5.20 )
+		caps? ( sys-libs/libcap )
+	)
+
+	xine? (
+		( >=media-libs/xine-lib-1.2
+			virtual/ffmpeg )
+		fbcon? ( jpeg? ( virtual/jpeg:* ) )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
+			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
+			jpeg? ( virtual/jpeg:* )
+			bluray? ( media-libs/libbluray )
+			opengl? ( virtual/opengl )
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-kernel/linux-headers
+	nls? ( sys-devel/gettext )
+	xine? (
+		X? (
+			x11-proto/xproto
+			x11-libs/libXxf86vm
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}"
+
+REQUIRED_USE=" || ( vdr xine )"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
+
+pkg_setup() {
+	vdr-plugin-2_pkg_setup
+
+	if use xine; then
+		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	if has_version ">=media-libs/xine-lib-1.2"; then
+		myconf="${myconf} --enable-libavutil"
+	else
+		myconf="${myconf} --disable-libavutil"
+	fi
+
+	# No autotools based configure script
+	./configure \
+		--cc=$(tc-getCC) \
+		--cxx=$(tc-getCXX) \
+		$(use_enable X x11) \
+		$(use_enable X xshm) \
+		$(use_enable X xdpms) \
+		$(use_enable X xshape) \
+		$(use_enable X xrender) \
+		$(use_enable fbcon fb) \
+		$(use_enable vdr) \
+		$(use_enable xine libxine) \
+		$(use_enable libextractor) \
+		$(use_enable caps libcap) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable xinerama) \
+		$(use_enable vdpau) \
+		$(use_enable dbus dbus-glib-1) \
+		$(use_enable nls i18n) \
+		$(use_enable bluray libbluray) \
+		$(use_enable opengl) \
+		${myconf} \
+		|| die
+}
+
+src_install() {
+	if use vdr; then
+		vdr-plugin-2_src_install
+
+		# bug 346989
+		insinto /etc/vdr/plugins/xineliboutput/
+		doins examples/allowed_hosts.conf
+		fowners -R vdr:vdr /etc/vdr/
+
+		if use nls; then
+			emake DESTDIR="${D}" i18n
+		fi
+
+		if use xine; then
+			doinitd "${FILESDIR}"/vdr-frontend
+
+			insinto $XINE_PLUGIN_DIR
+			doins xineplug_inp_xvdr.so
+
+			insinto $XINE_PLUGIN_DIR/post
+			doins xineplug_post_*.so
+
+			if use fbcon; then
+				dobin vdr-fbfe
+
+				insinto $VDR_PLUGIN_DIR
+				doins libxineliboutput-fbfe.so.*
+			fi
+
+			if use X; then
+				dobin vdr-sxfe
+
+				insinto $VDR_PLUGIN_DIR
+				doins libxineliboutput-sxfe.so.*
+			fi
+		fi
+	else
+		emake DESTDIR="${D}" install
+
+		dodoc HISTORY README
+	fi
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2019-12-15 16:34 Joerg Bornkessel
  0 siblings, 0 replies; 19+ messages in thread
From: Joerg Bornkessel @ 2019-12-15 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     5575f4077a292b162d9d8c46644dde850236932c
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 16:33:09 2019 +0000
Commit:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 16:33:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5575f407

media-plugins/vdr-xineliboutput: version bump

commit will also include:
cleanup old
version control moved from CVS to Git
eapi=7

Suggested-By: Pertti Kosunen <pertti.kosunen <AT> pp.nic.fi>
Suggested-By: Christian Kunkel <ch.kunkel <AT> gmx.de>
Bug: https://bugs.gentoo.org/614136
Bug: https://bugs.gentoo.org/648748
Closes: https://bugs.gentoo.org/614136
Closes: https://bugs.gentoo.org/648748
Package-Manager: Portage-2.3.81, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/Manifest           |   4 +-
 .../vdr-xineliboutput-1.1.0.ebuild                 | 153 --------------------
 .../vdr-xineliboutput-2.0.0_pre20130821.ebuild     | 158 ---------------------
 ...50220.ebuild => vdr-xineliboutput-2.1.0.ebuild} |  21 +--
 .../vdr-xineliboutput-9999.ebuild                  |  17 +--
 5 files changed, 21 insertions(+), 332 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 269704ed6f1..023e8ba2808 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,4 +1,2 @@
-DIST vdr-xineliboutput-1.1.0.tgz 404820 BLAKE2B d2ed09b0b39878f6a865180e110502d774d6087b56bb905af0994c9b397de0db0d54599c6957022defeb9fcbcdd197de505aaf83b6e13845f55e14b65c825530 SHA512 255ae698c1dc9d9098847e62c386a6bd24ec1dc822fb695600ef944e18d0febfac0d5b487de57a17ea9f9bd3935d1d11763a06a5daa527ce95f9557a408c264d
 DIST vdr-xineliboutput-2.0.0.tgz 413085 BLAKE2B 85fffdbea51917035475863019095ed81bdda6e8e994c3d76b83433fca14cf680c64e268c04316199f6b707b5da7bf0ceafb991781ced552abebebf2e283fb5f SHA512 9410072bcd8ae71196e3417c12dc810da109f155748d58b3b0b422cd6d8cd29b3f8a7d0cbffada9dd22af679161ffeb096e952f620ed1c7f1122b46bf111f9ee
-DIST vdr-xineliboutput-2.0.0_p20150220.tar.xz 326520 BLAKE2B ee3c4c61b4df79fe8ae1a06119e0427e027d462c8d85f567b787604993427f70dc1d532c41dd1c1778ba96ff351c0f08db925820e075a3ed4a8837f7ae47cada SHA512 8e3a6fe4dad4875b1e2d2c6667e1c5d8f4542742fb74c40148aa5dc403b86743c32a49e1fb0979a59c312aaff4c038347f934105b0ca8d3097b61c59021966f3
-DIST xineliboutput-2.0.0_p20130821.tar.bz2 356633 BLAKE2B 499f3d341cfaf24ec00da4f159ad33182abf22295928cd57e87d9141fb971a4f75a66e5c3f38b7f3b5a227c5c91ec3a644160ebdbc203f8c4d733b8e1b12f64e SHA512 ee25447749dc5b8fe93da3c021823f8dd552619d64575525918c15447135af0d6684e613b20a1aa99a1fd8bd5334344ea03962ab75bbbffb0204d92adf36f9ed
+DIST vdr-xineliboutput-2.1.0.tgz 415333 BLAKE2B 8311271dda889cde5ab69d5bf1f643c8f6b1991ca615ce6322ea5585aac12b07b32f6fd933bf6c3797d45971597e61d429e4d9de356246109cab7c8f059b4d79 SHA512 226654dcd47864e9df8282ef401509d291677587b2850872c535abb7bee468a7c6d72c30953090890d002f0977aa1ee357a0fe6938ce3f3c1b6324e82b926537

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
deleted file mode 100644
index 22ecc06ccdd..00000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-GENTOO_VDR_CONDITIONAL=yes
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
-
-COMMON_DEPEND="
-	vdr? (
-		>=media-video/vdr-1.6.0
-		libextractor? ( >=media-libs/libextractor-0.5.20 )
-		caps? ( sys-libs/libcap )
-	)
-
-	xine? (
-		( >=media-libs/xine-lib-1.2
-			virtual/ffmpeg )
-		fbcon? ( jpeg? ( virtual/jpeg:* ) )
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
-			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
-			jpeg? ( virtual/jpeg:* )
-			bluray? ( media-libs/libbluray )
-			opengl? ( virtual/opengl )
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-kernel/linux-headers
-	nls? ( sys-devel/gettext )
-	xine? (
-		X? (
-			x11-base/xorg-proto
-			x11-libs/libXxf86vm
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}"
-
-REQUIRED_USE=" || ( vdr xine )"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-1.0.0_pre6"
-
-pkg_setup() {
-	vdr-plugin-2_pkg_setup
-
-	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
-		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
-	fi
-}
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-2.1.2"; then
-		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" \
-		-i config.c menu.c tools/udp_pes_scheduler.c
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if has_version ">=media-libs/xine-lib-1.2"; then
-		myconf="${myconf} --enable-libavutil"
-	else
-		myconf="${myconf} --disable-libavutil"
-	fi
-
-	# No autotools based configure script
-	./configure \
-		--cc=$(tc-getCC) \
-		--cxx=$(tc-getCXX) \
-		$(use_enable X x11) \
-		$(use_enable X xshm) \
-		$(use_enable X xdpms) \
-		$(use_enable X xshape) \
-		$(use_enable X xrender) \
-		$(use_enable fbcon fb) \
-		$(use_enable vdr) \
-		$(use_enable xine libxine) \
-		$(use_enable libextractor) \
-		$(use_enable caps libcap) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable xinerama) \
-		$(use_enable vdpau) \
-		$(use_enable dbus dbus-glib-1) \
-		$(use_enable nls i18n) \
-		$(use_enable bluray libbluray) \
-		$(use_enable opengl) \
-		${myconf} \
-		|| die
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
-	if use vdr; then
-		vdr-plugin-2_src_install
-
-		# bug 346989
-		insinto /etc/vdr/plugins/xineliboutput/
-		doins examples/allowed_hosts.conf
-		fowners -R vdr:vdr /etc/vdr/
-
-		if use nls; then
-			emake DESTDIR="${D}" i18n
-		fi
-
-		if use xine; then
-			insinto $XINE_PLUGIN_DIR
-			doins xineplug_inp_xvdr.so
-
-			insinto $XINE_PLUGIN_DIR/post
-			doins xineplug_post_*.so
-
-			if use fbcon; then
-				dobin vdr-fbfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-fbfe.so.*
-			fi
-
-			if use X; then
-				dobin vdr-sxfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-sxfe.so.*
-			fi
-		fi
-	else
-		emake DESTDIR="${D}" install
-
-		dodoc HISTORY README
-	fi
-}

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
deleted file mode 100644
index 6f3eb19458b..00000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-GENTOO_VDR_CONDITIONAL=yes
-
-DESCRIPTION="VDR Plugin: Xinelib PlugIn"
-HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-MY_P=${PN#vdr-}-${PV/_pre/_p}
-SRC_URI="http://vdr.websitec.de/download/${PN}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
-
-COMMON_DEPEND="
-	vdr? (
-		>=media-video/vdr-1.6.0
-		libextractor? ( >=media-libs/libextractor-0.5.20 )
-		caps? ( sys-libs/libcap )
-	)
-
-	xine? (
-		( >=media-libs/xine-lib-1.2
-			virtual/ffmpeg )
-		fbcon? ( jpeg? ( virtual/jpeg:* ) )
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
-			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
-			jpeg? ( virtual/jpeg:* )
-			bluray? ( media-libs/libbluray )
-			opengl? ( virtual/opengl )
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-kernel/linux-headers
-	nls? ( sys-devel/gettext )
-	xine? (
-		X? (
-			x11-base/xorg-proto
-			x11-libs/libXxf86vm
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}"
-
-REQUIRED_USE=" || ( vdr xine )"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
-
-pkg_setup() {
-	vdr-plugin-2_pkg_setup
-
-	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
-		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
-	fi
-}
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-2.1.10"; then
-		sed -e "s:pm = RenderPixmaps():pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()):"\
-			-e "s:delete pm;:DestroyPixmap(pm);:"\
-			-i osd.c
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if has_version ">=media-libs/xine-lib-1.2"; then
-		myconf="${myconf} --enable-libavutil"
-	else
-		myconf="${myconf} --disable-libavutil"
-	fi
-
-	# No autotools based configure script
-	./configure \
-		--cc=$(tc-getCC) \
-		--cxx=$(tc-getCXX) \
-		$(use_enable X x11) \
-		$(use_enable X xshm) \
-		$(use_enable X xdpms) \
-		$(use_enable X xshape) \
-		$(use_enable X xrender) \
-		$(use_enable fbcon fb) \
-		$(use_enable vdr) \
-		$(use_enable xine libxine) \
-		$(use_enable libextractor) \
-		$(use_enable caps libcap) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable xinerama) \
-		$(use_enable vdpau) \
-		$(use_enable dbus dbus-glib-1) \
-		$(use_enable nls i18n) \
-		$(use_enable bluray libbluray) \
-		$(use_enable opengl) \
-		${myconf} \
-		|| die
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
-	if use vdr; then
-		vdr-plugin-2_src_install
-
-		# bug 346989
-		insinto /etc/vdr/plugins/xineliboutput/
-		doins examples/allowed_hosts.conf
-		fowners -R vdr:vdr /etc/vdr/
-
-		if use nls; then
-			emake DESTDIR="${D}" i18n
-		fi
-
-		if use xine; then
-			doinitd "${FILESDIR}"/vdr-frontend
-
-			insinto $XINE_PLUGIN_DIR
-			doins xineplug_inp_xvdr.so
-
-			insinto $XINE_PLUGIN_DIR/post
-			doins xineplug_post_*.so
-
-			if use fbcon; then
-				dobin vdr-fbfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-fbfe.so.*
-			fi
-
-			if use X; then
-				dobin vdr-sxfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-sxfe.so.*
-			fi
-		fi
-	else
-		emake DESTDIR="${D}" install
-
-		dodoc HISTORY README
-	fi
-}

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
similarity index 87%
rename from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
rename to media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
index d383380175c..82652c7fe66 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
@@ -9,18 +9,16 @@ GENTOO_VDR_CONDITIONAL=yes
 
 DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-MY_PV=${PV/_pre/_p}
-SRC_URI="http://vdr.websitec.de/download/${PN}/${PN}-${MY_PV}.tar.xz"
-S="${WORKDIR}/${VDRPLUGIN}-${MY_PV}"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
+IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
 
 COMMON_DEPEND="
 	vdr? (
-		>=media-video/vdr-1.6.0
+		media-video/vdr
 		libextractor? ( >=media-libs/libextractor-0.5.20 )
 		caps? ( sys-libs/libcap )
 	)
@@ -33,12 +31,13 @@ COMMON_DEPEND="
 			x11-libs/libX11
 			x11-libs/libXext
 			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
+			bluray? ( media-libs/libbluray )
 			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
-			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
 			jpeg? ( virtual/jpeg:* )
-			bluray? ( media-libs/libbluray )
 			opengl? ( virtual/opengl )
+			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
+			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
+			xinerama? ( x11-libs/libXinerama )
 		)
 	)"
 
@@ -84,12 +83,14 @@ src_configure() {
 		$(use_enable X xshm) \
 		$(use_enable X xdpms) \
 		$(use_enable X xshape) \
+		$(use_enable X xrandr) \
 		$(use_enable X xrender) \
 		$(use_enable fbcon fb) \
 		$(use_enable vdr) \
 		$(use_enable xine libxine) \
 		$(use_enable libextractor) \
 		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
 		$(use_enable jpeg libjpeg) \
 		$(use_enable xinerama) \
 		$(use_enable vdpau) \

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index bca8332076f..d84cc093117 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 GENTOO_VDR_CONDITIONAL=yes
 
-inherit vdr-plugin-2 cvs toolchain-funcs
+inherit git-r3 toolchain-funcs vdr-plugin-2
 
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
+DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 
-ECVS_SERVER="xineliboutput.cvs.sourceforge.net:/cvsroot/xineliboutput"
-ECVS_MODULE="${PN}"
+EGIT_REPO_URI="https://git.code.sf.net/p/xineliboutput/git"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -55,7 +55,8 @@ DEPEND="${COMMON_DEPEND}
 	)"
 RDEPEND="${COMMON_DEPEND}"
 
-S=${WORKDIR}/${PN}
+S=${WORKDIR}/${P}
+
 VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
 
 pkg_setup() {
@@ -73,7 +74,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Allow user patches to be applied without modifyfing the ebuild
-	epatch_user
+	eaplly_user
 
 	vdr-plugin-2_src_prepare
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2020-01-12 17:56 Jörg Bornkessel
  0 siblings, 0 replies; 19+ messages in thread
From: Jörg Bornkessel @ 2020-01-12 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     ff2edc9332dccff8689f00a6a6f7397b60471ad6
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 17:32:20 2020 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 17:55:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff2edc93

media-plugins/vdr-xineliboutput: wrong license, fixed

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild | 4 ++--
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild | 4 ++--
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
index d594f721d33..349d81a244a 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
 

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
index 82652c7fe66..f157b6a17f7 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
 

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index d84cc093117..a262a36247f 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 EGIT_REPO_URI="https://git.code.sf.net/p/xineliboutput/git"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS=""
 IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
 
@@ -74,7 +74,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Allow user patches to be applied without modifyfing the ebuild
-	eaplly_user
+	eapply_user
 
 	vdr-plugin-2_src_prepare
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2020-02-14 21:51 Jörg Bornkessel
  0 siblings, 0 replies; 19+ messages in thread
From: Jörg Bornkessel @ 2020-02-14 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     fe67eecac26a95c3a29704f7522d2cf095b4cd59
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 21:43:48 2020 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Fri Feb 14 21:50:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe67eeca

media-plugins/vdr-xineliboutput: removed longdescription

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/metadata.xml b/media-plugins/vdr-xineliboutput/metadata.xml
index 9377b8a46e1..71f5a2660ed 100644
--- a/media-plugins/vdr-xineliboutput/metadata.xml
+++ b/media-plugins/vdr-xineliboutput/metadata.xml
@@ -5,9 +5,6 @@
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
-	<longdescription>
-		Video Disk Recorder Xinelib PlugIn ( VDR )
-	</longdescription>
 	<use>
 		<flag name="cec">Enable CEC support through <pkg>dev-libs/libcec</pkg></flag>
 		<flag name="bluray">Enable BluRay metadata support through <pkg>media-libs/libbluray</pkg></flag>


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2020-04-24 20:05 Jörg Bornkessel
  0 siblings, 0 replies; 19+ messages in thread
From: Jörg Bornkessel @ 2020-04-24 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c15caab8983407dc394a3871207109572a97fd03
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 20:04:43 2020 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 20:05:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c15caab8

media-plugins/vdr-xineliboutput: version bump, cleanup old

thx to S. Schreier for reporting this

Closes: https://bugs.gentoo.org/717070
Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/Manifest              |  2 +-
 ...ut-2.0.0.ebuild => vdr-xineliboutput-2.2.0.ebuild} | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 023e8ba2808..b3eae169dc5 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,2 +1,2 @@
-DIST vdr-xineliboutput-2.0.0.tgz 413085 BLAKE2B 85fffdbea51917035475863019095ed81bdda6e8e994c3d76b83433fca14cf680c64e268c04316199f6b707b5da7bf0ceafb991781ced552abebebf2e283fb5f SHA512 9410072bcd8ae71196e3417c12dc810da109f155748d58b3b0b422cd6d8cd29b3f8a7d0cbffada9dd22af679161ffeb096e952f620ed1c7f1122b46bf111f9ee
 DIST vdr-xineliboutput-2.1.0.tgz 415333 BLAKE2B 8311271dda889cde5ab69d5bf1f643c8f6b1991ca615ce6322ea5585aac12b07b32f6fd933bf6c3797d45971597e61d429e4d9de356246109cab7c8f059b4d79 SHA512 226654dcd47864e9df8282ef401509d291677587b2850872c535abb7bee468a7c6d72c30953090890d002f0977aa1ee357a0fe6938ce3f3c1b6324e82b926537
+DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0.ebuild
similarity index 87%
rename from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
rename to media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0.ebuild
index da8c3780dca..a0ae0f345cf 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs vdr-plugin-2
 
@@ -14,11 +14,11 @@ SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 SLOT="0"
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
+IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
 
 COMMON_DEPEND="
 	vdr? (
-		>=media-video/vdr-1.6.0
+		media-video/vdr
 		libextractor? ( >=media-libs/libextractor-0.5.20 )
 		caps? ( sys-libs/libcap )
 	)
@@ -31,12 +31,13 @@ COMMON_DEPEND="
 			x11-libs/libX11
 			x11-libs/libXext
 			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
+			bluray? ( media-libs/libbluray )
 			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
-			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
 			jpeg? ( virtual/jpeg:* )
-			bluray? ( media-libs/libbluray )
 			opengl? ( virtual/opengl )
+			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
+			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
+			xinerama? ( x11-libs/libXinerama )
 		)
 	)"
 
@@ -82,21 +83,25 @@ src_configure() {
 		$(use_enable X xshm) \
 		$(use_enable X xdpms) \
 		$(use_enable X xshape) \
+		$(use_enable X xrandr) \
 		$(use_enable X xrender) \
 		$(use_enable fbcon fb) \
 		$(use_enable vdr) \
 		$(use_enable xine libxine) \
 		$(use_enable libextractor) \
 		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
 		$(use_enable jpeg libjpeg) \
 		$(use_enable xinerama) \
-		$(use_enable vdpau) \
 		$(use_enable dbus dbus-glib-1) \
 		$(use_enable nls i18n) \
 		$(use_enable bluray libbluray) \
 		$(use_enable opengl) \
 		${myconf} \
 		|| die
+
+	# UINT64_C is needed by ffmpeg headers
+	append-cxxflags -D__STDC_CONSTANT_MACROS
 }
 
 src_install() {


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2020-04-26 10:35 David Seifert
  0 siblings, 0 replies; 19+ messages in thread
From: David Seifert @ 2020-04-26 10:35 UTC (permalink / raw
  To: gentoo-commits

commit:     9493f8d481df53017f3acf0e250415c21f44395b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 10:34:59 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 10:34:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9493f8d4

media-plugins/vdr-xineliboutput: Replace virtual/ffmpeg

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...vdr-xineliboutput-2.1.0.ebuild => vdr-xineliboutput-2.1.0-r1.ebuild} | 2 +-
 ...vdr-xineliboutput-2.2.0.ebuild => vdr-xineliboutput-2.2.0-r1.ebuild} | 2 +-
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
similarity index 99%
rename from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
rename to media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
index 5ff1c0f0d47..8fed3989426 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 
 	xine? (
 		( >=media-libs/xine-lib-1.2
-			virtual/ffmpeg )
+			media-video/ffmpeg )
 		fbcon? ( jpeg? ( virtual/jpeg:* ) )
 		X? (
 			x11-libs/libX11

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
similarity index 99%
rename from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0.ebuild
rename to media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
index a0ae0f345cf..e56e63363ca 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 
 	xine? (
 		( >=media-libs/xine-lib-1.2
-			virtual/ffmpeg )
+			media-video/ffmpeg )
 		fbcon? ( jpeg? ( virtual/jpeg:* ) )
 		X? (
 			x11-libs/libX11

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index a262a36247f..63a718c965d 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 
 	xine? (
 		( >=media-libs/xine-lib-1.2
-			virtual/ffmpeg )
+			media-video/ffmpeg )
 		fbcon? ( jpeg? ( virtual/jpeg:* ) )
 		X? (
 			x11-libs/libX11


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2020-05-03  8:56 Jörg Bornkessel
  0 siblings, 0 replies; 19+ messages in thread
From: Jörg Bornkessel @ 2020-05-03  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     edd486548f1f6eb3af268636bc1f491c0bfd6a4a
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 08:55:06 2020 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun May  3 08:55:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd48654

media-plugins/vdr-xineliboutput: fixed not detecting opengl in pkg-config

thx to josef95 @  bug 711978 to detect the solution for this

Closes: https://bugs.gentoo.org/711978
Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 .../vdr-xineliboutput-2.1.0-r2.ebuild              | 156 +++++++++++++++++++++
 .../vdr-xineliboutput-2.2.0-r2.ebuild              | 154 ++++++++++++++++++++
 2 files changed, 310 insertions(+)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
new file mode 100644
index 00000000000..57b4c4f49d7
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs vdr-plugin-2
+
+GENTOO_VDR_CONDITIONAL=yes
+
+DESCRIPTION="VDR Plugin: Xinelib PlugIn"
+HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
+
+COMMON_DEPEND="
+	vdr? (
+		media-video/vdr
+		libextractor? ( >=media-libs/libextractor-0.5.20 )
+		caps? ( sys-libs/libcap )
+	)
+
+	xine? (
+		( >=media-libs/xine-lib-1.2
+			media-video/ffmpeg )
+		fbcon? ( jpeg? ( virtual/jpeg:* ) )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
+			bluray? ( media-libs/libbluray )
+			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
+			jpeg? ( virtual/jpeg:* )
+			opengl? ( virtual/opengl )
+			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
+			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-kernel/linux-headers
+	nls? ( sys-devel/gettext )
+	xine? (
+		X? (
+			x11-base/xorg-proto
+			x11-libs/libXxf86vm
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}"
+
+REQUIRED_USE=" || ( vdr xine )"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
+
+pkg_setup() {
+	vdr-plugin-2_pkg_setup
+
+	if use xine; then
+		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
+	fi
+}
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# bug 711978
+	sed -e "s:X11  opengl:X11  OpenGl:" -i configure || die
+}
+
+src_configure() {
+	local myconf
+
+	if has_version ">=media-libs/xine-lib-1.2"; then
+		myconf="${myconf} --enable-libavutil"
+	else
+		myconf="${myconf} --disable-libavutil"
+	fi
+
+	# No autotools based configure script
+	./configure \
+		--cc=$(tc-getCC) \
+		--cxx=$(tc-getCXX) \
+		$(use_enable X x11) \
+		$(use_enable X xshm) \
+		$(use_enable X xdpms) \
+		$(use_enable X xshape) \
+		$(use_enable X xrandr) \
+		$(use_enable X xrender) \
+		$(use_enable fbcon fb) \
+		$(use_enable vdr) \
+		$(use_enable xine libxine) \
+		$(use_enable libextractor) \
+		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable xinerama) \
+		$(use_enable vdpau) \
+		$(use_enable dbus dbus-glib-1) \
+		$(use_enable nls i18n) \
+		$(use_enable bluray libbluray) \
+		$(use_enable opengl) \
+		${myconf} \
+		|| die
+
+	# UINT64_C is needed by ffmpeg headers
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+}
+
+src_install() {
+	if use vdr; then
+		vdr-plugin-2_src_install
+
+		# bug 346989
+		insinto /etc/vdr/plugins/xineliboutput/
+		doins examples/allowed_hosts.conf
+		fowners -R vdr:vdr /etc/vdr/
+
+		if use nls; then
+			emake DESTDIR="${D}" i18n
+		fi
+
+		if use xine; then
+			doinitd "${FILESDIR}"/vdr-frontend
+
+			insinto $XINE_PLUGIN_DIR
+			doins xineplug_inp_xvdr.so
+
+			insinto $XINE_PLUGIN_DIR/post
+			doins xineplug_post_*.so
+
+			if use fbcon; then
+				dobin vdr-fbfe
+
+				insinto $VDR_PLUGIN_DIR
+				doins libxineliboutput-fbfe.so.*
+			fi
+
+			if use X; then
+				dobin vdr-sxfe
+
+				insinto $VDR_PLUGIN_DIR
+				doins libxineliboutput-sxfe.so.*
+			fi
+		fi
+	else
+		emake DESTDIR="${D}" install
+
+		dodoc HISTORY README
+	fi
+}

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
new file mode 100644
index 00000000000..05f03857fb3
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs vdr-plugin-2
+
+GENTOO_VDR_CONDITIONAL=yes
+
+DESCRIPTION="VDR Plugin: Xinelib PlugIn"
+HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
+
+COMMON_DEPEND="
+	vdr? (
+		media-video/vdr
+		libextractor? ( >=media-libs/libextractor-0.5.20 )
+		caps? ( sys-libs/libcap )
+	)
+
+	xine? (
+		( >=media-libs/xine-lib-1.2
+			media-video/ffmpeg )
+		fbcon? ( jpeg? ( virtual/jpeg:* ) )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
+			bluray? ( media-libs/libbluray )
+			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
+			jpeg? ( virtual/jpeg:* )
+			opengl? ( virtual/opengl )
+			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
+			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-kernel/linux-headers
+	nls? ( sys-devel/gettext )
+	xine? (
+		X? (
+			x11-base/xorg-proto
+			x11-libs/libXxf86vm
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}"
+
+REQUIRED_USE=" || ( vdr xine )"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
+
+pkg_setup() {
+	vdr-plugin-2_pkg_setup
+
+	if use xine; then
+		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
+	fi
+}
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# bug 711978
+	sed -e "s:X11  opengl:X11  OpenGl:" -i configure || die
+}
+src_configure() {
+	local myconf
+
+	if has_version ">=media-libs/xine-lib-1.2"; then
+		myconf="${myconf} --enable-libavutil"
+	else
+		myconf="${myconf} --disable-libavutil"
+	fi
+
+	# No autotools based configure script
+	./configure \
+		--cc=$(tc-getCC) \
+		--cxx=$(tc-getCXX) \
+		$(use_enable X x11) \
+		$(use_enable X xshm) \
+		$(use_enable X xdpms) \
+		$(use_enable X xshape) \
+		$(use_enable X xrandr) \
+		$(use_enable X xrender) \
+		$(use_enable fbcon fb) \
+		$(use_enable vdr) \
+		$(use_enable xine libxine) \
+		$(use_enable libextractor) \
+		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable xinerama) \
+		$(use_enable dbus dbus-glib-1) \
+		$(use_enable nls i18n) \
+		$(use_enable bluray libbluray) \
+		$(use_enable opengl) \
+		${myconf} \
+		|| die
+
+	# UINT64_C is needed by ffmpeg headers
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+}
+
+src_install() {
+	if use vdr; then
+		vdr-plugin-2_src_install
+
+		# bug 346989
+		insinto /etc/vdr/plugins/xineliboutput/
+		doins examples/allowed_hosts.conf
+		fowners -R vdr:vdr /etc/vdr/
+
+		if use nls; then
+			emake DESTDIR="${D}" i18n
+		fi
+
+		if use xine; then
+			doinitd "${FILESDIR}"/vdr-frontend
+
+			insinto $XINE_PLUGIN_DIR
+			doins xineplug_inp_xvdr.so
+
+			insinto $XINE_PLUGIN_DIR/post
+			doins xineplug_post_*.so
+
+			if use fbcon; then
+				dobin vdr-fbfe
+
+				insinto $VDR_PLUGIN_DIR
+				doins libxineliboutput-fbfe.so.*
+			fi
+
+			if use X; then
+				dobin vdr-sxfe
+
+				insinto $VDR_PLUGIN_DIR
+				doins libxineliboutput-sxfe.so.*
+			fi
+		fi
+	else
+		emake DESTDIR="${D}" install
+
+		dodoc HISTORY README
+	fi
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2020-06-27 20:51 Aaron Bauman
  0 siblings, 0 replies; 19+ messages in thread
From: Aaron Bauman @ 2020-06-27 20:51 UTC (permalink / raw
  To: gentoo-commits

commit:     3f049101097c85693e7fc407a276a0e195bb8ab8
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 17 17:44:49 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 20:51:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f049101

media-plugins/vdr-xineliboutput: add missing flag-o-matic eclass

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16299
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild | 2 +-
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild | 2 +-
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild | 2 +-
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild | 2 +-
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
index 8fed3989426..26cc8d658f5 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs vdr-plugin-2
+inherit flag-o-matic toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
index 57b4c4f49d7..22b0356c3c5 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs vdr-plugin-2
+inherit flag-o-matic toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
index e56e63363ca..5f905220218 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs vdr-plugin-2
+inherit flag-o-matic toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
index 05f03857fb3..67a25eda735 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs vdr-plugin-2
+inherit flag-o-matic toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index 63a718c965d..b81bf629a3f 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 GENTOO_VDR_CONDITIONAL=yes
 
-inherit git-r3 toolchain-funcs vdr-plugin-2
+inherit flag-o-matic git-r3 toolchain-funcs vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2021-04-05  9:06 Jörg Bornkessel
  0 siblings, 0 replies; 19+ messages in thread
From: Jörg Bornkessel @ 2021-04-05  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     eb20013b2a9e72a1dbc298ed65051201e14502f1
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 09:05:54 2021 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 09:06:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb20013b

media-plugins/vdr-xineliboutput: calls cc directly fixed

this commit will also fix the compile with llvm/clang,
the llvm/clang patch will fix only the errors to prevent
the plugin from compile,
a lot of warnings on llvm/clang are still exist

Closes: https://bugs.gentoo.org/771036
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/Manifest           |   2 +-
 .../vdr-xineliboutput-2.1.0-r1.ebuild              | 149 ---------------------
 .../vdr-xineliboutput-2.2.0-r1.ebuild              | 148 --------------------
 ...r2.ebuild => vdr-xineliboutput-2.2.0-r3.ebuild} |  11 +-
 4 files changed, 8 insertions(+), 302 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index b3eae169dc5..5e739095809 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,2 +1,2 @@
-DIST vdr-xineliboutput-2.1.0.tgz 415333 BLAKE2B 8311271dda889cde5ab69d5bf1f643c8f6b1991ca615ce6322ea5585aac12b07b32f6fd933bf6c3797d45971597e61d429e4d9de356246109cab7c8f059b4d79 SHA512 226654dcd47864e9df8282ef401509d291677587b2850872c535abb7bee468a7c6d72c30953090890d002f0977aa1ee357a0fe6938ce3f3c1b6324e82b926537
 DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9
+DIST vdr-xineliboutput-2.2.0_c++11.patch.bz2 7609 BLAKE2B fe3b9f8d8fb1425e11e068a410844c2ad4f7afa60ad815ee0918a9ce2fa16e450b418358f7688047a5d5b185bb783890a31cfa174d7dc4b29deb9d96f9295fbd SHA512 8323b73b082ef61fe74ef1110e991c8f8acfcf22ac8ddd9f06cd5f8cba6d0087a5500658e20402b8b590a1bb4f10ad7bf712be12a11c447f943aafa4a32413e3

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
deleted file mode 100644
index 26cc8d658f5..00000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs vdr-plugin-2
-
-GENTOO_VDR_CONDITIONAL=yes
-
-DESCRIPTION="VDR Plugin: Xinelib PlugIn"
-HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
-
-COMMON_DEPEND="
-	vdr? (
-		media-video/vdr
-		libextractor? ( >=media-libs/libextractor-0.5.20 )
-		caps? ( sys-libs/libcap )
-	)
-
-	xine? (
-		( >=media-libs/xine-lib-1.2
-			media-video/ffmpeg )
-		fbcon? ( jpeg? ( virtual/jpeg:* ) )
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-			bluray? ( media-libs/libbluray )
-			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
-			jpeg? ( virtual/jpeg:* )
-			opengl? ( virtual/opengl )
-			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
-			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-kernel/linux-headers
-	nls? ( sys-devel/gettext )
-	xine? (
-		X? (
-			x11-base/xorg-proto
-			x11-libs/libXxf86vm
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}"
-
-REQUIRED_USE=" || ( vdr xine )"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
-
-pkg_setup() {
-	vdr-plugin-2_pkg_setup
-
-	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
-		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if has_version ">=media-libs/xine-lib-1.2"; then
-		myconf="${myconf} --enable-libavutil"
-	else
-		myconf="${myconf} --disable-libavutil"
-	fi
-
-	# No autotools based configure script
-	./configure \
-		--cc=$(tc-getCC) \
-		--cxx=$(tc-getCXX) \
-		$(use_enable X x11) \
-		$(use_enable X xshm) \
-		$(use_enable X xdpms) \
-		$(use_enable X xshape) \
-		$(use_enable X xrandr) \
-		$(use_enable X xrender) \
-		$(use_enable fbcon fb) \
-		$(use_enable vdr) \
-		$(use_enable xine libxine) \
-		$(use_enable libextractor) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable xinerama) \
-		$(use_enable vdpau) \
-		$(use_enable dbus dbus-glib-1) \
-		$(use_enable nls i18n) \
-		$(use_enable bluray libbluray) \
-		$(use_enable opengl) \
-		${myconf} \
-		|| die
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
-	if use vdr; then
-		vdr-plugin-2_src_install
-
-		# bug 346989
-		insinto /etc/vdr/plugins/xineliboutput/
-		doins examples/allowed_hosts.conf
-		fowners -R vdr:vdr /etc/vdr/
-
-		if use nls; then
-			emake DESTDIR="${D}" i18n
-		fi
-
-		if use xine; then
-			doinitd "${FILESDIR}"/vdr-frontend
-
-			insinto $XINE_PLUGIN_DIR
-			doins xineplug_inp_xvdr.so
-
-			insinto $XINE_PLUGIN_DIR/post
-			doins xineplug_post_*.so
-
-			if use fbcon; then
-				dobin vdr-fbfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-fbfe.so.*
-			fi
-
-			if use X; then
-				dobin vdr-sxfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-sxfe.so.*
-			fi
-		fi
-	else
-		emake DESTDIR="${D}" install
-
-		dodoc HISTORY README
-	fi
-}

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
deleted file mode 100644
index 5f905220218..00000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs vdr-plugin-2
-
-GENTOO_VDR_CONDITIONAL=yes
-
-DESCRIPTION="VDR Plugin: Xinelib PlugIn"
-HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
-
-COMMON_DEPEND="
-	vdr? (
-		media-video/vdr
-		libextractor? ( >=media-libs/libextractor-0.5.20 )
-		caps? ( sys-libs/libcap )
-	)
-
-	xine? (
-		( >=media-libs/xine-lib-1.2
-			media-video/ffmpeg )
-		fbcon? ( jpeg? ( virtual/jpeg:* ) )
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-			bluray? ( media-libs/libbluray )
-			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
-			jpeg? ( virtual/jpeg:* )
-			opengl? ( virtual/opengl )
-			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
-			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-kernel/linux-headers
-	nls? ( sys-devel/gettext )
-	xine? (
-		X? (
-			x11-base/xorg-proto
-			x11-libs/libXxf86vm
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}"
-
-REQUIRED_USE=" || ( vdr xine )"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
-
-pkg_setup() {
-	vdr-plugin-2_pkg_setup
-
-	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
-		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if has_version ">=media-libs/xine-lib-1.2"; then
-		myconf="${myconf} --enable-libavutil"
-	else
-		myconf="${myconf} --disable-libavutil"
-	fi
-
-	# No autotools based configure script
-	./configure \
-		--cc=$(tc-getCC) \
-		--cxx=$(tc-getCXX) \
-		$(use_enable X x11) \
-		$(use_enable X xshm) \
-		$(use_enable X xdpms) \
-		$(use_enable X xshape) \
-		$(use_enable X xrandr) \
-		$(use_enable X xrender) \
-		$(use_enable fbcon fb) \
-		$(use_enable vdr) \
-		$(use_enable xine libxine) \
-		$(use_enable libextractor) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable xinerama) \
-		$(use_enable dbus dbus-glib-1) \
-		$(use_enable nls i18n) \
-		$(use_enable bluray libbluray) \
-		$(use_enable opengl) \
-		${myconf} \
-		|| die
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
-	if use vdr; then
-		vdr-plugin-2_src_install
-
-		# bug 346989
-		insinto /etc/vdr/plugins/xineliboutput/
-		doins examples/allowed_hosts.conf
-		fowners -R vdr:vdr /etc/vdr/
-
-		if use nls; then
-			emake DESTDIR="${D}" i18n
-		fi
-
-		if use xine; then
-			doinitd "${FILESDIR}"/vdr-frontend
-
-			insinto $XINE_PLUGIN_DIR
-			doins xineplug_inp_xvdr.so
-
-			insinto $XINE_PLUGIN_DIR/post
-			doins xineplug_post_*.so
-
-			if use fbcon; then
-				dobin vdr-fbfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-fbfe.so.*
-			fi
-
-			if use X; then
-				dobin vdr-sxfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-sxfe.so.*
-			fi
-		fi
-	else
-		emake DESTDIR="${D}" install
-
-		dodoc HISTORY README
-	fi
-}

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r3.ebuild
similarity index 92%
rename from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
rename to media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r3.ebuild
index 22b0356c3c5..beec586bcb2 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r3.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs vdr-plugin-2
+inherit vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 
 DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz
+		http://vdr.websitec.de/download/${PN}/${P}_c++11.patch.bz2"
 
 SLOT="0"
 LICENSE="GPL-2+"
@@ -71,6 +72,9 @@ src_prepare() {
 
 	# bug 711978
 	sed -e "s:X11  opengl:X11  OpenGl:" -i configure || die
+
+	# bug 771036, fix compile llvm/clang 
+	eapply "${WORKDIR}/${P}_c++11.patch"
 }
 
 src_configure() {
@@ -100,7 +104,6 @@ src_configure() {
 		$(use_enable cec libcec) \
 		$(use_enable jpeg libjpeg) \
 		$(use_enable xinerama) \
-		$(use_enable vdpau) \
 		$(use_enable dbus dbus-glib-1) \
 		$(use_enable nls i18n) \
 		$(use_enable bluray libbluray) \


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2021-04-13  0:26 Sam James
  0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2021-04-13  0:26 UTC (permalink / raw
  To: gentoo-commits

commit:     4f8ff43425ecd07a282e1e2be83454c95e62cd6f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  7 05:13:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 00:26:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8ff434

media-plugins/vdr-xineliboutput: call pkg-config via toolchain-funcs.eclass helper

This ensures we call the correct pkg-config in e.g. cross.

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
index 67a25eda735..c3df9aff749 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,7 +61,7 @@ pkg_setup() {
 	vdr-plugin-2_pkg_setup
 
 	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir libxine)
 		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
 	fi
 }


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2021-06-18 21:07 David Seifert
  0 siblings, 0 replies; 19+ messages in thread
From: David Seifert @ 2021-06-18 21:07 UTC (permalink / raw
  To: gentoo-commits

commit:     69b7769cd8060101f41193f5cf5cf9af7d9741b7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 21:06:50 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 21:06:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b7769c

media-plugins/vdr-xineliboutput: respect ${PKG_CONFIG}

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild | 6 +++---
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
index b9d615c9322..fb37a10e6c2 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit vdr-plugin-2
+inherit toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	)"
 
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	sys-kernel/linux-headers
 	nls? ( sys-devel/gettext )
 	xine? (
@@ -53,6 +52,7 @@ DEPEND="${COMMON_DEPEND}
 		)
 	)"
 RDEPEND="${COMMON_DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE=" || ( vdr xine )"
 
@@ -62,7 +62,7 @@ pkg_setup() {
 	vdr-plugin-2_pkg_setup
 
 	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir libxine)
 		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
 	fi
 }

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index b81bf629a3f..bc97c78bee0 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,6 @@ COMMON_DEPEND="
 	cec? ( dev-libs/libcec )"
 
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	sys-kernel/linux-headers
 	nls? ( sys-devel/gettext )
 	xine? (
@@ -54,6 +53,7 @@ DEPEND="${COMMON_DEPEND}
 		)
 	)"
 RDEPEND="${COMMON_DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${P}
 
@@ -67,7 +67,7 @@ pkg_setup() {
 	vdr-plugin-2_pkg_setup
 
 	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir libxine)
 		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
 	fi
 }


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2022-03-19 23:33 Sam James
  0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2022-03-19 23:33 UTC (permalink / raw
  To: gentoo-commits

commit:     2914a83db179802dd017b9f8dd9db32743f823aa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 23:06:32 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 23:33:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2914a83d

media-plugins/vdr-xineliboutput: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild | 8 ++++----
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild | 8 ++++----
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild     | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
index c3df9aff749c..c99f1ade06e2 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,8 +11,8 @@ DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2+"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
 
@@ -83,8 +83,8 @@ src_configure() {
 
 	# No autotools based configure script
 	./configure \
-		--cc=$(tc-getCC) \
-		--cxx=$(tc-getCXX) \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
 		$(use_enable X x11) \
 		$(use_enable X xshm) \
 		$(use_enable X xdpms) \

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
index fb37a10e6c22..601a84339a77 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,8 +12,8 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz
 		http://vdr.websitec.de/download/${PN}/${P}_clang.patch.bz2"
 
-SLOT="0"
 LICENSE="GPL-2+"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
 
@@ -89,8 +89,8 @@ src_configure() {
 
 	# No autotools based configure script
 	./configure \
-		--cc=$(tc-getCC) \
-		--cxx=$(tc-getCXX) \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
 		$(use_enable X x11) \
 		$(use_enable X xshm) \
 		$(use_enable X xdpms) \

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index bc97c78bee09..c95ba6bb45b1 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,8 +12,8 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 
 EGIT_REPO_URI="https://git.code.sf.net/p/xineliboutput/git"
 
-SLOT="0"
 LICENSE="GPL-2+"
+SLOT="0"
 KEYWORDS=""
 IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
 
@@ -93,8 +93,8 @@ src_configure() {
 
 	# No autotools based configure script
 	./configure \
-		--cc=$(tc-getCC) \
-		--cxx=$(tc-getCXX) \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
 		$(use_enable X x11) \
 		$(use_enable X xshm) \
 		$(use_enable X xdpms) \


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2022-06-03  5:32 Sam James
  0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2022-06-03  5:32 UTC (permalink / raw
  To: gentoo-commits

commit:     911921d650f353d873e0ea1646c29c0e760eeb76
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 05:31:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 05:32:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=911921d6

media-plugins/vdr-xineliboutput: move away from virtual/jpeg

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild | 4 ++--
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
index d230fd885fb0..22f0489518ed 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
@@ -27,14 +27,14 @@ COMMON_DEPEND="
 	xine? (
 		( >=media-libs/xine-lib-1.2
 			media-video/ffmpeg )
-		fbcon? ( jpeg? ( virtual/jpeg:* ) )
+		fbcon? ( jpeg? ( media-libs/libjpeg-turbo:= ) )
 		X? (
 			x11-libs/libX11
 			x11-libs/libXext
 			x11-libs/libXrender
 			bluray? ( media-libs/libbluray )
 			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
-			jpeg? ( virtual/jpeg:* )
+			jpeg? ( media-libs/libjpeg-turbo:= )
 			opengl? ( virtual/opengl )
 			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
 			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index 6e879e10e9a7..2ffc32df32a0 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -27,7 +27,7 @@ COMMON_DEPEND="
 	xine? (
 		( >=media-libs/xine-lib-1.2
 			media-video/ffmpeg )
-		fbcon? ( jpeg? ( virtual/jpeg:* ) )
+		fbcon? ( jpeg? ( media-libs/libjpeg-turbo:= ) )
 		X? (
 			x11-libs/libX11
 			x11-libs/libXext
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 			xinerama? ( x11-libs/libXinerama )
 			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
 			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
-			jpeg? ( virtual/jpeg:* )
+			jpeg? ( media-libs/libjpeg-turbo:= )
 			bluray? ( media-libs/libbluray )
 			opengl? ( virtual/opengl )
 		)


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

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/
@ 2023-12-24 23:07 Conrad Kostecki
  0 siblings, 0 replies; 19+ messages in thread
From: Conrad Kostecki @ 2023-12-24 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     5d1d4fde80b57dc1797fdfb100137888711c7f43
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Dec 17 14:13:46 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 23:03:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1d4fde

media-plugins/vdr-xineliboutput: add missing flag-o-matic inherit

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild | 2 +-
 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
index a032a30bcf6b..45cbb89f43c2 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs vdr-plugin-2
+inherit flag-o-matic toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
index ecd8919475df..c2eb19a57803 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs vdr-plugin-2
+inherit flag-o-matic toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 


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

end of thread, other threads:[~2023-12-24 23:07 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-18 21:07 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2023-12-24 23:07 Conrad Kostecki
2022-06-03  5:32 Sam James
2022-03-19 23:33 Sam James
2021-04-13  0:26 Sam James
2021-04-05  9:06 Jörg Bornkessel
2020-06-27 20:51 Aaron Bauman
2020-05-03  8:56 Jörg Bornkessel
2020-04-26 10:35 David Seifert
2020-04-24 20:05 Jörg Bornkessel
2020-02-14 21:51 Jörg Bornkessel
2020-01-12 17:56 Jörg Bornkessel
2019-12-15 16:34 Joerg Bornkessel
2017-08-06  9:27 Matthias Schwarzott
2017-07-03 19:51 Matthias Schwarzott
2017-07-03 19:37 Matthias Schwarzott
2017-01-06 12:25 Christian Ruppert
2016-04-20 15:00 Ian Stakenvicius
2015-10-16 20:11 Christian Ruppert

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