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.

(Portage version: 2.1.1_pre5-r1)

4 files changed, 190 insertions, 1 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/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
+}
+