Version bumped. Now shmclient should be better configurable.

Package-Manager: portage-2.1.2.7

6 files changed, 197 insertions, 9 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 53a9a63cd986..fe736e3b4ad7 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-softdevice
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.39 2007/05/02 12:13:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.40 2007/05/15 21:24:26 zzam Exp $
+
+*vdr-softdevice-0.4.0.20070515 (15 May 2007)
+
+  15 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/patches-0.4.0/series,
+  +files/patches-0.4.0/shm-fullscreen-parameter.diff,
+  +vdr-softdevice-0.4.0.20070515.ebuild:
+  Version bumped. Now shmclient should be better configurable.
 
   02 May 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-softdevice-0.3.1.20070313.ebuild:
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index ab9fef9e4710..4d91a51d0e89 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -5,6 +5,14 @@ AUX confd 431 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 SHA1 f58d450430066
 MD5 dacfaa95c10d3b9ae3c1e08ff04dcc65 files/confd 431
 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 files/confd 431
 SHA256 5a82e32365ff3c77dfdad50884be7ae6f7d5f54e249c69308fc041cdce61290e files/confd 431
+AUX patches-0.4.0/series 30 RMD160 c9f07af60848f2b8f0afd5ea81d73594002e9b15 SHA1 2c6d6d1ae2703fb04a27d2ee8e7ae9bcf695fe0d SHA256 abf6941b98dffc48dbe37d127e9907075ee5e22ceb9c07b4d6a1edb187fb104c
+MD5 7547d1b471f51ff3eda948f402f3bc3f files/patches-0.4.0/series 30
+RMD160 c9f07af60848f2b8f0afd5ea81d73594002e9b15 files/patches-0.4.0/series 30
+SHA256 abf6941b98dffc48dbe37d127e9907075ee5e22ceb9c07b4d6a1edb187fb104c files/patches-0.4.0/series 30
+AUX patches-0.4.0/shm-fullscreen-parameter.diff 737 RMD160 b09e27d40bc733b05ed2f01d3026e37671ef9bea SHA1 93da236176add5a323737ea845054f2964188451 SHA256 2665dd3d2e6059ec61ad8707af7f2b532485d49c8771f5875e0343a7325b48eb
+MD5 153b382d28f33fe46a3a6a52db33d89c files/patches-0.4.0/shm-fullscreen-parameter.diff 737
+RMD160 b09e27d40bc733b05ed2f01d3026e37671ef9bea files/patches-0.4.0/shm-fullscreen-parameter.diff 737
+SHA256 2665dd3d2e6059ec61ad8707af7f2b532485d49c8771f5875e0343a7325b48eb files/patches-0.4.0/shm-fullscreen-parameter.diff 737
 AUX rc-addon.sh 321 RMD160 b236a3ce160d66fd4b25ad8fe4239cbbe5cb0843 SHA1 02c5f2efad7a8a3a687d79dee998a3fffb0018ea SHA256 d6eaa97c313fca31920f7bcc6d060c3dac9c4ee2624bfff4b0c59fa4ff91153d
 MD5 26cfa3f4b7bc6686fd5de981b896e7da files/rc-addon.sh 321
 RMD160 b236a3ce160d66fd4b25ad8fe4239cbbe5cb0843 files/rc-addon.sh 321
@@ -44,6 +52,7 @@ DIST vdr-softdevice-cvs-20061124.tar.bz2 131902 RMD160 b0bf6df5570a0bcfd8c17e36d
 DIST vdr-softdevice-cvs-20061217.tar.bz2 134318 RMD160 1b07cfce1dab6b914759724d872f39a5b3058132 SHA1 e02986ffa2bf19a4dee6c655fcdbc4aa99bb1a40 SHA256 741338e46841d5b27d28ecd532c605a95cb41d9c1ac9f3175a0cb3db47508f4f
 DIST vdr-softdevice-cvs-20070313.tar.bz2 139092 RMD160 2423903131ebad7d3fcd980d81f58a4780642e91 SHA1 c1878b6aad4e94decbeeec5aef4257fb2e12693d SHA256 b3ab1fb512efb015b9ff5856ec66d6529da4b6fe77d40ef66178d4838c3fc43a
 DIST vdr-softdevice-cvs-20070410.tar.bz2 152234 RMD160 bdd798af100e158def9425d7c290ca0782b70f61 SHA1 9a1c71b1186cd2fca4457038a4600a140825c643 SHA256 d84127eaa243addfab53b8324a8242e75e633605cbe0b82f422f429a474a3396
+DIST vdr-softdevice-cvs-20070515.tar.bz2 151023 RMD160 f40c9a1175e2a92db535f753964ef0a1fcb96cb2 SHA1 bf22bbbc82b25fc18f8fecc73d873b6f03d5edc0 SHA256 2c627eeb40ec57ed018727fd4463796f807765e91c287c10e2c425db926aa751
 EBUILD vdr-softdevice-0.3.0-r1.ebuild 3386 RMD160 70ae64a339a4aa47953bc6f5ed7ad38a02d5e542 SHA1 9bd0df02f7b356c168e1b11314330545b3d14fc8 SHA256 a012d632267950d5579c88a60ba5cd0c4c7fcc166aa169ee319213fce9850161
 MD5 ef698c00dccd487af3963d7a61fde40d vdr-softdevice-0.3.0-r1.ebuild 3386
 RMD160 70ae64a339a4aa47953bc6f5ed7ad38a02d5e542 vdr-softdevice-0.3.0-r1.ebuild 3386
@@ -68,14 +77,18 @@ EBUILD vdr-softdevice-0.3.1.20070410.ebuild 3692 RMD160 5f91484ab857180cf573443d
 MD5 d16a1231960b3b6c2086c5200531704b vdr-softdevice-0.3.1.20070410.ebuild 3692
 RMD160 5f91484ab857180cf573443d0320228340319f22 vdr-softdevice-0.3.1.20070410.ebuild 3692
 SHA256 9f40afb5415712c00cf60d9bae00024a820773eda8ffc03b08a9949cbd085a3c vdr-softdevice-0.3.1.20070410.ebuild 3692
+EBUILD vdr-softdevice-0.4.0.20070515.ebuild 3562 RMD160 6a967037aa3413f2f2ff03bf54888269e70650a7 SHA1 9966b9e83194b1eb0515a504a3a3bda9bd3896ff SHA256 65d5715d13908626a7ef8ddba8688b68286e28c0912b8ff1a448d7b3a48ce7d6
+MD5 8330403da60ce871e3ccb085077c751b vdr-softdevice-0.4.0.20070515.ebuild 3562
+RMD160 6a967037aa3413f2f2ff03bf54888269e70650a7 vdr-softdevice-0.4.0.20070515.ebuild 3562
+SHA256 65d5715d13908626a7ef8ddba8688b68286e28c0912b8ff1a448d7b3a48ce7d6 vdr-softdevice-0.4.0.20070515.ebuild 3562
 EBUILD vdr-softdevice-0.4.0.ebuild 3653 RMD160 d6ad704f9ec1808c0b7883453a9a2de913b0299b SHA1 eaa0daa917a1401a67d08d5280f0fac9cf76a547 SHA256 a775a351ee9e1d2e94b1d5a79cfde451dde9e4d0716e10190dcfb38641a13f46
 MD5 c372535a8b2dc075f2f933539c5b9ace vdr-softdevice-0.4.0.ebuild 3653
 RMD160 d6ad704f9ec1808c0b7883453a9a2de913b0299b vdr-softdevice-0.4.0.ebuild 3653
 SHA256 a775a351ee9e1d2e94b1d5a79cfde451dde9e4d0716e10190dcfb38641a13f46 vdr-softdevice-0.4.0.ebuild 3653
-MISC ChangeLog 9062 RMD160 12b49a03f2f5f36d7edefe94bee48a79397dd4ea SHA1 fc525be2c40a149dec59ff69e79b53955fa83d62 SHA256 f4d316c2eb705e2796b061ed491657fb0374051d73d426a56f1ed1ec65e05078
-MD5 f4784e20b32b5d72ce1d0cd1e423e120 ChangeLog 9062
-RMD160 12b49a03f2f5f36d7edefe94bee48a79397dd4ea ChangeLog 9062
-SHA256 f4d316c2eb705e2796b061ed491657fb0374051d73d426a56f1ed1ec65e05078 ChangeLog 9062
+MISC ChangeLog 9351 RMD160 605fbd098a50a5662c06053b692b590c9ace30e4 SHA1 faa3724d9bc3b36667e8119af9ce33354f8149c7 SHA256 e4134299d190df49aeaa20f1e89aab9473d5ea83f0f318e9351822fd7b14a23a
+MD5 0d23d476c08901aa657f71ca1a483ffe ChangeLog 9351
+RMD160 605fbd098a50a5662c06053b692b590c9ace30e4 ChangeLog 9351
+SHA256 e4134299d190df49aeaa20f1e89aab9473d5ea83f0f318e9351822fd7b14a23a ChangeLog 9351
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -101,10 +114,13 @@ SHA256 23568c594cb811d6ec7d7fcd4dd8e47cbfa3cbef709bb5a13ead0afe42b5ce78 files/di
 MD5 64a03078951f99cedadb693eb15dd8df files/digest-vdr-softdevice-0.4.0 253
 RMD160 b18f87704da392d7903954f6388a2bfd93d0d418 files/digest-vdr-softdevice-0.4.0 253
 SHA256 b1ecc8de3b7507e2f708b8dedb8130374e2833fd5759595f8e169f342b4c6b31 files/digest-vdr-softdevice-0.4.0 253
+MD5 0e3425b134288786106a7e67e5fdfd67 files/digest-vdr-softdevice-0.4.0.20070515 286
+RMD160 28fadacb573f89e0512dfe2b462b93ff2595a9c7 files/digest-vdr-softdevice-0.4.0.20070515 286
+SHA256 b4d883a9f427145bd935ead8b1f50cc13041a836d9cd77a997d76e737fc88438 files/digest-vdr-softdevice-0.4.0.20070515 286
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGOIBxt2vP6XvVdOcRAnNEAJ9OOol3Yz6gfpbVcIyfFuG4Zz5PDwCfWjmC
-l5v7O4BJO6YcAtY/C02Doh8=
-=8fDl
+iD8DBQFGSiUQt2vP6XvVdOcRAij+AKDcOwPIITXUPq/gptDWkcHARjLY4ACgrdRd
+WMXtzG1x1XRv+vBQ52UzN+s=
+=dHUO
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20070515 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20070515
new file mode 100644
index 000000000000..b95cb5a47915
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20070515
@@ -0,0 +1,3 @@
+MD5 ba116b3c17d240c28682f290b11c8902 vdr-softdevice-cvs-20070515.tar.bz2 151023
+RMD160 f40c9a1175e2a92db535f753964ef0a1fcb96cb2 vdr-softdevice-cvs-20070515.tar.bz2 151023
+SHA256 2c627eeb40ec57ed018727fd4463796f807765e91c287c10e2c425db926aa751 vdr-softdevice-cvs-20070515.tar.bz2 151023
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/series b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
new file mode 100644
index 000000000000..f4d49416df58
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
@@ -0,0 +1 @@
+shm-fullscreen-parameter.diff
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/shm-fullscreen-parameter.diff b/media-plugins/vdr-softdevice/files/patches-0.4.0/shm-fullscreen-parameter.diff
new file mode 100644
index 000000000000..aaf0fdc4bf80
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/shm-fullscreen-parameter.diff
@@ -0,0 +1,21 @@
+Index: softdevice-cvs/ShmClient.c
+===================================================================
+--- softdevice-cvs.orig/ShmClient.c
++++ softdevice-cvs/ShmClient.c
+@@ -119,6 +119,16 @@ int main(int argc, char **argv) {
+         xvRemote= new cShmRemote("softdevice-xv");
+         //SetupStore.InitSetupStore();
+         SetupStore->xvFullscreen=0;
++	if (argc>1) {
++		if (strcmp(argv[1], "-f") == 0) {
++			SetupStore->xvFullscreen=1;
++		} else if (strcmp(argv[1], "-h") == 0) {
++			printf ("Shared-Memory-Client for vdr-softdevice\n");
++			printf ("Options:\n");
++			printf ("  -f   Start fullscreen\n");
++			return 0;
++		}
++	}
+ 
+         if ( !vout->Initialize()  ) {
+                 fprintf(stderr,"Could not init video out!\n");
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild
new file mode 100644
index 000000000000..8ab61c117710
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild,v 1.1 2007/05/15 21:24:26 zzam Exp $
+
+inherit vdr-plugin versionator
+
+
+DESCRIPTION="VDR Plugin: Software output-Device"
+HOMEPAGE="http://softdevice.berlios.de/"
+
+# Detect snapshots
+SNAP_V="$(get_version_component_range 4)"
+if [[ "$SNAP_V" ]]; then
+	MY_P="${PN}-cvs-${SNAP_V}"
+	S="${WORKDIR}/${MY_P#vdr-}"
+	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+			http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2"
+else
+	SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xv fbcon directfb mmx mmxext xinerama"
+
+RDEPEND=">=media-video/vdr-1.3.36
+	>=media-video/ffmpeg-0.4.9_pre1
+	directfb? (
+		dev-libs/DirectFB
+		dev-libs/DFB++
+	)
+	media-libs/alsa-lib
+	xv? ( || ( ( x11-libs/libX11
+				x11-libs/libXext
+				x11-libs/libXi
+				x11-libs/libXv
+				xinerama? ( x11-libs/libXinerama )
+			)
+			virtual/x11
+		) )"
+
+DEPEND="${RDEPEND}
+	xv? ( || ( ( x11-proto/xproto
+				x11-proto/xextproto
+				x11-libs/libXv
+				xinerama? ( x11-proto/xineramaproto )
+			)
+			virtual/x11
+	) )
+	fbcon? ( sys-kernel/linux-headers )
+	dev-util/pkgconfig"
+# Make sure the assembler USE flags are unmasked on amd64
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
+
+PATCHES="
+		${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff"
+
+pkg_setup() {
+	vdr-plugin_pkg_setup
+
+	if use !xv && use !fbcon && use !directfb; then
+		ewarn "You need to set at least one of these use-flags: xv fbcon directfb"
+		die "no output-method enabled"
+	fi
+
+	COMPILE_SHM=0
+	if has_version ">=media-video/vdr-1.3.0"; then
+		if use xv; then
+			COMPILE_SHM=1
+		else
+			elog "SHM does only support xv at the moment"
+		fi
+	else
+		elog "SHM not supported on vdr-1.2"
+	fi
+	case ${COMPILE_SHM} in
+		0)	elog "SHM support will not be compiled." ;;
+		1)	elog "SHM support will be compiled." ;;
+	esac
+
+	# Check for ffmpeg relying on libtheora without pkg-config-file
+	# Bug #142250
+	if built_with_use media-video/ffmpeg theora	&& \
+		has_version "<media-libs/libtheora/libtheora-1.0_alpha4"; then
+
+			eerror "This package will not work when using ffmpeg with"
+			eerror "USE=\"theora\" combined with media-libs/libtheora"
+			eerror "older than version 1.0_alpha4."
+			eerror "Please update to at least media-libs/libtheora-1.0_alpha4."
+			die "Please update to at least media-libs/libtheora-1.0_alpha4."
+	fi
+}
+
+src_compile() {
+	local MYOPTS=""
+	MYOPTS="${MYOPTS} --disable-vidix"
+	use xv || MYOPTS="${MYOPTS} --disable-xv"
+	use fbcon || MYOPTS="${MYOPTS} --disable-fb"
+	use directfb || MYOPTS="${MYOPTS} --disable-dfb"
+
+	use mmx || MYOPTS="${MYOPTS} --disable-mmx"
+	use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
+
+	if use !mmx && use !mmxext; then
+		ewarn "${PN}"' does not compile with USE="-mmx -mmxext".'
+		ewarn 'Please enable at least one of these two use-flags.'
+		die "${PN}"' does not compile with USE="-mmx -mmxext".'
+	fi
+
+	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
+
+	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
+
+	cd ${S}
+	elog configure ${MYOPTS}
+	./configure ${MYOPTS} || die "configure failed"
+
+	vdr-plugin_src_compile
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	cd ${S}
+
+	insinto "${VDR_PLUGIN_DIR}"
+	doins libsoftdevice-*.so.*
+
+	if [[ "${COMPILE_SHM}" = "1" ]]; then
+		exeinto "/usr/bin"
+		doexe ShmClient
+	fi
+
+	insinto /usr/include/vdr-softdevice
+	doins *.h
+}
+