diff options
Diffstat (limited to 'media-video/vlc')
| -rw-r--r-- | media-video/vlc/ChangeLog | 12 | ||||
| -rw-r--r-- | media-video/vlc/Manifest | 19 | ||||
| -rw-r--r-- | media-video/vlc/files/digest-vlc-0.7.1 | 2 | ||||
| -rw-r--r-- | media-video/vlc/files/live-gcc3-3.patch | 30 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.7.1.ebuild | 224 |
5 files changed, 278 insertions, 9 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index e3bb8aa51f94..103d66a6271e 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-video/vlc # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.41 2004/02/23 13:36:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.42 2004/03/11 22:10:26 kanaka Exp $ + +*vlc-0.7.1 (11 Mar 2004) + + 11 Mar 2004; Joel Martin <kanaka@gentoo.org> vlc-0.7.1.ebuild, + files/live-gcc3-3.patch: + Merged latest unstable vlc-0.6.2-r1, and vlc provided ebuild by Derk-Jan + Hartman. Depend on new ffmpeg ebuild instead of pulling down ffmpeg directly. + Add LiveMedia, libcaca support. No implicit mplayer dependency. Bump faad2 + requirement. General cleanup. Removed other arches because or arch dependency + issues. 23 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> vlc-0.6.0-r1.ebuild, vlc-0.6.1.ebuild, vlc-0.6.2-r1.ebuild, vlc-0.6.2.ebuild: diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index cdf8712de011..20279be930b0 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,15 +1,18 @@ -MD5 6266cdf7f9fd3e66b6718f43d4300fd8 ChangeLog 8464 -MD5 1e621dfad90cc391ec2aa8c90223e5c9 vlc-0.6.1.ebuild 6127 -MD5 773d4d165b58ef73b58173ef37d2172e vlc-0.6.2-r1.ebuild 6507 MD5 dd830c30910da8d8ba1b90e2f092e53b vlc-0.6.0-r1.ebuild 5675 +MD5 a4502e52b54a7a57d838f40cf6711f10 vlc-0.7.1.ebuild 6643 MD5 cd1d51d573bc16ff415b2bd1e593c94f vlc-0.6.2.ebuild 5551 +MD5 773d4d165b58ef73b58173ef37d2172e vlc-0.6.2-r1.ebuild 6507 +MD5 1e621dfad90cc391ec2aa8c90223e5c9 vlc-0.6.1.ebuild 6127 +MD5 6406d5bdb6351efb83033fbbf55e2419 ChangeLog 8905 MD5 06579cc387999571bc69fadac7f077fa metadata.xml 263 -MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590 -MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202 -MD5 0ee383795d543048e4d47eb58f6d36bb files/mpeg2dec-20030612-configure.in-fpic.patch 1065 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63 +MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202 +MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995 +MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744 +MD5 20de936c17c2ab1c4767bcbce0d2e972 files/live-gcc3-3.patch 828 MD5 f3095908d6d0b8fb2fbceb3362574761 files/digest-vlc-0.6.1 63 MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2 202 -MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744 -MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995 +MD5 d0a16a05f6983059df4b1b07c0a47bdd files/digest-vlc-0.7.1 130 +MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590 +MD5 0ee383795d543048e4d47eb58f6d36bb files/mpeg2dec-20030612-configure.in-fpic.patch 1065 MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261 diff --git a/media-video/vlc/files/digest-vlc-0.7.1 b/media-video/vlc/files/digest-vlc-0.7.1 new file mode 100644 index 000000000000..3b595a8400f1 --- /dev/null +++ b/media-video/vlc/files/digest-vlc-0.7.1 @@ -0,0 +1,2 @@ +MD5 a25725fa8c9b8a64c60e315d22c31a58 vlc-0.7.1.tar.bz2 4063461 +MD5 c10a7fd0e3ff070821650319863d515e live.2004.02.26.tar.gz 337885 diff --git a/media-video/vlc/files/live-gcc3-3.patch b/media-video/vlc/files/live-gcc3-3.patch new file mode 100644 index 000000000000..29d387032cfe --- /dev/null +++ b/media-video/vlc/files/live-gcc3-3.patch @@ -0,0 +1,30 @@ +--- live.old/groupsock/Groupsock.cpp 2004-01-31 23:57:01.000000000 +0100 ++++ live/groupsock/Groupsock.cpp 2004-01-31 23:59:36.000000000 +0100 +@@ -26,7 +26,11 @@ + #if defined(__WIN32__) || defined(_WIN32) + #include <strstrea.h> + #else +-#include <strstream.h> ++# if !defined(__GNUC__) || (__GNUC__ < 3) ++# include <strstream.h> ++# else ++# include <sstream> ++# endif + #endif + #include <stdio.h> + +--- live.old/groupsock/NetInterface.cpp 2004-01-31 23:57:20.000000000 +0100 ++++ live/groupsock/NetInterface.cpp 2004-02-01 00:00:16.000000000 +0100 +@@ -24,7 +24,11 @@ + #if defined(__WIN32__) || defined(_WIN32) + #include <strstrea.h> + #else +-#include <strstream.h> ++# if !defined(__GNUC__) || (__GNUC__ < 3) ++# include <strstream.h> ++# else ++# include <sstream> ++# endif + #endif + + ////////// NetInterface ////////// diff --git a/media-video/vlc/vlc-0.7.1.ebuild b/media-video/vlc/vlc-0.7.1.ebuild new file mode 100644 index 000000000000..84bbb5197054 --- /dev/null +++ b/media-video/vlc/vlc-0.7.1.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# 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.1 2004/03/11 22:10:26 kanaka Exp $ + +inherit libtool gcc eutils + +# Missing support for... +# tarkin - package not in portage yet - experimental +# theora - package not in portage yet - experimental +# tremor - package not in portage yet - experimental + +# Change these to correspond with the +# unpacked dirnames of the CVS snapshots. +PLIVE=live + +SLIVE=${WORKDIR}/${PLIVE} +S=${WORKDIR}/${P} + +DESCRIPTION="VLC media player - Video player and streamer" +HOMEPAGE="http://www.videolan.org/vlc" +SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2 + http://download.videolan.org/pub/${PN}/${PV}/contrib/live.2004.02.26.tar.gz" + + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="arts qt ncurses dvd gtk nls 3dfx svga fbcon esd kde X alsa ggi speex + oggvorbis gnome xv oss sdl aalib slp truetype v4l xvid lirc bidi + wxwindows imlib mozilla dvb debug faad xosd matroska altivec png" + +RDEPEND="X? ( virtual/x11 ) + aalib? ( >=media-libs/aalib-1.4_rc4-r2 + >=media-libs/libcaca-0.9 ) + alsa? ( >=media-libs/alsa-lib-0.9_rc2 ) + arts? ( kde-base/kdelibs ) + dvb? ( media-libs/libdvb + media-tv/linuxtv-dvb ) + dvd? ( >=media-libs/libdvdread-0.9.4 + >=media-libs/libdvdcss-1.2.8 + >=media-libs/libdvdplay-1.0.1 ) + esd? ( >=media-sound/esound-0.2.22 ) + faad? ( >=media-libs/faad2-2.0_rc3 ) + ggi? ( >=media-libs/libggi-2.0_beta3 ) + gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) + gtk? ( =x11-libs/gtk+-1.2* ) + imlib? ( >=media-libs/imlib2-1.0.6 ) + kde? ( kde-base/kdelibs ) + lirc? ( app-misc/lirc ) + mad? ( media-libs/libmad media-libs/libid3tag ) + matroska? ( >=media-libs/libmatroska-0.6.2 ) + mozilla? ( >=net-www/mozilla-1.4 ) + ncurses? ( sys-libs/ncurses ) + nls? ( >=sys-devel/gettext-0.12.1 ) + oggvorbis? ( >=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 ) + qt? ( x11-libs/qt ) + sdl? ( >=media-libs/libsdl-1.2.5 ) + slp? ( >=net-libs/openslp-1.0.10 ) + truetype? ( >=media-libs/freetype-2.1.4 ) + wxwindows? ( >=x11-libs/wxGTK-2.4.1 ) + xosd? ( >=x11-libs/xosd-2.0 ) + xvid? ( >=media-libs/xvid-0.9.1 ) + 3dfx? ( media-libs/glide-v3 ) + bidi? ( >=dev-libs/fribidi-0.10.4 ) + png? ( >=media-libs/libpng-1.2.5 ) + speex? ( >=media-libs/speex-1.0.3 ) + >=media-libs/a52dec-0.7.4 + >=media-sound/lame-3.93.1 + >=media-libs/flac-1.1.0 + >=media-libs/libmpeg2-0.4.0 + >=media-video/ffmpeg-0.4.8.20040222 + >=media-libs/libdvbpsi-0.1.3" + +DEPEND="$RDEPEND >=sys-devel/autoconf-2.58" + +# liveMedia (live.com) is not a true library but needs to be 'imported' +# into your own sourcetree. This is against VLC coding policy. + +# get kde and arts paths +if use kde || use arts; then + inherit kde-functions + set-kdedir 3 + # $KDEDIR is now set to arts/kdelibs location +fi + +src_unpack() { + unpack ${A} + + cd ${SLIVE} + epatch ${FILESDIR}/live-gcc3-3.patch + + # if qt3 is installed, patch vlc to work with it instead of qt2 + if use qt || use kde + then + if [ ${QTDIR} = "/usr/qt/3" ] + then + sed -i -e "s:-lkfile::" configure + + cd ${S}/modules/gui/kde + sed -i \ + "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" \ + interface.h + + sed -i \ + 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' \ + preferences.cpp + fi + fi + + # We only have glide v3 in portage + cd ${S} + sed -i \ + -e "s:/usr/include/glide:/usr/include/glide3:" \ + -e "s:glide2x:glide3:" \ + configure + + cd ${S}/modules/video_output + epatch ${FILESDIR}/glide.patch + cd ${S} + + cd ${S} + # Avoid timestamp skews with autotools + touch configure.ac + touch aclocal.m4 + touch configure + touch config.h.in + touch $(find . -name Makefile.in) +} + +src_compile() { + # configure and building of livedotcom + cd ${SLIVE} + ./genMakefiles linux || die "Creating liveMedia Makefiles failed." + make || die "liveMedia code failed to compile." + + # Configure and build VLC + cd ${S} + local myconf + myconf="--disable-mga --enable-flac --with-gnu-ld \ + --enable-a52 --enable-dvbpsi --enable-libmpeg2 + --disable-kde" + + #--enable-pth GNU Pth support (default disabled) + #--enable-st State Threads (default disabled) + #--enable-gprof gprof profiling (default disabled) + #--enable-cprof cprof profiling (default disabled) + #--enable-mostly-builtin most modules will be built-in (default disabled) + #--disable-optimizations disable compiler optimizations (default enabled) + #--enable-testsuite build test modules (default disabled) + #--disable-plugins make all plugins built-in (default plugins enabled) + + use debug && myconf="${myconf} --enable-debug" \ + || myconf="${myconf} --enable-release" + + (use imlib && use wxwindows) && myconf="${myconf} --enable-skins" + + use mozilla \ + && myconf="${myconf} --enable-mozilla \ + MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \ + XPIDL=/usr/bin/xpidl" + + # vlc uses its own ultraoptimizaed CXXFLAGS + # and forcing custom ones generally fails building + export CXXFLAGS="" + export CFLAGS="" + export WANT_AUTOCONF_2_5=1 + export WANT_AUTOMAKE_1_6=1 + + myconf="${myconf} --enable-ffmpeg \ + --with-ffmpeg-mp3lame \ + --enable-livedotcom \ + --with-livedotcom-tree=${SLIVE}" + + econf \ + $(use_enable nls) \ + $(use_enable slp) \ + $(use_enable xosd) \ + $(use_enable ncurses) \ + $(use_enable alsa) \ + $(use_enable esd) \ + $(use_enable oss) \ + $(use_enable ggi) \ + $(use_enable sdl) \ + $(use_enable mad) \ + $(use_enable faad) \ + $(use_enable xvid) \ + $(use_enable v4l) \ + $(use_enable dvd) \ + $(use_enable dvd vcd) $(use_enable dvdread) $(use_enable dvd dvdplay) \ + $(use_enable dvb satellite) $(use_enable dvb pvr) \ + $(use_enable joystick) $(use_enable lirc) \ + $(use_enable qt) $(use_enable arts) \ + $(use_enable gtk) $(use_enable gnome) \ + $(use_enable oggvorbis ogg) $(use_enable oggvorbis vorbis) \ + $(use_enable speex) \ + $(use_enable matroska mkv) \ + $(use_enable truetype freetype) \ + $(use_enable bidi fribidi) \ + $(use_enable svga svgalib) \ + $(use_enable fbcon fb) \ + $(use_enable aalib aa) $(use_enable aalib caca) \ + $(use_enable xv xvideo) \ + $(use_enable X x11) \ + $(use_enable 3dfx glide) \ + $(use_enable altivec) \ + ${myconf} || die "configure of VLC failed" + + if [[ $(gcc-major-version) == 2 ]]; then + sed -i -e s:"-fomit-frame-pointer":: vlc-config || die + fi + + # parallel make doesn't work with our complicated makefile + # this is also the reason as why you shouldn't run autoconf + # or automake yourself. (or bootstrap for that matter) + MAKEOPTS="${MAKEOPTS} -j1" + emake || die "make of VLC failed" +} + +src_install() { + einstall || die "make install failed" + + dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \ + MAINTAINERS NEWS README* THANKS doc/ChangeLog-* +} |