Version bumped.

Package-Manager: portage-2.1.2_pre2-r7

4 files changed, 156 insertions, 8 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index bfcdf372cb85..988898729656 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.20 2006/10/08 12:52:48 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.21 2006/10/09 21:24:51 zzam Exp $
+
+*vdr-softdevice-0.3.0 (09 Oct 2006)
+
+  09 Oct 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-softdevice-0.3.0.ebuild:
+  Version bumped.
 
   08 Oct 2006; Matthias Schwarzott <zzam@gentoo.org> files/rc-addon.sh:
   Hide error-output of killall when stopping ShmClient.
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 10e321b043b2..2285e19876e4 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -46,6 +46,7 @@ MD5 01851b3338d57baa07fcdeff833327f6 files/vdr-softdevice-0.2.3a-CVS-20060511.di
 RMD160 25b8bb29a77ec03de06effcdbf0850e1c3303919 files/vdr-softdevice-0.2.3a-CVS-20060511.diff 5732
 SHA256 c69f0de683ed6d5d0d031fbc86c2a1a3f32a031c5a2b6778ea73d79eca8bd5e7 files/vdr-softdevice-0.2.3a-CVS-20060511.diff 5732
 DIST vdr-softdevice-0.2.3a.tgz 133780 RMD160 d97d7a1bbe4a3b325041bbe0e7ef23740f8121b1 SHA1 13f0b16b4bbde1c10b3dc31c075f43e8ca6eeb5d SHA256 bbf05254ce6f0559ce6aeed055272ba6fb207ba443a49926b91506e9de69ab92
+DIST vdr-softdevice-0.3.0.tgz 154294 RMD160 fce250ac59e0a4bd3122fbed85bb6d8a6f4c2ebe SHA1 89b532c536c450e2eb51fedbf2a0192e0940a179 SHA256 2c15bfaf94c07dda3facd3c44219c4d9ebb1199093ec0aa4d35c1d3f67828b8a
 DIST vdr-softdevice-cvs-20060814.tar.bz2 122901 RMD160 d9b010f9d10eb574681cbea2ea433ddd3f5356f7 SHA1 c7fa5c511916995c7661134ef085091892d5ea7a SHA256 476722fe33ff3bb75e7859b93b563d68b098cd78be31fe40044b4d27324e60f4
 DIST vdr-softdevice-cvs-20060908.tar.bz2 124038 RMD160 8991e3e0f4f6ea9a8a0171d19098e064c6584c82 SHA1 98e0443854f8a1612878496bd05a7a9c8c913063 SHA256 f41bfb0dd822ca6c5136fdde842382e72a937bc2acacfeb5430d0e73a5c47f37
 DIST vdr-softdevice-cvs-20060912.tar.bz2 125161 RMD160 467dd24893fa884921c0201dc64375e60f2382b1 SHA1 c985ffdb7e0a44524ab48b2cb1a7fd6704fab8dd SHA256 f4477713914966bbf50854f8c75232ce0ffdb669750c4483ba63521ab05410fd
@@ -65,10 +66,14 @@ EBUILD vdr-softdevice-0.2.3.20060912.ebuild 3502 RMD160 839ac96ff984a2f692ba9caa
 MD5 bac637bac289d5aeb8be2de5ca6de9e9 vdr-softdevice-0.2.3.20060912.ebuild 3502
 RMD160 839ac96ff984a2f692ba9caaab17f208c2bd52fb vdr-softdevice-0.2.3.20060912.ebuild 3502
 SHA256 d62ac03e91b4cdaa0366a2aac1bf57d7cc28432bae4690f4c6ef744d21800d9e vdr-softdevice-0.2.3.20060912.ebuild 3502
-MISC ChangeLog 4975 RMD160 7589e128f71465bef959e93949a2ef15b3e4356f SHA1 284fa7cf1011611d7df1325ff97ed006a1b16ade SHA256 f7502bbea55f5221d02801f12d928da3d6d423c62c535346cca830b05a261758
-MD5 3d187003650419d995566eeab6fbfc62 ChangeLog 4975
-RMD160 7589e128f71465bef959e93949a2ef15b3e4356f ChangeLog 4975
-SHA256 f7502bbea55f5221d02801f12d928da3d6d423c62c535346cca830b05a261758 ChangeLog 4975
+EBUILD vdr-softdevice-0.3.0.ebuild 3306 RMD160 ee2a56ab3993ca9ed41fdb33d025c428157b0b76 SHA1 cd29a9d03c14f8a7c9fd229fb029b7a951f72ccb SHA256 7abe90fa9858fc658412306d8e26eb532de2b548cef89a818bb9c258128e406b
+MD5 88918c0c7cb96bb624dc453876bb0496 vdr-softdevice-0.3.0.ebuild 3306
+RMD160 ee2a56ab3993ca9ed41fdb33d025c428157b0b76 vdr-softdevice-0.3.0.ebuild 3306
+SHA256 7abe90fa9858fc658412306d8e26eb532de2b548cef89a818bb9c258128e406b vdr-softdevice-0.3.0.ebuild 3306
+MISC ChangeLog 5116 RMD160 61cb11d6c86964f477fcea8f1e78a0526456b728 SHA1 6d2db6c92612c8115a898e69db659a798f4c27c1 SHA256 aa10d956bc0b82d5896c5679251ca9a480c0e1abda920bce84e44a9641ca8dea
+MD5 20ce0086ea95bd1c14a40b32ae688172 ChangeLog 5116
+RMD160 61cb11d6c86964f477fcea8f1e78a0526456b728 ChangeLog 5116
+SHA256 aa10d956bc0b82d5896c5679251ca9a480c0e1abda920bce84e44a9641ca8dea ChangeLog 5116
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -85,10 +90,13 @@ SHA256 9bfcf8f5e3979a64a0b76c55f8ea3abd339a8fa7d35e98a316b5f8af1902f0aa files/di
 MD5 7157de0ad97d3b2d1c0c887fa7cb8a9f files/digest-vdr-softdevice-0.2.3.20060912 286
 RMD160 cade67ed856b48b2dd2900d3326aed92cdca4200 files/digest-vdr-softdevice-0.2.3.20060912 286
 SHA256 72b63ba65244177985c6511baca48471cf48412d196441d9a8e354bc67ee7374 files/digest-vdr-softdevice-0.2.3.20060912 286
+MD5 1a99e63b0950911ea31f51ca8a438eb1 files/digest-vdr-softdevice-0.3.0 253
+RMD160 2f9b5df740163dbee55f753866ca320381b1f123 files/digest-vdr-softdevice-0.3.0 253
+SHA256 34eb4ff82a39af8ee4198902db6ae1551dd16194d1e668d50e52a1b209c65125 files/digest-vdr-softdevice-0.3.0 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFKPSqt2vP6XvVdOcRApa7AJ9YRj3nUKtaofvkvC9ckO1/v9+h9wCfboUQ
-s2v2TblFNbL6UhKEANgl5vk=
-=eo1t
+iD8DBQFFKr4vt2vP6XvVdOcRAtWwAJ0appQ9GFpkxGs8VvZ8k0aFVMm8/wCgik4c
+F1PL2uvWShY0CgaT+mXDZNE=
+=dDqi
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.0 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.0
new file mode 100644
index 000000000000..ac181d951443
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.0
@@ -0,0 +1,3 @@
+MD5 0be5f52328bd649a33f31df4cd905455 vdr-softdevice-0.3.0.tgz 154294
+RMD160 fce250ac59e0a4bd3122fbed85bb6d8a6f4c2ebe vdr-softdevice-0.3.0.tgz 154294
+SHA256 2c15bfaf94c07dda3facd3c44219c4d9ebb1199093ec0aa4d35c1d3f67828b8a vdr-softdevice-0.3.0.tgz 154294
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0.ebuild
new file mode 100644
index 000000000000..e881c255fe2d
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2006 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.0.ebuild,v 1.1 2006/10/09 21:24:51 zzam Exp $
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR plugin: Software output-Device"
+HOMEPAGE="http://softdevice.berlios.de/"
+SRC_URI="mirror://gentoo/${P}.tgz
+		http://dev.gentoo.org/~zzam/distfiles/${P}.tgz"
+
+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 )"
+
+
+PATCHES="
+		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
+		${FILESDIR}/softdevice-cvs-xinerama-configure-opts.patch"
+
+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
+			einfo "SHM does only support xv at the moment"
+		fi
+	else
+		einfo "SHM not supported on vdr-1.2"
+	fi
+	case ${COMPILE_SHM} in
+		0)	einfo "SHM support will not be compiled." ;;
+		1)	einfo "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"
+
+	# MMX-Support
+	# hardcode mmx for amd64 - do not disable even without use-flag
+	if ! use amd64; then
+		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
+	fi
+
+	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
+
+	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
+
+	cd ${S}
+	einfo 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
+}
+