Added patch to preserve all xv settings but colorkey.

Package-Manager: portage-2.1_pre10-r5

4 files changed, 200 insertions, 3 deletions

diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 3f8c7b74e7e2..da185f86fe8c 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -9,6 +9,10 @@ AUX rc-addon.sh 417 RMD160 e88a9bf5fd710ef3c89b1202c38f52cb26e0691f SHA1 54bfe12
 MD5 3fac805caca1748144085ca7194c7543 files/rc-addon.sh 417
 RMD160 e88a9bf5fd710ef3c89b1202c38f52cb26e0691f files/rc-addon.sh 417
 SHA256 6720c5829e67d6c7c6aaddaa234abc990f7547350785cc18be8ef6a3435253ac files/rc-addon.sh 417
+AUX vdr-softdevice-0.2.3-xv-settings.diff 3160 RMD160 787e9f8b371047ca14269ce70273fe03e17b0787 SHA1 8e887a659f19554434bd99ee87182b7329f69d6c SHA256 b9e4e1983969cd09c7219c4a3c00750c12a116bdb406418beb3e2e7df9e70ab7 size 3160
+MD5 eaf618bbc005045f78b01b542d792878 files/vdr-softdevice-0.2.3-xv-settings.diff 3160
+RMD160 787e9f8b371047ca14269ce70273fe03e17b0787 files/vdr-softdevice-0.2.3-xv-settings.diff 3160
+SHA256 b9e4e1983969cd09c7219c4a3c00750c12a116bdb406418beb3e2e7df9e70ab7 files/vdr-softdevice-0.2.3-xv-settings.diff 3160
 AUX vdr-softdevice-0.2.3a-CVS-20060511.diff 5732 RMD160 25b8bb29a77ec03de06effcdbf0850e1c3303919 SHA1 8bb680969474fc93cf9f544328b7230f8b459a47 SHA256 c69f0de683ed6d5d0d031fbc86c2a1a3f32a031c5a2b6778ea73d79eca8bd5e7 size 5732
 MD5 01851b3338d57baa07fcdeff833327f6 files/vdr-softdevice-0.2.3a-CVS-20060511.diff 5732
 RMD160 25b8bb29a77ec03de06effcdbf0850e1c3303919 files/vdr-softdevice-0.2.3a-CVS-20060511.diff 5732
@@ -18,6 +22,10 @@ MD5 4708f556a9bfa9207c43c6359190e3e1 files/vdr-softdevice-0.2.3a-Makefile.diff 9
 RMD160 f53d9a9d7b6f816f32b9bed2106f47701d199feb files/vdr-softdevice-0.2.3a-Makefile.diff 950
 SHA256 cb0cc884b706d01c74f2c5baef1cdd795ddfc27e4d8ca30bd96df75b6b40455e files/vdr-softdevice-0.2.3a-Makefile.diff 950
 DIST vdr-softdevice-0.2.3a.tgz 133780 RMD160 d97d7a1bbe4a3b325041bbe0e7ef23740f8121b1 SHA256 bbf05254ce6f0559ce6aeed055272ba6fb207ba443a49926b91506e9de69ab92 size 133780
+EBUILD vdr-softdevice-0.2.3.20060511-r1.ebuild 2274 RMD160 81dbe26bb438d4f45c302ae2ca08b75d0ad557c3 SHA1 1a0ca3717ada478403b3039497a0c8628517bd2b SHA256 ed539aa6f58d360aa5b50eba7c2b6c70f17bc740a89a185cb6dab36848e95586 size 2274
+MD5 ae26ee4d36f32525eee5675576c447d2 vdr-softdevice-0.2.3.20060511-r1.ebuild 2274
+RMD160 81dbe26bb438d4f45c302ae2ca08b75d0ad557c3 vdr-softdevice-0.2.3.20060511-r1.ebuild 2274
+SHA256 ed539aa6f58d360aa5b50eba7c2b6c70f17bc740a89a185cb6dab36848e95586 vdr-softdevice-0.2.3.20060511-r1.ebuild 2274
 EBUILD vdr-softdevice-0.2.3.20060511.ebuild 2219 RMD160 dab0cfa472a0252408efd5e993e8da2e0f610778 SHA1 81414ab5af9b749895f3870cba26f20f4e1835f5 SHA256 4dba99bb2e88dcecc6ceb10c156028487b0c2072a37b3acc3b61f3c02275497c size 2219
 MD5 d3c67c8e9e65356185cf00f4cc51d022 vdr-softdevice-0.2.3.20060511.ebuild 2219
 RMD160 dab0cfa472a0252408efd5e993e8da2e0f610778 vdr-softdevice-0.2.3.20060511.ebuild 2219
@@ -37,13 +45,16 @@ SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 metadata
 MD5 c7a0fabecfebf2988f2c1552b361c1ae files/digest-vdr-softdevice-0.2.3.20060511 256
 RMD160 498e786a7b8110e307aa41c04ed04d88aade4653 files/digest-vdr-softdevice-0.2.3.20060511 256
 SHA256 5d9d302686e0c254357af9482fb419c4510e73882e820f3bfcf76387d49be011 files/digest-vdr-softdevice-0.2.3.20060511 256
+MD5 c7a0fabecfebf2988f2c1552b361c1ae files/digest-vdr-softdevice-0.2.3.20060511-r1 256
+RMD160 498e786a7b8110e307aa41c04ed04d88aade4653 files/digest-vdr-softdevice-0.2.3.20060511-r1 256
+SHA256 5d9d302686e0c254357af9482fb419c4510e73882e820f3bfcf76387d49be011 files/digest-vdr-softdevice-0.2.3.20060511-r1 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)
 
-iD8DBQFEY4+2ZfSl1Kp5KmoRAvoZAKCuMRaMuEqtwyVnnfvGryiyihtHlgCg7VRu
-KvMNTnxaRjF6mqpDLMfVWiY=
-=EaJo
+iD8DBQFEZibhZfSl1Kp5KmoRAhLnAJwPp2uzqNJHGhRgu3BkKwKaMX5/lgCgyzfF
+IVFOjlg00pwllbvD31w57J8=
+=ChOn
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060511-r1 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060511-r1
new file mode 100644
index 000000000000..cb395c04db4b
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060511-r1
@@ -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/files/vdr-softdevice-0.2.3-xv-settings.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-xv-settings.diff
new file mode 100644
index 000000000000..5e592127e456
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-xv-settings.diff
@@ -0,0 +1,83 @@
+diff -ru --exclude=CVS --ignore-matching-lines=Id: softdevice-0.2.3.20060511/video-xv.c softdevice-0.2.3.20060511-zzam/video-xv.c
+--- softdevice-0.2.3.20060511/video-xv.c	2006-04-25 00:56:47.000000000 +0200
++++ softdevice-0.2.3.20060511-zzam/video-xv.c	2006-05-13 20:31:19.000000000 +0200
+@@ -126,6 +126,21 @@
+ 
+ /* ---------------------------------------------------------------------------
+  */
++int cXvPortAttributeStore::GetValuePercent(int index)
++{
++      int value = portAttributeCurrentValues[index];
++
++      value = (int) (((double) value - (double) portAttributes[index].min_value) * 100.0
++              / ((double) portAttributes[index].max_value - (double) portAttributes[index].min_value));
++
++      if (value <= 100 &&
++          value >= 0)
++        return value;
++      return 0;
++}
++
++/* ---------------------------------------------------------------------------
++ */
+ void cXvPortAttributeStore::SetValuePercent(char *name, int value)
+ {
+   for (int i = 0; i < portAttributeCount; ++i)
+@@ -149,15 +164,16 @@
+ 
+ /* ---------------------------------------------------------------------------
+  */
+-void cXvPortAttributeStore::SetColorkey(int value)
++int cXvPortAttributeStore::SetColorkey(int value)
+ {
+   for (int i = 0; i < portAttributeCount; ++i)
+   {
+     if (!strcmp("XV_COLORKEY",portAttributes[i].name))
+     {
++      int oldColorkey = portAttributeCurrentValues[i];
+       portAttributeCurrentValues[i] = value;
+       XvSetPortAttribute(dpy,port,portAttributeAtoms[i],portAttributeCurrentValues[i]);
+-      return;
++      return oldColorkey;
+     }
+   }
+ }
+@@ -217,13 +233,25 @@
+         portAttributeCurrentValues[i] = portAttributeSaveValues[i];
+       }
+       if (!strcmp(portAttributes[i].name, "XV_BRIGHTNESS"))
++      {
+         setupStore->vidCaps |= CAP_BRIGHTNESS;
++	setupStore->vidBrightness = currBrightness = GetValuePercent(i);
++      }
+       if (!strcmp(portAttributes[i].name, "XV_CONTRAST"))
++      {
+         setupStore->vidCaps |= CAP_CONTRAST;
++	setupStore->vidContrast = currContrast = GetValuePercent(i);
++      }
+       if (!strcmp(portAttributes[i].name, "XV_HUE"))
++      {
+         setupStore->vidCaps |= CAP_HUE;
++	setupStore->vidHue = currHue = GetValuePercent(i);
++      }
+       if (!strcmp(portAttributes[i].name, "XV_SATURATION"))
++      {
+         setupStore->vidCaps |= CAP_SATURATION;
++	setupStore->vidSaturation = currSaturation = GetValuePercent(i);
++      }
+ 
+       dsyslog("[XvVideoOut]:"
+               "   %-25s %-4sXvGettable %-4sXvSettable "
+diff -ru --exclude=CVS --ignore-matching-lines=Id: softdevice-0.2.3.20060511/video-xv.h softdevice-0.2.3.20060511-zzam/video-xv.h
+--- softdevice-0.2.3.20060511/video-xv.h	2006-04-23 21:38:29.000000000 +0200
++++ softdevice-0.2.3.20060511-zzam/video-xv.h	2006-05-13 20:29:38.000000000 +0200
+@@ -91,7 +91,8 @@
+   void SetXInfo(Display *dpy, XvPortID port, cSetupStore *setupStore);
+   void SetValue(char *name, int value);
+   void SetValuePercent(char *name, int value);
+-  void SetColorkey(int value);
++  int GetValuePercent(int index);
++  int SetColorkey(int value);
+   void Increment(char *name);
+   void Decrement(char *name);
+   void Save();
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r1.ebuild
new file mode 100644
index 000000000000..db61dce8eb15
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r1.ebuild
@@ -0,0 +1,100 @@
+# 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-r1.ebuild,v 1.1 2006/05/13 18:35:01 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"
+
+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-xv-settings.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
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	insinto "${VDR_PLUGIN_DIR}"
+	doins libsubvdr-*.so.*
+
+	if [[ "${COMPILE_SHM}" = "1" ]]; then
+		exeinto "/usr/bin"
+		doexe ShmClient
+	fi
+}
+