From e09683a5c512037d33b6a3703592458370526d43 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 11 Jun 2010 10:46:38 +0000 Subject: [PATCH] bump to rc3 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-video/vlc/ChangeLog | 7 +- media-video/vlc/Manifest | 10 +- media-video/vlc/vlc-1.1.0_rc3.ebuild | 380 +++++++++++++++++++++++++++ 3 files changed, 392 insertions(+), 5 deletions(-) create mode 100644 media-video/vlc/vlc-1.1.0_rc3.ebuild diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 970ed0fd022a..68e0054026f9 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.587 2010/05/25 12:22:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.588 2010/06/11 10:46:38 aballier Exp $ + +*vlc-1.1.0_rc3 (11 Jun 2010) + + 11 Jun 2010; Alexis Ballier +vlc-1.1.0_rc3.ebuild: + bump to rc3 *vlc-1.1.0_rc (25 May 2010) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index ba1cd9e894a8..378e306d4e24 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -3,20 +3,22 @@ Hash: SHA1 DIST vlc-1.0.6.tar.bz2 22149704 RMD160 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 SHA1 834346a84a71d915440b7741e04b6e02de451786 SHA256 f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e415e1842 DIST vlc-1.1.0-rc.tar.bz2 23094772 RMD160 19fb22c5bd2087d646b7ff063076ca8fdd852954 SHA1 48ed0fc70c628daffc5143d73ceae79125219c15 SHA256 23e125721ca7cced16b3c60331d7d58064d2c1f8dc3c384639a78ae4c6fc0806 +DIST vlc-1.1.0-rc3.tar.bz2 23475512 RMD160 dfe85c0311957eb428e4daf7f0b657ce359ab081 SHA1 d18b220ed9b2347100225f0ca0a206b3874b3d2a SHA256 7b2c8a3a374a7f795b2f774b7b8b112af36da3b318760c3034fcc80863d53e01 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8 EBUILD vlc-1.0.6.ebuild 12316 RMD160 f9e95b57ca80417f744808f47d92f92c4a1f8027 SHA1 ad8ba73ec351c0623a91b28bd27aad44893a5d99 SHA256 a5c00bd42a93d39eb356b43f6e9ba660db0138690bd19b302041514507b8c62c EBUILD vlc-1.0.9999.ebuild 12274 RMD160 907353609dd74ed3feae7521b68bd935b1c41314 SHA1 052cf8cf27b9e8719c8807a1561b8b10d3d48adc SHA256 7fbeecfc14a13c0e315e9a85e6b2389497fbc5f88abc4ad83953fa477d42102d EBUILD vlc-1.1.0_rc.ebuild 12076 RMD160 077c304d4640c23c1f2468a72dde9a92d0cb74d9 SHA1 6b317a4a696f240599fd42c3b24968f8d6155676 SHA256 d3498a31e6bb3cb60a39d7ae0b2d645960e6eb963d14bab94436a5eca144e525 +EBUILD vlc-1.1.0_rc3.ebuild 12080 RMD160 d2349baa36be6ea2f26c15510ffe0fcedb5deff6 SHA1 148547a222cc15859b5d3d0243618fdf7bcd405e SHA256 516e1b4442915bf8ca0a1991e52c63c1b598ace5d55591eca285b3b7144363f8 EBUILD vlc-1.1.9999.ebuild 12024 RMD160 4b465629ba058b97840df849d21d0edfb4ab6b1f SHA1 063e77dd5a6a19110f3120930438b115b8c56c2e SHA256 16538ade0953e9e46c82f13f69f4a6aef97b71431f6122c377f0c53067d5a3ef EBUILD vlc-9999.ebuild 12021 RMD160 ece397d7ff4b265cec4e5d71b28c6af2ab588043 SHA1 1588c1a347827baf7fe76b8ddb746b886e96635f SHA256 eb44fd663c1974c64368ca8b901e89161d2c6f8f8e1bb6ef374b429f66a5b785 -MISC ChangeLog 91044 RMD160 8f0bc7346390eff11b88dedd7f8d85138e42c394 SHA1 6202b1d907934d04c49a8039db0b420d2391fab6 SHA256 ab9b8cd360ec47b263b884f443065dbcafe7b23e23fca0a0c9eb2d0509013bef +MISC ChangeLog 91164 RMD160 d90231c2301b0aba79a80a81a5a0639be835eee5 SHA1 39ca90a84331e762ff0455c5ed20f4eab56a48f1 SHA256 a36bad9e20d67ce55ff19048f4e03b573fbe7681dacda65fa05ef9fcf151cf8f MISC metadata.xml 4240 RMD160 548096f0459b43b103c315e07db92e50563ea1e7 SHA1 8a12510531e256c4fad1fc6dd6c28e56c0ab46eb SHA256 fdf69f66df99eb7339d0d12d2baddb8b8d338c839ae7d12051375e38621006a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkv7wRcACgkQvFcC4BYPU0ry7gCgieWJfq6d04OFwcFtTWdAy99/ -HYYAnRYovP+HeikrV59byPozUGoh2pLN -=culx +iEYEARECAAYFAkwSFBQACgkQvFcC4BYPU0p2SQCfXKw+kzUJrqHFpNsoklThOwjl +e8MAoIOBv8TrZ5iMWxxHoesOXvAo0rP2 +=oQwm -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-1.1.0_rc3.ebuild b/media-video/vlc/vlc-1.1.0_rc3.ebuild new file mode 100644 index 000000000000..9448ab817b63 --- /dev/null +++ b/media-video/vlc/vlc-1.1.0_rc3.ebuild @@ -0,0 +1,380 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_rc3.ebuild,v 1.1 2010/06/11 10:46:38 aballier Exp $ + +EAPI="2" + +SCM="" +if [ "${PV%9999}" != "${PV}" ] ; then + SCM=git + EGIT_BOOTSTRAP="bootstrap" + EGIT_BRANCH=master + EGIT_PROJECT=${P} + if [ "${PV%.9999}" != "${PV}" ] ; then + EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git" + else + EGIT_REPO_URI="git://git.videolan.org/vlc.git" + fi +fi + +inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic ${SCM} + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" +VLC_SNAPSHOT_TIME="0013" + +PATCHLEVEL="85" +DESCRIPTION="VLC media player - Video player and streamer" +HOMEPAGE="http://www.videolan.org/vlc/" +if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild + SRC_URI="" +elif [[ "${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 [[ "${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" + +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394 + debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig + +gcrypt ggi gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca + libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx + modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss + png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba + schroedinger sdl sdl-image shine shout skins speex sqlite sse stream + svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm + vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi" + +RDEPEND=" + !!<=media-video/vlc-1.0.99999 + sys-libs/zlib + >=media-libs/libdvbpsi-0.1.6 + a52? ( >=media-libs/a52dec-0.7.4-r3 ) + aalib? ( media-libs/aalib ) + aac? ( >=media-libs/faad2-2.6.1 ) + alsa? ( media-libs/alsa-lib ) + avahi? ( >=net-dns/avahi-0.6[dbus] ) + bidi? ( >=dev-libs/fribidi-0.10.4 ) + cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) ) + dbus? ( >=sys-apps/dbus-1.0.2 ) + dc1394? ( >=sys-libs/libraw1394-2.0.1 + >=media-libs/libdc1394-2.0.2 ) + dirac? ( >=media-video/dirac-0.10.0 ) + directfb? ( dev-libs/DirectFB sys-libs/zlib ) + dts? ( media-libs/libdca ) + dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) + elibc_glibc? ( >=sys-libs/glibc-2.8 ) + ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 ) + flac? ( media-libs/libogg + >=media-libs/flac-1.1.2 ) + fluidsynth? ( media-sound/fluidsynth ) + fontconfig? ( media-libs/fontconfig ) + gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) + ggi? ( media-libs/libggi ) + gnome? ( gnome-base/gnome-vfs ) + gnutls? ( >=net-libs/gnutls-1.7.4 ) + id3tag? ( media-libs/libid3tag sys-libs/zlib ) + ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) + jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) + kate? ( >=media-libs/libkate-0.1.1 ) + libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig ) + libcaca? ( >=media-libs/libcaca-0.99_beta14 ) + libnotify? ( x11-libs/libnotify ) + libproxy? ( net-libs/libproxy ) + libtiger? ( media-libs/libtiger ) + lirc? ( app-misc/lirc ) + live? ( >=media-plugins/live-2008.07.06 ) + lua? ( >=dev-lang/lua-5.1 ) + matroska? ( + >=dev-libs/libebml-0.7.6 + >=media-libs/libmatroska-0.8.0 ) + modplug? ( >=media-libs/libmodplug-0.8 ) + mp3? ( media-libs/libmad ) + mpeg? ( >=media-libs/libmpeg2-0.3.2 ) + mtp? ( >=media-libs/libmtp-1.0.0 ) + musepack? ( >=media-sound/musepack-tools-444 ) + ncurses? ( sys-libs/ncurses ) + nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt ) + ogg? ( media-libs/libogg ) + opengl? ( virtual/opengl ) + png? ( media-libs/libpng sys-libs/zlib ) + projectm? ( media-libs/libprojectm ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.11 + !X? ( >=media-sound/pulseaudio-0.9.11[-X] ) ) + qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) + remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) + samba? ( || ( >=net-fs/samba-3.4.6[smbclient] + =media-libs/schroedinger-1.0.6 ) + sdl? ( >=media-libs/libsdl-1.2.8 + sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) + shout? ( media-libs/libshout ) + skins? ( + x11-libs/qt-gui:4 x11-libs/qt-core:4 + x11-libs/libXext x11-libs/libX11 + media-libs/freetype media-fonts/dejavu + ) + speex? ( media-libs/speex ) + sqlite? ( >=dev-db/sqlite-3.6.0:3 ) + svg? ( >=gnome-base/librsvg-2.9.0 ) + svga? ( media-libs/svgalib ) + taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) + theora? ( >=media-libs/libtheora-1.0_beta3 ) + truetype? ( media-libs/freetype + media-fonts/dejavu ) + twolame? ( media-sound/twolame ) + udev? ( >=sys-fs/udev-142 ) + upnp? ( net-libs/libupnp ) + v4l2? ( libv4l2? ( media-libs/libv4l ) ) + v4l? ( libv4l? ( media-libs/libv4l ) ) + vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 ) + vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) + vorbis? ( media-libs/libvorbis ) + win32codecs? ( media-libs/win32codecs ) + X? ( x11-libs/libX11 ) + x264? ( >=media-libs/x264-0.0.20090923 ) + xcb? ( x11-libs/libxcb x11-libs/xcb-util ) + xml? ( dev-libs/libxml2 ) + xosd? ( x11-libs/xosd ) + zvbi? ( >=media-libs/zvbi-0.2.25 ) + " + +DEPEND="${RDEPEND} + dvb? ( sys-kernel/linux-headers ) + kde? ( >=kde-base/kdelibs-4 ) + v4l? ( sys-kernel/linux-headers ) + v4l2? ( >=sys-kernel/linux-headers-2.6.25 ) + xcb? ( x11-proto/xproto ) + dev-util/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +# Displays a warning if the first use flag is set but the second is not +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 $1 depends strictly on $2 +# if use $1 then enable $2 +vlc_use_enable_force() { + use $1 && echo "--enable-$2" +} + +pkg_setup() { + if has_version '<=media-video/vlc-1.0.99999'; then + eerror "Please unmerge vlc-1.0.x first before installing ${P}" + eerror "If you don't do that, some plugins will get linked against" + eerror "the old ${PN} version and will not work." + die "Unmerge vlc 1.0.x first" + fi + + # Useflags we need to forcefuly enable + vlc_use_force remoteosd gcrypt + vlc_use_force skins truetype + vlc_use_force skins qt4 + vlc_use_force vlm stream + vlc_use_force vaapi ffmpeg + + # Useflags that will be automagically discarded if deps are not met + vlc_use_needs bidi truetype + vlc_use_needs cddb cdda + vlc_use_needs fontconfig truetype + vlc_use_needs libv4l2 v4l2 + vlc_use_needs libv4l v4l + vlc_use_needs libtiger kate + vlc_use_needs xv xcb + + if use qt4 || use skins ; then + qt4_pkg_setup + else + ewarn "You have disabled the qt4 useflag, ${PN} will not have any" + ewarn "graphical interface. Maybe that is not what you want..." + fi +} + +src_unpack() { + unpack ${A} + if [ "${PV%9999}" != "${PV}" ] ; then + git_src_unpack + fi +} + +src_prepare() { + if [ "${PV%9999}" != "${PV}" ] ; then + git_src_prepare + fi + # Make it build with libtool 1.5 + rm -f m4/lt* m4/libtool.m4 + + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + eautoreconf +} + +src_configure() { + + # It would fail if -fforce-addr is used due to too few registers... + use x86 && filter-flags -fforce-addr + + econf \ + $(use_enable a52) \ + $(use_enable aalib aa) \ + $(use_enable aac faad) \ + $(use_enable alsa) \ + $(use_enable altivec) \ + --disable-asademux \ + $(use_enable atmo) \ + $(use_enable avahi bonjour) \ + $(use_enable bidi fribidi) \ + $(use_enable cdda vcd) \ + $(use_enable cddb libcddb) \ + $(use_enable dbus) $(use_enable dbus dbus-control) \ + $(use_enable dirac) \ + $(use_enable directfb) \ + $(use_enable dc1394) \ + $(use_enable debug) \ + $(use_enable dts dca) \ + $(use_enable dvb) \ + $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ + $(use_enable fbcon fb) \ + $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \ + $(use_enable flac) \ + $(use_enable fluidsynth) \ + $(use_enable fontconfig) \ + $(use_enable ggi) \ + $(use_enable gnome gnomevfs) \ + $(use_enable gnutls) \ + $(use_enable httpd) \ + $(use_enable id3tag) \ + $(use_enable ieee1394 dv) \ + $(use_enable jack) \ + $(use_enable kate) \ + $(use_with kde kde-solid) \ + $(use_enable libass) \ + $(use_enable libcaca caca) \ + $(use_enable gcrypt libgcrypt) \ + $(use_enable libnotify notify) \ + $(use_enable libproxy) \ + --disable-libtar \ + $(use_enable libtiger tiger) \ + $(use_enable libv4l) \ + $(use_enable libv4l2) \ + $(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 mtp) \ + $(use_enable musepack mpc) \ + $(use_enable ncurses) \ + $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \ + $(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 projectm) \ + $(use_enable pulseaudio pulse) \ + $(use_enable pvr) \ + $(use_enable qt4) \ + $(use_enable remoteosd) \ + $(use_enable rtsp realrtsp) \ + $(use_enable run-as-root) \ + $(use_enable samba smb) \ + $(use_enable schroedinger) \ + $(use_enable sdl) \ + $(use_enable sdl-image) \ + $(use_enable shine) \ + $(use_enable shout) \ + $(use_enable skins skins2) \ + $(use_enable speex) \ + $(use_enable sqlite) \ + $(use_enable sse) \ + $(use_enable stream sout) \ + $(use_enable svg) \ + $(use_enable svga svgalib) \ + $(use_enable taglib) \ + $(use_enable theora) \ + $(use_enable truetype freetype) \ + $(use_enable twolame) \ + $(use_enable udev) \ + $(use_enable upnp) \ + $(use_enable v4l) \ + $(use_enable v4l2) \ + $(use_enable vcdx) \ + $(use_enable vaapi libva) \ + $(use_enable vlm) \ + $(use_enable vorbis) \ + $(use_enable win32codecs loader) \ + $(use_enable wma-fixed) \ + $(use_with X x) \ + $(use_enable x264) \ + $(use_enable xcb) \ + $(use_enable xml libxml2) \ + $(use_enable xosd) \ + $(use_enable xv xvideo) \ + $(use_enable zvbi) $(use_enable !zvbi telx) \ + --disable-snapshot \ + --disable-growl \ + --disable-optimizations \ + --enable-fast-install \ + $(vlc_use_enable_force vlm sout) \ + $(vlc_use_enable_force skins qt4) \ + $(vlc_use_enable_force skins freetype) \ + $(vlc_use_enable_force remoteosd libgcrypt) \ + $(vlc_use_enable_force vaapi avcodec) +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS HACKING THANKS NEWS README \ + doc/fortunes.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 +} + +pkg_postinst() { + gnome2_pkg_postinst + + if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then + einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" + "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/" + else + ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" + ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "If you do not do it, vlc will take a long time to load." + fi +} -- 2.26.2