1 |
tomwij 13/10/26 06:24:22 |
2 |
|
3 |
Modified: vlc-9999.ebuild vlc-2.1.9999.ebuild |
4 |
vlc-2.0.9999.ebuild ChangeLog |
5 |
Log: |
6 |
Fix bug #426754 by bailing out on <sys-devel/gcc-4.5. Prepared for version bumps by fixing up SRC_URI to support the a release. |
7 |
|
8 |
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.195 media-video/vlc/vlc-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.195&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.195&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.194&r2=1.195 |
16 |
|
17 |
Index: vlc-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v |
20 |
retrieving revision 1.194 |
21 |
retrieving revision 1.195 |
22 |
diff -u -r1.194 -r1.195 |
23 |
--- vlc-9999.ebuild 24 Oct 2013 23:34:33 -0000 1.194 |
24 |
+++ vlc-9999.ebuild 26 Oct 2013 06:24:22 -0000 1.195 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2013 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.194 2013/10/24 23:34:33 tomwij Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.195 2013/10/26 06:24:22 tomwij Exp $ |
30 |
|
31 |
EAPI="5" |
32 |
|
33 |
@@ -185,6 +185,14 @@ |
34 |
|
35 |
S="${WORKDIR}/${MY_P}" |
36 |
|
37 |
+pkg_setup() { |
38 |
+ if [[ "$(tc-getCC)" == *"gcc"* ]] ; then |
39 |
+ if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then |
40 |
+ die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754." |
41 |
+ fi |
42 |
+ fi |
43 |
+} |
44 |
+ |
45 |
src_unpack() { |
46 |
if [ "${PV%9999}" != "${PV}" ] ; then |
47 |
git-r3_src_unpack |
48 |
|
49 |
|
50 |
|
51 |
1.2 media-video/vlc/vlc-2.1.9999.ebuild |
52 |
|
53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?rev=1.2&view=markup |
54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?rev=1.2&content-type=text/plain |
55 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?r1=1.1&r2=1.2 |
56 |
|
57 |
Index: vlc-2.1.9999.ebuild |
58 |
=================================================================== |
59 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v |
60 |
retrieving revision 1.1 |
61 |
retrieving revision 1.2 |
62 |
diff -u -r1.1 -r1.2 |
63 |
--- vlc-2.1.9999.ebuild 26 Oct 2013 05:53:46 -0000 1.1 |
64 |
+++ vlc-2.1.9999.ebuild 26 Oct 2013 06:24:22 -0000 1.2 |
65 |
@@ -1,6 +1,6 @@ |
66 |
# Copyright 1999-2013 Gentoo Foundation |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.1 2013/10/26 05:53:46 tomwij Exp $ |
69 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.2 2013/10/26 06:24:22 tomwij Exp $ |
70 |
|
71 |
EAPI="5" |
72 |
|
73 |
@@ -183,6 +183,14 @@ |
74 |
|
75 |
S="${WORKDIR}/${MY_P}" |
76 |
|
77 |
+pkg_setup() { |
78 |
+ if [[ "$(tc-getCC)" == *"gcc"* ]] ; then |
79 |
+ if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then |
80 |
+ die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754." |
81 |
+ fi |
82 |
+ fi |
83 |
+} |
84 |
+ |
85 |
src_unpack() { |
86 |
if [ "${PV%9999}" != "${PV}" ] ; then |
87 |
git-r3_src_unpack |
88 |
|
89 |
|
90 |
|
91 |
1.27 media-video/vlc/vlc-2.0.9999.ebuild |
92 |
|
93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild?rev=1.27&view=markup |
94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild?rev=1.27&content-type=text/plain |
95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild?r1=1.26&r2=1.27 |
96 |
|
97 |
Index: vlc-2.0.9999.ebuild |
98 |
=================================================================== |
99 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v |
100 |
retrieving revision 1.26 |
101 |
retrieving revision 1.27 |
102 |
diff -u -r1.26 -r1.27 |
103 |
--- vlc-2.0.9999.ebuild 26 Oct 2013 05:53:46 -0000 1.26 |
104 |
+++ vlc-2.0.9999.ebuild 26 Oct 2013 06:24:22 -0000 1.27 |
105 |
@@ -1,6 +1,6 @@ |
106 |
# Copyright 1999-2013 Gentoo Foundation |
107 |
# Distributed under the terms of the GNU General Public License v2 |
108 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.26 2013/10/26 05:53:46 tomwij Exp $ |
109 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.27 2013/10/26 06:24:22 tomwij Exp $ |
110 |
|
111 |
EAPI="5" |
112 |
|
113 |
@@ -26,7 +26,7 @@ |
114 |
if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild |
115 |
SRC_URI="" |
116 |
elif [[ "${MY_P}" == "${P}" ]]; then |
117 |
- SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" |
118 |
+ SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV/a/}/${P}.tar.xz" |
119 |
else |
120 |
SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" |
121 |
fi |
122 |
@@ -186,6 +186,14 @@ |
123 |
|
124 |
S="${WORKDIR}/${MY_P}" |
125 |
|
126 |
+pkg_setup() { |
127 |
+ if [[ "$(tc-getCC)" == *"gcc"* ]] ; then |
128 |
+ if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then |
129 |
+ die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754." |
130 |
+ fi |
131 |
+ fi |
132 |
+} |
133 |
+ |
134 |
src_unpack() { |
135 |
if [ "${PV%9999}" != "${PV}" ] ; then |
136 |
git-r3_src_unpack |
137 |
|
138 |
|
139 |
|
140 |
1.859 media-video/vlc/ChangeLog |
141 |
|
142 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.859&view=markup |
143 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.859&content-type=text/plain |
144 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.858&r2=1.859 |
145 |
|
146 |
Index: ChangeLog |
147 |
=================================================================== |
148 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
149 |
retrieving revision 1.858 |
150 |
retrieving revision 1.859 |
151 |
diff -u -r1.858 -r1.859 |
152 |
--- ChangeLog 26 Oct 2013 05:53:46 -0000 1.858 |
153 |
+++ ChangeLog 26 Oct 2013 06:24:22 -0000 1.859 |
154 |
@@ -1,6 +1,11 @@ |
155 |
# ChangeLog for media-video/vlc |
156 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
157 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.858 2013/10/26 05:53:46 tomwij Exp $ |
158 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.859 2013/10/26 06:24:22 tomwij Exp $ |
159 |
+ |
160 |
+ 26 Oct 2013; Tom Wijsman <TomWij@g.o> vlc-2.0.9999.ebuild, |
161 |
+ vlc-2.1.9999.ebuild, vlc-9999.ebuild: |
162 |
+ Fix bug #426754 by bailing out on <sys-devel/gcc-4.5. Prepared for version |
163 |
+ bumps by fixing up SRC_URI to support the a release. |
164 |
|
165 |
*vlc-2.1.9999 (26 Oct 2013) |