Added a new snapshot. Removed patches that already got included upstream.

Package-Manager: portage-2.1.4

4 files changed, 160 insertions, 9 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 9126d6f1c559..3a4757cddb88 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.51 2007/11/21 12:49:53 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.52 2008/01/20 20:44:25 zzam Exp $
+
+*vdr-softdevice-0.4.0.20080120 (20 Jan 2008)
+
+  20 Jan 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-softdevice-0.4.0.20080120.ebuild:
+  Added a new snapshot. Removed patches that already got included upstream.
 
   21 Nov 2007; Matthias Schwarzott <zzam@gentoo.org>
   -files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff,
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 5b83333d6e0f..36750464e96c 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -47,6 +47,7 @@ RMD160 0f92a226eb7c176bd799bbbf933a657c5e3a1222 files/vdr-softdevice-20070711-vd
 SHA256 d4380a425d79068f50b9acf81c7c1e187274b405e1c8f43cba3fafbb2d159027 files/vdr-softdevice-20070711-vdr-1.5.9.diff 1902
 DIST vdr-softdevice-0.4.0.tgz 190505 RMD160 78c49568776b71d3b892de8cdc7406f31fd90115 SHA1 0949d6727011ebd0ed0947d9906d081bbe4d2162 SHA256 4a43426e03a36771bce272123d2b3a0a7dc5aac05b98277a985ba277e3c0b9c9
 DIST vdr-softdevice-cvs-20070711.tar.bz2 152000 RMD160 23be2f95bbb3e4d649a3ade799c443c579f80b84 SHA1 07ee85a8168bea9a9aace5018910f9672802dfb6 SHA256 6c869ae0c86fe42a24f767c40f538d07f70806474d7851643870b3a778b68c1a
+DIST vdr-softdevice-cvs-20080120.tar.bz2 154349 RMD160 0b9b69aafb5855757c199e04852ccde5a7c43529 SHA1 aff47780abc6e2ff3093e4c165ee525f10306e39 SHA256 267c7ded33944902f495012de04020ee6df209e661cba9e640a36460f6b6ca73
 EBUILD vdr-softdevice-0.4.0.20070711-r1.ebuild 3815 RMD160 b0d79b21826e479494c573dffd865c4092656ce8 SHA1 68c5408499fc34f2ee0bc04abefbc2844f648181 SHA256 4da53c3856b2368bca5bc5b68bd9037bab7a8ce3da59334f38dc0806135ae31a
 MD5 262498194495d006e09af70d3e5fe053 vdr-softdevice-0.4.0.20070711-r1.ebuild 3815
 RMD160 b0d79b21826e479494c573dffd865c4092656ce8 vdr-softdevice-0.4.0.20070711-r1.ebuild 3815
@@ -55,14 +56,18 @@ EBUILD vdr-softdevice-0.4.0.20070711.ebuild 3560 RMD160 22ce3eeb627eb920caa1f88c
 MD5 74c322eda3e9abba01795bc585f4677f vdr-softdevice-0.4.0.20070711.ebuild 3560
 RMD160 22ce3eeb627eb920caa1f88c432b8ba7eace979b vdr-softdevice-0.4.0.20070711.ebuild 3560
 SHA256 49c400c47b939134f6ff168a01c1e7bcde66b553fd125001a698a5e883665a3c vdr-softdevice-0.4.0.20070711.ebuild 3560
+EBUILD vdr-softdevice-0.4.0.20080120.ebuild 3556 RMD160 0716700615c6ea9b7829a6cff54e71aff8b0dc3a SHA1 ef020af36350cf353c5de877ca79b6ccd849078f SHA256 9758ce019557df7c3aa7c34a058c1d6433bca797815ebab4182ca82a2893273a
+MD5 49b0763b8cd895b2d571e9eebfac1a08 vdr-softdevice-0.4.0.20080120.ebuild 3556
+RMD160 0716700615c6ea9b7829a6cff54e71aff8b0dc3a vdr-softdevice-0.4.0.20080120.ebuild 3556
+SHA256 9758ce019557df7c3aa7c34a058c1d6433bca797815ebab4182ca82a2893273a vdr-softdevice-0.4.0.20080120.ebuild 3556
 EBUILD vdr-softdevice-0.4.0.ebuild 3597 RMD160 72ee53bfb4248923878d4426ef4ead20455a0d55 SHA1 4c7b69603bfcdecc51561dca72d796c599fe3ab2 SHA256 416d3d25ce245b474ea49203b1c2e6560d1b7016c19f3e92a8460f620bf2ecc7
 MD5 c0f2c6d002190375a9aac26bba8e420e vdr-softdevice-0.4.0.ebuild 3597
 RMD160 72ee53bfb4248923878d4426ef4ead20455a0d55 vdr-softdevice-0.4.0.ebuild 3597
 SHA256 416d3d25ce245b474ea49203b1c2e6560d1b7016c19f3e92a8460f620bf2ecc7 vdr-softdevice-0.4.0.ebuild 3597
-MISC ChangeLog 12273 RMD160 448606d5e13713514e632b7a2ccf36101251f14a SHA1 e07f7c0167bf18bc9c722fcb6cebae4d4f890a53 SHA256 a701df6ea77981e053f2148d0fb6ca9f0ec163ccdbcfae04581a2d493a4355a3
-MD5 e7cfc806f03949943c89a80a20d63ca9 ChangeLog 12273
-RMD160 448606d5e13713514e632b7a2ccf36101251f14a ChangeLog 12273
-SHA256 a701df6ea77981e053f2148d0fb6ca9f0ec163ccdbcfae04581a2d493a4355a3 ChangeLog 12273
+MISC ChangeLog 12490 RMD160 77216c9abacbb7106aa49f0ac3f0d06a26efb182 SHA1 dfbb64b7f92270997567e8736cd5f931973bfd63 SHA256 b747767b0f3033533677cd4f4b94d01c20299025e1b9a6d68aef52d2f231c1ce
+MD5 2cdba3483706bbb338ad9143ed9a0a35 ChangeLog 12490
+RMD160 77216c9abacbb7106aa49f0ac3f0d06a26efb182 ChangeLog 12490
+SHA256 b747767b0f3033533677cd4f4b94d01c20299025e1b9a6d68aef52d2f231c1ce ChangeLog 12490
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -76,10 +81,13 @@ SHA256 5fba935e9d93ff6239e7a1628013928d97c0c16dc912671c0cb9f14a7a9dfea9 files/di
 MD5 bfc7a5ccc03b0e1844b240f20f39eb00 files/digest-vdr-softdevice-0.4.0.20070711-r1 286
 RMD160 14d95da8d015dab58c81f7f5cd669a7de0b82139 files/digest-vdr-softdevice-0.4.0.20070711-r1 286
 SHA256 5fba935e9d93ff6239e7a1628013928d97c0c16dc912671c0cb9f14a7a9dfea9 files/digest-vdr-softdevice-0.4.0.20070711-r1 286
+MD5 0eaf920d3b5a9f1ad2fb6320ba5a7dfc files/digest-vdr-softdevice-0.4.0.20080120 286
+RMD160 151de7ffa4b0cfc2c9ac6b9f514878dd219465ee files/digest-vdr-softdevice-0.4.0.20080120 286
+SHA256 b567fbea2510190b90f17a33af3f5e0e4cc3caa4d56681e0b8118635f97ecb74 files/digest-vdr-softdevice-0.4.0.20080120 286
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHRCl5t2vP6XvVdOcRAmZCAJ99cYwCYZcjkgkvoF+pvyO9unPBLwCfWMKv
-CyMoPbnC6nTbQB8ZmcFVA14=
-=iJoC
+iD8DBQFHk7Kvt2vP6XvVdOcRAq0+AKDaDWqlk3s/tWC2f9g/rl2uH2n3wACg26QR
+DjyQepOjTrpbZ11MbaZ7yWw=
+=lgWm
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20080120 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20080120
new file mode 100644
index 000000000000..756ac5f4c56c
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20080120
@@ -0,0 +1,3 @@
+MD5 089cf19955787beb3efa8077e8bc6b2b vdr-softdevice-cvs-20080120.tar.bz2 154349
+RMD160 0b9b69aafb5855757c199e04852ccde5a7c43529 vdr-softdevice-cvs-20080120.tar.bz2 154349
+SHA256 267c7ded33944902f495012de04020ee6df209e661cba9e640a36460f6b6ca73 vdr-softdevice-cvs-20080120.tar.bz2 154349
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20080120.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20080120.ebuild
new file mode 100644
index 000000000000..816a57e8562a
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20080120.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2008 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.20080120.ebuild,v 1.1 2008/01/20 20:44:25 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 )
+	)"
+
+DEPEND="${RDEPEND}
+	xv? ( x11-proto/xproto
+				x11-proto/xextproto
+				x11-libs/libXv
+				xinerama? ( x11-proto/xineramaproto )
+			)
+	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
+		${FILESDIR}/patches-0.4.0/stream-repacker.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
+}