Bump to 0.8.6b release

Package-Manager: portage-2.1.2.4

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 348519c871616d340ac339caf383395ae3c3b8c1..b9ed45ff2792778bb199072aef62e7c34c75c5fa 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.236 2007/04/18 23:19:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.237 2007/04/18 23:43:34 aballier Exp $
+
+*vlc-0.8.6b (18 Apr 2007)
+
+  18 Apr 2007; Alexis Ballier <aballier@gentoo.org> +vlc-0.8.6b.ebuild:
+  Bump to 0.8.6b release
 
   18 Apr 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6-r1.ebuild,
   vlc-0.8.6b_beta1.ebuild:

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6b23fe2895b7e89a4a857a27f6d95a037fa161fe..b03d75a071b9c65c47fe0d2fcaa24a4dc4d73a99 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,20 +3,25 @@ Hash: SHA1
 
 DIST vlc-0.8.6.tar.bz2 10506025 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d SHA1 86c038fdca2b6c8665e83e302a1a7a5e64a6b912 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7
 DIST vlc-0.8.6b-test1.tar.bz2 10451832 RMD160 34c49c1451856a7817728de099cf30448fbe21b5 SHA1 a2f9f40df2d3ea366b17a8f4dc9ea9b3130555bb SHA256 191f4764148cd01f9a96d287ddeedc9ea09c1ce5615dadd587bccbb6f069d1d3
+DIST vlc-0.8.6b.tar.bz2 10479890 RMD160 568b4d8860d0d5def2655cd278142ba8915ca0cb SHA1 2e67f073009de766340f1ef9f3920c2b4efa327e SHA256 1a101f517485cd1bcabac5c4d180421d34e86af78710ed858ec61f78e3602377
 DIST vlc-patches-38.tar.bz2 11402 RMD160 647b92b86823bdf2ed1e3ba40457aa892154bcbb SHA1 1d0d3b8ccbb95f75b2bce52ad801d398b00c9125 SHA256 17174e05fb41aac4607e84b075e91e8375bb2d59a114916ca6ecaea6b885da0c
 DIST vlc-patches-41.tar.bz2 11926 RMD160 c395422359abf9b99f7da80d8b47c8e269d80a10 SHA1 87b2ebc0d564480b3a9878a10b575405bbdce2aa SHA256 df162c2965844e0f3bacad4952ff41377566ae543a3f31b2fe1cdd33fc3e8a9c
 EBUILD vlc-0.8.6-r1.ebuild 8811 RMD160 914b43930578c0bc98ef52899b7d6c46892e937a SHA1 01208812f8c555856167b6fc3a69a2058b7c16f4 SHA256 2e0eb61ae189bf095bf28b68fa41e607d3c156ff0e588f79c7d0489a76c4d759
 MD5 0d24646410412442a2f9f980b0dc55e2 vlc-0.8.6-r1.ebuild 8811
 RMD160 914b43930578c0bc98ef52899b7d6c46892e937a vlc-0.8.6-r1.ebuild 8811
 SHA256 2e0eb61ae189bf095bf28b68fa41e607d3c156ff0e588f79c7d0489a76c4d759 vlc-0.8.6-r1.ebuild 8811
+EBUILD vlc-0.8.6b.ebuild 9240 RMD160 50d692ddf0ca9c2f96a7b085e00082a8436e059a SHA1 7a087965091cc78ff7955fb1f3b9858128943da8 SHA256 8fa9f6274f361cfcc77651e29cf24b49bf45ea8908a3757cddbc9272a57dc228
+MD5 a872b0cb7d0457bbbe1c59e0b979e535 vlc-0.8.6b.ebuild 9240
+RMD160 50d692ddf0ca9c2f96a7b085e00082a8436e059a vlc-0.8.6b.ebuild 9240
+SHA256 8fa9f6274f361cfcc77651e29cf24b49bf45ea8908a3757cddbc9272a57dc228 vlc-0.8.6b.ebuild 9240
 EBUILD vlc-0.8.6b_beta1.ebuild 9246 RMD160 af494428b233a01d557db70d1c7a0c86734676bb SHA1 02486fdd0229f33c277b61be8f85e74af9dd5cc4 SHA256 8ec6f81bbac1772cfff68b5219f57eea587358f79080f1c10ddbfa0b7e73acd9
 MD5 e1001b4fad82eeb751159b59d5ecf15a vlc-0.8.6b_beta1.ebuild 9246
 RMD160 af494428b233a01d557db70d1c7a0c86734676bb vlc-0.8.6b_beta1.ebuild 9246
 SHA256 8ec6f81bbac1772cfff68b5219f57eea587358f79080f1c10ddbfa0b7e73acd9 vlc-0.8.6b_beta1.ebuild 9246
-MISC ChangeLog 42597 RMD160 0c67055b1b4f58a081d527b7b924900532dde8c0 SHA1 ac792006bfec37062093520001bea014d5909e1c SHA256 a83e914747b33363991d2b64c5fa9b50f74a12e595eef1001bce4227eeb2e77e
-MD5 300a13afe96f94c6e8f8185a7a7bfc17 ChangeLog 42597
-RMD160 0c67055b1b4f58a081d527b7b924900532dde8c0 ChangeLog 42597
-SHA256 a83e914747b33363991d2b64c5fa9b50f74a12e595eef1001bce4227eeb2e77e ChangeLog 42597
+MISC ChangeLog 42722 RMD160 502799bd229acac31df5174ac30f2ee32d8a2366 SHA1 5a2f0111b3e47517e73fe00874b81dfa1a154a5c SHA256 c85722528a2ca59ac467b03bb6dab76d13ee0e869541b32bfba20f3171723dce
+MD5 427ab1024d81c72c015d50f8b7ede92f ChangeLog 42722
+RMD160 502799bd229acac31df5174ac30f2ee32d8a2366 ChangeLog 42722
+SHA256 c85722528a2ca59ac467b03bb6dab76d13ee0e869541b32bfba20f3171723dce ChangeLog 42722
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -24,13 +29,16 @@ SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata
 MD5 f092393d29444807cf8b26f68f030806 files/digest-vlc-0.8.6-r1 482
 RMD160 b5114b76751655641d6031891a0caec8541e7433 files/digest-vlc-0.8.6-r1 482
 SHA256 0eca80ff9addee5971dbcefaa597b261889874ef2fe93f38f7360347381c047a files/digest-vlc-0.8.6-r1 482
+MD5 7959107d3dac9e414d6046a69d3ed449 files/digest-vlc-0.8.6b 485
+RMD160 4e5804eb51dd05bca1dac59dcbaeb292bd7f1284 files/digest-vlc-0.8.6b 485
+SHA256 4f8c21720700f4554c7bcef3097983e11a19bd403dc19f7a7045f65df84d4691 files/digest-vlc-0.8.6b 485
 MD5 38cfe9d04ad639093a6435e02f455569 files/digest-vlc-0.8.6b_beta1 503
 RMD160 280656f5c57f651e9371a183cbe3532d394579f5 files/digest-vlc-0.8.6b_beta1 503
 SHA256 281b094804a59019b02f88eff0c456817305d3f1496b697be01be87870fd6f56 files/digest-vlc-0.8.6b_beta1 503
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJqeBvFcC4BYPU0oRAuiZAKCSPOWaVYJbC7OZuTjNgg80ivlr4gCgvCg9
-GVVtbqVaaM4yITJQ5LdHkSg=
-=kYhG
+iD8DBQFGJq0MvFcC4BYPU0oRAvFkAKDAYO3mFln9xBIpdtbsB4XKN5XlNgCeN6ak
+aYkYi87m6zlQh56mtXl7GeU=
+=Ih7w
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/files/digest-vlc-0.8.6b b/media-video/vlc/files/digest-vlc-0.8.6b
new file mode 100644 (file)
index 0000000..6d40572
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.8.6b
@@ -0,0 +1,6 @@
+MD5 eef8e95e34a3e0d2414b080cb7a1f749 vlc-0.8.6b.tar.bz2 10479890
+RMD160 568b4d8860d0d5def2655cd278142ba8915ca0cb vlc-0.8.6b.tar.bz2 10479890
+SHA256 1a101f517485cd1bcabac5c4d180421d34e86af78710ed858ec61f78e3602377 vlc-0.8.6b.tar.bz2 10479890
+MD5 6216343ac13af1f43c44cf5241295c4a vlc-patches-41.tar.bz2 11926
+RMD160 c395422359abf9b99f7da80d8b47c8e269d80a10 vlc-patches-41.tar.bz2 11926
+SHA256 df162c2965844e0f3bacad4952ff41377566ae543a3f31b2fe1cdd33fc3e8a9c vlc-patches-41.tar.bz2 11926

diff --git a/media-video/vlc/vlc-0.8.6b.ebuild b/media-video/vlc/vlc-0.8.6b.ebuild
new file mode 100644 (file)
index 0000000..b3f79cc
--- /dev/null
+++ b/media-video/vlc/vlc-0.8.6b.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6b.ebuild,v 1.1 2007/04/18 23:43:34 aballier Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins
+
+RESTRICT="confcache"
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+
+PATCHLEVEL="41"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+
+if [[ "${P}" == *_p* ]]; then # Snapshots
+       SRC_URI="mirror://gentoo/${P}.tar.bz2"
+       MY_P="${P}"
+elif [[ "${MY_P}" == "${P}" ]]; then
+       SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+else
+       SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
+fi
+
+SRC_URI="${SRC_URI}
+       mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l cdda ogg matroska
+dvb dvd vcd 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 sdl-image png xml samba daap corba mod speex shout rtsp
+win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
+optimisememory libnotify jack musepack x264"
+
+RDEPEND="
+               >=media-video/ffmpeg-0.4.9_p20050226-r1
+               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.8.0 )
+               mp3? ( media-libs/libmad )
+               a52? ( >=media-libs/a52dec-0.7.4-r3 )
+               dts? ( || (  >=media-libs/libdts-0.0.2-r3 media-libs/libdca ) )
+               flac? ( media-libs/libogg
+                       >=media-libs/flac-1.1.2 )
+               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 )
+               skins? ( >=x11-libs/wxGTK-2.6.2-r1
+                       media-libs/freetype
+                       media-fonts/ttf-bitstream-vera )
+               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.2.9 )
+               sys-libs/zlib
+               png? ( media-libs/libpng )
+               media-libs/libdvbpsi
+               sdl? ( >=media-libs/libsdl-1.2.8
+                       sdl-image? ( media-libs/sdl-image ) )
+               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 )
+               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-7 )
+                       opengl? ( virtual/opengl )
+               )
+               directfb? ( dev-libs/DirectFB )
+               upnp? ( || ( >=net-misc/upnp-1.2 net-misc/libupnp ) )
+               nsplugin? (
+                       !seamonkey? ( www-client/mozilla-firefox )
+                       seamonkey? ( www-client/seamonkey )
+               )
+               libnotify? ( x11-libs/libnotify )
+               musepack? ( media-libs/libmpcdec )
+               x264? ( >=media-libs/x264-svn-20061014 )
+               jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )"
+
+DEPEND="${RDEPEND}
+       X? ( xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) ) )
+       dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+       if use wxwindows || use skins; 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
+               ewarn "Trying to build with skins support but without truetype."
+               ewarn "Enabling truetype."
+       fi
+       if use skins && ! use wxwindows; then
+               ewarn "Trying to build with skins support but without wxwindows."
+               ewarn "Enabling wxwindows."
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       has_version '>=dev-libs/libcdio-0.78' || \
+               export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch"
+
+       # Drop patches that have been merged
+       EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 260_all_format-string-sa23592.patch
+       270_all_libtar-automagic.patch 280_all_sdl-image-automagic.patch
+       300_all_fullscreen_amd64.patch"
+
+       EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+       AT_M4DIR="m4" eautoreconf
+
+       # Replace install-sh with libtool's copy
+       cp /usr/share/libtool/install-sh "${S}/autotools"
+}
+
+src_compile () {
+       local XPIDL=""
+       local MOZILLA_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
+
+       if use nsplugin; then
+               if use seamonkey; then
+                       XPIDL=/usr/lib/seamonkey
+                       MOZILLA_CONFIG=/usr/lib/seamonkey/seamonkey-config
+               else
+                       XPIDL=/usr/lib/mozilla-firefox
+                       MOZILLA_CONFIG=/usr/lib/mozilla-firefox/firefox-config
+               fi
+       fi
+
+       if use live && ! has_version '>=media-plugins/live-2006.12.08'; then
+               myconf="${myconf} --enable-live555 --with-live555-tree=/usr/$(get_libdir)/live"
+       else
+               myconf="${myconf} $(use_enable live live555)"
+       fi
+
+       if use truetype || use skins; then
+               myconf="${myconf} --enable-freetype"
+       else
+               myconf="${myconf} --disable-freetype"
+       fi
+
+       if use wxwindows || use skins; then
+               myconf="${myconf} --enable-wxwidgets"
+       else
+               myconf="${myconf} --disable-wxwidgets"
+       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 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 ncurses) \
+               $(use_enable xosd) \
+               $(use_enable lirc) \
+               $(use_enable mp3 mad) \
+               $(use_enable a52) \
+               $(use_enable dts) \
+               $(use_enable mpeg libmpeg2) \
+               $(use_enable ggi) \
+               $(use_enable 3dfx glide) \
+               $(use_enable sdl) \
+               $(use_enable sdl-image) \
+               $(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 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 upnp) \
+               $(use_enable optimisememory optimize-memory) \
+               $(use_enable libnotify notify) \
+               $(use_enable jack) \
+               $(use_enable musepack mpc) \
+               $(use_enable x264) \
+               --enable-ffmpeg \
+               --disable-faad \
+               --disable-dv \
+               --disable-libvc1 \
+               --disable-snapshot \
+               --disable-growl \
+               --disable-pth \
+               --disable-portaudio \
+               --disable-libtar \
+               --disable-optimizations \
+               --enable-utf8 \
+               --enable-libtool \
+               $(use_enable nsplugin mozilla) \
+               XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
+               WX_CONFIG="${WX_CONFIG}" \
+               ${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() {
+       # First install the library, to avoid screwups during relinking.select
+       emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+       dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
+               doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
+
+       if use nsplugin; then
+               dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+               mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
+                       "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
+       fi
+
+       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 || use skins || rm "${D}/usr/share/applications/vlc.desktop"
+}