1 |
vapier 12/04/05 18:42:48 |
2 |
|
3 |
Modified: ChangeLog mplayer-1.0_rc4_p20120405.ebuild |
4 |
Log: |
5 |
Fix pkg-config handling with libdvd{nav,read} #410189. |
6 |
|
7 |
(Portage version: 2.2.0_alpha95/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.847 media-video/mplayer/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.847&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.847&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.846&r2=1.847 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
19 |
retrieving revision 1.846 |
20 |
retrieving revision 1.847 |
21 |
diff -u -r1.846 -r1.847 |
22 |
--- ChangeLog 5 Apr 2012 12:02:56 -0000 1.846 |
23 |
+++ ChangeLog 5 Apr 2012 18:42:48 -0000 1.847 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-video/mplayer |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.846 2012/04/05 12:02:56 aballier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.847 2012/04/05 18:42:48 vapier Exp $ |
29 |
+ |
30 |
+ 05 Apr 2012; Mike Frysinger <vapier@g.o> |
31 |
+ mplayer-1.0_rc4_p20120405.ebuild, +files/mplayer-1.0_rc4-pkg-config.patch: |
32 |
+ Fix pkg-config handling with libdvd{nav,read} #410189. |
33 |
|
34 |
05 Apr 2012; Alexis Ballier <aballier@g.o> |
35 |
mplayer-1.0_rc4_p20120405.ebuild, mplayer-9999.ebuild: |
36 |
|
37 |
|
38 |
|
39 |
1.3 media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild?rev=1.3&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild?rev=1.3&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild?r1=1.2&r2=1.3 |
44 |
|
45 |
Index: mplayer-1.0_rc4_p20120405.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild,v |
48 |
retrieving revision 1.2 |
49 |
retrieving revision 1.3 |
50 |
diff -u -r1.2 -r1.3 |
51 |
--- mplayer-1.0_rc4_p20120405.ebuild 5 Apr 2012 12:02:56 -0000 1.2 |
52 |
+++ mplayer-1.0_rc4_p20120405.ebuild 5 Apr 2012 18:42:48 -0000 1.3 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2012 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild,v 1.2 2012/04/05 12:02:56 aballier Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild,v 1.3 2012/04/05 18:42:48 vapier Exp $ |
58 |
|
59 |
EAPI=4 |
60 |
|
61 |
@@ -187,7 +187,11 @@ |
62 |
xv? ( X ) |
63 |
xvmc? ( xv )" |
64 |
|
65 |
-PATCHES=( "${FILESDIR}/ffmpeg.patch" "${FILESDIR}/ffmpeg2.patch" ) |
66 |
+PATCHES=( |
67 |
+ "${FILESDIR}/ffmpeg.patch" |
68 |
+ "${FILESDIR}/ffmpeg2.patch" |
69 |
+ "${FILESDIR}/${PN}-1.0_rc4-pkg-config.patch" |
70 |
+) |
71 |
|
72 |
pkg_setup() { |
73 |
if [[ ${PV} == *9999* ]]; then |
74 |
@@ -529,6 +533,7 @@ |
75 |
" |
76 |
fi |
77 |
|
78 |
+ tc-export PKG_CONFIG |
79 |
./configure \ |
80 |
--cc="$(tc-getCC)" \ |
81 |
--host-cc="$(tc-getBUILD_CC)" \ |