From c1cfdb97d55c12be86a29fa75de466cce085d53f Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 28 Feb 2008 18:09:15 +0000 Subject: [PATCH] version bump, stable candidate for security fixes Package-Manager: portage-2.1.4.4 --- media-video/vlc/ChangeLog | 7 +- media-video/vlc/Manifest | 10 +- media-video/vlc/vlc-0.8.6e.ebuild | 310 ++++++++++++++++++++++++++++++ 3 files changed, 322 insertions(+), 5 deletions(-) create mode 100644 media-video/vlc/vlc-0.8.6e.ebuild diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 37fae4a66009..e24703cf5ea1 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.296 2008/02/28 09:11:51 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.297 2008/02/28 18:09:15 aballier Exp $ + +*vlc-0.8.6e (28 Feb 2008) + + 28 Feb 2008; Alexis Ballier +vlc-0.8.6e.ebuild: + version bump, stable candidate for security fixes *vlc-0.9.0_alpha20080228 (28 Feb 2008) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 0d3f56d287c5..886d18afe883 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -2,6 +2,7 @@ Hash: SHA1 DIST vlc-0.8.6d.tar.bz2 11170003 RMD160 16c1998dbc30ad96bebdd8792d135b5f7899166e SHA1 63afd15cc782795c8d8f3de5edc614389465c577 SHA256 c608ea08d8c6125897164b752f55cba0f35ed57d72f345eb8275b97359e23205 +DIST vlc-0.8.6e.tar.bz2 11098938 RMD160 f09bae196a7b22cdc6013c5fc22dd6f82d60737a SHA1 6b981ddbe7f6b95cd566ee195b4445b5773c21bd SHA256 e80b5af8e78889a67698d086da33779ed78b64c1387237282432d303c1809c3b DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54 DIST vlc-patches-45.tar.bz2 5825 RMD160 5aee3bb6679e8e20b685bfef0d4c86b94f7bee15 SHA1 be5c81838f3d8f71cba9768bbfae46507c02dd0f SHA256 2dccd7baec3f977cc8576610c333b1f5b655cd0f50391c3efc2f9069be70ca39 DIST vlc-patches-46.tar.bz2 10127 RMD160 954918c1819fda22191432baf5ffd8b6f10dc091 SHA1 4013e8bbd963675427880e8df83b26c57c41cf1a SHA256 ec91abf2354f301029f9f7ac730b760de0c46e4ba5240ac5fc7471c1dcd19030 @@ -12,15 +13,16 @@ DIST vlc-snapshot-20080128.tar.bz2 13338438 RMD160 3afdcc37aeac15850da1244a7e614 DIST vlc-snapshot-20080228.tar.bz2 13470327 RMD160 43fddffdceee24cb6bebd70afae9a525c1e0c10b SHA1 702d00f11e7c22af582583217157c528c89ce76b SHA256 f6998d70cdc095f73466edf6447df29fc780c1918c9fd781cce6a6e55b14c58a EBUILD vlc-0.8.6d-r1.ebuild 8856 RMD160 c8b97cfcf40fb156494d9f6ec47841673f34f25b SHA1 a4c17eae4ecd903292ea58eda5dd83f84df234ea SHA256 715c532a18def89a9353749429922c69ea83ea7920fbeef1261988751c18af05 EBUILD vlc-0.8.6d.ebuild 8812 RMD160 a7c7c2874187dc4ef7b3a068b63adea2d6d60c1b SHA1 71387df3303bc1b34639c360e0867023404d2e10 SHA256 c9b9e29b57c7295ac42616e521e229f2abb2b459b7de4f5580cfb038c2ce23b7 +EBUILD vlc-0.8.6e.ebuild 9096 RMD160 cb285a9e62713b1d14d302f02f51cd82e3b85178 SHA1 aece3d1a2b2787919700e7eb32fb60d0d2ab9886 SHA256 601581c3105ea855504b10a8fb0a15f620cb203fe2e6bf309dd744b5de4b2ca1 EBUILD vlc-0.9.0_alpha20080117.ebuild 10282 RMD160 d4ebda22b84d6e38c41464634a6541acb1d95178 SHA1 cb763cf9caa3e2dec4c347bcad7cb2477aa6cf9c SHA256 eb79bb917dc33cff0f62813d3e929042fd7f640845ad8d054a1508145a921bd6 EBUILD vlc-0.9.0_alpha20080128.ebuild 10256 RMD160 b733693597e8f47737c0ec1e3a54f0299034db7d SHA1 6ecae97bff0c75c8cbfa54e16d53ae0c42824ad8 SHA256 484d2dc024818cbf90e70574c9dfbe1e8a936490d716e467019499cd564b482f EBUILD vlc-0.9.0_alpha20080228.ebuild 10426 RMD160 2d86e06871dbe8373fd79378d8915c962dcf3a52 SHA1 3d32e6be93c00d5a3d9e1a76e6d70b9f894a73e2 SHA256 09ff14aa396d6fec632c91d83b92666907493ef88d32137b4cf8fc08d48fd97a -MISC ChangeLog 50919 RMD160 b459d7fd46314b2c92f25b9fb6abce7901addc9b SHA1 4d30016cead6952fb6cb1274beb5736e67c5da87 SHA256 588d5f3f3cae515cf4683efa282d01f892155ad7e8829813d576daa353ca52be +MISC ChangeLog 51071 RMD160 9f54e647f2d81d18ebdbc7071a3a5bf236c02d62 SHA1 42f2a2ce55ca80c6d8ac74bd9d1a05e52881c059 SHA256 eb9ccff7661510c583ae8f0b65c03d28e04e37003f255612dc135f3f195fade1 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHxnrzvFcC4BYPU0oRAnmiAKCcOJFmfgNzz37A4pNrQndDdZK3CQCdE1CZ -YaAg9+MVj5/i5ZFd43KJy0s= -=KwTT +iD8DBQFHxvjrvFcC4BYPU0oRAgAVAJ9BNFhcfkL+3sce3bV9JksO/nfuNgCguVnE +xkqTvB0HAWxDGywBga05PXs= +=dobj -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-0.8.6e.ebuild b/media-video/vlc/vlc-0.8.6e.ebuild new file mode 100644 index 000000000000..67b352702f71 --- /dev/null +++ b/media-video/vlc/vlc-0.8.6e.ebuild @@ -0,0 +1,310 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6e.ebuild,v 1.1 2008/02/28 18:09:15 aballier Exp $ + +WANT_AUTOMAKE=latest +WANT_AUTOCONF=latest + +inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" + +PATCHLEVEL="47" +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 modplug speex shout rtsp +win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey +optimisememory libnotify jack musepack x264 dc1394 gnome" + +RDEPEND=" + >=media-video/ffmpeg-0.4.9_p20050226-r1 + =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 ) + gnome? ( gnome-base/gnome-vfs ) + 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/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* ) + skins? ( =x11-libs/wxGTK-2.6* + 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 ) + modplug? ( 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 ) + opengl? ( virtual/opengl ) + ) + directfb? ( dev-libs/DirectFB ) + upnp? ( net-libs/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 ) + dc1394? ( sys-libs/libraw1394 + =dev-libs/libcdio-0.78' || \ + export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch" + + # Drop patches that have been merged + export EPATCH_EXCLUDE="${EPATCH_EXCLUDE} + 340_all_format_string_injection_httpd.patch + 350_all_stack_based_overflow_subtitles.patch + 360_all_CVE-2008-0225.patch + 370_all_CVE-2008-0295.patch" + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + AT_M4DIR="m4" eautoreconf +} + +src_compile () { + local XPIDL="" + local MOZILLA_CONFIG="" + + use vlm && \ + myconf="${myconf} --enable-vlm --enable-sout" || \ + myconf="${myconf} --disable-vlm" + + 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 gnome gnomevfs) \ + $(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 modplug 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) \ + $(use_enable dc1394) \ + $(use_enable directfb) \ + --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" +} -- 2.26.2