Added new snapshot. Contains lots of improvements.

Package-Manager: portage-2.1.2.2

4 files changed, 166 insertions, 5 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 494b763c1654..c477117fbe61 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.34 2007/02/16 12:26:37 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.35 2007/03/13 11:43:30 zzam Exp $
+
+*vdr-softdevice-0.3.1.20070313 (13 Mar 2007)
+
+  13 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-softdevice-0.3.1.20070313.ebuild:
+  Added new snapshot. Contains lots of improvements.
 
   16 Feb 2007; Simon Stelling <blubb@gentoo.org>
   vdr-softdevice-0.3.1.20061217.ebuild:
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 4ced321ac6a1..56e7d38189f5 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX confd 431 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 SHA1 f58d4504300662d6a00324091c5d2e22f9f1feb2 SHA256 5a82e32365ff3c77dfdad50884be7ae6f7d5f54e249c69308fc041cdce61290e
 MD5 dacfaa95c10d3b9ae3c1e08ff04dcc65 files/confd 431
 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 files/confd 431
@@ -34,6 +37,7 @@ DIST vdr-softdevice-0.3.0.tgz 154294 RMD160 fce250ac59e0a4bd3122fbed85bb6d8a6f4c
 DIST vdr-softdevice-0.3.1.tgz 154509 RMD160 b582215eca1c0ce954eca54045456145488b1b34 SHA1 5f0cf60897820a6f15035174f4b5cb437afee782 SHA256 d88fc234ad6d3686b95d4848519ffdb97ee22a1fcd8cff60d737c0ecb1a43252
 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
 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
@@ -50,10 +54,14 @@ EBUILD vdr-softdevice-0.3.1.20061217.ebuild 3537 RMD160 f7c45ee3b10b204c64f75f70
 MD5 78dc5738c56ffdf9ac50e0d8650d1ea6 vdr-softdevice-0.3.1.20061217.ebuild 3537
 RMD160 f7c45ee3b10b204c64f75f70bf255859948be59b vdr-softdevice-0.3.1.20061217.ebuild 3537
 SHA256 aa45686f325c1218c1cd3a5d1708864798b04239bee557b0cc209e38849eeac5 vdr-softdevice-0.3.1.20061217.ebuild 3537
-MISC ChangeLog 8164 RMD160 9f363a05b138ce9c4d927209ced3656823fd8761 SHA1 8c2f564c3b6553c5374f2df3af8b19a19eedad92 SHA256 7a673d3581ddf09420ec70b78a2cbb44b9a39bd16decde5f072d8c9022de2a3f
-MD5 a3b6bcb3501716ecb73ce1c4ce921028 ChangeLog 8164
-RMD160 9f363a05b138ce9c4d927209ced3656823fd8761 ChangeLog 8164
-SHA256 7a673d3581ddf09420ec70b78a2cbb44b9a39bd16decde5f072d8c9022de2a3f ChangeLog 8164
+EBUILD vdr-softdevice-0.3.1.20070313.ebuild 3536 RMD160 d3f4fdbb2ae7426f02a31418f32c92647a12ccbd SHA1 76462135ba26fa29d8ce8a8cc163900c862d4522 SHA256 bac304c03d35cb1d61b89a62bbcea231048479863ae5f9c4d7ee6acac5fbc66c
+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
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -70,3 +78,13 @@ SHA256 8ae7a69241616d142fcc81fb835a4400bd59094b83cc35c4051f97ce9a56f218 files/di
 MD5 7c9f01afbc74587480120a2be789a0a3 files/digest-vdr-softdevice-0.3.1.20061217 286
 RMD160 3c61590cb2a0fb1cf9648fdc4c7de7f2aa595a02 files/digest-vdr-softdevice-0.3.1.20061217 286
 SHA256 7a6c1f850f8a96e5d7fd1f8e56dbb8076c838ff9a983805e166e17aaf6f09399 files/digest-vdr-softdevice-0.3.1.20061217 286
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF9o5rt2vP6XvVdOcRAsckAJ4upx2U4Dr5j52NlbPfBLCrbiyEBQCfYepq
+W5QtPbGENbZObW0Q3nj2CmU=
+=4rdN
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20070313 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20070313
new file mode 100644
index 000000000000..93b25883936d
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20070313
@@ -0,0 +1,3 @@
+MD5 2461f9f869f6097fa01bfb4a6a60dd27 vdr-softdevice-cvs-20070313.tar.bz2 139092
+RMD160 2423903131ebad7d3fcd980d81f58a4780642e91 vdr-softdevice-cvs-20070313.tar.bz2 139092
+SHA256 b3ab1fb512efb015b9ff5856ec66d6529da4b6fe77d40ef66178d4838c3fc43a vdr-softdevice-cvs-20070313.tar.bz2 139092
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070313.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070313.ebuild
new file mode 100644
index 000000000000..babbfea422b1
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070313.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.20070313.ebuild,v 1.1 2007/03/13 11:43:30 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="~x86 ~amd64"
+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
+}
+