Version bumped. Now shmclient should be better configurable.

(Portage version: 2.1.2.7)

5 files changed, 173 insertions, 1 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 53a9a63cd986..fe736e3b4ad7 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-softdevice
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.39 2007/05/02 12:13:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.40 2007/05/15 21:24:26 zzam Exp $
+
+*vdr-softdevice-0.4.0.20070515 (15 May 2007)
+
+  15 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/patches-0.4.0/series,
+  +files/patches-0.4.0/shm-fullscreen-parameter.diff,
+  +vdr-softdevice-0.4.0.20070515.ebuild:
+  Version bumped. Now shmclient should be better configurable.
 
   02 May 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-softdevice-0.3.1.20070313.ebuild:
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20070515 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20070515
new file mode 100644
index 000000000000..b95cb5a47915
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20070515
@@ -0,0 +1,3 @@
+MD5 ba116b3c17d240c28682f290b11c8902 vdr-softdevice-cvs-20070515.tar.bz2 151023
+RMD160 f40c9a1175e2a92db535f753964ef0a1fcb96cb2 vdr-softdevice-cvs-20070515.tar.bz2 151023
+SHA256 2c627eeb40ec57ed018727fd4463796f807765e91c287c10e2c425db926aa751 vdr-softdevice-cvs-20070515.tar.bz2 151023
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/series b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
new file mode 100644
index 000000000000..f4d49416df58
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
@@ -0,0 +1 @@
+shm-fullscreen-parameter.diff
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/shm-fullscreen-parameter.diff b/media-plugins/vdr-softdevice/files/patches-0.4.0/shm-fullscreen-parameter.diff
new file mode 100644
index 000000000000..aaf0fdc4bf80
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/shm-fullscreen-parameter.diff
@@ -0,0 +1,21 @@
+Index: softdevice-cvs/ShmClient.c
+===================================================================
+--- softdevice-cvs.orig/ShmClient.c
++++ softdevice-cvs/ShmClient.c
+@@ -119,6 +119,16 @@ int main(int argc, char **argv) {
+         xvRemote= new cShmRemote("softdevice-xv");
+         //SetupStore.InitSetupStore();
+         SetupStore->xvFullscreen=0;
++	if (argc>1) {
++		if (strcmp(argv[1], "-f") == 0) {
++			SetupStore->xvFullscreen=1;
++		} else if (strcmp(argv[1], "-h") == 0) {
++			printf ("Shared-Memory-Client for vdr-softdevice\n");
++			printf ("Options:\n");
++			printf ("  -f   Start fullscreen\n");
++			return 0;
++		}
++	}
+ 
+         if ( !vout->Initialize()  ) {
+                 fprintf(stderr,"Could not init video out!\n");
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild
new file mode 100644
index 000000000000..8ab61c117710
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2007 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.4.0.20070515.ebuild,v 1.1 2007/05/15 21:24:26 zzam Exp $
+
+inherit vdr-plugin versionator
+
+
+DESCRIPTION="VDR Plugin: Software output-Device"
+HOMEPAGE="http://softdevice.berlios.de/"
+
+# Detect snapshots
+SNAP_V="$(get_version_component_range 4)"
+if [[ "$SNAP_V" ]]; then
+	MY_P="${PN}-cvs-${SNAP_V}"
+	S="${WORKDIR}/${MY_P#vdr-}"
+	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+			http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2"
+else
+	SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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 )
+	dev-util/pkgconfig"
+# Make sure the assembler USE flags are unmasked on amd64
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
+
+PATCHES="
+		${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.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
+			elog "SHM does only support xv at the moment"
+		fi
+	else
+		elog "SHM not supported on vdr-1.2"
+	fi
+	case ${COMPILE_SHM} in
+		0)	elog "SHM support will not be compiled." ;;
+		1)	elog "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"
+
+	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
+
+	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
+
+	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
+
+	cd ${S}
+	elog 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
+}
+