From: Diego Elio Pettenò Date: Fri, 26 Jan 2007 19:52:35 +0000 (+0000) Subject: Add a snapshot from the bugfix branch of VLC to fix bug #161828 and other. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5bc6aac1f4e36b70de5a1caf5981e489abf407a3;p=gentoo.git Add a snapshot from the bugfix branch of VLC to fix bug #161828 and other. Package-Manager: portage-2.1.2-r4 --- diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 01bbb0533c3b..690cef3e5682 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.209 2007/01/15 21:16:28 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.210 2007/01/26 19:52:35 flameeyes Exp $ + +*vlc-0.8.6_p18636 (26 Jan 2007) + + 26 Jan 2007; Diego Pettenò + +vlc-0.8.6_p18636.ebuild: + Add a snapshot from the bugfix branch of VLC to fix bug #161828 and other. 15 Jan 2007; Gustavo Zacarias vlc-0.8.6-r1.ebuild: Stable on sparc wrt security #159845 diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index d2a9d8698803..8d87c214a6bc 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -3,6 +3,7 @@ Hash: SHA1 DIST vlc-0.8.4a.tar.bz2 7191539 RMD160 50ea307c1aa70d7189a8c7cd09bf5e1d60e4856b SHA1 043462db25e6eeb7f648c600d2dbca1524056580 SHA256 003b6bb71255af006ac3a36ff0184e0cb9d5e08589b2d500f73b3c8052d6adf9 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-patches-16.tar.bz2 10206 RMD160 e9edce6e298a74cb08eec00bcadac6097f772cbf SHA1 81864732b0669dd944c9b6c7efbb3e2362b66471 SHA256 d537ec6e05cbeef04179435e2aabcc9bc9c876063000fd5b037184fabad8c5aa DIST vlc-patches-33.tar.bz2 10189 RMD160 b5951d9528d53d740bc5dd41282d4b603bcb4682 SHA1 f20c7cd3aaa78ecc3b60eae456e8a9ea08fe424f SHA256 0508fee2afadf4c9bfd05b28098f81fe35c60bb60c26c040c1bb3de0b2df7d2c EBUILD vlc-0.8.4a-r1.ebuild 7123 RMD160 7c33c38b070daff71acb59f83655d5c64b05b54a SHA1 767f5a46624002488571a443bc776a6efc72d330 SHA256 e3621a1941a365c4e5ee8d257b4d0d0878ac40d5a021627513cc4402053e5028 @@ -13,10 +14,14 @@ EBUILD vlc-0.8.6-r1.ebuild 8094 RMD160 93e20c827221cabc067b2b8c234b376040515166 MD5 89d2a2be1cef5ae82cedd4abfb8dbaeb vlc-0.8.6-r1.ebuild 8094 RMD160 93e20c827221cabc067b2b8c234b376040515166 vlc-0.8.6-r1.ebuild 8094 SHA256 940c4d8545c0a42ba7ac271673fd708e23c469d42f467ebddf1e0bcd5819a3ce vlc-0.8.6-r1.ebuild 8094 -MISC ChangeLog 38657 RMD160 0e07b77c884a1512100b59537c045ce6bab9f807 SHA1 acbe34df7f9e0ebc023fe5c5be2a464b5f10fd3b SHA256 c3febe325126beb062af4c6d0d81baea7feb2e1f9fbf4a5d3d16b763c1daa32d -MD5 67cc74d5276458d1ea8e99e1f8dcaf59 ChangeLog 38657 -RMD160 0e07b77c884a1512100b59537c045ce6bab9f807 ChangeLog 38657 -SHA256 c3febe325126beb062af4c6d0d81baea7feb2e1f9fbf4a5d3d16b763c1daa32d ChangeLog 38657 +EBUILD vlc-0.8.6_p18636.ebuild 8282 RMD160 2bfd25f208c06ea5f21f53747f34edb70b7704c6 SHA1 4be7aeafe7ee2cb27c523c4cc76a96547a8f9ca8 SHA256 fd05bbdd9a5d81df60b9e995c90b5e8bd5ee8efdd17560b94b06ccfe0fbdce8a +MD5 604dfa29196b2109bbc81aa178a327d5 vlc-0.8.6_p18636.ebuild 8282 +RMD160 2bfd25f208c06ea5f21f53747f34edb70b7704c6 vlc-0.8.6_p18636.ebuild 8282 +SHA256 fd05bbdd9a5d81df60b9e995c90b5e8bd5ee8efdd17560b94b06ccfe0fbdce8a vlc-0.8.6_p18636.ebuild 8282 +MISC ChangeLog 38850 RMD160 cb1a66c1ccb8063217f942d824f1c8d6ca058972 SHA1 4809dddeea3998bba0638a559d8427bf3e56932d SHA256 d883f19e6158f5e55dcb4802e79b0433a37567f46c20c8527f1328ac3f25a4f0 +MD5 ce4311c84db97829f83f4a1ca3045b72 ChangeLog 38850 +RMD160 cb1a66c1ccb8063217f942d824f1c8d6ca058972 ChangeLog 38850 +SHA256 d883f19e6158f5e55dcb4802e79b0433a37567f46c20c8527f1328ac3f25a4f0 ChangeLog 38850 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 ecfd8c4a8edf5a58d299acaff67a316567d2e802bd676a356fbb113ce28779a8 files/di MD5 2c5bd9432c8b97f895fe5837dec270fc files/digest-vlc-0.8.6-r1 482 RMD160 57f2c20ccd4c9f38e52edb6991aba0960dca069a files/digest-vlc-0.8.6-r1 482 SHA256 46e3bae591b10b274bd7453a4d44edecc31286f0429609bcc134ddb03e8f9965 files/digest-vlc-0.8.6-r1 482 +MD5 f8ad5dac481685f28c83c52128de5a76 files/digest-vlc-0.8.6_p18636 503 +RMD160 b363ecc44f8e5e2279c12aa1e1dfab16696a9ab4 files/digest-vlc-0.8.6_p18636 503 +SHA256 c1946c8219a13dccd089882e1b1d72c7d0d71182c9dc4c25cc5761edd11269d9 files/digest-vlc-0.8.6_p18636 503 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFq+83KRy60XGEcJIRAkJPAJ9BBzDW+VJrpnsA5qJw2DxYw2k79gCePjnV -tMznMSokOM13OL0jwHNvU64= -=qDzl +iD8DBQFFulwMAiZjviIA2XgRAjuvAKCoLLoeu1lqXtmzQYMJRpmcID9j4gCgy7li +LjPOG8WpHXoOZ+GfaNIgLDE= +=AHE/ -----END PGP SIGNATURE----- diff --git a/media-video/vlc/files/digest-vlc-0.8.6_p18636 b/media-video/vlc/files/digest-vlc-0.8.6_p18636 new file mode 100644 index 000000000000..6bc10ec1b426 --- /dev/null +++ b/media-video/vlc/files/digest-vlc-0.8.6_p18636 @@ -0,0 +1,6 @@ +MD5 32efedc258bb97c935f501a75c83c980 vlc-0.8.6_p18636.tar.bz2 10732448 +RMD160 7be1851933e13cb8938ace4139324fae1485eaa1 vlc-0.8.6_p18636.tar.bz2 10732448 +SHA256 8d1dbee4b95f460457beddfa02fd4ab9ff162815e9d82f11a96c4e4f03aa09fe vlc-0.8.6_p18636.tar.bz2 10732448 +MD5 6d6cae37cb7a9219db522929236c9215 vlc-patches-33.tar.bz2 10189 +RMD160 b5951d9528d53d740bc5dd41282d4b603bcb4682 vlc-patches-33.tar.bz2 10189 +SHA256 0508fee2afadf4c9bfd05b28098f81fe35c60bb60c26c040c1bb3de0b2df7d2c vlc-patches-33.tar.bz2 10189 diff --git a/media-video/vlc/vlc-0.8.6_p18636.ebuild b/media-video/vlc/vlc-0.8.6_p18636.ebuild new file mode 100644 index 000000000000..b4ec6cda9df0 --- /dev/null +++ b/media-video/vlc/vlc-0.8.6_p18636.ebuild @@ -0,0 +1,287 @@ +# 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.6_p18636.ebuild,v 1.1 2007/01/26 19:52:35 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="33" +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_PV}/${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 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.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 ) + 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 ) + ) =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 =dev-libs/libcdio-0.78' || \ + export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch" + + EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 260_all_format-string-sa23592.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="--enable-live555 --with-live555-tree=/usr/$(get_libdir)/live" + else + myconf="$(use_enable live live555)" + 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 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 \ + $(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 TODO 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}/" + + rm -rf "${D}/usr/share/doc/vlc" \ + "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico} + fi + + 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" +}