summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-03-22 17:47:34 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-03-22 17:47:34 +0000
commit89fc308dde9bc7a422db8d636b98b9c0eff1777d (patch)
tree4ade05bc7fdba601d6dad5283d3cef1e8fc02731 /media-video
parentStable for HPPA (bug #214077). (diff)
downloadhistorical-89fc308dde9bc7a422db8d636b98b9c0eff1777d.tar.gz
historical-89fc308dde9bc7a422db8d636b98b9c0eff1777d.tar.bz2
historical-89fc308dde9bc7a422db8d636b98b9c0eff1777d.zip
Rev bump with new patchset for security fixes (bug #214277)
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog7
-rw-r--r--media-video/vlc/Manifest10
-rw-r--r--media-video/vlc/vlc-0.8.6e-r1.ebuild304
3 files changed, 316 insertions, 5 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 8f20fe71f4f6..9b0aaa7a0201 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.312 2008/03/22 17:02:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.313 2008/03/22 17:47:34 aballier Exp $
+
+*vlc-0.8.6e-r1 (22 Mar 2008)
+
+ 22 Mar 2008; Alexis Ballier <aballier@gentoo.org> +vlc-0.8.6e-r1.ebuild:
+ Rev bump with new patchset for security fixes (bug #214277)
22 Mar 2008; Alexis Ballier <aballier@gentoo.org>
-vlc-0.9.0_alpha20080117.ebuild, -vlc-0.9.0_alpha20080309.ebuild,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 82269c89930b..00c139427fb5 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,15 +5,17 @@ DIST vlc-0.8.6e.tar.bz2 11098938 RMD160 f09bae196a7b22cdc6013c5fc22dd6f82d60737a
DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
DIST vlc-patches-47.tar.bz2 13649 RMD160 bdf985702c9cdec41b704f0719bb0cc40d1f1988 SHA1 d02b1897fadeb7b6b467c441b77467008daeca4d SHA256 53bd5a76140f6058468866ec0b48846723882b9adf547c494d1558532a6123fa
DIST vlc-patches-48.tar.bz2 5839 RMD160 1ef334b9b8fccaad37647a9bd8d0f5dcb8f725da SHA1 2a5d36e42c7b517e1e271e4e354c6ecd86c3398c SHA256 fcfcbf65ef821ffef6161e1ad45010ab0fd75837a12a328c99ba152d3732f825
+DIST vlc-patches-49.tar.bz2 10964 RMD160 3fd9e15faf76fba09cf2e40992863e91110c8fc2 SHA1 4bd106053cdbcf6a6324f8b739d2cf70bf5578ea SHA256 8027a7492e3aa59ffc89708094dfbfac1706e7cb0492e0848e2e02f612d18e1a
DIST vlc-snapshot-20080319.tar.bz2 13608730 RMD160 c95ecac419a83846f12b5248808c9e279c871aee SHA1 f2ef963a862421faf9c1be1b8aa9a6c791324f78 SHA256 d7450c6900e5c0b874bc2a116b857ba81b8736193c6af21a8700862f3f105e25
+EBUILD vlc-0.8.6e-r1.ebuild 8873 RMD160 2f8c2532e66ce0a53da62c70d0e358f1dc6534d8 SHA1 7f2dd4e5441e7b8275043f9056b5bdf16883fbd9 SHA256 63b367205a652476bb59bf90757253b12cb2333c35afca403f6ad84f0695641e
EBUILD vlc-0.8.6e.ebuild 9098 RMD160 1b9b95427f942e40289a47414abe59c19b2b3a50 SHA1 6050a5b89143d1c6e92e0344a5461ae1e7f28461 SHA256 7b394afb2eee0aec4ce844714c00240bd97e8cefc88dfc4e115a14c8dda622ad
EBUILD vlc-0.9.0_alpha20080319.ebuild 10410 RMD160 f250aacec07fc6098bd9b68ad9c7d2700f8bb16b SHA1 b081e6e1a0d9f42b145c51799d91729b8b28c090 SHA256 507cf4e4c481b34f9c37a0861f2205ffac5fb767aba68e238fc28a2db2449570
-MISC ChangeLog 53266 RMD160 9ba245208c33e2fc6f043563b887d9ad0b675f21 SHA1 12485d997137a0366f809e4f8a3a99c6904c353c SHA256 3a7d4e9ca2653849641db6575b0d15d0cdf714325d928f22fd4279f9ad71e91f
+MISC ChangeLog 53434 RMD160 ca0784a211f8195b27afbfe7ce8adef88de92189 SHA1 2dbf5124fa7f4b7f790154452aa78d962c754dcc SHA256 83212403e1a4d3be1f047a575a9cb527306aa309b68a741b695135de101c8618
MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFH5TusvFcC4BYPU0oRAhViAJ99vKPMLDJvUx6gwl1kUBcnEyh+uwCdEDtU
-nyppGHcPaGxJAGUGWAwkhSU=
-=xM56
+iD8DBQFH5UZBvFcC4BYPU0oRAlskAJ4uYzRX44IHDwzgYEZwXE+2ISH2QgCcDK2R
+aNrmnqvYJCWzP/enpkNUmw4=
+=44uw
-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.8.6e-r1.ebuild b/media-video/vlc/vlc-0.8.6e-r1.ebuild
new file mode 100644
index 000000000000..b7d3adc04e3c
--- /dev/null
+++ b/media-video/vlc/vlc-0.8.6e-r1.ebuild
@@ -0,0 +1,304 @@
+# 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-r1.ebuild,v 1.1 2008/03/22 17:47:34 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="49"
+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
+ <media-video/ffmpeg-0.4.9_p20070616-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 )
+ 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-2* )
+ seamonkey? ( =www-client/seamonkey-1* )
+ )
+ 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
+ <media-libs/libdc1394-1.9.99 )"
+
+DEPEND="${RDEPEND}
+ v4l? ( sys-kernel/linux-headers )
+ dvb? ( sys-kernel/linux-headers )
+ X? ( xinerama? ( x11-proto/xineramaproto ) )
+ 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"
+
+ 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"
+}