Added newer snapshot.

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index d880d327ba33def1bcbb9b71b60e7ac3ff61a580..d01024f4fa42c6b974aa9d8b3e468ed79de916c6 100644 (file)
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,13 @@
 # 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.31 2006/12/03 14:23:57 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.32 2006/12/17 13:07:44 zzam Exp $
+
+*vdr-softdevice-0.3.1.20061217 (17 Dec 2006)
+
+  17 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/softdevice-cvs-20061217-xinerama-configure-opts.patch,
+  +vdr-softdevice-0.3.1.20061217.ebuild:
+  Added newer snapshot.
 
   03 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
   +files/vdr-softdevice-0.3.1-uint64.diff,

diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index b8dbfd27b46bf3cca573d8bc16146baf95edbcc6..0b85bb3dc3e7e04f5cf44a690bbc4a81f72d2d82 100644 (file)
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -9,6 +9,10 @@ AUX rc-addon.sh 325 RMD160 583102f24bface0fadb4b1a6378246daec5eb9de SHA1 d4b1424
 MD5 c968f05e0abe7bf8aafc14699617ac1c files/rc-addon.sh 325
 RMD160 583102f24bface0fadb4b1a6378246daec5eb9de files/rc-addon.sh 325
 SHA256 82af787d8d96e3c21076a326b02def7626d89381530661a090b2f49271d59fd6 files/rc-addon.sh 325
+AUX softdevice-cvs-20061217-xinerama-configure-opts.patch 809 RMD160 80bbd8d93a6147f45d2c92d6541ee57088158532 SHA1 00381361652397d4c1930d1129c6e7e9ef4a1191 SHA256 d819155aafb9afeb7ed42332b1f9407a46c400d9bdbbbcef6eb37d1773213bdd
+MD5 ac7b0dbd287fd7cfd4299422c8b8c851 files/softdevice-cvs-20061217-xinerama-configure-opts.patch 809
+RMD160 80bbd8d93a6147f45d2c92d6541ee57088158532 files/softdevice-cvs-20061217-xinerama-configure-opts.patch 809
+SHA256 d819155aafb9afeb7ed42332b1f9407a46c400d9bdbbbcef6eb37d1773213bdd files/softdevice-cvs-20061217-xinerama-configure-opts.patch 809
 AUX softdevice-cvs-xinerama-configure-opts.patch 758 RMD160 fe4b6d46d3721bcc8d5332bccb0289ddf9df84e8 SHA1 d7986ae138de94752afec5a76471ffc15cf3f81a SHA256 8eb0467383004b3f43d1e868d78bb76d8c0afc09841edce978d373f65cdc3ad0
 MD5 e8fe69985f1d48b7b62c32c1151912b0 files/softdevice-cvs-xinerama-configure-opts.patch 758
 RMD160 fe4b6d46d3721bcc8d5332bccb0289ddf9df84e8 files/softdevice-cvs-xinerama-configure-opts.patch 758
@@ -32,6 +36,7 @@ SHA256 74f1905b5d9de5a5210203f7c654d91602f6b45d57fd277c84b8b6b27ab22157 files/vd
 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
+DIST vdr-softdevice-cvs-20061217.tar.bz2 134318 RMD160 1b07cfce1dab6b914759724d872f39a5b3058132 SHA1 e02986ffa2bf19a4dee6c655fcdbc4aa99bb1a40 SHA256 741338e46841d5b27d28ecd532c605a95cb41d9c1ac9f3175a0cb3db47508f4f
 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
@@ -44,10 +49,14 @@ EBUILD vdr-softdevice-0.3.1.20061124.ebuild 3520 RMD160 bd98d93a813a0234fed08885
 MD5 2a021f248147ea4fc686edbb44c0680d vdr-softdevice-0.3.1.20061124.ebuild 3520
 RMD160 bd98d93a813a0234fed088859be1ac6a869e27d3 vdr-softdevice-0.3.1.20061124.ebuild 3520
 SHA256 26eb7750098c9da914601f95086fe182c33c150b07190a4fbb53ecc8dc02fc59 vdr-softdevice-0.3.1.20061124.ebuild 3520
-MISC ChangeLog 7527 RMD160 96095b3ad155d9492529983701f5d980c5c5b197 SHA1 b7aff85ee10013957ec6d4b3f61c49a113eb3114 SHA256 ce95782228af888634c074a00192ec8c607c4eb020e6f8829bca94020080a245
-MD5 372995535ad536799fca543bef6d6e99 ChangeLog 7527
-RMD160 96095b3ad155d9492529983701f5d980c5c5b197 ChangeLog 7527
-SHA256 ce95782228af888634c074a00192ec8c607c4eb020e6f8829bca94020080a245 ChangeLog 7527
+EBUILD vdr-softdevice-0.3.1.20061217.ebuild 3482 RMD160 cdb0744092b18063d284bbf123f20896926cd986 SHA1 f4c8223b86ea762f45a67f01b453632199bec887 SHA256 b154064e8b36395dd1d0503a23b83fec9b1d3b3e3ceaef24758ac9dac9246ae4
+MD5 f499691e84bcd3aa6a560ef7eeee2ac4 vdr-softdevice-0.3.1.20061217.ebuild 3482
+RMD160 cdb0744092b18063d284bbf123f20896926cd986 vdr-softdevice-0.3.1.20061217.ebuild 3482
+SHA256 b154064e8b36395dd1d0503a23b83fec9b1d3b3e3ceaef24758ac9dac9246ae4 vdr-softdevice-0.3.1.20061217.ebuild 3482
+MISC ChangeLog 7756 RMD160 fb6aeed3804c413f6b8bc83318251638a16108c7 SHA1 51c85e497db23b3c1d6a87ac4e34a5bb2e93ced7 SHA256 9e24710ddb74960bb3f144be2980bb76fb11a6668e71d606f85d5b9aec2d6d4b
+MD5 ab08443e4c8ba8175783d6640d339998 ChangeLog 7756
+RMD160 fb6aeed3804c413f6b8bc83318251638a16108c7 ChangeLog 7756
+SHA256 9e24710ddb74960bb3f144be2980bb76fb11a6668e71d606f85d5b9aec2d6d4b ChangeLog 7756
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -61,10 +70,13 @@ SHA256 a776d0acfd3bebf0e41af293f315bbaa0f3ddd428cc5ae4751808589d25f5d28 files/di
 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
+MD5 7c9f01afbc74587480120a2be789a0a3 files/digest-vdr-softdevice-0.3.1.20061217 286
+RMD160 3c61590cb2a0fb1cf9648fdc4c7de7f2aa595a02 files/digest-vdr-softdevice-0.3.1.20061217 286
+SHA256 7a6c1f850f8a96e5d7fd1f8e56dbb8076c838ff9a983805e166e17aaf6f09399 files/digest-vdr-softdevice-0.3.1.20061217 286
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFct4Rt2vP6XvVdOcRAgyKAKDgCMb8A2OrGXoy3g6dYYbdlp/7pACfbHnV
-p16SK637qH/4Y1p8GG75ULM=
-=jz5j
+iD8DBQFFhUErt2vP6XvVdOcRAt8NAJ48Exm0Qv5WdZlnOZds8pefBhkWJgCeNIrG
+UTFrg/ftEKqs1IATZnW1pBM=
+=/Z7R
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20061217 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20061217
new file mode 100644 (file)
index 0000000..7f2c1e9
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1.20061217
@@ -0,0 +1,3 @@
+MD5 dcbd5a9eaf2eed4981eaa9b9d18f41bb vdr-softdevice-cvs-20061217.tar.bz2 134318
+RMD160 1b07cfce1dab6b914759724d872f39a5b3058132 vdr-softdevice-cvs-20061217.tar.bz2 134318
+SHA256 741338e46841d5b27d28ecd532c605a95cb41d9c1ac9f3175a0cb3db47508f4f vdr-softdevice-cvs-20061217.tar.bz2 134318

diff --git a/media-plugins/vdr-softdevice/files/softdevice-cvs-20061217-xinerama-configure-opts.patch b/media-plugins/vdr-softdevice/files/softdevice-cvs-20061217-xinerama-configure-opts.patch
new file mode 100644 (file)
index 0000000..c2f7820
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/softdevice-cvs-20061217-xinerama-configure-opts.patch
@@ -0,0 +1,19 @@
+diff -ru softdevice-cvs-20061217-orig/configure softdevice-cvs-20061217/configure
+--- softdevice-cvs-20061217-orig/configure     2006-12-17 11:21:03.409168554 +0100
++++ softdevice-cvs-20061217/configure  2006-12-17 11:22:29.526212838 +0100
+@@ -57,6 +57,7 @@
+   echo "  --disable-mmx"
+   echo "  --disable-mmx2"
+   echo "  --disable-alsa"
++  echo "  --disable-xinerama"
+   echo "  --disable-oss"
+   echo "  --disable-yaepg / --enable-yapg (yaepg patch support)"
+   echo "  --with-ffmpeg-path YOUR_FFMPEG_PATH"
+@@ -81,6 +82,7 @@
+     --disable-mmx2) shift; with_mmx2="no";;
+     --disable-alsa) shift; alsa="no";;
+     --disable-oss) shift; oss="no";;
++    --disable-xinerama) shift; xinerama="no";;
+     --disable-yaepg) shift; yaepg="no";;
+     --enable-yaepg) shift; yaepg="yes";;
+     --with-ffmpeg-path) shift;

diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild
new file mode 100644 (file)
index 0000000..f648762
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.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.20061217.ebuild,v 1.1 2006/12/17 13:07:44 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-20061217-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
+}
+