From: Alexis Ballier Date: Fri, 23 Apr 2010 16:18:09 +0000 (+0000) Subject: Simplify vlc_use_enable_force here too, fix some useflags deps, require dbus on avahi... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6bc13005a640cd1b693adbd565e89bc2014c418d;p=gentoo.git Simplify vlc_use_enable_force here too, fix some useflags deps, require dbus on avahi for avahi-client Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 77cdb3301fbc..1b368f724970 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.572 2010/04/23 15:24:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.573 2010/04/23 16:18:09 aballier Exp $ + + 23 Apr 2010; Alexis Ballier vlc-1.1.0_pre2.ebuild, + vlc-1.1.9999.ebuild, vlc-9999.ebuild: + Simplify vlc_use_enable_force here too, fix some useflags deps, require + dbus on avahi for avahi-client 23 Apr 2010; Alexis Ballier vlc-1.0.6.ebuild, vlc-1.0.9999.ebuild: diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 481e1ac2c02c..f6cab5857cee 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -13,15 +13,15 @@ EBUILD vlc-1.0.4.ebuild 11941 RMD160 9401debb4d071980307ac583f7b8e8ea52ad8a50 SH EBUILD vlc-1.0.5.ebuild 12055 RMD160 827dd3c7f1ba1bb6e7b9b1d688c11b703aa6c205 SHA1 e4d094e7986207ba5e529bdccfbe2dcb52658130 SHA256 e98a0afe4f02d9a04b4b0a629f0bcdb1d90b6d80aabda8cfc38c728a77e92afb EBUILD vlc-1.0.6.ebuild 12265 RMD160 684f96f03185f0d28c2b4282df815252173fa1a5 SHA1 289ba0335d594279364177efd498a267bf875855 SHA256 04264e74eba0f15262aa93b661194923b2a5860196279df50dc84e4190134919 EBUILD vlc-1.0.9999.ebuild 12217 RMD160 3eec1d182fa6f12894345165da6071b3f4ba5c21 SHA1 83bc5c5249a68618a85d937ad3bb7931187d0bc0 SHA256 8ac5307f2c23d9f5f996e9487f1e9a5815269ab8e670873376868f855059d059 -EBUILD vlc-1.1.0_pre2.ebuild 11656 RMD160 9c7ef7b180ce03cd3ff68a3e0b23e0488d1867b3 SHA1 f3fb31e13756be79ced600eebda47d5fefe4b634 SHA256 ec54d493da2e4974d1c8ff8c564f14912c6c663effc7c75ad0fa20d30bacbe4d -EBUILD vlc-1.1.9999.ebuild 11602 RMD160 c92c9980eeb9ea27b4457a9793ce964c64683f74 SHA1 2ac86a41730a8f7b69a2812d6f1328ae81921593 SHA256 67493fd892938244f5ff6d19b74c45a94d1bbc00fcc58fae04c6cbbb30a8bec6 -EBUILD vlc-9999.ebuild 11599 RMD160 23255ecedbb9681eb3702de358ccea780011e645 SHA1 84b0657c20b4a9ef228ecb2f51bef5d94fbc5396 SHA256 a51937cbc2a3361dd871f38c42611a68eb1828e8e70297c65a44e9a3a5e261a2 -MISC ChangeLog 88655 RMD160 f6f0304af0eba41cdc6e7a6987bacb9d06f0ab20 SHA1 888c73cd0f38f17823f016f22338aa2a6d3c6473 SHA256 39eb3a05a26ec21b6840fd14cc50f86ded79e9dc3462b139fcf080072231bc3e +EBUILD vlc-1.1.0_pre2.ebuild 11847 RMD160 8929d49d053c100566295aa5b8634b3210a9d63b SHA1 825bab7321fd2967f595696e18ed2576d7f07a91 SHA256 893df21f4e6c0d725d4ec0f4bb1460008e57c0be18d93a8853e42420b1ee5ee4 +EBUILD vlc-1.1.9999.ebuild 11793 RMD160 51a944123258b0c77a5d26c2ed1db62981594da4 SHA1 a8eb03a6564888d561b743ee614b945c5626e86d SHA256 a9fa709e005d7eaf550ce40b26f9f3e7b1343fd2e3be4d895954d794cb3b0cff +EBUILD vlc-9999.ebuild 11790 RMD160 a824573ae2dcc442c7be54787988f8b220675703 SHA1 2a1b5761a7586bba4c146948db121a06317ec365 SHA256 a1631a91a2b5eea69a74776dfa196e0ca3bf1c5a2008c8a97cd6a556ce32a556 +MISC ChangeLog 88878 RMD160 020459058377a51fa205c839dd7426833a5a206b SHA1 7e2eb3e4139526c9425f8700263f59b2168011d6 SHA256 745e7546c3168f21f55e3702d72afcc83d611b621d433c69ead826e5d337f695 MISC metadata.xml 4152 RMD160 371740d72f49649ff3d8e3e9397730962c85d4a3 SHA1 69e10d0465819e595218136e1bdf6fe12f9ab099 SHA256 c5ca4cd5ddfbb0cf93c851eb9f12ac33d561cbeb8fcef9df64eb79c1f9023632 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvRu68ACgkQvFcC4BYPU0ofAwCgrn2H5hygfSSDMB0rlLiCU4Rm -vgcAoMbPnyWykZSBCZ5Jom1DrdhRaixK -=1vVm +iEYEARECAAYFAkvRyEkACgkQvFcC4BYPU0p4JACffFZAehPbqwG3p5OX3hGKUJcp +nykAn1wDMLbcwL/Bf77pbVy9ZN4XhiHe +=FASa -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-1.1.0_pre2.ebuild b/media-video/vlc/vlc-1.1.0_pre2.ebuild index aef93eb7a95e..bb4cd51ad72b 100644 --- a/media-video/vlc/vlc-1.1.0_pre2.ebuild +++ b/media-video/vlc/vlc-1.1.0_pre2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild,v 1.1 2010/04/22 19:26:40 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild,v 1.2 2010/04/23 16:18:09 aballier Exp $ EAPI="2" @@ -63,7 +63,7 @@ RDEPEND=" aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( media-libs/alsa-lib ) - avahi? ( >=net-dns/avahi-0.6 ) + avahi? ( >=net-dns/avahi-0.6[dbus] ) bidi? ( >=dev-libs/fribidi-0.10.4 ) cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) ) dbus? ( >=sys-apps/dbus-1.0.2 ) @@ -120,7 +120,11 @@ RDEPEND=" sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) - skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 ) + skins? ( + x11-libs/qt-gui:4 x11-libs/qt-core:4 + x11-libs/libXext x11-libs/libX11 + media-libs/freetype media-fonts/dejavu + ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) @@ -164,14 +168,10 @@ vlc_use_force() { use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled." } -# Use when $2 depends strictly on $3 -# if use $1 then enable $2 and $3, otherwise disable $2 +# Use when $1 depends strictly on $2 +# if use $1 then enable $2 vlc_use_enable_force() { - if use $1 ; then - echo "--enable-$2 --enable-$3" - else - echo "--disable-$2" - fi + use $1 && echo "--enable-$2" } pkg_setup() { @@ -181,16 +181,22 @@ pkg_setup() { eerror "the old ${PN} version and will not work." die "Unmerge vlc 1.0.x first" fi - vlc_use_needs skins truetype + + # Useflags we need to forcefuly enable + vlc_use_force remoteosd gcrypt + vlc_use_force skins truetype vlc_use_force skins qt4 + vlc_use_force vlm stream + + # Useflags that will be automagically discarded if deps are not met vlc_use_needs bidi truetype - vlc_use_force remoteosd gcrypt + vlc_use_needs cddb cdda vlc_use_needs fontconfig truetype vlc_use_needs libv4l2 v4l2 vlc_use_needs libv4l v4l vlc_use_needs libtiger kate vlc_use_needs xv xcb - vlc_use_needs cddb cdda + if use qt4 || use skins ; then qt4_pkg_setup else @@ -287,6 +293,7 @@ src_configure() { $(use_enable pulseaudio pulse) \ $(use_enable pvr) \ $(use_enable qt4) \ + $(use_enable remoteosd) \ $(use_enable rtsp realrtsp) \ $(use_enable run-as-root) \ $(use_enable samba smb) \ @@ -311,6 +318,7 @@ src_configure() { $(use_enable v4l) \ $(use_enable v4l2) \ $(use_enable vcdx) \ + $(use_enable vlm) \ $(use_enable vorbis) \ $(use_enable win32codecs loader) \ $(use_enable wma-fixed) \ @@ -324,9 +332,10 @@ src_configure() { --disable-growl \ --disable-optimizations \ --enable-fast-install \ - $(vlc_use_enable_force vlm vlm sout) \ - $(vlc_use_enable_force skins skins2 qt4) \ - $(vlc_use_enable_force remoteosd remoteosd libgcrypt) + $(vlc_use_enable_force vlm sout) \ + $(vlc_use_enable_force skins qt4) \ + $(vlc_use_enable_force skins freetype) \ + $(vlc_use_enable_force remoteosd libgcrypt) } src_install() { diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild index 8beb20456b44..39c4e398d0bd 100644 --- a/media-video/vlc/vlc-1.1.9999.ebuild +++ b/media-video/vlc/vlc-1.1.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.1 2010/04/23 11:08:49 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.2 2010/04/23 16:18:09 aballier Exp $ EAPI="2" @@ -63,7 +63,7 @@ RDEPEND=" aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( media-libs/alsa-lib ) - avahi? ( >=net-dns/avahi-0.6 ) + avahi? ( >=net-dns/avahi-0.6[dbus] ) bidi? ( >=dev-libs/fribidi-0.10.4 ) cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) ) dbus? ( >=sys-apps/dbus-1.0.2 ) @@ -120,7 +120,11 @@ RDEPEND=" sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) - skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 ) + skins? ( + x11-libs/qt-gui:4 x11-libs/qt-core:4 + x11-libs/libXext x11-libs/libX11 + media-libs/freetype media-fonts/dejavu + ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) @@ -164,14 +168,10 @@ vlc_use_force() { use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled." } -# Use when $2 depends strictly on $3 -# if use $1 then enable $2 and $3, otherwise disable $2 +# Use when $1 depends strictly on $2 +# if use $1 then enable $2 vlc_use_enable_force() { - if use $1 ; then - echo "--enable-$2 --enable-$3" - else - echo "--disable-$2" - fi + use $1 && echo "--enable-$2" } pkg_setup() { @@ -181,16 +181,22 @@ pkg_setup() { eerror "the old ${PN} version and will not work." die "Unmerge vlc 1.0.x first" fi - vlc_use_needs skins truetype + + # Useflags we need to forcefuly enable + vlc_use_force remoteosd gcrypt + vlc_use_force skins truetype vlc_use_force skins qt4 + vlc_use_force vlm stream + + # Useflags that will be automagically discarded if deps are not met vlc_use_needs bidi truetype - vlc_use_force remoteosd gcrypt + vlc_use_needs cddb cdda vlc_use_needs fontconfig truetype vlc_use_needs libv4l2 v4l2 vlc_use_needs libv4l v4l vlc_use_needs libtiger kate vlc_use_needs xv xcb - vlc_use_needs cddb cdda + if use qt4 || use skins ; then qt4_pkg_setup else @@ -287,6 +293,7 @@ src_configure() { $(use_enable pulseaudio pulse) \ $(use_enable pvr) \ $(use_enable qt4) \ + $(use_enable remoteosd) \ $(use_enable rtsp realrtsp) \ $(use_enable run-as-root) \ $(use_enable samba smb) \ @@ -311,6 +318,7 @@ src_configure() { $(use_enable v4l) \ $(use_enable v4l2) \ $(use_enable vcdx) \ + $(use_enable vlm) \ $(use_enable vorbis) \ $(use_enable win32codecs loader) \ $(use_enable wma-fixed) \ @@ -324,9 +332,10 @@ src_configure() { --disable-growl \ --disable-optimizations \ --enable-fast-install \ - $(vlc_use_enable_force vlm vlm sout) \ - $(vlc_use_enable_force skins skins2 qt4) \ - $(vlc_use_enable_force remoteosd remoteosd libgcrypt) + $(vlc_use_enable_force vlm sout) \ + $(vlc_use_enable_force skins qt4) \ + $(vlc_use_enable_force skins freetype) \ + $(vlc_use_enable_force remoteosd libgcrypt) } src_install() { diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 2e0e9fba19fc..13b4a1de4de7 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.68 2010/04/12 16:36:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.69 2010/04/23 16:18:09 aballier Exp $ EAPI="2" @@ -63,7 +63,7 @@ RDEPEND=" aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( media-libs/alsa-lib ) - avahi? ( >=net-dns/avahi-0.6 ) + avahi? ( >=net-dns/avahi-0.6[dbus] ) bidi? ( >=dev-libs/fribidi-0.10.4 ) cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) ) dbus? ( >=sys-apps/dbus-1.0.2 ) @@ -120,7 +120,11 @@ RDEPEND=" sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) - skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 ) + skins? ( + x11-libs/qt-gui:4 x11-libs/qt-core:4 + x11-libs/libXext x11-libs/libX11 + media-libs/freetype media-fonts/dejavu + ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) @@ -164,14 +168,10 @@ vlc_use_force() { use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled." } -# Use when $2 depends strictly on $3 -# if use $1 then enable $2 and $3, otherwise disable $2 +# Use when $1 depends strictly on $2 +# if use $1 then enable $2 vlc_use_enable_force() { - if use $1 ; then - echo "--enable-$2 --enable-$3" - else - echo "--disable-$2" - fi + use $1 && echo "--enable-$2" } pkg_setup() { @@ -181,16 +181,22 @@ pkg_setup() { eerror "the old ${PN} version and will not work." die "Unmerge vlc 1.0.x first" fi - vlc_use_needs skins truetype + + # Useflags we need to forcefuly enable + vlc_use_force remoteosd gcrypt + vlc_use_force skins truetype vlc_use_force skins qt4 + vlc_use_force vlm stream + + # Useflags that will be automagically discarded if deps are not met vlc_use_needs bidi truetype - vlc_use_force remoteosd gcrypt + vlc_use_needs cddb cdda vlc_use_needs fontconfig truetype vlc_use_needs libv4l2 v4l2 vlc_use_needs libv4l v4l vlc_use_needs libtiger kate vlc_use_needs xv xcb - vlc_use_needs cddb cdda + if use qt4 || use skins ; then qt4_pkg_setup else @@ -287,6 +293,7 @@ src_configure() { $(use_enable pulseaudio pulse) \ $(use_enable pvr) \ $(use_enable qt4) \ + $(use_enable remoteosd) \ $(use_enable rtsp realrtsp) \ $(use_enable run-as-root) \ $(use_enable samba smb) \ @@ -311,6 +318,7 @@ src_configure() { $(use_enable v4l) \ $(use_enable v4l2) \ $(use_enable vcdx) \ + $(use_enable vlm) \ $(use_enable vorbis) \ $(use_enable win32codecs loader) \ $(use_enable wma-fixed) \ @@ -324,9 +332,10 @@ src_configure() { --disable-growl \ --disable-optimizations \ --enable-fast-install \ - $(vlc_use_enable_force vlm vlm sout) \ - $(vlc_use_enable_force skins skins2 qt4) \ - $(vlc_use_enable_force remoteosd remoteosd libgcrypt) + $(vlc_use_enable_force vlm sout) \ + $(vlc_use_enable_force skins qt4) \ + $(vlc_use_enable_force skins freetype) \ + $(vlc_use_enable_force remoteosd libgcrypt) } src_install() {