Version bump to release candidate, fix the mozilla plugin thanks to the information...

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 8d61f03f3ea6548343a3c6076639da79bcdc639b..18115503c41b60352face7cc247eedc92e7b1c51 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.194 2006/11/21 12:29:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.195 2006/12/01 02:40:26 flameeyes Exp $
+
+*vlc-0.8.6_rc1 (01 Dec 2006)
+
+  01 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> +vlc-0.8.6_rc1.ebuild:
+  Version bump to release candidate, fix the mozilla plugin thanks to the
+  information by Tavin Cole in bug #156067.
 
   21 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Give this back to video herd.

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 5804cf72392e22e02c26f052fe65b4d3853d980c..ee13f4a82053dca26d4bcfa27547f2fe7d34272b 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,11 +3,13 @@ Hash: SHA1
 
 DIST vlc-0.8.4a.tar.bz2 7191539 RMD160 50ea307c1aa70d7189a8c7cd09bf5e1d60e4856b SHA1 043462db25e6eeb7f648c600d2dbca1524056580 SHA256 003b6bb71255af006ac3a36ff0184e0cb9d5e08589b2d500f73b3c8052d6adf9
 DIST vlc-0.8.5.tar.bz2 8562996 RMD160 d24140a5b4bf771754028090e103bb5c171e4fd8 SHA1 2f0a26a336a5211f32c7bcc653dfd0b27f1fb26b SHA256 48bc557bec16b48a304e5e760aef10e1c3cca2d74a011bc900bd1768d9ee79fa
+DIST vlc-0.8.6-rc1.tar.bz2 10499652 RMD160 624dc44acdff2033e53d45aa27bb674c971891e3 SHA1 2220648e74f012526e0317b02dc512661ba6c31a SHA256 0d6678dfd99a00bee40b3965ff436bec380bbd5b1dc85b46fbc8a1728b63e7d9
 DIST vlc-0.8.6-test2a.tar.bz2 10212754 RMD160 4238df450a18031ef4d06c53c8fee76acd11ab7e SHA1 09615d3c2c7202fb7ead2bb1be0e4dcdca43d435 SHA256 eb07896fe987ae77f35640959008ff59eb071e3ffbda26d14076f47c787f4f2d
 DIST vlc-patches-16.tar.bz2 10206 RMD160 e9edce6e298a74cb08eec00bcadac6097f772cbf SHA1 81864732b0669dd944c9b6c7efbb3e2362b66471 SHA256 d537ec6e05cbeef04179435e2aabcc9bc9c876063000fd5b037184fabad8c5aa
 DIST vlc-patches-25.tar.bz2 11370 RMD160 ee95b5698cff2f3ccf347b0ed5bc7c43c0c13502 SHA1 5b72ce53fced638747228f9eedb3eec80ce32b2b SHA256 be82dbf2ceb476b1dc035ee90e7c1bb01f6efe52c3679751416c2133ba3c0dde
 DIST vlc-patches-28.tar.bz2 12689 RMD160 32e0c7a35e8492b4885e3ca41af1dc4563a383c8 SHA1 80fd57a0aaa1f2fc3a57b2c7f44ceedac2aa6233 SHA256 5b7d4e3b14682e889e0ec00d66999d24bf4d4494b88887f3fb7c32e360dd5393
 DIST vlc-patches-29.tar.bz2 8544 RMD160 3c68001fc784329d72836ba7007020edcbfa9164 SHA1 8b42a78a71468bae5612361b73ba630cf69d2afe SHA256 c29f9588d6cfcc3b8ff13a1862a7d1e6edde9aac41c9dcbf7c032bf4c8fa2414
+DIST vlc-patches-30.tar.bz2 7589 RMD160 475614ebb0983de00535ca867a0cf67d820d285f SHA1 32bda4ebbd5932e12b9f55f8638100cc16337ab1 SHA256 4608e72c9fc89d9ddf48dfd380f01c7c6edcee9668599badfc65cf769b660f86
 EBUILD vlc-0.8.4a-r1.ebuild 7123 RMD160 7c33c38b070daff71acb59f83655d5c64b05b54a SHA1 767f5a46624002488571a443bc776a6efc72d330 SHA256 e3621a1941a365c4e5ee8d257b4d0d0878ac40d5a021627513cc4402053e5028
 MD5 661adeff1292bb17ab516387be301479 vlc-0.8.4a-r1.ebuild 7123
 RMD160 7c33c38b070daff71acb59f83655d5c64b05b54a vlc-0.8.4a-r1.ebuild 7123
@@ -24,10 +26,14 @@ EBUILD vlc-0.8.6_beta2.ebuild 7820 RMD160 cdd50208e57a5d84da9372f20f5f235dbca622
 MD5 f5c285d2e8d551d31d022624f0eeb3ad vlc-0.8.6_beta2.ebuild 7820
 RMD160 cdd50208e57a5d84da9372f20f5f235dbca62217 vlc-0.8.6_beta2.ebuild 7820
 SHA256 a19dcec045d2280aa47227731b6cd5c301fdd9a358711e63ad0252d073d88de4 vlc-0.8.6_beta2.ebuild 7820
-MISC ChangeLog 36447 RMD160 0600c15142ccbf653c36e63cb0dbff7a9953db01 SHA1 3250f9a6421b69bd669a51aadcff9cc9bc1ff059 SHA256 b02cc18c2f337e32d6dec6d52a1f1fbf0367a88e6428d8687b8c6df1db1c2b6d
-MD5 c6d2c5dd8e60f994e9ecad3004ac3388 ChangeLog 36447
-RMD160 0600c15142ccbf653c36e63cb0dbff7a9953db01 ChangeLog 36447
-SHA256 b02cc18c2f337e32d6dec6d52a1f1fbf0367a88e6428d8687b8c6df1db1c2b6d ChangeLog 36447
+EBUILD vlc-0.8.6_rc1.ebuild 7982 RMD160 29e4301a033fbcf448bd7276de0bae30abd18198 SHA1 ac3300b70083114624c6d71356dbfa9a2c6ebda4 SHA256 9785c4397d8dbeef282f079a708046d61de414e9271b37d5132d05b681f01f93
+MD5 5516fd674a84fa980b2dc58caa3493cc vlc-0.8.6_rc1.ebuild 7982
+RMD160 29e4301a033fbcf448bd7276de0bae30abd18198 vlc-0.8.6_rc1.ebuild 7982
+SHA256 9785c4397d8dbeef282f079a708046d61de414e9271b37d5132d05b681f01f93 vlc-0.8.6_rc1.ebuild 7982
+MISC ChangeLog 36672 RMD160 e75a7d2445030cf649391c043ea44e8f2a1e129f SHA1 07d4eaba1f4863ab65ee08cab9320dd0c4259be9 SHA256 1837e143675a3c86f22b2e31330c095145d172533a1b4c8d3cadb813bc1fe611
+MD5 9a61c2840d0964866aec2a735dadabcb ChangeLog 36672
+RMD160 e75a7d2445030cf649391c043ea44e8f2a1e129f ChangeLog 36672
+SHA256 1837e143675a3c86f22b2e31330c095145d172533a1b4c8d3cadb813bc1fe611 ChangeLog 36672
 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
@@ -44,10 +50,13 @@ SHA256 71ab8cd26defa0b2ab1517c7fc93188a38657475a9099907c87f7ed03dca32b4 files/di
 MD5 3b81236426f547ff24a72bda792e7d21 files/digest-vlc-0.8.6_beta2 500
 RMD160 467fe195b1d17ac594807ea5b3c9c1b8f336df5c files/digest-vlc-0.8.6_beta2 500
 SHA256 8ee2b8cad31d5d39f1db30c2e54c506eb983c2963a4cd137f39ef4812417dc0f files/digest-vlc-0.8.6_beta2 500
+MD5 b5cbe221456a451b9bfbfef3b74db4aa files/digest-vlc-0.8.6_rc1 491
+RMD160 e6a6c774da90365961c3faddcc53b387f99adfb2 files/digest-vlc-0.8.6_rc1 491
+SHA256 a5db2da297832f85b7163811a85914406916556b0c3eb73c99ea6e782bd108cb files/digest-vlc-0.8.6_rc1 491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYvE2AiZjviIA2XgRAlKJAKCxAK/s7M26eoIzVXgesfK+i7gO/ACdHGZ0
-IRYBF7EVtqEXlGSeE+jtcXs=
-=8v3F
+iD8DBQFFb5YjAiZjviIA2XgRAhRuAKCclxSEF3Va+iepDGstV/QjlFCWXwCcCKwS
+Byy800zDX/ZjQ9VEC9OtekQ=
+=ihhx
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/files/digest-vlc-0.8.6_rc1 b/media-video/vlc/files/digest-vlc-0.8.6_rc1
new file mode 100644 (file)
index 0000000..3afc4d3
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.8.6_rc1
@@ -0,0 +1,6 @@
+MD5 edbd60bf285df32dd393bc1fd04be0c2 vlc-0.8.6-rc1.tar.bz2 10499652
+RMD160 624dc44acdff2033e53d45aa27bb674c971891e3 vlc-0.8.6-rc1.tar.bz2 10499652
+SHA256 0d6678dfd99a00bee40b3965ff436bec380bbd5b1dc85b46fbc8a1728b63e7d9 vlc-0.8.6-rc1.tar.bz2 10499652
+MD5 fea3a341ffe64467a0517083d18d9e57 vlc-patches-30.tar.bz2 7589
+RMD160 475614ebb0983de00535ca867a0cf67d820d285f vlc-patches-30.tar.bz2 7589
+SHA256 4608e72c9fc89d9ddf48dfd380f01c7c6edcee9668599badfc65cf769b660f86 vlc-patches-30.tar.bz2 7589

diff --git a/media-video/vlc/vlc-0.8.6_rc1.ebuild b/media-video/vlc/vlc-0.8.6_rc1.ebuild
new file mode 100644 (file)
index 0000000..153f096
--- /dev/null
+++ b/media-video/vlc/vlc-0.8.6_rc1.ebuild
@@ -0,0 +1,273 @@
+# 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.6_rc1.ebuild,v 1.1 2006/12/01 02:40:26 flameeyes 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="30"
+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_PV}/${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="~amd64 ~ppc ~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 png xml samba daap corba mod speex shout rtsp
+win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
+optimisememory libnotify"
+
+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.7.5 )
+               mp3? ( media-libs/libmad )
+               a52? ( >=media-libs/a52dec-0.7.4-r3 )
+               dts? ( >=media-libs/libdts-0.0.2-r3 )
+               flac? ( ~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 )
+               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
+               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 )
+               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 )
+               nsplugin? (
+                       !seamonkey? ( www-client/mozilla-firefox )
+                       seamonkey? ( www-client/seamonkey )
+               )
+               libnotify? ( x11-libs/libnotify )"
+
+DEPEND="${RDEPEND}
+       X? ( xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) ) )
+       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}"
+
+       has_version '>=dev-libs/libcdio-0.78' || \
+               export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.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 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
+
+       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
+
+       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 live555) $(use_with live live555-tree /usr/lib/live) \
+               $(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 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) \
+               --enable-ffmpeg \
+               --disable-faad \
+               --disable-jack \
+               --disable-dv \
+               --disable-libvc1 \
+               --disable-snapshot \
+               --disable-growl \
+               --disable-pth \
+               --disable-portaudio \
+               --disable-x264 \
+               --enable-utf8 \
+               --enable-libtool \
+               XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_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 TODO NEWS README \
+               doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
+
+       dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+       mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
+               "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
+
+       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"
+}