New snapshot.

Package-Manager: portage-2.1.2.3

4 files changed, 159 insertions, 8 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index c477117fbe61..caeb33249ce1 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.35 2007/03/13 11:43:30 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.36 2007/04/10 09:38:13 zzam Exp $
+
+*vdr-softdevice-0.3.1.20070410 (10 Apr 2007)
+
+  10 Apr 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-softdevice-0.3.1.20070410.ebuild:
+  New snapshot.
 
 *vdr-softdevice-0.3.1.20070313 (13 Mar 2007)
 
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 56e7d38189f5..523a085274b1 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -38,6 +38,7 @@ DIST vdr-softdevice-0.3.1.tgz 154509 RMD160 b582215eca1c0ce954eca54045456145488b
 DIST vdr-softdevice-cvs-20061124.tar.bz2 131902 RMD160 b0bf6df5570a0bcfd8c17e36d43b868b8daac2a4 SHA1 db610e83bc0a65042ef5d327595d70182988717d SHA256 e6f12f790de569090277513d40fa8a4658063d5c4d006e9788cfc4c1b2cf0aae
 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
 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
@@ -58,10 +59,14 @@ EBUILD vdr-softdevice-0.3.1.20070313.ebuild 3536 RMD160 d3f4fdbb2ae7426f02a31418
 MD5 ef3a773347cf18de74d302f6af1284b9 vdr-softdevice-0.3.1.20070313.ebuild 3536
 RMD160 d3f4fdbb2ae7426f02a31418f32c92647a12ccbd vdr-softdevice-0.3.1.20070313.ebuild 3536
 SHA256 bac304c03d35cb1d61b89a62bbcea231048479863ae5f9c4d7ee6acac5fbc66c vdr-softdevice-0.3.1.20070313.ebuild 3536
-MISC ChangeLog 8357 RMD160 bbfeb4c1e1a0a7b105dff25813f44f7259f3e85f SHA1 2ed1e0725cbabc7e4ba6b12a9ae304cd8865b902 SHA256 b4f7d2138bfbb5ac6d5f5618b1e21bf5683b67ca29cc40f32c3933801eb39aaf
-MD5 777d33b305dd004442d7ef69953259b0 ChangeLog 8357
-RMD160 bbfeb4c1e1a0a7b105dff25813f44f7259f3e85f ChangeLog 8357
-SHA256 b4f7d2138bfbb5ac6d5f5618b1e21bf5683b67ca29cc40f32c3933801eb39aaf ChangeLog 8357
+EBUILD vdr-softdevice-0.3.1.20070410.ebuild 3536 RMD160 3ae2038282239c53a3456e2395f13855a09923bd SHA1 dd22aa2ac8411385e5842c249676dc2720955781 SHA256 8ffa9863bac1893c4c423f9cd3621dcadcb0ad7dad7fc9c5651a8affada87373
+MD5 458fb6aafbe2505315fbdd983710799b vdr-softdevice-0.3.1.20070410.ebuild 3536
+RMD160 3ae2038282239c53a3456e2395f13855a09923bd vdr-softdevice-0.3.1.20070410.ebuild 3536
+SHA256 8ffa9863bac1893c4c423f9cd3621dcadcb0ad7dad7fc9c5651a8affada87373 vdr-softdevice-0.3.1.20070410.ebuild 3536
+MISC ChangeLog 8514 RMD160 b5eb9f0c14b2dcbdc7f50bf3f9fa8c83d161a501 SHA1 b4dfffe8c8d8dbfe89d3ede27b5844584a8c1cff SHA256 3afc3df9c635005985a50aa555187264b50801b10d92eb10cfddf7399ec210a5
+MD5 67d00ac252404e07194ccbc302f1648f ChangeLog 8514
+RMD160 b5eb9f0c14b2dcbdc7f50bf3f9fa8c83d161a501 ChangeLog 8514
+SHA256 3afc3df9c635005985a50aa555187264b50801b10d92eb10cfddf7399ec210a5 ChangeLog 8514
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -81,10 +86,13 @@ SHA256 7a6c1f850f8a96e5d7fd1f8e56dbb8076c838ff9a983805e166e17aaf6f09399 files/di
 MD5 5e69efac3fa4e33fe8f12de821dcb01d files/digest-vdr-softdevice-0.3.1.20070313 286
 RMD160 37f4d617d6308cb344422686f0bda48aeaecbc3f files/digest-vdr-softdevice-0.3.1.20070313 286
 SHA256 f006e82a988786556fbc7bc8f77ea9993c223a5a2ab26225df06d995ba315a5b files/digest-vdr-softdevice-0.3.1.20070313 286
+MD5 19e67a59118b02a037fda43a5ae7ecca files/digest-vdr-softdevice-0.3.1.20070410 286
+RMD160 0188f142a1e134513271438d9df100fb86a575cb files/digest-vdr-softdevice-0.3.1.20070410 286
+SHA256 23568c594cb811d6ec7d7fcd4dd8e47cbfa3cbef709bb5a13ead0afe42b5ce78 files/digest-vdr-softdevice-0.3.1.20070410 286
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9o5rt2vP6XvVdOcRAsckAJ4upx2U4Dr5j52NlbPfBLCrbiyEBQCfYepq
-W5QtPbGENbZObW0Q3nj2CmU=
-=4rdN
+iD8DBQFGG1sXt2vP6XvVdOcRAkYjAKC3xzErZuw6vvNLn06bStCu4tdFqACfffX3
+rELV01agqN6jY41avbUDO5A=
+=LcW9
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20070410 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20070410
new file mode 100644
index 000000000000..1d459f92563c
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20070410
@@ -0,0 +1,3 @@
+MD5 a5559f4f13400a182296fe844467a4ab vdr-softdevice-cvs-20070410.tar.bz2 152234
+RMD160 bdd798af100e158def9425d7c290ca0782b70f61 vdr-softdevice-cvs-20070410.tar.bz2 152234
+SHA256 d84127eaa243addfab53b8324a8242e75e633605cbe0b82f422f429a474a3396 vdr-softdevice-cvs-20070410.tar.bz2 152234
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild
new file mode 100644
index 000000000000..d2008dfced48
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild
@@ -0,0 +1,134 @@
+# 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.3.1.20070410.ebuild,v 1.1 2007/04/10 09:38:13 zzam Exp $
+
+inherit vdr-plugin
+
+MY_P="${PN}-cvs-${PV#0.3.1.}"
+S="${WORKDIR}/${MY_P#vdr-}"
+
+DESCRIPTION="VDR Plugin: Software output-Device"
+HOMEPAGE="http://softdevice.berlios.de/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+		http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2"
+
+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}/vdr-softdevice-0.2.3-shm-fullscreen.diff
+		${FILESDIR}/softdevice-cvs-20061217-xinerama-configure-opts.patch
+		${FILESDIR}/vdr-softdevice-0.3.1-osdmode-software-default.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
+}
+