Revert threading-patch.

Package-Manager: portage-2.1_rc3-r5

4 files changed, 129 insertions, 8 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 4a5c0387ee37..2f3b43321416 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.5 2006/05/29 19:34:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.6 2006/06/02 12:18:54 zzam Exp $
+
+*vdr-softdevice-0.2.3.20060511-r5 (02 Jun 2006)
+
+  02 Jun 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-softdevice-0.2.3.20060511-r5.ebuild:
+  Revert threading-patch.
 
 *vdr-softdevice-0.2.3.20060511-r4 (29 May 2006)
 
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index a1627a555213..ef6a9db5f8f3 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -54,6 +54,10 @@ EBUILD vdr-softdevice-0.2.3.20060511-r4.ebuild 2531 RMD160 570961607cbd7a1e0185b
 MD5 f5f01829d11d029688dfb229c2d49776 vdr-softdevice-0.2.3.20060511-r4.ebuild 2531
 RMD160 570961607cbd7a1e0185b68ee68a78b8186c2742 vdr-softdevice-0.2.3.20060511-r4.ebuild 2531
 SHA256 c5f5fd9d720305a20e5987ca05149c0c4bbb07724a2b4186327274c21c3f69b9 vdr-softdevice-0.2.3.20060511-r4.ebuild 2531
+EBUILD vdr-softdevice-0.2.3.20060511-r5.ebuild 2481 RMD160 db38f709876d196bfe17d3a979e46f5d97abf35f SHA1 fbbea4518b9d1ec8a697efe134775b7e1d609456 SHA256 3e7c891f5adcc3b94acd8039cce11827b1fd64636a9c5d3012d64f2e95b45808
+MD5 0076c4b1fe8529f5896d96fa9eae56b2 vdr-softdevice-0.2.3.20060511-r5.ebuild 2481
+RMD160 db38f709876d196bfe17d3a979e46f5d97abf35f vdr-softdevice-0.2.3.20060511-r5.ebuild 2481
+SHA256 3e7c891f5adcc3b94acd8039cce11827b1fd64636a9c5d3012d64f2e95b45808 vdr-softdevice-0.2.3.20060511-r5.ebuild 2481
 EBUILD vdr-softdevice-0.2.3.20060511.ebuild 2219 RMD160 dab0cfa472a0252408efd5e993e8da2e0f610778 SHA1 81414ab5af9b749895f3870cba26f20f4e1835f5 SHA256 4dba99bb2e88dcecc6ceb10c156028487b0c2072a37b3acc3b61f3c02275497c
 MD5 d3c67c8e9e65356185cf00f4cc51d022 vdr-softdevice-0.2.3.20060511.ebuild 2219
 RMD160 dab0cfa472a0252408efd5e993e8da2e0f610778 vdr-softdevice-0.2.3.20060511.ebuild 2219
@@ -62,10 +66,10 @@ EBUILD vdr-softdevice-0.2.3a.ebuild 1321 RMD160 686fb334913ed010a790f06d38772655
 MD5 cf7919c2cd4eae6d4a59233ad97a790a vdr-softdevice-0.2.3a.ebuild 1321
 RMD160 686fb334913ed010a790f06d38772655601d9a0e vdr-softdevice-0.2.3a.ebuild 1321
 SHA256 41144f94417e747f4539d5bd04adcbb9f70e3f12088eaa5c5b62ea373de4a54a vdr-softdevice-0.2.3a.ebuild 1321
-MISC ChangeLog 1611 RMD160 a1209d726ca58be2fc763380c0472ddf01989d05 SHA1 833559f97a815c094c5cde4643e087b228202bb2 SHA256 e118e0ef1d794036a3687bb40ee46044ffab068b22442be4d7cfa1baf1009237
-MD5 b4e9bbb002b506569fd10fdff29ecc7a ChangeLog 1611
-RMD160 a1209d726ca58be2fc763380c0472ddf01989d05 ChangeLog 1611
-SHA256 e118e0ef1d794036a3687bb40ee46044ffab068b22442be4d7cfa1baf1009237 ChangeLog 1611
+MISC ChangeLog 1784 RMD160 0490948c906b37801e1f4eeeb79c1269f49f66aa SHA1 4892dce20b39b27017b56d39326b21d2e06d30bb SHA256 b1d439b67e872b7e77849c505b943b8f4536e8739bc5fb3367a5feb7ef125d6f
+MD5 67c13392556b391e24f82761489bb242 ChangeLog 1784
+RMD160 0490948c906b37801e1f4eeeb79c1269f49f66aa ChangeLog 1784
+SHA256 b1d439b67e872b7e77849c505b943b8f4536e8739bc5fb3367a5feb7ef125d6f ChangeLog 1784
 MISC metadata.xml 300 RMD160 c85719cef743cf573efe73f8f84564292085c91c SHA1 4c00933e1ed60039fae091034d83e28d0890e87c SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
 RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300
@@ -85,13 +89,16 @@ SHA256 5d9d302686e0c254357af9482fb419c4510e73882e820f3bfcf76387d49be011 files/di
 MD5 c7a0fabecfebf2988f2c1552b361c1ae files/digest-vdr-softdevice-0.2.3.20060511-r4 256
 RMD160 498e786a7b8110e307aa41c04ed04d88aade4653 files/digest-vdr-softdevice-0.2.3.20060511-r4 256
 SHA256 5d9d302686e0c254357af9482fb419c4510e73882e820f3bfcf76387d49be011 files/digest-vdr-softdevice-0.2.3.20060511-r4 256
+MD5 c7a0fabecfebf2988f2c1552b361c1ae files/digest-vdr-softdevice-0.2.3.20060511-r5 256
+RMD160 498e786a7b8110e307aa41c04ed04d88aade4653 files/digest-vdr-softdevice-0.2.3.20060511-r5 256
+SHA256 5d9d302686e0c254357af9482fb419c4510e73882e820f3bfcf76387d49be011 files/digest-vdr-softdevice-0.2.3.20060511-r5 256
 MD5 c7a0fabecfebf2988f2c1552b361c1ae files/digest-vdr-softdevice-0.2.3a 256
 RMD160 498e786a7b8110e307aa41c04ed04d88aade4653 files/digest-vdr-softdevice-0.2.3a 256
 SHA256 5d9d302686e0c254357af9482fb419c4510e73882e820f3bfcf76387d49be011 files/digest-vdr-softdevice-0.2.3a 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEe0zlZfSl1Kp5KmoRArQoAKCA3Dh/jf2E/KLewls0gU4HcMEnjgCfcef7
-OF+7rn3UW7BitYu9oVFuSec=
-=h10E
+iD8DBQFEgCy6ZfSl1Kp5KmoRApEbAKDa502CjaDe8UIJbLOWrWf1N03xLwCePBT8
+76MoK0smxWbRi58+PPWlF50=
+=4RCK
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060511-r5 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060511-r5
new file mode 100644
index 000000000000..cb395c04db4b
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060511-r5
@@ -0,0 +1,3 @@
+MD5 dfae4ed2ab2bb17572de993461cf36f8 vdr-softdevice-0.2.3a.tgz 133780
+RMD160 d97d7a1bbe4a3b325041bbe0e7ef23740f8121b1 vdr-softdevice-0.2.3a.tgz 133780
+SHA256 bbf05254ce6f0559ce6aeed055272ba6fb207ba443a49926b91506e9de69ab92 vdr-softdevice-0.2.3a.tgz 133780
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r5.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r5.ebuild
new file mode 100644
index 000000000000..a2de52d5c692
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r5.ebuild
@@ -0,0 +1,105 @@
+# 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.20060511-r5.ebuild,v 1.1 2006/06/02 12:18:54 zzam Exp $
+
+inherit vdr-plugin versionator
+
+MY_PV="$(get_version_component_range 1-3)a"
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="VDR plugin: Software output-Device"
+HOMEPAGE="http://softdevice.berlios.de/"
+SRC_URI="mirror://gentoo/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="xv fbcon directfb mmx mmxext"
+
+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
+			)
+			virtual/x11
+		) )"
+
+DEPEND="${RDEPEND}
+	xv? ( || ( ( x11-proto/xproto
+				x11-proto/xextproto
+			)
+			virtual/x11
+	) )
+	fbcon? ( sys-kernel/linux-headers )"
+
+
+S=${WORKDIR}/${VDRPLUGIN}-${MY_PV}
+PATCHES="${FILESDIR}/${MY_P}-Makefile.diff ${FILESDIR}/${MY_P}-CVS-20060511.diff
+		${FILESDIR}/vdr-softdevice-0.2.3-shm-contrast.diff
+		${FILESDIR}/vdr-softdevice-0.2.3-shm-key-init.diff
+		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.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
+			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
+}
+
+disable_in_makefile() {
+	local makefile_define="${1}"
+	sed -i Makefile -e "s-^${makefile_define}-#${makefile_define}-"
+}
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	cd ${S}
+	disable_in_makefile VIDIX_SUPPORT
+	use xv || disable_in_makefile XV_SUPPORT
+	use directfb || disable_in_makefile DFB_SUPPORT
+	use fbcon || disable_in_makefile FB_SUPPORT
+	if [[ "${COMPILE_SHM}" = "1" ]]; then
+		sed -i Makefile -e 's:^#SHM_SUPPORT:SHM_SUPPORT:'
+	fi
+
+	use mmxext || sed -i Makefile -e '/MMX2$/d'
+	use mmx || sed -i Makefile -e '/MMX$/d'
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	insinto "${VDR_PLUGIN_DIR}"
+	doins libsubvdr-*.so.*
+
+	if [[ "${COMPILE_SHM}" = "1" ]]; then
+		exeinto "/usr/bin"
+		doexe ShmClient
+	fi
+}
+