From: Alexis Ballier Date: Thu, 6 Oct 2011 20:47:21 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=78902fb565565a8dd5b58d3dc15ea15ce919d880;p=gentoo.git version bump Package-Manager: portage-2.2.0_alpha62/cvs/Linux x86_64 --- diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 4a1cbb23864a..31f3fd225de5 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.742 2011/09/22 15:29:42 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.743 2011/10/06 20:47:21 aballier Exp $ + +*vlc-1.1.12 (06 Oct 2011) + + 06 Oct 2011; Alexis Ballier +vlc-1.1.12.ebuild: + version bump 22 Sep 2011; Alexis Ballier vlc-1.1.11.ebuild, vlc-1.1.9999.ebuild, vlc-9999.ebuild: diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index ad3bb8f0dca9..18092904c9f4 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -2,17 +2,19 @@ Hash: SHA1 DIST vlc-1.1.11.tar.bz2 26319862 RMD160 fa8a32a8e81a5f707b3cace6fa9808d5d7cb9fe6 SHA1 068e75bdbfe6e595a4db14ad49e05688c8b1d5ad SHA256 682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb +DIST vlc-1.1.12.tar.bz2 26220996 RMD160 117530abc8bd3f38d9233b7a7c91a3aaa17af87c SHA1 b39de66711a33746ce12f16a50e41d3def7b1452 SHA256 6dc50d27d25a0fab55b66f9ae3aa4001082d2d86b96b0491a8dab35423be1a68 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9 EBUILD vlc-1.1.11.ebuild 12434 RMD160 841ccd134aefacdaf865478cb9cc70225b2e6a65 SHA1 69b27da2bff3f063981711beb585e55cf834f90c SHA256 941fe6c49003c443920845246e57a3d6ce4b38edd6780a59cc264b8c2dc92f12 +EBUILD vlc-1.1.12.ebuild 12440 RMD160 16b472dfe7c82accdfc54bd28aa96d7170435b94 SHA1 337610446845b5aac8a068d2ab184106b89c53d9 SHA256 b77e9a876501447b6fd098a70dbaf7286961f8b3c654bacf26c860949a94575e EBUILD vlc-1.1.9999.ebuild 12347 RMD160 2c6e70371161e8def7ef908338917ee0561414db SHA1 d8ca1b960700e7ae68c62a465e62b80449bc308a SHA256 b7f47cdc537b0ec0b334cf7f85269f20eb01e976c2855fdc3921de7539958d78 EBUILD vlc-9999.ebuild 10918 RMD160 0b99b52040aa5621513499f820870f8fcbfc13cd SHA1 638b33d492ca30066f92289dda664163e9405475 SHA256 26ca8b5f6e36bb207818fcea2f0a1e71070e9467bf3b57bb9ee7da6437dd3bb1 -MISC ChangeLog 110419 RMD160 727aef16757123184db27cf78d8c9dbf22ff884b SHA1 81a48c83fb1e98ee917cac92d9df3dcbc8f6d1b0 SHA256 581bfa805fdb19d6aac1925d0ed772b89038045e376192fb3166b220c2db3ffe +MISC ChangeLog 110534 RMD160 600a9f54770c05208b3557c5e903122b13c73632 SHA1 fd4d238c26b3f0f7fb4bf7d86acdb1b65757b962 SHA256 8d889b339d03ce44213c873cf5d3a5d21bd39eba891a533108b122fc3e1e321e MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk57VG0ACgkQvFcC4BYPU0qpcwCguQ9cS7AGFmmhHaoBINRvURCh -CJAAnRiB0NWM/XyZfLOUNaLx1vrliKi7 -=/Flt +iEYEARECAAYFAk6OE98ACgkQvFcC4BYPU0rj/gCfV0foi5PYqueW3AepWcpQJ6i3 +XfIAoIfP1xuwnVMxf36WjqTDfc7bS9hv +=Zji1 -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-1.1.12.ebuild b/media-video/vlc/vlc-1.1.12.ebuild new file mode 100644 index 000000000000..898a99ba023d --- /dev/null +++ b/media-video/vlc/vlc-1.1.12.ebuild @@ -0,0 +1,379 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.12.ebuild,v 1.1 2011/10/06 20:47:21 aballier Exp $ + +EAPI="3" + +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="99" +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" + +if [ "${PV%9999}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +else + KEYWORDS="" +fi +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 gme 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=" + || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] =media-libs/libdvbpsi-0.1.6 + a52? ( >=media-libs/a52dec-0.7.4-r3 ) + aalib? ( media-libs/aalib x11-libs/libX11 ) + aac? ( >=media-libs/faad2-2.6.1 ) + alsa? ( >=media-libs/alsa-lib-1.0.23 ) + 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? ( virtual/ffmpeg ) + 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 ) + gme? ( media-libs/game-music-emu ) + gnome? ( gnome-base/gnome-vfs ) + gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 ) + 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.8.1 ) + 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 x11-libs/libxcb x11-libs/xcb-util ) + ogg? ( media-libs/libogg ) + opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 =media-sound/pulseaudio-0.9.22 + ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) ) ) + 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.10 ) + sdl? ( >=media-libs/libsdl-1.2.8 x11-libs/libX11 + 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 virtual/ffmpeg ) + 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} + !!<=media-video/vlc-1.0.99999 + alsa? ( >=media-sound/alsa-headers-1.0.23 ) + 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() { + # Useflags we need to forcefuly enable + vlc_use_force remoteosd gcrypt + vlc_use_force gnutls gcrypt + vlc_use_force skins truetype + vlc_use_force skins qt4 + vlc_use_force vlm stream + vlc_use_force vaapi ffmpeg + vlc_use_force nsplugin xcb + has_version '