Added desktop entry for ShmClient. Fixed quoting of PATCHES variable.

Package-Manager: portage-2.1.5_rc6

7 files changed, 165 insertions, 27 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 6563c981a1da..783fcfb7cb40 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.54 2008/04/18 20:34:54 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.55 2008/04/24 19:21:52 zzam Exp $
+
+*vdr-softdevice-0.5.0-r1 (24 Apr 2008)
+
+  24 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-softdevice-0.4.0.ebuild, vdr-softdevice-0.4.0.20070711.ebuild,
+  vdr-softdevice-0.4.0.20070711-r1.ebuild,
+  vdr-softdevice-0.4.0.20080120.ebuild, +vdr-softdevice-0.5.0-r1.ebuild:
+  Added desktop entry for ShmClient. Fixed quoting of PATCHES variable.
 
 *vdr-softdevice-0.5.0 (18 Apr 2008)
 
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 9b45bf998958..7e55a298c9e2 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -16,17 +16,18 @@ DIST vdr-softdevice-0.4.0.tgz 190505 RMD160 78c49568776b71d3b892de8cdc7406f31fd9
 DIST vdr-softdevice-0.5.0.tgz 200049 RMD160 de854f35173e0ecea21ce73613b5f6e58293d9fa SHA1 e92ef0d6bf71ea6a2c7e2c84dfef07a1c3e81708 SHA256 8b1eec4f5b7cd9a051439830408c1209d5583a5979551b28b69649f1e3381bc3
 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 3805 RMD160 c1a94052f9e6e8dcfb3cf4de4df7eec565ac9aed SHA1 368bba0b0fb3bf4309b72cb9d838f9e64d1316d6 SHA256 a005e52323aad477987a613d9b812508dda2903e8a71650fdd9f15e00b76cba2
-EBUILD vdr-softdevice-0.4.0.20070711.ebuild 3550 RMD160 cf4ca212a829d960102777a3b35e790b67f5381a SHA1 13eaab21da3aaac4abb10c7e04f541341bed9c3e SHA256 7f60ef21394ca9e01801062ec6eb6a4f65928015f33af4b00e3e0ae8d2a1741a
-EBUILD vdr-softdevice-0.4.0.20080120.ebuild 3546 RMD160 81266266b38b032bf39b64ee708bafa4f5390503 SHA1 88bc411fa07ee43918cc161661801b9a4f933898 SHA256 5b8b1077ed16cfd166460a1de649937d911e7e98c174e6dd6b2de5352c99bfe7
-EBUILD vdr-softdevice-0.4.0.ebuild 3587 RMD160 e716fe032ba49013921428d2a6b6a749777c7f17 SHA1 76c3369ae123b27becd8a5604c60113fef8d3477 SHA256 05c2d060e19f0e10b9f8e0864a777a869936406a9e2eb8c0b094a5f1bbc749c0
+EBUILD vdr-softdevice-0.4.0.20070711-r1.ebuild 3806 RMD160 c64b0364984fbcfe0a8673c151317f937638df7a SHA1 f9b7d718d3da2cac59fc687a9368a6fdf4506dcf SHA256 75d93902818438cae5fb99d76234135559c34519dd27e2d9db2df27ab7741131
+EBUILD vdr-softdevice-0.4.0.20070711.ebuild 3550 RMD160 79275bd9563266fed3191e2253b9091f3dec6970 SHA1 056e08aba8447f079cb4f10882bf8ecbcbac6893 SHA256 f8a1331d77c6246905315100f58f7762610158791f0edf1942e9a826c660f8d1
+EBUILD vdr-softdevice-0.4.0.20080120.ebuild 3546 RMD160 63faac2aa9c025c1ffa85d4fe0c6633a3abba606 SHA1 ebf2b63eaa67a5c2dd49528ca80e799b0b7a32a0 SHA256 56bd4911043de6c648db4371f91d1d4a9d0478cf7fbea1c660bab66a7783584d
+EBUILD vdr-softdevice-0.4.0.ebuild 3588 RMD160 12d960454ed4cd5a295ef4cab66621d5da3b947d SHA1 181412532815c11aa305de573725ee94076ba468 SHA256 85cde41dd65b8d4d4b7c227651a0294c6ed9be9ffbcbe93ca2426d18a28e421b
+EBUILD vdr-softdevice-0.5.0-r1.ebuild 3571 RMD160 7777c4adad624dcc42b99b906bcd8e902bc85791 SHA1 35c05c982c2abb179478c4ecac8d7d9abe2da0c3 SHA256 63566dd9be19cfe87c5d1b4b8aaf1ff3591d117629b48e5262e40db781641831
 EBUILD vdr-softdevice-0.5.0.ebuild 3487 RMD160 3b61c650f425dcb50697fcabaedd43f9d135b94e SHA1 1a4bdfc8070018d76f96b13e37475ac4345c5975 SHA256 caae055cbcfdc31391ec1014ca54b9ee6224bb13bfd2f34071c917c8179a66c6
-MISC ChangeLog 12913 RMD160 2a7d0079950941aa364d6d774722a2c09626eaff SHA1 30e914a768a30d227cced881ef929ab56d767cb6 SHA256 da258621a429fe37ff13af99b8bef3723e75deb7887722ac44c921bc405bf849
+MISC ChangeLog 13264 RMD160 078dfbe251d8e2c394a28d2a7989c9651b9e1d3f SHA1 d5ca5101329761ba716f40dfba36e6fc324dac4a SHA256 4b53342cc3045432d68c76995aeec7de3dab6cdd9f57c830cee9b859de33c46d
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgJBfcACgkQt2vP6XvVdOcHYACgw8ntHjvKavy1ootqvFwGAJP3
-C9sAoNCE3S7rA68gBqe4/8w9KExVyZP+
-=SWdo
+iEYEARECAAYFAkgQ3d0ACgkQt2vP6XvVdOe2fQCg0NOgCw3946Cd+2+jdNXTp9CL
+7D0An2UmGBYCJJDcFeY0tl9CLrwwAhMX
+=PQdx
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild
index 7ba310f710b2..e106ad7b8471 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.20070711-r1.ebuild,v 1.5 2008/01/20 21:54:37 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild,v 1.6 2008/04/24 19:21:52 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -49,10 +49,9 @@ DEPEND="${RDEPEND}
 # 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/shm-init-setupStore.diff
-		${FILESDIR}/patches-0.4.0/stream-repacker.diff"
+PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff"
+	"${FILESDIR}/patches-0.4.0/shm-init-setupStore.diff"
+	"${FILESDIR}/patches-0.4.0/stream-repacker.diff")
 
 pkg_setup() {
 	vdr-plugin_pkg_setup
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild
index 40d0aaae49da..4be132402636 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild
@@ -1,6 +1,6 @@
 # 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.20070711.ebuild,v 1.4 2008/01/20 21:54:37 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild,v 1.5 2008/04/24 19:21:52 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -49,9 +49,8 @@ DEPEND="${RDEPEND}
 # 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/shm-init-setupStore.diff"
+PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff"
+	"${FILESDIR}/patches-0.4.0/shm-init-setupStore.diff")
 
 pkg_setup() {
 	vdr-plugin_pkg_setup
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
index 5772e3e7cd34..f213b0d4e1c3 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20080120.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20080120.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2008/01/20 21:54:37 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20080120.ebuild,v 1.3 2008/04/24 19:21:52 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -49,9 +49,8 @@ DEPEND="${RDEPEND}
 # 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"
+PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff"
+	"${FILESDIR}/patches-0.4.0/stream-repacker.diff")
 
 pkg_setup() {
 	vdr-plugin_pkg_setup
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild
index bd13c3243e04..b5d8439b07f0 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.6 2008/01/20 21:54:37 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild,v 1.7 2008/04/24 19:21:52 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -49,10 +49,9 @@ DEPEND="${RDEPEND}
 # Remove this once default-linux/amd64/2006.1 is deprecated
 DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
 
-PATCHES="
-		${FILESDIR}/${PN}-0.2.3-shm-fullscreen.diff
-		${FILESDIR}/${PN}-0.4.0-xinerama-configure-opts.patch
-		${FILESDIR}/${PN}-0.3.1-osdmode-software-default.diff"
+PATCHES=("${FILESDIR}/${PN}-0.2.3-shm-fullscreen.diff"
+	"${FILESDIR}/${PN}-0.4.0-xinerama-configure-opts.patch"
+	"${FILESDIR}/${PN}-0.3.1-osdmode-software-default.diff")
 
 pkg_setup() {
 	vdr-plugin_pkg_setup
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..f3b0487ff170
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0-r1.ebuild
@@ -0,0 +1,133 @@
+# 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.5.0-r1.ebuild,v 1.1 2008/04/24 19:21:52 zzam Exp $
+
+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
+			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")
+
+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
+}