From 1d2e05e8824e740c705574be4287f39172ea54eb Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Wed, 11 Apr 2007 15:38:25 +0000 Subject: [PATCH] Version bumped. Make ebuild detect if it is a snapshot or normal version. Package-Manager: portage-2.1.2.3 --- media-plugins/vdr-softdevice/ChangeLog | 9 +- media-plugins/vdr-softdevice/Manifest | 34 +++-- .../files/digest-vdr-softdevice-0.4.0 | 3 + ...device-0.4.0-xinerama-configure-opts.patch | 19 +++ .../vdr-softdevice-0.3.1.20070410.ebuild | 19 ++- .../vdr-softdevice-0.4.0.ebuild | 141 ++++++++++++++++++ 6 files changed, 207 insertions(+), 18 deletions(-) create mode 100644 media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0 create mode 100644 media-plugins/vdr-softdevice/files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch create mode 100644 media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog index caeb33249ce1..28bddb477179 100644 --- a/media-plugins/vdr-softdevice/ChangeLog +++ b/media-plugins/vdr-softdevice/ChangeLog @@ -1,6 +1,13 @@ # 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.36 2007/04/10 09:38:13 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.37 2007/04/11 15:38:25 zzam Exp $ + +*vdr-softdevice-0.4.0 (11 Apr 2007) + + 11 Apr 2007; Matthias Schwarzott + +files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch, + vdr-softdevice-0.3.1.20070410.ebuild, +vdr-softdevice-0.4.0.ebuild: + Version bumped. Make ebuild detect if it is a snapshot or normal version. *vdr-softdevice-0.3.1.20070410 (10 Apr 2007) diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest index 523a085274b1..d39936ad9c77 100644 --- a/media-plugins/vdr-softdevice/Manifest +++ b/media-plugins/vdr-softdevice/Manifest @@ -33,8 +33,13 @@ AUX vdr-softdevice-0.3.1-uint64.diff 2347 RMD160 194138937dd075a12ca03cfc38f909f MD5 3430f1e5f704b79fa36742059e6f76ed files/vdr-softdevice-0.3.1-uint64.diff 2347 RMD160 194138937dd075a12ca03cfc38f909f9cac3c385 files/vdr-softdevice-0.3.1-uint64.diff 2347 SHA256 74f1905b5d9de5a5210203f7c654d91602f6b45d57fd277c84b8b6b27ab22157 files/vdr-softdevice-0.3.1-uint64.diff 2347 +AUX vdr-softdevice-0.4.0-xinerama-configure-opts.patch 787 RMD160 13bfd161b68372ccc3a5ea3b777d0d5e4a59da9f SHA1 ab65432f810ddd2fa3b9251f5a565c7937fc0be1 SHA256 541d3ff037d2c8ebcfca5873d551ff91e2618e8d551317a0497b6138c8b8af1d +MD5 b42d231deef6ec5dc17e1a85e22f5b6e files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch 787 +RMD160 13bfd161b68372ccc3a5ea3b777d0d5e4a59da9f files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch 787 +SHA256 541d3ff037d2c8ebcfca5873d551ff91e2618e8d551317a0497b6138c8b8af1d files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch 787 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-0.4.0.tgz 190505 RMD160 78c49568776b71d3b892de8cdc7406f31fd90115 SHA1 0949d6727011ebd0ed0947d9906d081bbe4d2162 SHA256 4a43426e03a36771bce272123d2b3a0a7dc5aac05b98277a985ba277e3c0b9c9 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 DIST vdr-softdevice-cvs-20070313.tar.bz2 139092 RMD160 2423903131ebad7d3fcd980d81f58a4780642e91 SHA1 c1878b6aad4e94decbeeec5aef4257fb2e12693d SHA256 b3ab1fb512efb015b9ff5856ec66d6529da4b6fe77d40ef66178d4838c3fc43a @@ -59,14 +64,18 @@ EBUILD vdr-softdevice-0.3.1.20070313.ebuild 3536 RMD160 d3f4fdbb2ae7426f02a31418 MD5 ef3a773347cf18de74d302f6af1284b9 vdr-softdevice-0.3.1.20070313.ebuild 3536 RMD160 d3f4fdbb2ae7426f02a31418f32c92647a12ccbd vdr-softdevice-0.3.1.20070313.ebuild 3536 SHA256 bac304c03d35cb1d61b89a62bbcea231048479863ae5f9c4d7ee6acac5fbc66c vdr-softdevice-0.3.1.20070313.ebuild 3536 -EBUILD vdr-softdevice-0.3.1.20070410.ebuild 3536 RMD160 3ae2038282239c53a3456e2395f13855a09923bd SHA1 dd22aa2ac8411385e5842c249676dc2720955781 SHA256 8ffa9863bac1893c4c423f9cd3621dcadcb0ad7dad7fc9c5651a8affada87373 -MD5 458fb6aafbe2505315fbdd983710799b vdr-softdevice-0.3.1.20070410.ebuild 3536 -RMD160 3ae2038282239c53a3456e2395f13855a09923bd vdr-softdevice-0.3.1.20070410.ebuild 3536 -SHA256 8ffa9863bac1893c4c423f9cd3621dcadcb0ad7dad7fc9c5651a8affada87373 vdr-softdevice-0.3.1.20070410.ebuild 3536 -MISC ChangeLog 8514 RMD160 b5eb9f0c14b2dcbdc7f50bf3f9fa8c83d161a501 SHA1 b4dfffe8c8d8dbfe89d3ede27b5844584a8c1cff SHA256 3afc3df9c635005985a50aa555187264b50801b10d92eb10cfddf7399ec210a5 -MD5 67d00ac252404e07194ccbc302f1648f ChangeLog 8514 -RMD160 b5eb9f0c14b2dcbdc7f50bf3f9fa8c83d161a501 ChangeLog 8514 -SHA256 3afc3df9c635005985a50aa555187264b50801b10d92eb10cfddf7399ec210a5 ChangeLog 8514 +EBUILD vdr-softdevice-0.3.1.20070410.ebuild 3692 RMD160 5f91484ab857180cf573443d0320228340319f22 SHA1 46f67ff76c6c06ee375ec37bb74ddbca4d525fff SHA256 9f40afb5415712c00cf60d9bae00024a820773eda8ffc03b08a9949cbd085a3c +MD5 d16a1231960b3b6c2086c5200531704b vdr-softdevice-0.3.1.20070410.ebuild 3692 +RMD160 5f91484ab857180cf573443d0320228340319f22 vdr-softdevice-0.3.1.20070410.ebuild 3692 +SHA256 9f40afb5415712c00cf60d9bae00024a820773eda8ffc03b08a9949cbd085a3c vdr-softdevice-0.3.1.20070410.ebuild 3692 +EBUILD vdr-softdevice-0.4.0.ebuild 3653 RMD160 d6ad704f9ec1808c0b7883453a9a2de913b0299b SHA1 eaa0daa917a1401a67d08d5280f0fac9cf76a547 SHA256 a775a351ee9e1d2e94b1d5a79cfde451dde9e4d0716e10190dcfb38641a13f46 +MD5 c372535a8b2dc075f2f933539c5b9ace vdr-softdevice-0.4.0.ebuild 3653 +RMD160 d6ad704f9ec1808c0b7883453a9a2de913b0299b vdr-softdevice-0.4.0.ebuild 3653 +SHA256 a775a351ee9e1d2e94b1d5a79cfde451dde9e4d0716e10190dcfb38641a13f46 vdr-softdevice-0.4.0.ebuild 3653 +MISC ChangeLog 8812 RMD160 b308c413ab26c0f3943acd781bd141ca6a490e85 SHA1 8076a233ba897bb9bddfad2980b722c5101ed32f SHA256 ea7e42b305cb0148bd74227be428639228d2fc31070abb07bce3b63f45d29c87 +MD5 cf682fee31df957fdd24e093b3967b7d ChangeLog 8812 +RMD160 b308c413ab26c0f3943acd781bd141ca6a490e85 ChangeLog 8812 +SHA256 ea7e42b305cb0148bd74227be428639228d2fc31070abb07bce3b63f45d29c87 ChangeLog 8812 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298 @@ -89,10 +98,13 @@ SHA256 f006e82a988786556fbc7bc8f77ea9993c223a5a2ab26225df06d995ba315a5b files/di MD5 19e67a59118b02a037fda43a5ae7ecca files/digest-vdr-softdevice-0.3.1.20070410 286 RMD160 0188f142a1e134513271438d9df100fb86a575cb files/digest-vdr-softdevice-0.3.1.20070410 286 SHA256 23568c594cb811d6ec7d7fcd4dd8e47cbfa3cbef709bb5a13ead0afe42b5ce78 files/digest-vdr-softdevice-0.3.1.20070410 286 +MD5 64a03078951f99cedadb693eb15dd8df files/digest-vdr-softdevice-0.4.0 253 +RMD160 b18f87704da392d7903954f6388a2bfd93d0d418 files/digest-vdr-softdevice-0.4.0 253 +SHA256 b1ecc8de3b7507e2f708b8dedb8130374e2833fd5759595f8e169f342b4c6b31 files/digest-vdr-softdevice-0.4.0 253 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGG1sXt2vP6XvVdOcRAkYjAKC3xzErZuw6vvNLn06bStCu4tdFqACfffX3 -rELV01agqN6jY41avbUDO5A= -=LcW9 +iD8DBQFGHQD5t2vP6XvVdOcRAiDyAJwK3+djntkCC6J5UmWPGpI5vVVldgCg3Vik +TQq5ItUUhCcqSHp7Otb7XdM= +=BGDp -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0 new file mode 100644 index 000000000000..3a934228ef70 --- /dev/null +++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0 @@ -0,0 +1,3 @@ +MD5 216dff52bbde4cd5ed30a8c71938d064 vdr-softdevice-0.4.0.tgz 190505 +RMD160 78c49568776b71d3b892de8cdc7406f31fd90115 vdr-softdevice-0.4.0.tgz 190505 +SHA256 4a43426e03a36771bce272123d2b3a0a7dc5aac05b98277a985ba277e3c0b9c9 vdr-softdevice-0.4.0.tgz 190505 diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch new file mode 100644 index 000000000000..d9e735bf1c00 --- /dev/null +++ b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch @@ -0,0 +1,19 @@ +diff -ru softdevice-0.4.0-orig/configure softdevice-0.4.0/configure +--- softdevice-0.4.0-orig/configure 2007-04-11 17:30:54.486914045 +0200 ++++ softdevice-0.4.0/configure 2007-04-11 17:31:38.619850758 +0200 +@@ -59,6 +59,7 @@ + echo " --disable-mmx" + echo " --disable-mmx2" + echo " --disable-alsa" ++ echo " --disable-xinerama" + echo " --disable-oss" + echo " --disable-suspendkey" + echo " --disable-yaepg / --enable-yapg (yaepg patch support)" +@@ -83,6 +84,7 @@ + --disable-mmx) shift; with_mmx="no";; + --disable-mmx2) shift; with_mmx2="no";; + --disable-alsa) shift; alsa="no";; ++ --disable-xinerama) shift; xinerama="no";; + --disable-oss) shift; oss="no";; + --disable-suspendkey) shift; suspendkey="no";; + --disable-yaepg) shift; yaepg="no";; diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild index d2008dfced48..9e9406879c3d 100644 --- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild @@ -1,16 +1,23 @@ # Copyright 1999-2007 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.20070410.ebuild,v 1.1 2007/04/10 09:38:13 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20070410.ebuild,v 1.2 2007/04/11 15:38:25 zzam Exp $ -inherit vdr-plugin +inherit vdr-plugin versionator -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" + +# 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" diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild new file mode 100644 index 000000000000..3b109a78e973 --- /dev/null +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2007 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.1 2007/04/11 15:38: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 ) + ) + 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" +# 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}/${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 + + 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 "