From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: media-video/vlc/
Date: Sat, 10 Dec 2011 05:20:12 +0000 (UTC) [thread overview]
Message-ID: <3a97fc6961593f16729b6e889de934dd07eb7961.anarchy@gentoo> (raw)
commit: 3a97fc6961593f16729b6e889de934dd07eb7961
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 05:18:32 2011 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 05:18:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=3a97fc69
update vlc ebuild to use nsapi
---
media-video/vlc/Manifest | 4 +-
.../{vlc-1.1.12.ebuild => vlc-1.1.12-r1.ebuild} | 34 +++++++++++---------
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 44e0e9f..5f1a267 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,5 +1,5 @@
AUX 0001-Support-building-against-NPAPI-SDK.patch 1441 RMD160 63dd43b85752f4f2dc671cfc1fada0cc71286ca2 SHA1 5e6336cf511e452e1b23f5da74d9a79bbeab8861 SHA256 66eefb895ab8b533e4e0499b66d74b41874a129464d89477d6ccb813cdad3d26
DIST vlc-1.1.12.tar.bz2 26220996 RMD160 117530abc8bd3f38d9233b7a7c91a3aaa17af87c SHA1 b39de66711a33746ce12f16a50e41d3def7b1452 SHA256 6dc50d27d25a0fab55b66f9ae3aa4001082d2d86b96b0491a8dab35423be1a68
-DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9
-EBUILD vlc-1.1.12.ebuild 12536 RMD160 ab30e65e4c998b6aa2be95569106249512090ac1 SHA1 fc47544b44af9b888e7ec603e366a4db8cfe99b9 SHA256 bea670bb694ef3b2de23541a6cd2626bd1d2d61c60892e377954ea14ab9bddcf
+DIST vlc-patches-102.tar.bz2 4286 RMD160 c8d693d88e231fe8ff5257be296f967ce592d91b SHA1 83471b1df166dfb6c1faaa6d4120c09ab7d9b9fd SHA256 649d10cb9ddb604468b05dfaa9bc0ce22af906f04e744ec671fc76472ac622be
+EBUILD vlc-1.1.12-r1.ebuild 12598 RMD160 dd0c42073b57f5b8ba32a6e53669da0864ac75d5 SHA1 738fdcb9ce1e608e4d7e38e475cc59a3f7287102 SHA256 f6bffb30582d70612e58105f6cde8498c95dca2a1381b6eaa0153438f1313e3e
MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
diff --git a/media-video/vlc/vlc-1.1.12.ebuild b/media-video/vlc/vlc-1.1.12-r1.ebuild
similarity index 94%
rename from media-video/vlc/vlc-1.1.12.ebuild
rename to media-video/vlc/vlc-1.1.12-r1.ebuild
index 9d6ea6e..c796dd1 100644
--- a/media-video/vlc/vlc-1.1.12.ebuild
+++ b/media-video/vlc/vlc-1.1.12-r1.ebuild
@@ -1,6 +1,6 @@
# 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.11.ebuild,v 1.5 2011/08/27 17:38:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.12-r1.ebuild,v 1.1 2011/12/09 19:58:47 aballier Exp $
EAPI="3"
@@ -24,7 +24,7 @@ MY_PV="${MY_PV/-beta/-test}"
MY_P="${PN}-${MY_PV}"
VLC_SNAPSHOT_TIME="0013"
-PATCHLEVEL="99"
+PATCHLEVEL="102"
DESCRIPTION="VLC media player - Video player and streamer"
HOMEPAGE="http://www.videolan.org/vlc/"
if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
@@ -56,7 +56,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
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
+ svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm
vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
RDEPEND="
@@ -91,7 +91,7 @@ RDEPEND="
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 )
+ libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 )
libproxy? ( net-libs/libproxy )
libtiger? ( media-libs/libtiger )
lirc? ( app-misc/lirc )
@@ -105,7 +105,7 @@ RDEPEND="
musepack? ( >=media-sound/musepack-tools-444 )
ncurses? ( sys-libs/ncurses )
nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.2 )
- x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
+ 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 <x11-libs/libX11-1.3.99.901[xcb] ) )
png? ( media-libs/libpng sys-libs/zlib )
@@ -130,12 +130,15 @@ RDEPEND="
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 )
+ truetype? ( media-libs/freetype virtual/ttf-fonts
+ !fontconfig? ( 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 ) )
+ v4l? (
+ libv4l2? ( media-libs/libv4l )
+ 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 )
@@ -144,7 +147,7 @@ RDEPEND="
x264? ( >=media-libs/x264-0.0.20090923 )
xcb? ( x11-libs/libxcb x11-libs/xcb-util )
xml? ( dev-libs/libxml2 )
- xosd? ( x11-libs/xosd )
+ xosd? ( x11-libs/xosd x11-libs/libX11 )
zvbi? ( >=media-libs/zvbi-0.2.25 )
"
@@ -153,8 +156,7 @@ DEPEND="${RDEPEND}
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 )
+ v4l? ( >=sys-kernel/linux-headers-2.6.25 )
xcb? ( x11-proto/xproto )
dev-util/pkgconfig"
@@ -188,12 +190,13 @@ pkg_setup() {
has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X
vlc_use_force sdl X
vlc_use_force aalib X
+ vlc_use_force xosd X
# 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 libv4l2 v4l
vlc_use_needs libv4l v4l
vlc_use_needs libtiger kate
vlc_use_needs xv xcb
@@ -285,7 +288,7 @@ src_configure() {
$(use_enable mtp) \
$(use_enable musepack mpc) \
$(use_enable ncurses) \
- $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \
+ $(use_enable nsplugin mozilla) \
$(use_enable ogg) \
$(use_enable opengl glx) $(use_enable opengl) \
$(use_enable optimisememory optimize-memory) \
@@ -318,8 +321,8 @@ src_configure() {
$(use_enable twolame) \
$(use_enable udev) \
$(use_enable upnp) \
- $(use_enable v4l) \
- $(use_enable v4l2) \
+ --disable-v4l \
+ $(use_enable v4l v4l2) \
$(use_enable vcdx) \
$(use_enable vaapi libva) \
$(use_enable vlm) \
@@ -346,6 +349,7 @@ src_configure() {
$(vlc_use_enable_force nsplugin xcb) \
$(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x') \
$(use sdl && echo '--with-x') \
+ $(use xosd && echo '--with-x') \
$(use aalib && echo '--with-x')
}
next reply other threads:[~2011-12-10 5:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-10 5:20 Jory Pratt [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-12-18 3:33 [gentoo-commits] proj/mozilla:master commit in: media-video/vlc/ Jory Pratt
2011-12-21 13:57 Jory Pratt
2012-02-09 2:54 Jory Pratt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3a97fc6961593f16729b6e889de934dd07eb7961.anarchy@gentoo \
--to=anarchy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox