diff options
| -rw-r--r-- | media-video/vlc/ChangeLog | 16 | ||||
| -rw-r--r-- | media-video/vlc/Manifest | 6 | ||||
| -rw-r--r-- | media-video/vlc/files/buildorder.patch | 12 | ||||
| -rw-r--r-- | media-video/vlc/files/digest-vlc-0.6.1 | 1 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.6.1.ebuild | 208 |
5 files changed, 239 insertions, 4 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 2a79a435331a..78fb63d64d6b 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for media-video/vlc # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.28 2003/07/21 06:37:23 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.29 2003/08/01 08:46:29 raker Exp $ + +*vlc-0.6.1 (01 Aug 2003) + + 01 Aug 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.1.ebuild, + files/buildorder.patch: + The "elusive math equation" release. + Version bump. Re-organized the ebuild to coincide with the listing + of configure options outputted by ./configure --help. Added support + for USE variables faad, xosd, and matroska. Added a patch based on + upstream cvs which allows the mozilla plugin to compile properly. + I have updated the dependancies to the new ebuilds of libdvdcss-1.2.8 + and libdvbpsi-0.1.3 as upstream authors suggest these versions. + We are now weighing in at 33 use variables folks. :) Presently, + perhaps the most prolific package in Portage. :) 21 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r1.ebuild: Removed the matrox use variable and forced disable-mga as the diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index aad40013b2eb..276d4cbde1b2 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -4,9 +4,8 @@ MD5 185be9f9dcdfa12776bd5295a1e23570 vlc-0.5.2.ebuild 3876 MD5 6c597e964cfd0c0e082ffbcb64ef7b2d vlc-0.6.0.ebuild 5100 MD5 f38f55232741d4faeb8946546ad42a39 vlc-0.5.2-r1.ebuild 4481 MD5 ecee6eaca98dfa911be0126c0c9fe3ec vlc-0.4.5.ebuild 3850 -MD5 2ef924652adee7f873f0f6dcc97551fc vlc-0.6.1.ebuild 6202 -MD5 3d6a889be7f19100506721b14c88d076 ChangeLog 5621 -MD5 ae7bd87a3f7aeb5766a598ac9f1f43af files/libvlc_pic.patch 1321 +MD5 acd0485ba37a0ca02e31c7333b4a234e vlc-0.6.1.ebuild 6171 +MD5 bbd0277b2c4ce4dc7e175703069a3777 ChangeLog 6314 MD5 6d7dd1d8477d38f85cc4d4ed59489b4f files/digest-vlc-0.5.2-r1 63 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63 MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995 @@ -15,3 +14,4 @@ MD5 36b957169001a5ba78c09d813f23b550 files/digest-vlc-0.4.5 63 MD5 6d7dd1d8477d38f85cc4d4ed59489b4f files/digest-vlc-0.5.2 63 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0 63 MD5 f3095908d6d0b8fb2fbceb3362574761 files/digest-vlc-0.6.1 63 +MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590 diff --git a/media-video/vlc/files/buildorder.patch b/media-video/vlc/files/buildorder.patch new file mode 100644 index 000000000000..f61dccd75230 --- /dev/null +++ b/media-video/vlc/files/buildorder.patch @@ -0,0 +1,12 @@ +diff -urN vlc-0.6.1/Makefile.am vlc-0.6.1-modified/Makefile.am +--- vlc-0.6.1/Makefile.am 2003-07-28 17:26:11.000000000 -0500 ++++ vlc-0.6.1-modified/Makefile.am 2003-07-31 23:37:00.000000000 -0500 +@@ -7,7 +7,7 @@ + # SUBDIRS stores the directories where a "make" is required when building + # something. DIST_SUBDIRS stores the directories where nothing is built but + # which have makefiles with distribution information. +-SUBDIRS = intl modules po mozilla share m4 . ++SUBDIRS = intl modules po . mozilla share m4 + DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools + + EXTRA_DIST = \ diff --git a/media-video/vlc/files/digest-vlc-0.6.1 b/media-video/vlc/files/digest-vlc-0.6.1 new file mode 100644 index 000000000000..d38e2a00c70b --- /dev/null +++ b/media-video/vlc/files/digest-vlc-0.6.1 @@ -0,0 +1 @@ +MD5 46cfa8ea0ce7ebb4e85bdef3827e4ace vlc-0.6.1.tar.bz2 2958187 diff --git a/media-video/vlc/vlc-0.6.1.ebuild b/media-video/vlc/vlc-0.6.1.ebuild new file mode 100644 index 000000000000..5a980dbf6a73 --- /dev/null +++ b/media-video/vlc/vlc-0.6.1.ebuild @@ -0,0 +1,208 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# 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.1 2003/08/01 08:46:29 raker Exp $ + +# Missing support for... +# tarkin - package not in portage yet - experimental +# theora - package not in portage yet - experimental +# tremor - package not in portage yet - experimental + + +IUSE="arts qt ncurses dvd gtk nls 3dfx svga fbcon esd kde X alsa ggi \ + oggvorbis gnome xv oss sdl aalib slp truetype v4l xvid lirc \ + wxwindows imlib mozilla dvb debug faad xosd matroska" + +DESCRIPTION="VideoLAN Client - DVD/video player and more" +SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2" +HOMEPAGE="http://www.videolan.org/vlc" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa" + +DEPEND="X? ( virtual/x11 ) + aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) + 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.3 + >=media-libs/libdvdcss-1.2.8 + >=media-libs/libdvdplay-1.0.1 ) + esd? ( >=media-sound/esound-0.2.22 ) + faad? ( >=media-libs/faad2-1.1 ) + 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-sound/mad-0.14.2b ) + matroska? ( >=media-libs/libmatroska-0.4.4 ) + mozilla? ( >=net-www/mozilla-1.4 ) + ncurses? ( sys-libs/ncurses ) + nls? ( sys-devel/gettext ) + 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 ) + >=media-libs/a52dec-0.7.4 + >=media-libs/flac-1.1.0 + >=media-libs/libdv-0.98 + >=media-libs/libdvbpsi-0.1.3 + >media-video/ffmpeg-0.4.6 + >media-libs/libmpeg2-0.3.1 + >=media-video/mplayer-0.90" + +# mplayer is a required dependancy until the libpostproc code becomes +# a separate packages or until ffmpeg get support for installing +# the library. + +# get kde and arts paths +if [ -n "`use kde`" -o -n "`use arts`" ]; then + inherit kde-functions + set-kdedir 3 + # $KDEDIR is now set to arts/kdelibs location +fi + +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/buildorder.patch + + # if qt3 is installed, patch vlc to work with it instead of qt2 + ( use qt || use kde ) && ( \ + if [ ${QTDIR} = "/usr/qt/3" ] + then + sed -i -e "s:-lkfile::" configure + + cd ${S}/modules/gui/kde + sed -i -e "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" interface.h + + sed -i -e 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' preferences.cpp + fi + ) + + # Change the location where glide headers are installed + cd ${S} + sed -i -e "s:/usr/include/glide:/usr/include/glide3:" configure +} + +src_compile(){ + local myconf + myconf="--disable-mga --enable-flac --with-gnu-ld" + + #--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) + #--disable-altivec disable AltiVec optimizations (default enabled on PPC) + #--enable-testsuite build test modules (default disabled) + #--disable-plugins make all plugins built-in (default plugins enabled) + + use nls || myconf="${myconf} --disable-nls" + + use debug && myconf="${myconf} --enable-debug" \ + || myconf="${myconf} --enable-release" + + use dvd \ + && myconf="${myconf} --enable-dvdread" \ + || myconf="${myconf} \ + --disable-dvd \ + --disable-dvdread \ + --disable-dvdplay \ + --disable-vcd" + + use v4l && myconf="${myconf} --enable-v4l" + + use dvb && myconf="${myconf} --enable-satellite --enable-pvr" + + use oggvorbis || myconf="${myconf} --disable-vorbis --disable-ogg" + + use matroska || myconf="${myconf} --disable-mkv" + + use mad && myconf="${myconf} --enable-mad" + + use faad && myconf="${myconf} --enable-faad" + + use xvid && myconf="${myconf} --enable-xvid" + + use X || myconf="${myconf} --disable-x11" + + use xv || myconf="${myconf} --disable-xvideo" + + use sdl || myconf="${myconf} --disable-sdl" + + use truetype && myconf="${myconf} --enable-freetype" + + use fbcon || myconf="${myconf} --disable-fb" + + use svga && myconf="${myconf} --enable-svgalib" + + use ggi && myconf="${myconf} --enable-ggi" + + use 3dfx && myconf="${myconf} --enable-glide" + + use aalib && myconf="${myconf} --enable-aa" + + use oss || myconf="${myconf} --disable-oss" + + use esd && myconf="${myconf} --enable-esd" + + use arts && myconf="${myconf} --enable-arts" + + use alsa && myconf="${myconf} --enable-alsa" + + (use imlib && use wxwindows) && myconf="${myconf} --enable-skins" + + use gtk || myconf="${myconf} --disable-gtk" + + use gnome && myconf="${myconf} --enable-gnome" + + use qt && myconf="${myconf} --enable-qt" + + use kde && myconf="${myconf} --enable-kde" + + use ncurses && myconf="${myconf} --enable-ncurses" + + use xosd && myconf="${myconf} --enable-xosd" + + use slp || myconf="${myconf} --disable-slp" + + use lirc && myconf="${myconf} --enable-lirc" + + use joystick && myconf="${myconf} --enable-joystick" + + use mozilla && \ + myconf="${myconf} --enable-mozilla \ + MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \ + XPIDL=/usr/bin/xpidl" + + export CXXFLAGS="" + export CFLAGS="" + export WANT_AUTOCONF_2_5=1 + export WANT_AUTOMAKE_1_6=1 + + # The buildorder.patch changes Makefile.am, so we need to + # run automake so the change is propogated + automake + + econf ${myconf} || die "configure of VLC failed" + + 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-* +} |