Added cvs-snapshot that will perhaps solve Bug #145590.

Package-Manager: portage-2.1.2_rc2-r1

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index d5544b8468bbc49563e2b363175f9971b5eb8a45..c6c7a7e733b2cc74c2d08c9f4f67f27d33f0bd8f 100644 (file)
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2006/11/23 12:44:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.30 2006/11/24 21:51:36 zzam Exp $
+
+*vdr-softdevice-0.3.1.20061124 (24 Nov 2006)
+
+  24 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-softdevice-0.3.1.20061124.ebuild:
+  Added cvs-snapshot that will perhaps solve Bug #145590.
 
 *vdr-softdevice-0.3.1-r2 (23 Nov 2006)
 

diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 676efb9c75f07c8b435d8ccaaa5151a92a63eff7..9266268830dba6bf45ee4d635bb933a9140f1994 100644 (file)
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -27,6 +27,7 @@ RMD160 b6266883351086f04ff65ff8b3253b0d7c2d9bbf files/vdr-softdevice-0.3.1-osdmo
 SHA256 e9203e71ca046db87c710a1f51ec4825032a3e0214cd91b2fa96ba6790beddaa files/vdr-softdevice-0.3.1-osdmode-software-default.diff 537
 DIST vdr-softdevice-0.3.0.tgz 154294 RMD160 fce250ac59e0a4bd3122fbed85bb6d8a6f4c2ebe SHA1 89b532c536c450e2eb51fedbf2a0192e0940a179 SHA256 2c15bfaf94c07dda3facd3c44219c4d9ebb1199093ec0aa4d35c1d3f67828b8a
 DIST vdr-softdevice-0.3.1.tgz 154509 RMD160 b582215eca1c0ce954eca54045456145488b1b34 SHA1 5f0cf60897820a6f15035174f4b5cb437afee782 SHA256 d88fc234ad6d3686b95d4848519ffdb97ee22a1fcd8cff60d737c0ecb1a43252
+DIST vdr-softdevice-cvs-20061124.tar.bz2 131902 RMD160 b0bf6df5570a0bcfd8c17e36d43b868b8daac2a4 SHA1 db610e83bc0a65042ef5d327595d70182988717d SHA256 e6f12f790de569090277513d40fa8a4658063d5c4d006e9788cfc4c1b2cf0aae
 EBUILD vdr-softdevice-0.3.0-r1.ebuild 3386 RMD160 ed9379861664e914c1accd14673ad4ab64989fe1 SHA1 67190be95a1603494ee72f5fb79cd6c37835eae4 SHA256 ae10137293fc83cd7b20961318f7e8783718b3041f9ff63d42b436d8b213cadf
 MD5 33f2a278d27996d3446b01ee969101ba vdr-softdevice-0.3.0-r1.ebuild 3386
 RMD160 ed9379861664e914c1accd14673ad4ab64989fe1 vdr-softdevice-0.3.0-r1.ebuild 3386
@@ -35,10 +36,14 @@ EBUILD vdr-softdevice-0.3.1-r2.ebuild 3394 RMD160 66d0f4c260068b6d141476d110cd5b
 MD5 28e971e64cc89bd3f40a0f96c6997a97 vdr-softdevice-0.3.1-r2.ebuild 3394
 RMD160 66d0f4c260068b6d141476d110cd5bf939322f79 vdr-softdevice-0.3.1-r2.ebuild 3394
 SHA256 932ff2d55d3b601d9473eb6e27ffd50174a2914c02e4fe9dfc404e0022ce1634 vdr-softdevice-0.3.1-r2.ebuild 3394
-MISC ChangeLog 7142 RMD160 a3b0e5b8228e405bc461fc9b62daa28c1dd95324 SHA1 6bb6a237dcfccc744a4efc9e1010f9d79246931c SHA256 8e7ee5fa2c521ed17c41644c707818102d4dc556cbb87991ad211f177981f45d
-MD5 5591f119f09a62b7b2a3f57345ff298e ChangeLog 7142
-RMD160 a3b0e5b8228e405bc461fc9b62daa28c1dd95324 ChangeLog 7142
-SHA256 8e7ee5fa2c521ed17c41644c707818102d4dc556cbb87991ad211f177981f45d ChangeLog 7142
+EBUILD vdr-softdevice-0.3.1.20061124.ebuild 3473 RMD160 50ad0ff16daed3aef391f43d306a7f95c0969133 SHA1 9ccba4ce1d91dd138b583efb3e4f1f6555553167 SHA256 5859338f73ab650c6958694e28888ff015fab34ea032ce6e5b887729951d7ec3
+MD5 803935a1c15c4423abaa6a10eff8c151 vdr-softdevice-0.3.1.20061124.ebuild 3473
+RMD160 50ad0ff16daed3aef391f43d306a7f95c0969133 vdr-softdevice-0.3.1.20061124.ebuild 3473
+SHA256 5859338f73ab650c6958694e28888ff015fab34ea032ce6e5b887729951d7ec3 vdr-softdevice-0.3.1.20061124.ebuild 3473
+MISC ChangeLog 7341 RMD160 0155c9df08170b61fdb5ea1b8fc7adc31ed19cdf SHA1 c5f28f21afe363e088d9ed1fba2651ef290546c0 SHA256 12a1891022799daa896e5583b0c2a59d9de670504711f82ce018d07eaa6985f6
+MD5 3172a81da454691e01119cda8410206c ChangeLog 7341
+RMD160 0155c9df08170b61fdb5ea1b8fc7adc31ed19cdf ChangeLog 7341
+SHA256 12a1891022799daa896e5583b0c2a59d9de670504711f82ce018d07eaa6985f6 ChangeLog 7341
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -49,10 +54,13 @@ SHA256 34eb4ff82a39af8ee4198902db6ae1551dd16194d1e668d50e52a1b209c65125 files/di
 MD5 5c83d0a75504c4936e5a075cc9a1be98 files/digest-vdr-softdevice-0.3.1-r2 253
 RMD160 c657f1b00221b635b1bf9394bb360eb5925f46a7 files/digest-vdr-softdevice-0.3.1-r2 253
 SHA256 a776d0acfd3bebf0e41af293f315bbaa0f3ddd428cc5ae4751808589d25f5d28 files/digest-vdr-softdevice-0.3.1-r2 253
+MD5 2953b3320784b3f8deda206aa49ef86a files/digest-vdr-softdevice-0.3.1.20061124 286
+RMD160 f58d577dbe62dc5fc3916bb636274cd8d6bffaae files/digest-vdr-softdevice-0.3.1.20061124 286
+SHA256 8ae7a69241616d142fcc81fb835a4400bd59094b83cc35c4051f97ce9a56f218 files/digest-vdr-softdevice-0.3.1.20061124 286
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFZZent2vP6XvVdOcRAnkJAJ9eVP+zODeCNWeptCj2tBvyPyJXwQCeJna2
-LNh0FS3FbB1uara6B0k7h5o=
-=gfee
+iD8DBQFFZ2lzt2vP6XvVdOcRAqdaAKDS/8hXnEU1TLrDsBaenVzIvsgrSwCgr+Wq
+fardeRmyvOAiFsifX3piXBU=
+=nmhj
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20061124 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20061124
new file mode 100644 (file)
index 0000000..7fcd71d
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20061124
@@ -0,0 +1,3 @@
+MD5 9f249fdd5c631cc86f805110d4fde586 vdr-softdevice-cvs-20061124.tar.bz2 131902
+RMD160 b0bf6df5570a0bcfd8c17e36d43b868b8daac2a4 vdr-softdevice-cvs-20061124.tar.bz2 131902
+SHA256 e6f12f790de569090277513d40fa8a4658063d5c4d006e9788cfc4c1b2cf0aae vdr-softdevice-cvs-20061124.tar.bz2 131902

diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild
new file mode 100644 (file)
index 0000000..b451e5e
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild
@@ -0,0 +1,136 @@
+# 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.3.1.20061124.ebuild,v 1.1 2006/11/24 21:51:36 zzam Exp $
+
+inherit vdr-plugin
+
+MY_P="${PN}-cvs-${PV#0.3.1.}"
+S="${WORKDIR}/${MY_P#vdr-}"
+
+DESCRIPTION="VDR Plugin: Software output-Device"
+HOMEPAGE="http://softdevice.berlios.de/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+               http://dev.gentoo.org/~zzam/distfiles/${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 )
+       dev-util/pkgconfig"
+
+
+PATCHES="
+               ${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
+               ${FILESDIR}/softdevice-cvs-xinerama-configure-opts.patch
+               ${FILESDIR}/vdr-softdevice-0.3.1-osdmode-software-default.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
+                       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
+       # hardcode mmx for amd64 - do not disable even without use-flag
+       if ! use amd64; then
+               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
+       fi
+
+       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
+
+       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
+}
+