summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-07-03 19:13:37 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-07-03 19:13:37 +0000
commit604f8927bc6a68d9b6dc07f2a3366226ee5f421f (patch)
treef5c3eeebb173de3273f7ef65b47fa5b9abebfb2f
parentStable on sparc, bug #209222 (diff)
downloadhistorical-604f8927bc6a68d9b6dc07f2a3366226ee5f421f.tar.gz
historical-604f8927bc6a68d9b6dc07f2a3366226ee5f421f.tar.bz2
historical-604f8927bc6a68d9b6dc07f2a3366226ee5f421f.zip
remove unused snapshot
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/Manifest10
-rw-r--r--media-video/vlc/vlc-0.9.0_alpha20080625.ebuild361
3 files changed, 9 insertions, 368 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 37b0d34942d4..946d1cbd7de1 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/vlc
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.353 2008/07/03 19:06:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.354 2008/07/03 19:13:37 aballier Exp $
+
+ 03 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+ -vlc-0.9.0_alpha20080625.ebuild:
+ remove unused snapshot
03 Jul 2008; Alexis Ballier <aballier@gentoo.org> vlc-0.9.0_beta1.ebuild:
make libgcrypt optional again
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index bad5904f4237..bbcb463824c2 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -8,17 +8,15 @@ DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1
DIST vlc-patches-53.tar.bz2 9737 RMD160 dfbc11984c21c2bfe31bd77c813415fa04b10204 SHA1 1726c2bd17539c076fc4baa2d9611a4b39abab39 SHA256 dd2558049044701a60bdf2c30a6a716e009a6c4c180a54ea848a1de105e00ca5
DIST vlc-patches-55.tar.bz2 8111 RMD160 66eb8d34bc39f6b5c408e7f66b2868ad848031ef SHA1 723c02a0113e836d9b604d7a9380a0125f64e1d5 SHA256 11626cce5d2c15780a812f067ec45d582b06cc1dc205f5b897c666f711b583db
DIST vlc-patches-56.tar.bz2 5736 RMD160 fbda37e0662e89c0452c28ea6a369e27f7b2f04f SHA1 06cc90f7ca5cf8754623ce0608d3c721f04c7b8c SHA256 6b968adf43c66f472013c7fb141595ba414291aa45c0800c8afdf4a260a11296
-DIST vlc-snapshot-20080625.tar.bz2 15158559 RMD160 19caabbfce71ff5efcf5302488827a4021d3ca4f SHA1 7c61096fd2ad9a6711841ede4126e37591e70b43 SHA256 fdad2b8561de5a23e7120c94b30ad8833973accd7a0dd4000c0b3e3aac308895
EBUILD vlc-0.8.6g.ebuild 9086 RMD160 97f2951ccb49c282d68f6bbad2b1b9c43bf475cf SHA1 d3528f8373cea598576af21661969319d7a4690c SHA256 6d9338668490b13da61365e8856f4b749419dd90d135ca22970b3c4b4c93cb47
EBUILD vlc-0.8.6h.ebuild 8989 RMD160 3f08b80bdc96d6ab57f5d5869949bf18f3a4c915 SHA1 2b9b6a353c7b467bb5468ec6770dfdb62638269b SHA256 eabf234909dfb3f9bbc36993839c00039282847cfdc580bd88ac4f6ae31cfce8
-EBUILD vlc-0.9.0_alpha20080625.ebuild 10821 RMD160 95ecf6c386355a4b5890453be37190bd2627615a SHA1 14b42e00939fa0dfeb6e413ee1eecd95ea0bd4dd SHA256 232bda01b4cb40d31cbfa267f9bc289f2c5f4bd459f807eded0f5b55899ee731
EBUILD vlc-0.9.0_beta1.ebuild 10917 RMD160 a81a9eb7e02544a0ffabf7a7aed640e6f016e3d1 SHA1 ee8573f50be8298a02dcb35b0f8a9a45b3eb7f43 SHA256 e6cbb0413881348c58e758e9f22f1b4c178098204831ecec5bb3cb5c9d55c342
-MISC ChangeLog 58964 RMD160 145e8acba59c314677c716ed023e379e50f33290 SHA1 0915e9f8f31444599a3e2d54e12326f71e2b291b SHA256 970f6dfa92832c3eca6b16604128b0fe900e2fce227b47974c452efc11329292
+MISC ChangeLog 59077 RMD160 d5eae8386ca2b7326d93ccec1988641410bbc0c3 SHA1 59a263775ebb0c02f2fa1bc8bebfaf751bc9ce32 SHA256 95dc1d401b3405e1beddd400f762b6cc3cacc70c7545d3c70454a3c9b8671bb1
MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkhtI08ACgkQvFcC4BYPU0rbkwCggLRoEsPUWtCn83pZfcmXlA/G
-ezEAn2gtHzgg+b3Wni9ocbWDeE1o3k06
-=HMOn
+iEYEARECAAYFAkhtJOsACgkQvFcC4BYPU0osRACgsWLrYX01OzhYmW85IMgOKMy+
+HzUAnjiiRuXRmCG3BTWq4K2J2SGMwfyF
+=aLrS
-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild
deleted file mode 100644
index 76551f0f8eab..000000000000
--- a/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild,v 1.10 2008/06/29 19:40:47 aballier Exp $
-
-EAPI="1"
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-VLC_SNAPSHOT_TIME="0013"
-
-#RESTRICT="test"
-
-PATCHLEVEL="56"
-M4_TARBALL_VERSION="1"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org
- SRC_URI="http://nightlies.videolan.org/build/source/trunk-${PV/*_alpha/}-${VLC_SNAPSHOT_TIME}/${PN}-snapshot-${PV/*_alpha/}.tar.bz2"
- MY_P="${P/_alpha*/}-git"
-elif [[ "${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_P}/${MY_P}.tar.bz2"
-fi
-
-SRC_URI="${SRC_URI}
- mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
- mirror://gentoo/${PN}-m4-${M4_TARBALL_VERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="a52 aac aalib alsa altivec arts atmo avahi bidi cdda cddb cdio dbus dc1394
- debug directfb dts dvb dvd esd fbcon fluidsynth +ffmpeg flac ggi gnome gnutls hal httpd
- id3tag jack libcaca libnotify lirc live lua matroska mmx modplug mp3 mpeg
- musepack musicbrainz ncurses nsplugin ogg opengl optimisememory oss png pulseaudio pvr +qt4
- remoteosd rtsp samba sdl sdl-image seamonkey shout skins speex sse stream svg svga taglib
- theora truetype twolame upnp v4l v4l2 vcd vcdx vlm vorbis win32codecs
- X x264 xinerama xml xosd xulrunner xv"
-
-RDEPEND="
- sys-libs/zlib
- media-libs/libdvbpsi
- a52? ( >=media-libs/a52dec-0.7.4-r3 )
- aalib? ( media-libs/aalib )
- aac? ( >=media-libs/faad2-2.6.1 )
- alsa? ( media-libs/alsa-lib )
- arts? ( kde-base/arts )
- avahi? ( >=net-dns/avahi-0.6 )
- bidi? ( >=dev-libs/fribidi-0.10.4 )
- cdda? ( >=dev-libs/libcdio-0.72
- cddb? ( >=media-libs/libcddb-1.2.0 ) )
- cdio? ( >=dev-libs/libcdio-0.78.2
- >=media-video/vcdimager-0.7.22 )
- dbus? ( >=sys-apps/dbus-1.0.2 )
- dc1394? ( sys-libs/libraw1394
- <media-libs/libdc1394-1.9.99 )
- directfb? ( dev-libs/DirectFB )
- dts? ( media-libs/libdca )
- dvd? ( media-libs/libdvdread
- media-libs/libdvdcss
- >=media-libs/libdvdnav-0.1.9
- media-libs/libdvdplay )
- esd? ( media-sound/esound )
- ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616 )
- flac? ( media-libs/libogg
- >=media-libs/flac-1.1.2 )
- fluidsynth? ( media-sound/fluidsynth )
- ggi? ( media-libs/libggi )
- gnome? ( gnome-base/gnome-vfs )
- gnutls? ( >=net-libs/gnutls-1.3.3 )
- >=dev-libs/libgcrypt-1.2.0
- hal? ( sys-apps/hal )
- id3tag? ( media-libs/libid3tag
- sys-libs/zlib )
- jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
- libcaca? ( media-libs/libcaca )
- libnotify? ( x11-libs/libnotify )
- lirc? ( app-misc/lirc )
- live? ( >=media-plugins/live-2007.02.20 )
- lua? ( >=dev-lang/lua-5.1 )
- matroska? (
- >=dev-libs/libebml-0.7.6
- >=media-libs/libmatroska-0.8.0 )
- modplug? ( media-libs/libmodplug )
- mp3? ( media-libs/libmad )
- mpeg? ( >=media-libs/libmpeg2-0.3.2 )
- musepack? ( media-libs/libmpcdec )
- musicbrainz? ( =media-libs/musicbrainz-2* )
- ncurses? ( sys-libs/ncurses )
- nsplugin? (
- xulrunner? ( >=net-libs/xulrunner-1.8 )
- !xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )
- !xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) )
- )
- ogg? ( media-libs/libogg )
- png? ( media-libs/libpng )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
- qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.2.0:4 ) )
- remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
- samba? ( net-fs/samba )
- sdl? ( >=media-libs/libsdl-1.2.8
- sdl-image? ( media-libs/sdl-image ) )
- shout? ( media-libs/libshout )
- skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.2.0:4 ) )
- speex? ( media-libs/speex )
- svg? ( >=gnome-base/librsvg-2.9.0 )
- svga? ( media-libs/svgalib )
- taglib? ( media-libs/taglib )
- theora? ( media-libs/libtheora )
- truetype? ( media-libs/freetype
- media-fonts/ttf-bitstream-vera )
- twolame? ( media-sound/twolame )
- upnp? ( net-libs/libupnp )
- vorbis? ( media-libs/libvorbis )
- win32codecs? ( media-libs/win32codecs )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- xv? ( x11-libs/libXv )
- xinerama? ( x11-libs/libXinerama )
- opengl? ( virtual/opengl )
- )
- x264? ( media-libs/x264 )
- xml? ( dev-libs/libxml2 )
- xosd? ( x11-libs/xosd )
- "
-
-# Disabled features and reasons:
-# xvmc? ( x11-libs/libXvMC )
-# Will probably compile only on x86
-# dirac? ( >=media-video/dirac-0.10.0 )
-# Needs testing but can be ok
-# zvbi? ( >=media-libs/zvbi-0.2.25 )
-# Dep not up to date enough
-# kate? ( >=media-libs/libkate-0.1.1 )
-# No package yet
-
-DEPEND="${RDEPEND}
- dvb? ( sys-kernel/linux-headers )
- v4l? ( sys-kernel/linux-headers )
- v4l2? ( sys-kernel/linux-headers )
- X? ( xinerama? ( x11-proto/xineramaproto ) )
- dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# Dispalys a warning if the first use flag is set but not the second
-vlc_use_needs() {
- use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
-}
-
-# Notify the user that some useflag have been forced on
-vlc_use_force() {
- use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
-}
-
-# Use when $2 depends strictly on $3
-# if use $1 then enable $2 and $3, otherwise disable $2
-vlc_use_enable_force() {
- if use $1 ; then
- echo "--enable-$2 --enable-$3"
- else
- echo "--disable-$2"
- fi
-}
-
-# Prints the configure argument for the ffmpeg scaling api to use
-vlc_ffmpeg_scaling_api() {
- if use ffmpeg ; then
- if has_version ">=media-video/ffmpeg-0.4.9_p20070616-r1" ; then
- echo "--enable-swscale --disable-imgresample"
- else
- echo "--disable-swscale --enable-imgresample"
- fi
- else
- echo "--disable-swscale --disable-imgresample"
- fi
-}
-
-pkg_setup() {
- vlc_use_needs skins truetype
- vlc_use_force skins qt4
- vlc_use_needs cdda cdio
- vlc_use_needs vcdx cdio
- vlc_use_needs bidi truetype
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
- AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
-}
-
-src_compile () {
-
- # It would fail if -fforce-addr is used due to too few registers...
- use x86 && filter-flags -fforce-addr
-
- local XPIDL=""
- local MOZILLA_CONFIG=""
-
- if use nsplugin; then
- if use xulrunner; then
- XPIDL=/usr/$(get_libdir)/xulrunner
- MOZILLA_CONFIG=/usr/bin/xulrunner-config
- elif use seamonkey; then
- XPIDL=/usr/$(get_libdir)/seamonkey
- MOZILLA_CONFIG=/usr/$(get_libdir)/seamonkey/seamonkey-config
- else
- XPIDL=/usr/$(get_libdir)/mozilla-firefox
- MOZILLA_CONFIG=/usr/$(get_libdir)/mozilla-firefox/firefox-config
- fi
- fi
-
- econf \
- $(use_enable a52) \
- $(use_enable aalib aa) \
- $(use_enable aac faad) \
- $(use_enable alsa) \
- $(use_enable altivec) \
- $(use_enable arts) \
- --disable-asademux \
- $(use_enable atmo) \
- $(use_enable avahi bonjour) \
- $(use_enable bidi fribidi) \
- $(use_enable cdda) $(use_enable cdda cddax)\
- $(use_enable cddb libcddb) \
- $(use_enable cdio libcdio) \
- --disable-csri \
- $(use_enable dbus) $(use_enable dbus dbus-control) \
- --disable-dirac \
- $(use_enable directfb) \
- $(use_enable dc1394) \
- $(use_enable debug) \
- $(use_enable dts dca) \
- --disable-dv \
- $(use_enable dvb) \
- $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
- $(use_enable esd) \
- $(use_enable fbcon fb) \
- $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(vlc_ffmpeg_scaling_api) $(use_enable ffmpeg postproc) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- --disable-galaktos \
- $(use_enable ggi) \
- $(use_enable gnome gnomevfs) \
- $(use_enable gnutls) \
- $(use_enable hal) \
- $(use_enable httpd) \
- $(use_enable id3tag) \
- $(use_enable jack) \
- --disable-kate \
- $(use_enable libcaca caca) \
- --enable-libgcrypt \
- $(use_enable libnotify notify) \
- --disable-libproxy \
- --disable-libtar \
- $(use_enable lirc) \
- $(use_enable live live555) \
- $(use_enable lua) \
- $(use_enable matroska mkv) \
- $(use_enable mmx) \
- $(use_enable modplug mod) \
- $(use_enable mp3 mad) \
- $(use_enable mpeg libmpeg2) \
- $(use_enable musepack mpc) \
- $(use_enable musicbrainz) \
- $(use_enable ncurses) \
- $(use_enable nsplugin mozilla) XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
- $(use_enable ogg) \
- $(use_enable opengl glx) $(use_enable opengl) \
- $(use_enable optimisememory optimize-memory) \
- $(use_enable oss) \
- $(use_enable png) \
- --disable-portaudio \
- $(use_enable pulseaudio pulse) \
- $(use_enable pvr) \
- $(use_enable qt4) \
- $(use_enable remoteosd) \
- $(use_enable rtsp realrtsp) \
- $(use_enable samba smb) \
- $(use_enable sdl) \
- $(use_enable sdl-image) \
- $(use_enable shout) \
- $(use_enable skins skins2) \
- $(use_enable speex) \
- $(use_enable sse) \
- --enable-sout \
- $(use_enable svg) \
- $(use_enable svga svgalib) \
- $(use_enable taglib) \
- $(use_enable theora) \
- $(use_enable truetype freetype) \
- $(use_enable twolame) \
- $(use_enable upnp) \
- $(use_enable v4l) \
- $(use_enable v4l2) \
- $(use_enable vcd) \
- $(use_enable vcdx) \
- $(use_enable vorbis) \
- $(use_enable win32codecs loader) \
- $(use_enable X x11) $(use_enable X screen) \
- $(use_enable x264) \
- $(use_enable xinerama) \
- $(use_enable xml libxml2) \
- $(use_enable xosd) \
- $(use_enable xv xvideo) \
- --disable-xvmc \
- --disable-zvbi \
- --disable-snapshot \
- --disable-growl \
- --disable-optimizations \
- --enable-fast-install \
- $(vlc_use_enable_force vlm vlm sout) \
- $(vlc_use_enable_force skins skins2 qt4)
-
- # Reminder to re-add this when disabling it will not be broken
- # $(use_enable stream sout) \
-
- 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 "make install failed"
-
- dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
- doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
-
- rm -rf "${D}/usr/share/doc/vlc" \
- "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
-
- if use nsplugin; then
- dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
- mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
- "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
- 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
-}