Added new cvs snapshot. Cleaned up mmx handling. Removed now obsolete patches. Subplugins has been renamed. Added xinerama use-flag. Added patch for cle266 support.

Package-Manager: portage-2.1.1_pre5-r1

5 files changed, 209 insertions, 8 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 0a397d215868..46f1b9867464 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,15 @@
 # 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.13 2006/08/14 18:51:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.14 2006/08/15 08:43:43 zzam Exp $
+
+*vdr-softdevice-0.2.3.20060814 (15 Aug 2006)
+
+  15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/softdevice-cvs-libcle266mpegdec-0.2.patch,
+  +vdr-softdevice-0.2.3.20060814.ebuild:
+  Added new cvs snapshot. Cleaned up mmx handling. Removed now obsolete
+  patches. Subplugins has been renamed. Added xinerama use-flag. Added patch
+  for cle266 support.
 
   14 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
   -files/vdr-softdevice-0.2.3a-Makefile.diff,
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 9274a7858c9a..91f91a434b7d 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -9,6 +9,10 @@ AUX rc-addon.sh 517 RMD160 0464596425c28c1e86bdcd8bb8cebf54a4494eec SHA1 0f4aab8
 MD5 9681d6da52f4a45800743e2fd5110816 files/rc-addon.sh 517
 RMD160 0464596425c28c1e86bdcd8bb8cebf54a4494eec files/rc-addon.sh 517
 SHA256 aea8bf3ed04c763750d3685ff7bbf5f79989d49e1903c8350a78129be28298af files/rc-addon.sh 517
+AUX softdevice-cvs-libcle266mpegdec-0.2.patch 2418 RMD160 1ddfec6fc08d663561cb9f953b227276b788a1fa SHA1 f27abb01793b64386bf4d547da7d21cec2f8a3f9 SHA256 ad245b34d41eca93a3bbe4dd0a4f28b6c1a29df0baeb08332d40e5d760c8eba0
+MD5 a958bc6219a57595bef39884211ebc02 files/softdevice-cvs-libcle266mpegdec-0.2.patch 2418
+RMD160 1ddfec6fc08d663561cb9f953b227276b788a1fa files/softdevice-cvs-libcle266mpegdec-0.2.patch 2418
+SHA256 ad245b34d41eca93a3bbe4dd0a4f28b6c1a29df0baeb08332d40e5d760c8eba0 files/softdevice-cvs-libcle266mpegdec-0.2.patch 2418
 AUX vdr-softdevice-0.2.3-picture-settings-use-defaults.diff 5306 RMD160 005f050095fc34b172f741fee73a97c5b70d40f5 SHA1 05b6ba545bcf071221f2b16f9ef1ef7e80d49175 SHA256 ca66e41ae3af48b3cd2c08f5347f1fdcc54dc2d8fe87db42af0e05aecc8127e1
 MD5 51f2423448df2efb22656fc55a5138f0 files/vdr-softdevice-0.2.3-picture-settings-use-defaults.diff 5306
 RMD160 005f050095fc34b172f741fee73a97c5b70d40f5 files/vdr-softdevice-0.2.3-picture-settings-use-defaults.diff 5306
@@ -38,14 +42,19 @@ 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-cvs-20060814.tar.bz2 122901 RMD160 d9b010f9d10eb574681cbea2ea433ddd3f5356f7 SHA1 c7fa5c511916995c7661134ef085091892d5ea7a SHA256 476722fe33ff3bb75e7859b93b563d68b098cd78be31fe40044b4d27324e60f4
 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
 SHA256 9be701e372f6001124721c3b636c53a2d14dd561599641e394b611ab47f06450 vdr-softdevice-0.2.3.20060511-r7.ebuild 3098
-MISC ChangeLog 3387 RMD160 a92dd075d32535dd2b71df426b6aacb07361ad30 SHA1 ce310e474f9c7c105c98db329c132779f17df30d SHA256 324e328fca3af921b63449602bda0eafad383ad90eaec091d23ef488080a3f13
-MD5 669d2a292c8636fb1d523568efb924a2 ChangeLog 3387
-RMD160 a92dd075d32535dd2b71df426b6aacb07361ad30 ChangeLog 3387
-SHA256 324e328fca3af921b63449602bda0eafad383ad90eaec091d23ef488080a3f13 ChangeLog 3387
+EBUILD vdr-softdevice-0.2.3.20060814.ebuild 3065 RMD160 1d9b100def975c6382a2baaea9744140242d4cb6 SHA1 07d1448b7dc07cfa2b2febe60a3265518a41d267 SHA256 a83bbb58bd6699a477fe9bad161375c210908e08e96e2055b172048c17304b95
+MD5 a5ee8fdd0e0ac93db7f2e78f3201bd67 vdr-softdevice-0.2.3.20060814.ebuild 3065
+RMD160 1d9b100def975c6382a2baaea9744140242d4cb6 vdr-softdevice-0.2.3.20060814.ebuild 3065
+SHA256 a83bbb58bd6699a477fe9bad161375c210908e08e96e2055b172048c17304b95 vdr-softdevice-0.2.3.20060814.ebuild 3065
+MISC ChangeLog 3751 RMD160 5949ab09b9a588a64931dc74f89816e4ae9cc5be SHA1 2f612719e74caa66b36158a90705d38993c44a87 SHA256 78d618e7cdddbf8784f9609355a436dae000edde66a2ed5c200d2546a89709ad
+MD5 a7b5298e5e0e80b4cecb2393a78ad563 ChangeLog 3751
+RMD160 5949ab09b9a588a64931dc74f89816e4ae9cc5be ChangeLog 3751
+SHA256 78d618e7cdddbf8784f9609355a436dae000edde66a2ed5c200d2546a89709ad ChangeLog 3751
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -53,10 +62,13 @@ SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 metadata
 MD5 c7a0fabecfebf2988f2c1552b361c1ae files/digest-vdr-softdevice-0.2.3.20060511-r7 256
 RMD160 498e786a7b8110e307aa41c04ed04d88aade4653 files/digest-vdr-softdevice-0.2.3.20060511-r7 256
 SHA256 5d9d302686e0c254357af9482fb419c4510e73882e820f3bfcf76387d49be011 files/digest-vdr-softdevice-0.2.3.20060511-r7 256
+MD5 2fed7fd9a2a77ab1a608e5215a0c25d3 files/digest-vdr-softdevice-0.2.3.20060814 286
+RMD160 5e763b40d209c8a319dc776f174b07a84dc4f375 files/digest-vdr-softdevice-0.2.3.20060814 286
+SHA256 8b86ceef4b53dc1cfc1b5d595124a672bc98f5da8c14227241d905ab41581b42 files/digest-vdr-softdevice-0.2.3.20060814 286
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE4MY8t2vP6XvVdOcRAjy+AKCM3NH0XOyRNQmrQ8P4bjbLJb7SIgCgkybt
-soaGOQ3OOn+fcKnbrX6fbLU=
-=JjIr
+iD8DBQFE4YlPt2vP6XvVdOcRAgQvAKCHroNvSQJ9iPuhWDT1M3pFOeV5KQCgxpR/
+ufBvIP1IDYRsHm5zNbllstE=
+=lkiD
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060814 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060814
new file mode 100644
index 000000000000..9c81f33962ab
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060814
@@ -0,0 +1,3 @@
+MD5 0737819d11a425aadbbe30d7cdb0c0d7 vdr-softdevice-cvs-20060814.tar.bz2 122901
+RMD160 d9b010f9d10eb574681cbea2ea433ddd3f5356f7 vdr-softdevice-cvs-20060814.tar.bz2 122901
+SHA256 476722fe33ff3bb75e7859b93b563d68b098cd78be31fe40044b4d27324e60f4 vdr-softdevice-cvs-20060814.tar.bz2 122901
diff --git a/media-plugins/vdr-softdevice/files/softdevice-cvs-libcle266mpegdec-0.2.patch b/media-plugins/vdr-softdevice/files/softdevice-cvs-libcle266mpegdec-0.2.patch
new file mode 100644
index 000000000000..cb32a8a28198
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/softdevice-cvs-libcle266mpegdec-0.2.patch
@@ -0,0 +1,56 @@
+Index: configure

+===================================================================

+RCS file: /cvsroot/softdevice/softdevice/configure,v

+retrieving revision 1.20

+diff -u -r1.20 configure

+--- configure	10 Jul 2006 19:40:25 -0000	1.20

++++ configure	13 Jul 2006 11:38:08 -0000

+@@ -299,15 +299,17 @@

+ #

+ if test "${dfb}" = "yes" ; then

+   echo -n "Checking for libcle266mpegdec ... "

+-  cle266_cflags=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags libcle266mpegdec 2>>config.log` || cle266="no"

++  cle266_version=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --modversion libcle266mpegdec 2>>config.log` || cle266="no"

+   if test "${cle266}" = "yes" ; then

++    cle266_cflags=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags libcle266mpegdec`

+     cle266_libs=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --libs libcle266mpegdec`

+     cle266_opts="${cle266_cflags} ${cle266_libs}"

+   fi

+ 

+-  if test "${cle266}" = "yes" ; then

++  if test "${cle266}" = "yes" && test "${cle266_version}" = "0.2"; then

+     echo "Enabled cle266 hardware decoding."

+   else

++    cle266="no"

+     echo "Not found."

+   fi

+ else

+Index: mpeg2decoder.c

+===================================================================

+RCS file: /cvsroot/softdevice/softdevice/mpeg2decoder.c,v

+retrieving revision 1.66

+diff -u -r1.66 mpeg2decoder.c

+--- mpeg2decoder.c	17 Jun 2006 16:27:34 -0000	1.66

++++ mpeg2decoder.c	13 Jul 2006 11:38:08 -0000

+@@ -757,7 +757,7 @@

+ };

+ 

+ #ifdef HAVE_CLE266_MPEG_DECODER

+-float aspect_ratio_values[5]={1.0, 1.0, 4.0/3.0, 16.0/9.0, 221.0/110 };

++float aspect_ratio_values[5]={1.0, 1.0, 4.0/3.0, 16.0/9.0, 2.21 };

+ 

+ int cVideoStreamDecoder::DecodePicture_cle266(sPicBuffer *&pic, 

+                 int &got_picture,uint8_t *data, int length, int64_t pkt_pts) {

+@@ -790,9 +790,9 @@

+   pic->width = decoder.width;

+   pic->height = decoder.height;

+   pic->pts = pkt_pts;

+-  pic->edge_width=pic->edge_height=0;

+-  pic->dtg_active_format = 0; // currently not parsed

+-  pic->interlaced_frame = true; // FIXME Do we have that information?

++  pic->edge_width = pic->edge_height = 0;

++  pic->dtg_active_format = decoder.dtg_active_format;

++  pic->interlaced_frame = decoder.progressive_sequence ? false : true;

+   pic->aspect_ratio = ( decoder.aspect_ratio_info >= 0 

+     && decoder.aspect_ratio_info < 5 ) ?

+     aspect_ratio_values[decoder.aspect_ratio_info] : 1.0;

diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814.ebuild
new file mode 100644
index 000000000000..21bb0dce227f
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814.ebuild
@@ -0,0 +1,121 @@
+# 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.20060814.ebuild,v 1.1 2006/08/15 08:43:43 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"
+
+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-key-init.diff
+		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
+		${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
+	use mmx || MYOPTS="${MYOPTS} --disable-mmx"
+	use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
+
+	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
+
+	insinto "${VDR_PLUGIN_DIR}"
+	doins libsoftdevice-*.so.*
+
+	if [[ "${COMPILE_SHM}" = "1" ]]; then
+		exeinto "/usr/bin"
+		doexe ShmClient
+	fi
+}
+