Add new snapshot that works with new ffmpeg versions.

Package-Manager: portage-2.1.6.7/cvs/Linux i686

3 files changed, 148 insertions, 6 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 628ba492c5af..33b3b6a2f941 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.60 2009/01/13 20:41:28 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.61 2009/02/18 21:29:49 zzam Exp $
+
+*vdr-softdevice-0.5.0.20090218 (18 Feb 2009)
+
+  18 Feb 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-softdevice-0.5.0.20090218.ebuild:
+  Add new snapshot that works with new ffmpeg versions.
 
   13 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
   vdr-softdevice-0.5.0.20080922.ebuild:
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 2485339d189f..a0b318361a03 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -8,13 +8,15 @@ AUX patches-0.4.0/shm-fullscreen-parameter.diff 737 RMD160 b09e27d40bc733b05ed2f
 AUX rc-addon.sh 321 RMD160 b236a3ce160d66fd4b25ad8fe4239cbbe5cb0843 SHA1 02c5f2efad7a8a3a687d79dee998a3fffb0018ea SHA256 d6eaa97c313fca31920f7bcc6d060c3dac9c4ee2624bfff4b0c59fa4ff91153d
 AUX vdr-softdevice-0.5.0.20080922-offsett.patch 1298 RMD160 ac28491ce13a8d06dc8bd5af6805a4fcd91c9cfd SHA1 5a8ae7cf83c737077b85213f9cfc1b789c9c028c SHA256 ccf16a8e94b6b9a0cb284b1e11595858b330f1307b2157eb1224db6b91e78661
 DIST vdr-softdevice-cvs-20080922.tar.bz2 161453 RMD160 8640c1f3aaf8b0edc994247382bfbf390e514fad SHA1 6d87279fe51a04cff50b949daf32d744ca72efc4 SHA256 95588510261069c3d71f466350bb8eee524d70f2b84ba5120745f01b011c8de5
+DIST vdr-softdevice-cvs-20090218.tar.bz2 161620 RMD160 273b55bd4dd551b82714724aa097a5ac2a0f0521 SHA1 059080d76529cccfe78fb4503731158622c308e5 SHA256 79f03506b40da140ad31be0849a9e33f7fb223eaa5f070fa1ade906b863548f6
 EBUILD vdr-softdevice-0.5.0.20080922.ebuild 3566 RMD160 f4fb258bf79f7969e5f4a894bc57ea0227fb02cb SHA1 8307b7065d0bc1f44ec9a9d20c99c70baec390e8 SHA256 b9443de9249cb7c12510eaba76de19c14793f5fc9451c43afb3b817d1717ef72
-MISC ChangeLog 14057 RMD160 bbe020cf61521c201d93e53da830f0f55f901998 SHA1 078f597dea331166ec4d07d9a00103df01e0fe6e SHA256 ffc0fe7119ab913e7bb34e7a6f9333e2529eca932c50cfdd3961e72b0f16f0a7
+EBUILD vdr-softdevice-0.5.0.20090218.ebuild 3532 RMD160 1cf7b1de5d17845bf02291fbd6138af82b5428d9 SHA1 053dfa12454d6f63326e24c78a14262723e8f5f3 SHA256 d29ccf707e7b04d37762fa786f5d8ba4240c9a8497dfb8cd2505ac56c112aad5
+MISC ChangeLog 14254 RMD160 97b120e15d52f4a3a449e1eccb57d8b0b9ea53e1 SHA1 92ace6ec436858d272054f78c375f42797594d6b SHA256 a85014e4378ef79eebb646c62e040acca38e929aa77aad02f2b0e061303e5cf7
 MISC metadata.xml 315 RMD160 9ff61fc577af435ee1e4c8cc622a7495ee2b6932 SHA1 514ba8e35690751b2d1d8cfba2c4162152f07d0f SHA256 0e99bf3f1538b2fef87bd304d896b78a5ddfb8a75277550c261801dcd3c4e279
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkls/H0ACgkQt2vP6XvVdOcTlQCgwFrGRBZOjDYGg8++mDzaCPNJ
-lVwAnRASgvn9pFHY+RSETyrJUX35SnWF
-=f8cH
+iEYEARECAAYFAkmcfdMACgkQt2vP6XvVdOdvRwCgnsNjNmHSvCIhc9BeygLAAOk0
+qO8AoKXMNrltZ+K6Q5gvPKaK8DLF94v2
+=iA3c
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild
new file mode 100644
index 000000000000..8181a161ec1b
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2009 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.5.0.20090218.ebuild,v 1.1 2009/02/18 21:29:49 zzam Exp $
+
+EAPI=1
+
+inherit eutils 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"
+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")
+
+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-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
+		make_desktop_entry ShmClient "VDR softdevice Client" "" "AudioVideo;TV"
+	fi
+
+	insinto /usr/include/vdr-softdevice
+	doins *.h
+}