| 1 |
commit: fa1195f92eeb97f001aa7da9eacf2f66b8363e3b |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 21 13:56:34 2011 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 21 13:56:34 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=fa1195f9 |
| 7 |
|
| 8 |
sync vlc ebuild with current tree, use npapi-sdk as default still |
| 9 |
|
| 10 |
--- |
| 11 |
media-video/vlc/Manifest | 6 +++--- |
| 12 |
.../{vlc-1.1.12-r2.ebuild => vlc-1.1.13.ebuild} | 19 ++++++------------- |
| 13 |
2 files changed, 9 insertions(+), 16 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest |
| 16 |
index b1c8dac..31a46f1 100644 |
| 17 |
--- a/media-video/vlc/Manifest |
| 18 |
+++ b/media-video/vlc/Manifest |
| 19 |
@@ -1,5 +1,5 @@ |
| 20 |
AUX 0001-Support-building-against-NPAPI-SDK.patch 1441 RMD160 63dd43b85752f4f2dc671cfc1fada0cc71286ca2 SHA1 5e6336cf511e452e1b23f5da74d9a79bbeab8861 SHA256 66eefb895ab8b533e4e0499b66d74b41874a129464d89477d6ccb813cdad3d26 |
| 21 |
-DIST vlc-1.1.12.tar.bz2 26220996 RMD160 117530abc8bd3f38d9233b7a7c91a3aaa17af87c SHA1 b39de66711a33746ce12f16a50e41d3def7b1452 SHA256 6dc50d27d25a0fab55b66f9ae3aa4001082d2d86b96b0491a8dab35423be1a68 |
| 22 |
-DIST vlc-patches-103.tar.bz2 4610 RMD160 db486b668e5c98e4c46f7cb8eac60b9fb7696446 SHA1 bb329088a1b73de4eff59399bd66b2d145ab59f3 SHA256 5019bb3cc49621b3186079d05a63a191c3e8c69b6b9221ea015932d8e02b443e |
| 23 |
-EBUILD vlc-1.1.12-r2.ebuild 12436 RMD160 b6b3611f2295e6365f84b3bb06415792607c59fc SHA1 ad617bd56c927d6bc8343bb6665b7e54f4aa518e SHA256 ac3a9c05ed08fe49ff28e8c2d8f1a5e3627a7d47f9462513e8bab33e59223e09 |
| 24 |
+DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1 |
| 25 |
+DIST vlc-patches-104.tar.bz2 3839 RMD160 bde7bd345b8082a82382f8c874d7ec2a9151382e SHA1 85729ea0889de759d8476c9571c2680fd31b588c SHA256 cb019bdea9ea95b7bbe2d2ef1194d276e93e1cf0e4e62403e80698c785f1a1ec |
| 26 |
+EBUILD vlc-1.1.13.ebuild 12298 RMD160 dcd1858617d0d5fd06878e6c1a28a0be203479d2 SHA1 52ea16ae2ceb01ce90b4fe06e0e5b8087b2efe8f SHA256 b364e3b4e929c7a55c5053a6eaa6f04f42bc1a04af431dd072b5dcf31b9df1f3 |
| 27 |
MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8 |
| 28 |
|
| 29 |
diff --git a/media-video/vlc/vlc-1.1.12-r2.ebuild b/media-video/vlc/vlc-1.1.13.ebuild |
| 30 |
similarity index 97% |
| 31 |
rename from media-video/vlc/vlc-1.1.12-r2.ebuild |
| 32 |
rename to media-video/vlc/vlc-1.1.13.ebuild |
| 33 |
index 7890116..8190deb 100644 |
| 34 |
--- a/media-video/vlc/vlc-1.1.12-r2.ebuild |
| 35 |
+++ b/media-video/vlc/vlc-1.1.13.ebuild |
| 36 |
@@ -1,15 +1,13 @@ |
| 37 |
# Copyright 1999-2011 Gentoo Foundation |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
-# $Header: $ |
| 40 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.13.ebuild,v 1.1 2011/12/21 12:18:47 aballier Exp $ |
| 41 |
|
| 42 |
EAPI="3" |
| 43 |
|
| 44 |
SCM="" |
| 45 |
if [ "${PV%9999}" != "${PV}" ] ; then |
| 46 |
- SCM=git |
| 47 |
+ SCM=git-2 |
| 48 |
EGIT_BOOTSTRAP="bootstrap" |
| 49 |
- EGIT_BRANCH=master |
| 50 |
- EGIT_PROJECT=${P} |
| 51 |
if [ "${PV%.9999}" != "${PV}" ] ; then |
| 52 |
EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git" |
| 53 |
else |
| 54 |
@@ -24,7 +22,7 @@ MY_PV="${MY_PV/-beta/-test}" |
| 55 |
MY_P="${PN}-${MY_PV}" |
| 56 |
VLC_SNAPSHOT_TIME="0013" |
| 57 |
|
| 58 |
-PATCHLEVEL="103" |
| 59 |
+PATCHLEVEL="104" |
| 60 |
DESCRIPTION="VLC media player - Video player and streamer" |
| 61 |
HOMEPAGE="http://www.videolan.org/vlc/" |
| 62 |
if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild |
| 63 |
@@ -186,10 +184,9 @@ pkg_setup() { |
| 64 |
vlc_use_force vlm stream |
| 65 |
vlc_use_force vaapi ffmpeg |
| 66 |
vlc_use_force nsplugin xcb |
| 67 |
- has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X |
| 68 |
+ vlc_use_force xosd X |
| 69 |
vlc_use_force sdl X |
| 70 |
vlc_use_force aalib X |
| 71 |
- vlc_use_force xosd X |
| 72 |
|
| 73 |
# Useflags that will be automagically discarded if deps are not met |
| 74 |
vlc_use_needs bidi truetype |
| 75 |
@@ -211,14 +208,11 @@ pkg_setup() { |
| 76 |
src_unpack() { |
| 77 |
unpack ${A} |
| 78 |
if [ "${PV%9999}" != "${PV}" ] ; then |
| 79 |
- git_src_unpack |
| 80 |
+ git-2_src_unpack |
| 81 |
fi |
| 82 |
} |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
- if [ "${PV%9999}" != "${PV}" ] ; then |
| 86 |
- git_src_prepare |
| 87 |
- fi |
| 88 |
# Make it build with libtool 1.5 |
| 89 |
rm -f m4/lt* m4/libtool.m4 |
| 90 |
|
| 91 |
@@ -287,7 +281,7 @@ src_configure() { |
| 92 |
$(use_enable mtp) \ |
| 93 |
$(use_enable musepack mpc) \ |
| 94 |
$(use_enable ncurses) \ |
| 95 |
- $(use_enable nsplugin mozilla) \ |
| 96 |
+ $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \ |
| 97 |
$(use_enable ogg) \ |
| 98 |
$(use_enable opengl glx) $(use_enable opengl) \ |
| 99 |
$(use_enable optimisememory optimize-memory) \ |
| 100 |
@@ -346,7 +340,6 @@ src_configure() { |
| 101 |
$(vlc_use_enable_force gnutls libgcrypt) \ |
| 102 |
$(vlc_use_enable_force vaapi avcodec) \ |
| 103 |
$(vlc_use_enable_force nsplugin xcb) \ |
| 104 |
- $(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x') \ |
| 105 |
$(use sdl && echo '--with-x') \ |
| 106 |
$(use xosd && echo '--with-x') \ |
| 107 |
$(use aalib && echo '--with-x') |
Archives