From: Diego Elio Pettenò Date: Fri, 17 Nov 2006 01:47:10 +0000 (+0000) Subject: Add the test2a version of VLC, masked. Unfortunately here are troubles with libtool... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e62002d453f40e817d40df20414bac4be2f5b0e;p=gentoo.git Add the test2a version of VLC, masked. Unfortunately here are troubles with libtool and shared libvlc, and thus you need to remove old version before merging this one. Package-Manager: portage-2.1.2_rc1-r7 --- diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 0277297df001..9dcee7ad2b24 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,14 @@ # 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.190 2006/11/11 00:19:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.191 2006/11/17 01:47:10 flameeyes Exp $ + +*vlc-0.8.6_beta2 (17 Nov 2006) + + 17 Nov 2006; Diego Pettenò + +vlc-0.8.6_beta2.ebuild: + Add the test2a version of VLC, masked. Unfortunately here are troubles with + libtool and shared libvlc, and thus you need to remove old version before + merging this one. 11 Nov 2006; Diego Pettenò vlc-0.8.5-r5.ebuild: Ignore patch 230_all_libcdio-0.78.2.patch when using older versions of diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index b451fd2a23a9..c2de8f531d9d 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -3,9 +3,11 @@ 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-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 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 @@ -18,10 +20,14 @@ EBUILD vlc-0.8.5-r5.ebuild 7479 RMD160 d87443d301afdc32f29b74beb908852bd309c737 MD5 81ff77133353f46a2181354d2978d73e vlc-0.8.5-r5.ebuild 7479 RMD160 d87443d301afdc32f29b74beb908852bd309c737 vlc-0.8.5-r5.ebuild 7479 SHA256 9a7e6659a999ac2749b9222d58ed8816ab7f0bae848a588f618837ed927f0761 vlc-0.8.5-r5.ebuild 7479 -MISC ChangeLog 35744 RMD160 65c2af666f112eed44f9e37f14118e1bf3e25353 SHA1 972a5910708dafc7d62ce06b0ea0fd5903287df4 SHA256 ecb656d6a4a6ce2a6ca5e7155760f9239c243ba0234923078c294c4f613f079a -MD5 a88ddc78fae2774ac22ab0c9a395212e ChangeLog 35744 -RMD160 65c2af666f112eed44f9e37f14118e1bf3e25353 ChangeLog 35744 -SHA256 ecb656d6a4a6ce2a6ca5e7155760f9239c243ba0234923078c294c4f613f079a ChangeLog 35744 +EBUILD vlc-0.8.6_beta2.ebuild 7726 RMD160 b63cb8a968b77e9e7f67f6ada6742fbbff81d512 SHA1 9385166444c5acfec78c4fe56fc5c7128920922f SHA256 4c44103e0ffee293fa8f538029ad98000387df6969adb357d27046af5c7435a0 +MD5 5f0c1a0174865fcc4dcac0b7838b77a4 vlc-0.8.6_beta2.ebuild 7726 +RMD160 b63cb8a968b77e9e7f67f6ada6742fbbff81d512 vlc-0.8.6_beta2.ebuild 7726 +SHA256 4c44103e0ffee293fa8f538029ad98000387df6969adb357d27046af5c7435a0 vlc-0.8.6_beta2.ebuild 7726 +MISC ChangeLog 36031 RMD160 a085b0c9cd31be417e1b1dbc1665244a973faf77 SHA1 1ae51553afa9db8fac0b4a21a0b1e72a7589a361 SHA256 12a100222b5ce38bada66c2ae6e267f26614d05f6bcbafc0fc6434ba3ecde39b +MD5 f02e939d551c4e197ef388477f211e13 ChangeLog 36031 +RMD160 a085b0c9cd31be417e1b1dbc1665244a973faf77 ChangeLog 36031 +SHA256 12a100222b5ce38bada66c2ae6e267f26614d05f6bcbafc0fc6434ba3ecde39b ChangeLog 36031 MISC metadata.xml 249 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 SHA1 fc3811086b04b8f498738e2461158e2f17da5fb4 SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249 @@ -35,10 +41,13 @@ SHA256 bfd1f44477c295414873d4caa10fe213eed6a193d129c1b0f2a619fa8b3db1f8 files/di MD5 cf41ef50eba316f28accddd936186d61 files/digest-vlc-0.8.5-r5 479 RMD160 1e715798d907f8e77c151260cc5b130bdec6741a files/digest-vlc-0.8.5-r5 479 SHA256 71ab8cd26defa0b2ab1517c7fc93188a38657475a9099907c87f7ed03dca32b4 files/digest-vlc-0.8.5-r5 479 +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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFVRc4AiZjviIA2XgRAscuAKDV/TXg1vXdePKD0VmnBxGgAc4qjQCg80gp -hwVJwBqAgPyJxwO8TKldxA8= -=Paw9 +iD8DBQFFXRTRAiZjviIA2XgRAoynAKDIt658OG7nCvyrjmtMg1ngTO7ZRACfRwJ4 +kWUozLbf0ajnQ3/eaX6J70A= +=qYOW -----END PGP SIGNATURE----- diff --git a/media-video/vlc/files/digest-vlc-0.8.6_beta2 b/media-video/vlc/files/digest-vlc-0.8.6_beta2 new file mode 100644 index 000000000000..0e77de2d3a51 --- /dev/null +++ b/media-video/vlc/files/digest-vlc-0.8.6_beta2 @@ -0,0 +1,6 @@ +MD5 5c9f205988f374d9d39bd62a4f6b6cc7 vlc-0.8.6-test2a.tar.bz2 10212754 +RMD160 4238df450a18031ef4d06c53c8fee76acd11ab7e vlc-0.8.6-test2a.tar.bz2 10212754 +SHA256 eb07896fe987ae77f35640959008ff59eb071e3ffbda26d14076f47c787f4f2d vlc-0.8.6-test2a.tar.bz2 10212754 +MD5 e531679fb9b61a92f4d9b328f9b1c9ee vlc-patches-29.tar.bz2 8544 +RMD160 3c68001fc784329d72836ba7007020edcbfa9164 vlc-patches-29.tar.bz2 8544 +SHA256 c29f9588d6cfcc3b8ff13a1862a7d1e6edde9aac41c9dcbf7c032bf4c8fa2414 vlc-patches-29.tar.bz2 8544 diff --git a/media-video/vlc/vlc-0.8.6_beta2.ebuild b/media-video/vlc/vlc-0.8.6_beta2.ebuild new file mode 100644 index 000000000000..b957096614f8 --- /dev/null +++ b/media-video/vlc/vlc-0.8.6_beta2.ebuild @@ -0,0 +1,262 @@ +# 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_beta2.ebuild,v 1.1 2006/11/17 01:47:10 flameeyes Exp $ + +WANT_AUTOMAKE=latest +WANT_AUTOCONF=latest + +inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins + +RESTRICT="confcache" + +MY_P="${P/_beta/-test}" + +PATCHLEVEL="29" +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_P}/${MY_P}a.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" +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 ) + ) =net-misc/upnp-1.2 ) + nsplugin? ( + !seamonkey? ( www-client/mozilla-firefox ) + seamonkey? ( www-client/seamonkey ) + ) + libnotify? ( x11-libs/libnotify )" + +# For a series of reason, libtool breaks stuff with plugins and +# shared libvlc. Until that can be sorted out, remove VLC before +DEPEND="${RDEPEND} + !=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 () { + 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 + use seamonkey && \ + myconf="${myconf} --enable-mozilla=seamonkey" || \ + myconf="${myconf} --enable-mozilla=firefox" + 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 \ + ${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() { + emake DESTDIR="${D}" install || die "Installation 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" +}