Added newer snapshot fixing the OSD-color-issue without forcing -O0.

Package-Manager: portage-2.1.1

4 files changed, 161 insertions, 8 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 9082d7f00379..6d9d0361bc3e 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.18 2006/09/08 19:35:09 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.19 2006/09/12 10:00:41 zzam Exp $
+
+*vdr-softdevice-0.2.3.20060912 (12 Sep 2006)
+
+  12 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-softdevice-0.2.3.20060912.ebuild:
+  Added newer snapshot fixing the OSD-color-issue without forcing -O0.
 
 *vdr-softdevice-0.2.3.20060908 (08 Sep 2006)
 
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 895646f2a7d5..6523b9d909ad 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -48,6 +48,7 @@ SHA256 c69f0de683ed6d5d0d031fbc86c2a1a3f32a031c5a2b6778ea73d79eca8bd5e7 files/vd
 DIST vdr-softdevice-0.2.3a.tgz 133780 RMD160 d97d7a1bbe4a3b325041bbe0e7ef23740f8121b1 SHA1 13f0b16b4bbde1c10b3dc31c075f43e8ca6eeb5d SHA256 bbf05254ce6f0559ce6aeed055272ba6fb207ba443a49926b91506e9de69ab92
 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
 EBUILD vdr-softdevice-0.2.3.20060511-r7.ebuild 3098 RMD160 d9733421ea94ec172257737294cf8c6af855ff00 SHA1 2dda664645a4f6c9b9b43cf886d2efc1d8270803 SHA256 9be701e372f6001124721c3b636c53a2d14dd561599641e394b611ab47f06450
 MD5 43a1247255aef5bc32a2eb739657b50e vdr-softdevice-0.2.3.20060511-r7.ebuild 3098
 RMD160 d9733421ea94ec172257737294cf8c6af855ff00 vdr-softdevice-0.2.3.20060511-r7.ebuild 3098
@@ -60,10 +61,14 @@ EBUILD vdr-softdevice-0.2.3.20060908.ebuild 3539 RMD160 50529a02b301db556de31000
 MD5 d6832ce82d12726443d285589a9c0084 vdr-softdevice-0.2.3.20060908.ebuild 3539
 RMD160 50529a02b301db556de31000d04439957e0e616b vdr-softdevice-0.2.3.20060908.ebuild 3539
 SHA256 e762f9892b1105c9c7d67ab4c686fead9e7e997e7f6c0efdefe6646225a7045b vdr-softdevice-0.2.3.20060908.ebuild 3539
-MISC ChangeLog 4634 RMD160 7a0657b61b1125c4b9486b072cb99b6559512a54 SHA1 85f5502e9baec91c30ffdd4d1441f2c0ca763918 SHA256 17249f2fe2952d0b7afb2aed3cf39ce8f4ea5da11b74e0be6b5919fbe24e0dbf
-MD5 edc271a64b4891ace1db7c94c44bd966 ChangeLog 4634
-RMD160 7a0657b61b1125c4b9486b072cb99b6559512a54 ChangeLog 4634
-SHA256 17249f2fe2952d0b7afb2aed3cf39ce8f4ea5da11b74e0be6b5919fbe24e0dbf ChangeLog 4634
+EBUILD vdr-softdevice-0.2.3.20060912.ebuild 3502 RMD160 839ac96ff984a2f692ba9caaab17f208c2bd52fb SHA1 ca41bffa0d20c00eb96e0caa5db6efde7d463b1b SHA256 d62ac03e91b4cdaa0366a2aac1bf57d7cc28432bae4690f4c6ef744d21800d9e
+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 4846 RMD160 6d79096fea5ba1107547a72b9a7d54b79b0b84e9 SHA1 588c1780b829b85bbf03cd79e8c5c88c3a973aa4 SHA256 922a6d009bcabb4196e04e24d3deaee5639a7c41c705690a6f7019fe2b969e64
+MD5 ae05604ae228986a603a2895c89d0576 ChangeLog 4846
+RMD160 6d79096fea5ba1107547a72b9a7d54b79b0b84e9 ChangeLog 4846
+SHA256 922a6d009bcabb4196e04e24d3deaee5639a7c41c705690a6f7019fe2b969e64 ChangeLog 4846
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -77,10 +82,13 @@ SHA256 8b86ceef4b53dc1cfc1b5d595124a672bc98f5da8c14227241d905ab41581b42 files/di
 MD5 01d84406d1b0b0afddfa88deb70f166a files/digest-vdr-softdevice-0.2.3.20060908 286
 RMD160 74cd1ce3c5336ac2d51b68f8a2af7fbd3654b5e2 files/digest-vdr-softdevice-0.2.3.20060908 286
 SHA256 9bfcf8f5e3979a64a0b76c55f8ea3abd339a8fa7d35e98a316b5f8af1902f0aa files/digest-vdr-softdevice-0.2.3.20060908 286
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFAcX0t2vP6XvVdOcRAl8xAKCUrVF1xtfuJeh+gDobYbDyhVZQRgCdFKTV
-3YLTbLJtXX/7KHSxD92F4zI=
-=sdPu
+iD8DBQFFBoVYt2vP6XvVdOcRAvUaAJ94ILMpicCzyHU+TM/+R098jvUgRwCgoQDb
+J4UvhCLgS/QFxllf0usmZz0=
+=gXye
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060912 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060912
new file mode 100644
index 000000000000..96257f8a08f8
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060912
@@ -0,0 +1,3 @@
+MD5 52ceac742d5d1d780c77a57173710595 vdr-softdevice-cvs-20060912.tar.bz2 125161
+RMD160 467dd24893fa884921c0201dc64375e60f2382b1 vdr-softdevice-cvs-20060912.tar.bz2 125161
+SHA256 f4477713914966bbf50854f8c75232ce0ffdb669750c4483ba63521ab05410fd vdr-softdevice-cvs-20060912.tar.bz2 125161
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060912.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060912.ebuild
new file mode 100644
index 000000000000..0313d9682ff8
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060912.ebuild
@@ -0,0 +1,136 @@
+# 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.2.3.20060912.ebuild,v 1.1 2006/09/12 10:00:41 zzam Exp $
+
+inherit vdr-plugin versionator
+
+MY_PV="$(get_version_component_range 4)"
+MY_P=${PN}-cvs-${MY_PV}
+
+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 )"
+
+
+S=${WORKDIR}/${VDRPLUGIN}-cvs-${MY_PV}
+PATCHES="
+		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
+		${FILESDIR}/softdevice-cvs-xinerama-configure-opts.patch
+		${FILESDIR}/softdevice-cvs-libcle266mpegdec-0.2.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
+}
+