| 1 |
aballier 10/02/24 13:13:37 |
| 2 |
|
| 3 |
Modified: vlc-1.0.5.ebuild ChangeLog vlc-1.0.9999.ebuild |
| 4 |
Log: |
| 5 |
Add a conditional patch for 1.0.x series to build against xulrunner 1.9.2, bug #290318 |
| 6 |
(Portage version: 2.2_rc63/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 media-video/vlc/vlc-1.0.5.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: vlc-1.0.5.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- vlc-1.0.5.ebuild 23 Feb 2010 10:24:14 -0000 1.2 |
| 22 |
+++ vlc-1.0.5.ebuild 24 Feb 2010 13:13:36 -0000 1.3 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild,v 1.2 2010/02/23 10:24:14 aballier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild,v 1.3 2010/02/24 13:13:36 aballier Exp $ |
| 28 |
|
| 29 |
EAPI="2" |
| 30 |
|
| 31 |
@@ -24,7 +24,7 @@ |
| 32 |
MY_P="${PN}-${MY_PV}" |
| 33 |
VLC_SNAPSHOT_TIME="0013" |
| 34 |
|
| 35 |
-PATCHLEVEL="81" |
| 36 |
+PATCHLEVEL="83" |
| 37 |
M4_TARBALL_VERSION="1" |
| 38 |
DESCRIPTION="VLC media player - Video player and streamer" |
| 39 |
HOMEPAGE="http://www.videolan.org/vlc/" |
| 40 |
@@ -113,7 +113,7 @@ |
| 41 |
mtp? ( >=media-libs/libmtp-0.3.0 ) |
| 42 |
musepack? ( >=media-sound/musepack-tools-444 ) |
| 43 |
ncurses? ( sys-libs/ncurses ) |
| 44 |
- nsplugin? ( >=net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt <net-libs/xulrunner-1.9.2 ) |
| 45 |
+ nsplugin? ( >=net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt ) |
| 46 |
ogg? ( media-libs/libogg ) |
| 47 |
pda? ( x11-libs/gtk+:2 ) |
| 48 |
png? ( media-libs/libpng ) |
| 49 |
@@ -230,6 +230,7 @@ |
| 50 |
# Make it build with libtool 1.5 |
| 51 |
rm -f m4/lt* m4/libtool.m4 |
| 52 |
|
| 53 |
+ has_version '>=net-libs/xulrunner-1.9.2' || EPATCH_EXCLUDE="550_all_xulrunner192.patch" |
| 54 |
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" |
| 55 |
AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf |
| 56 |
} |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.558 media-video/vlc/ChangeLog |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.558&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.558&content-type=text/plain |
| 64 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.557&r2=1.558 |
| 65 |
|
| 66 |
Index: ChangeLog |
| 67 |
=================================================================== |
| 68 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
| 69 |
retrieving revision 1.557 |
| 70 |
retrieving revision 1.558 |
| 71 |
diff -u -r1.557 -r1.558 |
| 72 |
--- ChangeLog 24 Feb 2010 12:30:21 -0000 1.557 |
| 73 |
+++ ChangeLog 24 Feb 2010 13:13:36 -0000 1.558 |
| 74 |
@@ -1,6 +1,11 @@ |
| 75 |
# ChangeLog for media-video/vlc |
| 76 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 77 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.557 2010/02/24 12:30:21 aballier Exp $ |
| 78 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.558 2010/02/24 13:13:36 aballier Exp $ |
| 79 |
+ |
| 80 |
+ 24 Feb 2010; Alexis Ballier <aballier@g.o> vlc-1.0.5.ebuild, |
| 81 |
+ vlc-1.0.9999.ebuild: |
| 82 |
+ Add a conditional patch for 1.0.x series to build against xulrunner 1.9.2, |
| 83 |
+ bug #290318 |
| 84 |
|
| 85 |
24 Feb 2010; Alexis Ballier <aballier@g.o> vlc-9999.ebuild: |
| 86 |
Do not generate the plugin cache at buildtime and do it in postinst |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
1.38 media-video/vlc/vlc-1.0.9999.ebuild |
| 91 |
|
| 92 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild?rev=1.38&view=markup |
| 93 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild?rev=1.38&content-type=text/plain |
| 94 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild?r1=1.37&r2=1.38 |
| 95 |
|
| 96 |
Index: vlc-1.0.9999.ebuild |
| 97 |
=================================================================== |
| 98 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v |
| 99 |
retrieving revision 1.37 |
| 100 |
retrieving revision 1.38 |
| 101 |
diff -u -r1.37 -r1.38 |
| 102 |
--- vlc-1.0.9999.ebuild 23 Feb 2010 10:24:14 -0000 1.37 |
| 103 |
+++ vlc-1.0.9999.ebuild 24 Feb 2010 13:13:36 -0000 1.38 |
| 104 |
@@ -1,6 +1,6 @@ |
| 105 |
# Copyright 1999-2010 Gentoo Foundation |
| 106 |
# Distributed under the terms of the GNU General Public License v2 |
| 107 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.37 2010/02/23 10:24:14 aballier Exp $ |
| 108 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.38 2010/02/24 13:13:36 aballier Exp $ |
| 109 |
|
| 110 |
EAPI="2" |
| 111 |
|
| 112 |
@@ -24,7 +24,7 @@ |
| 113 |
MY_P="${PN}-${MY_PV}" |
| 114 |
VLC_SNAPSHOT_TIME="0013" |
| 115 |
|
| 116 |
-PATCHLEVEL="81" |
| 117 |
+PATCHLEVEL="83" |
| 118 |
M4_TARBALL_VERSION="1" |
| 119 |
DESCRIPTION="VLC media player - Video player and streamer" |
| 120 |
HOMEPAGE="http://www.videolan.org/vlc/" |
| 121 |
@@ -113,7 +113,7 @@ |
| 122 |
mtp? ( >=media-libs/libmtp-0.3.0 ) |
| 123 |
musepack? ( >=media-sound/musepack-tools-444 ) |
| 124 |
ncurses? ( sys-libs/ncurses ) |
| 125 |
- nsplugin? ( >=net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt <net-libs/xulrunner-1.9.2 ) |
| 126 |
+ nsplugin? ( >=net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt ) |
| 127 |
ogg? ( media-libs/libogg ) |
| 128 |
pda? ( x11-libs/gtk+:2 ) |
| 129 |
png? ( media-libs/libpng ) |
| 130 |
@@ -230,6 +230,7 @@ |
| 131 |
# Make it build with libtool 1.5 |
| 132 |
rm -f m4/lt* m4/libtool.m4 |
| 133 |
|
| 134 |
+ has_version '>=net-libs/xulrunner-1.9.2' || EPATCH_EXCLUDE="550_all_xulrunner192.patch" |
| 135 |
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" |
| 136 |
AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf |
| 137 |
} |
Archives