From: Diego Elio Pettenò Date: Mon, 5 Jun 2006 21:27:44 +0000 (+0000) Subject: Depend on version 1.2 of upnp or it won't work correctly. THanks to Colin Carle for... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c7f771789b66070bdf4e5e59fb37d219766b7177;p=gentoo.git Depend on version 1.2 of upnp or it won't work correctly. THanks to Colin Carle for reporting and Samuli Suominen for finding the solution. Closes bug #135681. Package-Manager: portage-2.1_rc4-r2 --- diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index b5e4d2d03b15..4624a24b4a15 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -8,7 +8,6 @@ DIST vlc-0.8.5.tar.bz2 8562996 RMD160 d24140a5b4bf771754028090e103bb5c171e4fd8 S DIST vlc-patches-1.tar.bz2 2149 DIST vlc-patches-13.tar.bz2 7504 DIST vlc-patches-16.tar.bz2 10206 RMD160 e9edce6e298a74cb08eec00bcadac6097f772cbf SHA1 81864732b0669dd944c9b6c7efbb3e2362b66471 SHA256 d537ec6e05cbeef04179435e2aabcc9bc9c876063000fd5b037184fabad8c5aa -DIST vlc-patches-21.tar.bz2 7982 RMD160 7aca9c943033b74792e52495b8b5e9630c4ff5e2 SHA1 199de52cdab1eb626534b0e1455d42c98018d458 SHA256 eecf75d2fbd83dc5f77308fc889f82912261937d905556dcff41cce0f76d8329 DIST vlc-patches-22.tar.bz2 8204 RMD160 4df3d97d5eb84d91184b2e54c76033df57dbab51 SHA1 0fd6627aac0d86ffe5a61a82c884dac93e6575ac SHA256 be17cdf18bf4a3437ddef289b299060da15152713fa6d4cfc3af1e2ac66cc26b DIST vlc-patches-7.tar.bz2 4696 EBUILD vlc-0.8.1-r1.ebuild 6040 RMD160 1378b1d36f6b69b17201d9604cd365d0590da496 SHA1 3e0c50f28f9b5392d12d2c52aaee5e5ec4b17bd6 SHA256 b56acb63f7ee2f918c9f128abc5fb40938ac8f0aa20dcf14c23cf960ffa5a977 @@ -27,18 +26,14 @@ EBUILD vlc-0.8.4a.ebuild 7479 RMD160 3564f9aa65035bb4c8a3f3b7504cfc23a7e31061 SH MD5 e63b5c8f0b36505d354aa3d02e8bdbe3 vlc-0.8.4a.ebuild 7479 RMD160 3564f9aa65035bb4c8a3f3b7504cfc23a7e31061 vlc-0.8.4a.ebuild 7479 SHA256 d2339f58717e338330870a65c1cbb18e6d3b0e34e23cdaf0a14b9e21cfb1e310 vlc-0.8.4a.ebuild 7479 -EBUILD vlc-0.8.5-r1.ebuild 7165 RMD160 611aed04ad1b17bfef45631a6785966747b7e4f1 SHA1 cbb512543bd5a8f40a4b5df63a3461750a290b33 SHA256 ab3bbba7e18ad472d2cdcfcb8a4176ec1f2aa80c6e1424ceec4fe7cef0b4594c -MD5 292f1b833c198ce35119691c61d66d51 vlc-0.8.5-r1.ebuild 7165 -RMD160 611aed04ad1b17bfef45631a6785966747b7e4f1 vlc-0.8.5-r1.ebuild 7165 -SHA256 ab3bbba7e18ad472d2cdcfcb8a4176ec1f2aa80c6e1424ceec4fe7cef0b4594c vlc-0.8.5-r1.ebuild 7165 -EBUILD vlc-0.8.5.ebuild 7162 RMD160 84a98fad21c49184f2693945ed72cbf4d2987993 SHA1 f12b5ae6952b559ecbc3a5f039b2b01743ba5269 SHA256 6ad8ac6378f65879d50edf8bfb3ccfea6841ab85c0167c724ff12e44001d421f -MD5 95f674fda70417a2556d54a4def899fd vlc-0.8.5.ebuild 7162 -RMD160 84a98fad21c49184f2693945ed72cbf4d2987993 vlc-0.8.5.ebuild 7162 -SHA256 6ad8ac6378f65879d50edf8bfb3ccfea6841ab85c0167c724ff12e44001d421f vlc-0.8.5.ebuild 7162 -MISC ChangeLog 31505 RMD160 efe32aab7b4846f9d31fb4221d2118dab8e6ea43 SHA1 1f8a5880d1e45e8c05ec211d19a8d0d5c4ab004e SHA256 fbf579a4d307e70774622048030ca0b8db2e207e926b45a7b3d4ba73fc40d18a -MD5 48ccd235f7f0fcd7fc52244398e5cca1 ChangeLog 31505 -RMD160 efe32aab7b4846f9d31fb4221d2118dab8e6ea43 ChangeLog 31505 -SHA256 fbf579a4d307e70774622048030ca0b8db2e207e926b45a7b3d4ba73fc40d18a ChangeLog 31505 +EBUILD vlc-0.8.5-r1.ebuild 7171 RMD160 3e71b4ee0777a29f70d93f2bc8c761da35532f6b SHA1 fc4c1f12fc3f0f856a223f2b9e1cfaafee1c67ec SHA256 b9f3a484534ea947a4c43661334e40df3a72598433e5ec085466e5e889df6041 +MD5 f03b236462ac7b5264413af967aacd23 vlc-0.8.5-r1.ebuild 7171 +RMD160 3e71b4ee0777a29f70d93f2bc8c761da35532f6b vlc-0.8.5-r1.ebuild 7171 +SHA256 b9f3a484534ea947a4c43661334e40df3a72598433e5ec085466e5e889df6041 vlc-0.8.5-r1.ebuild 7171 +MISC ChangeLog 31767 RMD160 4fbeb6c8c6b4449dcc930e3389da2667a540c448 SHA1 89dc6c400e0f4d7bba10eb14aee7ae02341eedf4 SHA256 007b60088451584a6a6aa938f87512f4c9094b711540a443ca6bbe8e2be3c84f +MD5 c15b07ada443480f0a623885d2028631 ChangeLog 31767 +RMD160 4fbeb6c8c6b4449dcc930e3389da2667a540c448 ChangeLog 31767 +SHA256 007b60088451584a6a6aa938f87512f4c9094b711540a443ca6bbe8e2be3c84f ChangeLog 31767 MISC metadata.xml 249 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 SHA1 fc3811086b04b8f498738e2461158e2f17da5fb4 SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249 @@ -55,16 +50,13 @@ SHA256 9119228935ccec9205c713e974e280ddef38fa7da219fbf6bf825d57e706c121 files/di MD5 f34d6c5a25230e1ebb6761514287f838 files/digest-vlc-0.8.4a-r1 482 RMD160 f5981b387f59cd065dd5e8a2d305ff966c4a59de files/digest-vlc-0.8.4a-r1 482 SHA256 ecfd8c4a8edf5a58d299acaff67a316567d2e802bd676a356fbb113ce28779a8 files/digest-vlc-0.8.4a-r1 482 -MD5 8a92210d8f76c78226208c233e0a44fe files/digest-vlc-0.8.5 476 -RMD160 75565192d32f8588d3cdd85fb9cf3cf7af72a6a2 files/digest-vlc-0.8.5 476 -SHA256 995ce9191e0f69e55faf0714c24cf7b8305a8c229464f26e8e65695c3d75266a files/digest-vlc-0.8.5 476 MD5 87dd25e38eae508ac37a7efe291e0b68 files/digest-vlc-0.8.5-r1 476 RMD160 bb74475c37b3822c4274dbc8b81a98da82b306a3 files/digest-vlc-0.8.5-r1 476 SHA256 a7c6c155dc73eb43c3edc08d1f43b2f019368af686ff630da0109748b5d4f626 files/digest-vlc-0.8.5-r1 476 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEgKepAiZjviIA2XgRAl0WAKCpTOmsWd/Aj8RpzFXUE2CXVJWDQACfQ9lE -jEXWVcpOSm7br6UadzYRGY8= -=+cKg +iD8DBQFEhKHLAiZjviIA2XgRAoboAKCwopyR7FDyrIg8F0IVF8YksWgD6ACgtgsV +yc20scxlNmeyjmQx8GWN0rE= +=wpj2 -----END PGP SIGNATURE----- diff --git a/media-video/vlc/files/digest-vlc-0.8.5 b/media-video/vlc/files/digest-vlc-0.8.5 deleted file mode 100644 index 5e33220e4c42..000000000000 --- a/media-video/vlc/files/digest-vlc-0.8.5 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 16bb5bf87ed94879a8eb7b0ff9b4f16f vlc-0.8.5.tar.bz2 8562996 -RMD160 d24140a5b4bf771754028090e103bb5c171e4fd8 vlc-0.8.5.tar.bz2 8562996 -SHA256 48bc557bec16b48a304e5e760aef10e1c3cca2d74a011bc900bd1768d9ee79fa vlc-0.8.5.tar.bz2 8562996 -MD5 dc69e0f738690944312cdf2a65a5889a vlc-patches-21.tar.bz2 7982 -RMD160 7aca9c943033b74792e52495b8b5e9630c4ff5e2 vlc-patches-21.tar.bz2 7982 -SHA256 eecf75d2fbd83dc5f77308fc889f82912261937d905556dcff41cce0f76d8329 vlc-patches-21.tar.bz2 7982 diff --git a/media-video/vlc/vlc-0.8.5.ebuild b/media-video/vlc/vlc-0.8.5.ebuild deleted file mode 100644 index 721569113fbf..000000000000 --- a/media-video/vlc/vlc-0.8.5.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5.ebuild,v 1.6 2006/05/28 01:18:43 flameeyes Exp $ - -inherit eutils wxwidgets nsplugins multilib autotools toolchain-funcs - -MY_P="${P/_beta/-test}" - -PATCHLEVEL="21" -DESCRIPTION="VLC media player - Video player and streamer" -HOMEPAGE="http://www.videolan.org/vlc/" - -[[ ${MY_P} != "${P}" ]] && \ - SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2" \ - || SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2" - -SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="a52 3dfx nls debug altivec httpd vlm gnutls live v4l cdda ogg matroska -dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl truetype svg fbcon svga -oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream -mp3 xv bidi sdl png xml samba daap corba screen mod speex nsplugin shout rtsp -win32codecs skins hal avahi xinerama cddb directfb upnp" - -RDEPEND="cdda? ( >=dev-libs/libcdio-0.71 - cddb? ( >=media-libs/libcddb-1.2.0 ) ) - live? ( >=media-plugins/live-2005.01.29 ) - dvd? ( media-libs/libdvdread - media-libs/libdvdcss - >=media-libs/libdvdnav-0.1.9 - media-libs/libdvdplay ) - esd? ( media-sound/esound ) - ogg? ( media-libs/libogg ) - matroska? ( - >=dev-libs/libebml-0.7.6 - >=media-libs/libmatroska-0.7.5 ) - mp3? ( media-libs/libmad ) - ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 ) - a52? ( >=media-libs/a52dec-0.7.4-r3 ) - dts? ( >=media-libs/libdts-0.0.2-r3 ) - flac? ( media-libs/flac ) - mpeg? ( >=media-libs/libmpeg2-0.3.2 ) - vorbis? ( media-libs/libvorbis ) - theora? ( media-libs/libtheora ) - truetype? ( media-libs/freetype - media-fonts/ttf-bitstream-vera ) - svga? ( media-libs/svgalib ) - ggi? ( media-libs/libggi ) - aalib? ( media-libs/aalib ) - libcaca? ( media-libs/libcaca ) - arts? ( kde-base/arts ) - alsa? ( media-libs/alsa-lib ) - wxwindows? ( >=x11-libs/wxGTK-2.6.2-r1 ) - ncurses? ( sys-libs/ncurses ) - xosd? ( x11-libs/xosd ) - lirc? ( app-misc/lirc ) - 3dfx? ( media-libs/glide-v3 ) - bidi? ( >=dev-libs/fribidi-0.10.4 ) - gnutls? ( >=net-libs/gnutls-1.0.17 ) - sys-libs/zlib - png? ( media-libs/libpng ) - media-libs/libdvbpsi - aac? ( >=media-libs/faad2-2.0-r2 ) - sdl? ( >=media-libs/libsdl-1.2.8 ) - xml? ( dev-libs/libxml2 ) - samba? ( net-fs/samba ) - vcd? ( >=dev-libs/libcdio-0.72 - >=media-video/vcdimager-0.7.21 ) - daap? ( >=media-libs/libopendaap-0.3.0 ) - corba? ( >=gnome-base/orbit-2.8.0 - >=dev-libs/glib-2.3.2 ) - v4l? ( sys-kernel/linux-headers ) - dvb? ( sys-kernel/linux-headers ) - mod? ( media-libs/libmodplug ) - speex? ( media-libs/speex ) - svg? ( >=gnome-base/librsvg-2.5.0 ) - nsplugin? ( >=net-libs/gecko-sdk-1.7.8 ) - shout? ( media-libs/libshout ) - win32codecs? ( media-libs/win32codecs ) - hal? ( sys-apps/hal ) - avahi? ( >=net-dns/avahi-0.6 ) - X? ( || ( ( - x11-libs/libX11 - x11-libs/libXext - xv? ( x11-libs/libXv ) - xinerama? ( x11-libs/libXinerama ) - ) virtual/x11 ) - opengl? ( virtual/opengl ) - ) - directfb? ( dev-libs/DirectFB ) - upnp? ( net-misc/upnp )" - -DEPEND="${RDEPEND} - X? ( || ( ( - x11-proto/xproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) - ) virtual/x11 ) - ) - dev-util/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use wxwindows; then - WX_GTK_VER="2.6" - need-wxwidgets unicode || die "You need to install wxGTK with unicode support." - fi - - if use skins && ! use truetype; then - eerror "Trying to build with skins support but without truetype." - die "You have to use 'truetype' to use 'skins'" - fi -} - -src_unpack() { - unpack ${A} - cd ${S} - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - AT_M4DIR="m4" eautoreconf -} - -src_compile () { - use nsplugin && myconf="${myconf} --with-mozilla-sdk-path=/usr/$(get_libdir)/gecko-sdk" - - use wxwindows && \ - myconf="${myconf} --with-wx-config=$(basename ${WX_CONFIG}) --with-wx-config-path=$(dirname ${WX_CONFIG})" - - use vlm && \ - myconf="${myconf} --enable-vlm --enable-sout" || \ - myconf="${myconf} --disable-vlm" - - if use directfb; then - myconf="${myconf} --enable-directfb --with-directfb=/usr" - append-flags "-I /usr/include/directfb" - else - myconf="${myconf} --disable-directfb" - fi - - econf \ - $(use_enable altivec) \ - $(use_enable stream sout) \ - $(use_enable httpd) \ - $(use_enable gnutls) \ - $(use_enable v4l) \ - $(use_enable cdda) $(use_enable cdda cddax)\ - $(use_enable cddb libcddb) \ - $(use_enable vcd) $(use_enable vcd vcdx) \ - $(use_enable dvb) $(use_enable dvb pvr) \ - $(use_enable ogg) \ - $(use_enable matroska mkv) \ - $(use_enable flac) \ - $(use_enable vorbis) \ - $(use_enable theora) \ - $(use_enable X x11) \ - $(use_enable xv xvideo) \ - $(use_enable xinerama) \ - $(use_enable opengl glx) $(use_enable opengl) \ - $(use_enable truetype freetype) \ - $(use_enable bidi fribidi) \ - $(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \ - $(use_enable fbcon fb) \ - $(use_enable svga svgalib) \ - $(use_enable 3dfx glide) \ - $(use_enable aalib aa) \ - $(use_enable libcaca caca) \ - $(use_enable oss) \ - $(use_enable esd) \ - $(use_enable arts) \ - $(use_enable alsa) \ - $(use_enable wxwindows wxwidgets) \ - $(use_enable ncurses) \ - $(use_enable xosd) \ - $(use_enable lirc) \ - $(use_enable live livedotcom) $(use_with live livedotcom-tree /usr/lib/live) \ - $(use_enable mp3 mad) \ - $(use_enable aac faad) \ - $(use_enable a52) \ - $(use_enable dts) \ - $(use_enable mpeg libmpeg2) \ - $(use_enable ggi) \ - $(use_enable 3dfx glide) \ - $(use_enable sdl) \ - $(use_enable png) \ - $(use_enable xml libxml2) \ - $(use_enable samba smb) \ - $(use_enable daap) \ - $(use_enable corba) \ - $(use_enable mod) \ - $(use_enable speex) \ - $(use_enable nsplugin mozilla) \ - $(use_enable shout) \ - $(use_enable rtsp) $(use_enable rtsp realrtsp) \ - $(use_enable win32codecs loader) \ - $(use_enable skins skins2) \ - $(use_enable hal) \ - $(use_enable avahi bonjour) \ - $(use_enable ffmpeg) \ - $(use_enable upnp) \ - --disable-jack \ - --disable-dv \ - --disable-libvc1 \ - --disable-snapshot \ - --disable-growl \ - --disable-pth \ - --disable-portaudio \ - --disable-x264 \ - --enable-utf8 \ - ${myconf} || die "configuration failed" - - if [[ $(gcc-major-version) == 2 ]]; then - sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed" - fi - - emake || die "make of VLC failed" -} - -src_install() { - make DESTDIR="${D}" plugindir="/usr/$(get_libdir)/${PLUGINS_DIR}" install || die "Installation failed!" - - dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \ - doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt - - rm -rf ${D}/usr/share/doc/vlc \ - ${D}/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico} - - use skins || rm -rf ${D}/usr/share/vlc/skins2 - - for res in 16 32 48; do - insinto /usr/share/icons/hicolor/${res}x${res}/apps/ - newins ${S}/share/vlc${res}x${res}.png vlc.png - done - - use wxwindows && domenu "${S}/debian/vlc.desktop" -}