From: Alexis Ballier Date: Fri, 13 Apr 2007 16:08:36 +0000 (+0000) Subject: Bump to test release of 0.8.6b (bugfix), dropping some patches X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8993953ba49ad3b3ce53b74294c05795fdd71130;p=gentoo.git Bump to test release of 0.8.6b (bugfix), dropping some patches Package-Manager: portage-2.1.2.3 --- diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 34db6327d2b1..0a0e529619c7 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,12 @@ # 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.232 2007/03/25 12:28:43 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.233 2007/04/13 16:08:36 aballier Exp $ + +*vlc-0.8.6b_beta1 (13 Apr 2007) + + 13 Apr 2007; Alexis Ballier + +vlc-0.8.6b_beta1.ebuild: + Bump to test release of 0.8.6b (bugfix), dropping some patches 25 Mar 2007; Alexis Ballier ChangeLog, Manifest: Fix typos in Changelog, thanks to Mihai Moldovan , bug #172057 diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index a99190bf8b1a..3d3563799d4e 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -3,6 +3,7 @@ Hash: SHA1 DIST vlc-0.8.6.tar.bz2 10506025 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d SHA1 86c038fdca2b6c8665e83e302a1a7a5e64a6b912 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7 DIST vlc-0.8.6_p18636.tar.bz2 10732448 RMD160 7be1851933e13cb8938ace4139324fae1485eaa1 SHA1 fff2d45fc24f6782ce3fd90ac7a3a9ec4d905d7d SHA256 8d1dbee4b95f460457beddfa02fd4ab9ff162815e9d82f11a96c4e4f03aa09fe +DIST vlc-0.8.6b-test1.tar.bz2 10451832 RMD160 34c49c1451856a7817728de099cf30448fbe21b5 SHA1 a2f9f40df2d3ea366b17a8f4dc9ea9b3130555bb SHA256 191f4764148cd01f9a96d287ddeedc9ea09c1ce5615dadd587bccbb6f069d1d3 DIST vlc-patches-38.tar.bz2 11402 RMD160 647b92b86823bdf2ed1e3ba40457aa892154bcbb SHA1 1d0d3b8ccbb95f75b2bce52ad801d398b00c9125 SHA256 17174e05fb41aac4607e84b075e91e8375bb2d59a114916ca6ecaea6b885da0c DIST vlc-patches-39.tar.bz2 11862 RMD160 b897d3556e23146dddfc0b8d792a9e67446aee2a SHA1 e0b067dd162d051bfebb6b70feaeba271157317b SHA256 31038e66d8d58778551a77cb7c8afdd875464ec7acd716b47ae8a6a25254f71e EBUILD vlc-0.8.6-r1.ebuild 8787 RMD160 fc6f19979022f167ae82c9e1d1d6afb80837c575 SHA1 9c6af8af2d89e5a01ccb815e4fccabcaf9030707 SHA256 a9564f1073cb5d4f1c05053b2b6a4dc8be4f573892e202a4d28080e4b0fe3796 @@ -13,10 +14,14 @@ EBUILD vlc-0.8.6_p18636.ebuild 9062 RMD160 b65187a11f91bd20ef62af9cebe7b9afd95bc MD5 d52928cf2e7d3612d62dbcb89e03a0d7 vlc-0.8.6_p18636.ebuild 9062 RMD160 b65187a11f91bd20ef62af9cebe7b9afd95bc174 vlc-0.8.6_p18636.ebuild 9062 SHA256 232acd6c87e9f6f68ad424cfe16f05aeee89fb8d5d967f3d520c48d92af5a255 vlc-0.8.6_p18636.ebuild 9062 -MISC ChangeLog 42027 RMD160 ec15ab234ee7e3aecf1dc5ad447c78ef02534a1f SHA1 2ec81461e094903a4a27335ebb651cbb92ed7094 SHA256 b634d8ac062e11e46ae1d2321d8a942f7fbda01b825e999f7959ea4206a5cf92 -MD5 efdff3824b5d4bf16c4b518177f3ac4c ChangeLog 42027 -RMD160 ec15ab234ee7e3aecf1dc5ad447c78ef02534a1f ChangeLog 42027 -SHA256 b634d8ac062e11e46ae1d2321d8a942f7fbda01b825e999f7959ea4206a5cf92 ChangeLog 42027 +EBUILD vlc-0.8.6b_beta1.ebuild 9196 RMD160 d55c05684c426a669eddb28a9707464902dfbcdd SHA1 aeb677a19c3fc458c5b0e6bf6e4facafcebdf404 SHA256 3d99b72ae17c2070c9e0904fa961be0e5c51e327e2362896617975cac0b2e42d +MD5 712f078923e7de9547a3079db9b69d86 vlc-0.8.6b_beta1.ebuild 9196 +RMD160 d55c05684c426a669eddb28a9707464902dfbcdd vlc-0.8.6b_beta1.ebuild 9196 +SHA256 3d99b72ae17c2070c9e0904fa961be0e5c51e327e2362896617975cac0b2e42d vlc-0.8.6b_beta1.ebuild 9196 +MISC ChangeLog 42206 RMD160 cd7629aa7388f51c74c5829726a0edf1c7ca9c7c SHA1 7f776b972fe6e84ac7ec963f6aeae19808ec2dc6 SHA256 a462b315a2222b84e721347656988f9d38afe521dfc659efdd6aa9bc0628668e +MD5 dc49669be8196acbd4996d4e6faea8e7 ChangeLog 42206 +RMD160 cd7629aa7388f51c74c5829726a0edf1c7ca9c7c ChangeLog 42206 +SHA256 a462b315a2222b84e721347656988f9d38afe521dfc659efdd6aa9bc0628668e ChangeLog 42206 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225 @@ -27,10 +32,13 @@ SHA256 0eca80ff9addee5971dbcefaa597b261889874ef2fe93f38f7360347381c047a files/di MD5 5f96e97e7980479981383b48c13c5d78 files/digest-vlc-0.8.6_p18636 503 RMD160 61e90e0c22a58cdff665e4707a893a115fed238a files/digest-vlc-0.8.6_p18636 503 SHA256 44d4201124ceb68bfbe1789290c7bbf0bddf19feb4336fdd1eb3990154e1b150 files/digest-vlc-0.8.6_p18636 503 +MD5 3a03893039f877c42292e7a0b595f331 files/digest-vlc-0.8.6b_beta1 503 +RMD160 3bfbf0c8c9ec060f0d8538f08175cc0f184f78bb files/digest-vlc-0.8.6b_beta1 503 +SHA256 aaf16f41e4d205d16e7729d4128b565862d20141e3d5b330966aae9a05cb832e files/digest-vlc-0.8.6b_beta1 503 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGBmsBvFcC4BYPU0oRAgYHAJ4146EbBhctlgwXxVDjUa3RzouGsACgnyOn -ZhuG+/bs11fPG58j6WVMbbg= -=Xbrg +iD8DBQFGH6ravFcC4BYPU0oRAoJ0AJ9tJpryrcYBhBstMZaX72sN6oo8kACfVuvr +fZ5FpEHsUaPuyPWvQpmcbdU= +=OiiJ -----END PGP SIGNATURE----- diff --git a/media-video/vlc/files/digest-vlc-0.8.6b_beta1 b/media-video/vlc/files/digest-vlc-0.8.6b_beta1 new file mode 100644 index 000000000000..8e63217f6825 --- /dev/null +++ b/media-video/vlc/files/digest-vlc-0.8.6b_beta1 @@ -0,0 +1,6 @@ +MD5 e98be7204024cbbd8909bac96a51889c vlc-0.8.6b-test1.tar.bz2 10451832 +RMD160 34c49c1451856a7817728de099cf30448fbe21b5 vlc-0.8.6b-test1.tar.bz2 10451832 +SHA256 191f4764148cd01f9a96d287ddeedc9ea09c1ce5615dadd587bccbb6f069d1d3 vlc-0.8.6b-test1.tar.bz2 10451832 +MD5 3949b206e49361fef1c2474e7e819c82 vlc-patches-39.tar.bz2 11862 +RMD160 b897d3556e23146dddfc0b8d792a9e67446aee2a vlc-patches-39.tar.bz2 11862 +SHA256 31038e66d8d58778551a77cb7c8afdd875464ec7acd716b47ae8a6a25254f71e vlc-patches-39.tar.bz2 11862 diff --git a/media-video/vlc/vlc-0.8.6b_beta1.ebuild b/media-video/vlc/vlc-0.8.6b_beta1.ebuild new file mode 100644 index 000000000000..2d3f3122cb72 --- /dev/null +++ b/media-video/vlc/vlc-0.8.6b_beta1.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_beta1.ebuild,v 1.1 2007/04/13 16:08:36 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="39" +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 ) + 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 ) + ) =net-misc/upnp-1.2 ) + 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 =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" +}