From: Chris White Date: Sat, 8 Jan 2005 03:58:40 +0000 (+0000) Subject: Bump to version 0.8.1. This is a nice cleanup of the ebuild for deps and all. Shoul... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e7a78ffbb437a54cfa58cb3525a932ca6423408;p=gentoo.git Bump to version 0.8.1. This is a nice cleanup of the ebuild for deps and all. Should run alot better than previous versions. Fixes bug #72338. --- diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index ffae29d84842..2ea09afa131e 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/vlc -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.61 2004/12/14 12:27:42 eradicator Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.62 2005/01/08 03:58:40 chriswhite Exp $ + +*vlc-0.8.1 (08 Jan 2005) + + 08 Jan 2005; Chris White +vlc-0.8.1.ebuild: + Bump to version 0.8.1. This is a nice cleanup of the ebuild for deps and + all. Should run alot better than previous versions. Fixes bug #72338. 14 Dec 2004; Jeremy Huddleston vlc-0.6.1.ebuild, vlc-0.6.2-r1.ebuild, vlc-0.6.2.ebuild, vlc-0.7.1-r1.ebuild, diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index b68bb37615c9..a917cb0ec487 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,17 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 674a7d2b750f6ad0658d25a01b97de8d ChangeLog 12114 +MD5 b9cad1ba03522bd207df40c552e19433 ChangeLog 12358 MD5 c93943ad91a4f4d68ccbed3cba86d848 metadata.xml 261 -MD5 423953afdbd3580e3a59dbfa8144d339 vlc-0.6.0-r1.ebuild 5636 -MD5 c20cd9affd985c5909e2352224fab894 vlc-0.6.1.ebuild 6116 -MD5 b50a2c6834c39b5396b7e5fb21a17434 vlc-0.6.2-r1.ebuild 6503 -MD5 7a86fa654bd4f47aa3a1c224085ac526 vlc-0.6.2.ebuild 5552 -MD5 e980700404b204d8b1c22eb5bf12b4d4 vlc-0.7.1-r1.ebuild 5976 -MD5 15a9991d3957db9ed11aabf926679b4a vlc-0.7.1.ebuild 6766 -MD5 ea7ad0a99254b8a0330e7df1b8744d9e vlc-0.7.2.ebuild 6006 -MD5 6754a10c910e15b68d5b37f0c92f3938 vlc-0.7.2-r1.ebuild 6478 -MD5 6d4c23d78a415f5c3a961dc97c898878 vlc-0.8.0.ebuild 6424 +MD5 08da0a38db66e5544413c66ec6516487 vlc-0.6.0-r1.ebuild 5640 +MD5 fa8532e6d95e4dec66304edd00c1a018 vlc-0.6.1.ebuild 6116 +MD5 2c3802bc581f92309feb5485ce804387 vlc-0.6.2-r1.ebuild 6503 +MD5 960b1fc8b834066e1dc161b5765a243d vlc-0.6.2.ebuild 5552 +MD5 8db29301596bd2ff04ff168688d91e8d vlc-0.7.1-r1.ebuild 5976 +MD5 dc4e698e935a23406b8c080a8cb2204e vlc-0.7.1.ebuild 6767 +MD5 45ecb78201816026db354510b0689915 vlc-0.7.2-r1.ebuild 6478 +MD5 810361d8956ee9bd225fcb2699385323 vlc-0.7.2.ebuild 6007 +MD5 35f93cfd59ac9612542c675c35139eef vlc-0.8.0.ebuild 6424 +MD5 7ed3f5c3a34bb48a4c2e9997f80e3a30 vlc-0.8.1.ebuild 5013 +MD5 77f4e9cceacd8059c3e1c8322a14c30a files/digest-vlc-0.8.1 63 MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261 MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63 @@ -21,17 +23,17 @@ MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202 MD5 d0a16a05f6983059df4b1b07c0a47bdd files/digest-vlc-0.7.1 130 MD5 f031efc738d255e8b7b893aaeb5ca30c files/digest-vlc-0.7.1-r1 63 MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2 63 +MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2-r1 63 +MD5 c3619276ab1c8a5790066e59ca82347d files/digest-vlc-0.8.0 63 MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744 MD5 20de936c17c2ab1c4767bcbce0d2e972 files/live-gcc3-3.patch 828 MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995 MD5 0ee383795d543048e4d47eb58f6d36bb files/mpeg2dec-20030612-configure.in-fpic.patch 1065 -MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2-r1 63 MD5 310366968813598e8b0cae64b5dbd19a files/vlc-0.7.2-live.patch 1287 -MD5 c3619276ab1c8a5790066e59ca82347d files/digest-vlc-0.8.0 63 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBvtxKArHZZzCEUG0RAqunAJ0T/I/2vTAWh6ohfTqGD/ufB0LAdgCfQPQs -FK2AEn07s8Y1bhQI2U5TRiw= -=0we3 +iD8DBQFB31lHFdQwWVoAgN4RAvojAJ0VODpPBx6xpeFTAAe9norzCjUtGQCeNCi0 +VV3asFR8ABa+FXnnBW6QivY= +=Nncf -----END PGP SIGNATURE----- diff --git a/media-video/vlc/files/digest-vlc-0.8.1 b/media-video/vlc/files/digest-vlc-0.8.1 new file mode 100644 index 000000000000..ebd3c42b8d90 --- /dev/null +++ b/media-video/vlc/files/digest-vlc-0.8.1 @@ -0,0 +1 @@ +MD5 9cdf6d70d51dad30d198edfa96047529 vlc-0.8.1.tar.bz2 4877791 diff --git a/media-video/vlc/vlc-0.6.0-r1.ebuild b/media-video/vlc/vlc-0.6.0-r1.ebuild index a87c690d9c0d..9389404b05de 100644 --- a/media-video/vlc/vlc-0.6.0-r1.ebuild +++ b/media-video/vlc/vlc-0.6.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.15 2004/11/01 01:13:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.16 2005/01/08 03:58:40 chriswhite Exp $ # Missing support for... # tarkin - package not in portage yet diff --git a/media-video/vlc/vlc-0.6.1.ebuild b/media-video/vlc/vlc-0.6.1.ebuild index fde01a5af874..78306ca333e7 100644 --- a/media-video/vlc/vlc-0.6.1.ebuild +++ b/media-video/vlc/vlc-0.6.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.1.ebuild,v 1.13 2004/12/14 12:27:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.1.ebuild,v 1.14 2005/01/08 03:58:40 chriswhite Exp $ # Missing support for... # tarkin - package not in portage yet - experimental diff --git a/media-video/vlc/vlc-0.6.2-r1.ebuild b/media-video/vlc/vlc-0.6.2-r1.ebuild index 94c447c934ea..46458f16b1a4 100644 --- a/media-video/vlc/vlc-0.6.2-r1.ebuild +++ b/media-video/vlc/vlc-0.6.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.16 2004/12/14 12:27:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.17 2005/01/08 03:58:40 chriswhite Exp $ # Missing support for... # tarkin - package not in portage yet - experimental diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild index 09032ffd84dc..dfc251a83b91 100644 --- a/media-video/vlc/vlc-0.6.2.ebuild +++ b/media-video/vlc/vlc-0.6.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.21 2004/12/14 12:27:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.22 2005/01/08 03:58:40 chriswhite Exp $ # Missing support for... # tarkin - package not in portage yet - experimental diff --git a/media-video/vlc/vlc-0.7.1-r1.ebuild b/media-video/vlc/vlc-0.7.1-r1.ebuild index 3c2dccf55dac..50db2de29da6 100644 --- a/media-video/vlc/vlc-0.7.1-r1.ebuild +++ b/media-video/vlc/vlc-0.7.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1-r1.ebuild,v 1.10 2004/12/14 12:27:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1-r1.ebuild,v 1.11 2005/01/08 03:58:40 chriswhite Exp $ # Missing support for... # tarkin - package not in portage yet - experimental diff --git a/media-video/vlc/vlc-0.7.1.ebuild b/media-video/vlc/vlc-0.7.1.ebuild index 705378b1b8a6..3f76ecd0aed4 100644 --- a/media-video/vlc/vlc-0.7.1.ebuild +++ b/media-video/vlc/vlc-0.7.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1.ebuild,v 1.9 2004/12/14 12:27:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1.ebuild,v 1.10 2005/01/08 03:58:40 chriswhite Exp $ # Missing support for... # tarkin - package not in portage yet - experimental diff --git a/media-video/vlc/vlc-0.7.2-r1.ebuild b/media-video/vlc/vlc-0.7.2-r1.ebuild index 34996e7ecf0a..b0e15474e78d 100644 --- a/media-video/vlc/vlc-0.7.2-r1.ebuild +++ b/media-video/vlc/vlc-0.7.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2-r1.ebuild,v 1.7 2004/12/14 12:27:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2-r1.ebuild,v 1.8 2005/01/08 03:58:40 chriswhite Exp $ # Missing support for... # tarkin - package not in portage yet - experimental diff --git a/media-video/vlc/vlc-0.7.2.ebuild b/media-video/vlc/vlc-0.7.2.ebuild index a0c8bd0c8425..98ff8daebff7 100644 --- a/media-video/vlc/vlc-0.7.2.ebuild +++ b/media-video/vlc/vlc-0.7.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.9 2004/12/14 12:27:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.10 2005/01/08 03:58:40 chriswhite Exp $ # Missing support for... # tarkin - package not in portage yet - experimental diff --git a/media-video/vlc/vlc-0.8.0.ebuild b/media-video/vlc/vlc-0.8.0.ebuild index a865704e6a0d..c9f1b3703edf 100644 --- a/media-video/vlc/vlc-0.8.0.ebuild +++ b/media-video/vlc/vlc-0.8.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.0.ebuild,v 1.3 2004/12/14 12:27:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.0.ebuild,v 1.4 2005/01/08 03:58:40 chriswhite Exp $ # Missing support for... # tarkin - package not in portage yet - experimental diff --git a/media-video/vlc/vlc-0.8.1.ebuild b/media-video/vlc/vlc-0.8.1.ebuild new file mode 100644 index 000000000000..134d4f6bb592 --- /dev/null +++ b/media-video/vlc/vlc-0.8.1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1.ebuild,v 1.1 2005/01/08 03:58:40 chriswhite Exp $ + +# Missing support for... +# tarkin - package not in portage yet - experimental +# tremor - package not in portage yet - experimental + +inherit libtool gcc eutils + +DESCRIPTION="VLC media player - Video player and streamer" +HOMEPAGE="http://www.videolan.org/vlc/" +SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="a52 3dfx nls utf8 debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg faad dts flac mpeg2 vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick mozilla hal stream mad xv bidi" + +DEPEND="hal? ( >=sys-apps/hal-0.2.97 ) + cdio? ( >=dev-libs/libcdio-0.70 ) + cddb? ( >=media-libs/libcddb-0.9.4 ) + live? ( media-plugins/live ) + dvd? ( media-libs/libdvdread + media-libs/libdvdcss + >=media-libs/libdvdnav-0.1.9 + media-libs/libdvdplay ) + dvdnav? ( >=media-libs/libdvdnav-0.1.9 ) + esd? ( media-sound/esound ) + ogg? ( media-libs/libogg ) + matroska? ( media-libs/libmatroska ) + mad? ( media-libs/libmad ) + ffmpeg? ( media-video/ffmpeg ) + a52? ( media-libs/a52dec ) + dts? ( media-libs/libdts ) + flac? ( media-libs/flac ) + mpeg2? ( >=media-libs/libmpeg2-0.3.2 ) + vorbis? ( media-libs/libvorbis ) + theora? ( media-libs/libtheora ) + X? ( virtual/x11 ) + xv? ( virtual/x11 ) + freetype? ( media-libs/freetype ) + svga? ( media-libs/svgalib ) + ggi? ( media-libs/libggi ) + aalib? ( media-libs/aalib ) + libcaca? ( media-libs/libcaca ) + arts? ( kde-base/arts ) + alsa? ( virtual/alsa ) + wxwindows? ( >=x11-libs/wxGTK-2.3.0 ) + ncurses? ( sys-libs/ncurses ) + xosd? ( x11-libs/xosd ) + lirc? ( app-misc/lirc ) + mozilla? ( net-www/mozilla ) + 3dfx? ( !amd64? ( media-libs/glide-v3 ) ) + bidi? ( >=dev-libs/fribidi-0.10.4 ) + gnutls? ( >=net-libs/gnutls-1.0.0 ) + sys-libs/zlib + media-libs/libpng + media-libs/libdvbpsi + " + +src_unpack() { + unpack ${A} + + # We only have glide v3 in portage + cd ${S} + sed -i \ + -e "s:/usr/include/glide:/usr/include/glide3:" \ + -e "s:glide2x:glide3:" \ + configure + + # Fix the default font + sed -i -e "s:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/X11R6/lib/X11/fonts/truetype/timesbd.ttf:" modules/misc/freetype.c + + cd ${S}/modules/video_output + epatch ${FILESDIR}/glide.patch + cd ${S} + +} + +src_compile () { + # Avoid timestamp skews with autotools + touch configure.ac + touch aclocal.m4 + touch configure + touch config.h.in + touch $(find . -name Makefile.in) + + # reason why: + # skins2 interface is horribly broken for some reason. + # Therefore it's being disabled for the standard wxwindows + # interface which isn't + myconf="${myconf} --disable-skins2" + + # reason why: + # cddax needs all this stuff to work + if use cdio && use cddb && use cdda ; then + myconf="${myconf} --enable-cddax" + else + myconf-"${myconf} --disable-cddax" + fi + + # reason why: + # mozilla-config is not in ${PATH} + # so the configure script won't find it + # unless we setup the proper variable + if use mozilla ; then + myconf="${myconf} --enable-mozilla" + MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config + else + myconf="${myconf} --disable-mozilla" + fi + + econf \ + $(use_enable altivec) \ + $(use_enable utf8) \ + $(use_enable stream sout) \ + $(use_enable httpd) \ + $(use_enable vlm) \ + $(use_enable gnutls) \ + $(use_enable v4l) \ + $(use_enable cdda ) \ + $(use_enable vcd ) \ + $(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 opengl glx) \ + $(use_enable opengl) \ + $(use_enable freetype) \ + $(use_enable bidi fribidi) \ + $(use_enable dvd dvdread) \ + $(use_enable dvd dvdplay) \ + $(use_eanble 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) \ + $(use_enable ncurses) \ + $(use_enable xosd) \ + $(use_enable lirc) \ + $(use_enable joystick) \ + $(use_enable live livedotcom) \ + $(use_enable mad) \ + $(use_enable ffmpeg) \ + $(use_enable faad) \ + $(use_enable a52) \ + $(use_enable dts) \ + $(use_enable mpeg2 libmpeg2) \ + $(use_enable ggi) \ + $(use_enable 3dfx glide) \ + ${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 + + MAKEOPTS="${MAKEOPTS} -j1" + emake || die "make of VLC failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Installation failed!" + + dodoc ABOUT-NLS AUTHORS MAINTAINERS INSTALL HACKING THANKS TODO NEWS README +}