1 |
mgorny 15/02/27 22:24:32 |
2 |
|
3 |
Modified: mpd-0.18.16.ebuild mpd-0.19.6.ebuild |
4 |
mpd-0.18.20.ebuild ChangeLog |
5 |
Log: |
6 |
Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62. |
7 |
|
8 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.8 media-sound/mpd/mpd-0.18.16.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.18.16.ebuild?rev=1.8&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.18.16.ebuild?rev=1.8&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.18.16.ebuild?r1=1.7&r2=1.8 |
16 |
|
17 |
Index: mpd-0.18.16.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.16.ebuild,v |
20 |
retrieving revision 1.7 |
21 |
retrieving revision 1.8 |
22 |
diff -u -r1.7 -r1.8 |
23 |
--- mpd-0.18.16.ebuild 3 Nov 2014 09:34:48 -0000 1.7 |
24 |
+++ mpd-0.18.16.ebuild 27 Feb 2015 22:24:32 -0000 1.8 |
25 |
@@ -1,6 +1,6 @@ |
26 |
-# Copyright 1999-2014 Gentoo Foundation |
27 |
+# Copyright 1999-2015 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.16.ebuild,v 1.7 2014/11/03 09:34:48 ago Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.16.ebuild,v 1.8 2015/02/27 22:24:32 mgorny Exp $ |
31 |
|
32 |
EAPI=5 |
33 |
inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user |
34 |
@@ -13,7 +13,7 @@ |
35 |
SLOT="0" |
36 |
KEYWORDS="amd64 arm hppa ppc ~sh x86 ~x86-fbsd ~x64-macos" |
37 |
IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac |
38 |
- fluidsynth gme +id3tag inotify ipv6 jack lame mms libmpdclient |
39 |
+ fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient |
40 |
libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus |
41 |
oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd |
42 |
twolame unicode vorbis wavpack wildmidi zeroconf zip" |
43 |
@@ -40,7 +40,10 @@ |
44 |
cdio? ( dev-libs/libcdio-paranoia ) |
45 |
curl? ( net-misc/curl ) |
46 |
faad? ( media-libs/faad2 ) |
47 |
- ffmpeg? ( virtual/ffmpeg ) |
48 |
+ ffmpeg? ( |
49 |
+ libav? ( media-video/libav:0= ) |
50 |
+ !libav? ( media-video/ffmpeg:0= ) |
51 |
+ ) |
52 |
flac? ( media-libs/flac[ogg?] ) |
53 |
fluidsynth? ( media-sound/fluidsynth ) |
54 |
gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) |
55 |
|
56 |
|
57 |
|
58 |
1.2 media-sound/mpd/mpd-0.19.6.ebuild |
59 |
|
60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.19.6.ebuild?rev=1.2&view=markup |
61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.19.6.ebuild?rev=1.2&content-type=text/plain |
62 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.19.6.ebuild?r1=1.1&r2=1.2 |
63 |
|
64 |
Index: mpd-0.19.6.ebuild |
65 |
=================================================================== |
66 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.6.ebuild,v |
67 |
retrieving revision 1.1 |
68 |
retrieving revision 1.2 |
69 |
diff -u -r1.1 -r1.2 |
70 |
--- mpd-0.19.6.ebuild 8 Dec 2014 19:13:10 -0000 1.1 |
71 |
+++ mpd-0.19.6.ebuild 27 Feb 2015 22:24:32 -0000 1.2 |
72 |
@@ -1,6 +1,6 @@ |
73 |
-# Copyright 1999-2014 Gentoo Foundation |
74 |
+# Copyright 1999-2015 Gentoo Foundation |
75 |
# Distributed under the terms of the GNU General Public License v2 |
76 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.6.ebuild,v 1.1 2014/12/08 19:13:10 angelos Exp $ |
77 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.6.ebuild,v 1.2 2015/02/27 22:24:32 mgorny Exp $ |
78 |
|
79 |
EAPI=5 |
80 |
inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user |
81 |
@@ -14,7 +14,7 @@ |
82 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos" |
83 |
IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg |
84 |
flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms |
85 |
- libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack |
86 |
+ libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack |
87 |
+network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid |
88 |
sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack |
89 |
wildmidi zeroconf zip" |
90 |
@@ -51,7 +51,10 @@ |
91 |
curl? ( net-misc/curl ) |
92 |
expat? ( dev-libs/expat ) |
93 |
faad? ( media-libs/faad2 ) |
94 |
- ffmpeg? ( virtual/ffmpeg ) |
95 |
+ ffmpeg? ( |
96 |
+ libav? ( media-video/libav:0= ) |
97 |
+ !libav? ( media-video/ffmpeg:0= ) |
98 |
+ ) |
99 |
flac? ( media-libs/flac[ogg?] ) |
100 |
fluidsynth? ( media-sound/fluidsynth ) |
101 |
glib? ( dev-libs/glib:2 ) |
102 |
|
103 |
|
104 |
|
105 |
1.2 media-sound/mpd/mpd-0.18.20.ebuild |
106 |
|
107 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.18.20.ebuild?rev=1.2&view=markup |
108 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.18.20.ebuild?rev=1.2&content-type=text/plain |
109 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.18.20.ebuild?r1=1.1&r2=1.2 |
110 |
|
111 |
Index: mpd-0.18.20.ebuild |
112 |
=================================================================== |
113 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.20.ebuild,v |
114 |
retrieving revision 1.1 |
115 |
retrieving revision 1.2 |
116 |
diff -u -r1.1 -r1.2 |
117 |
--- mpd-0.18.20.ebuild 8 Dec 2014 19:13:10 -0000 1.1 |
118 |
+++ mpd-0.18.20.ebuild 27 Feb 2015 22:24:32 -0000 1.2 |
119 |
@@ -1,6 +1,6 @@ |
120 |
-# Copyright 1999-2014 Gentoo Foundation |
121 |
+# Copyright 1999-2015 Gentoo Foundation |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.20.ebuild,v 1.1 2014/12/08 19:13:10 angelos Exp $ |
124 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.20.ebuild,v 1.2 2015/02/27 22:24:32 mgorny Exp $ |
125 |
|
126 |
EAPI=5 |
127 |
inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user |
128 |
@@ -13,7 +13,7 @@ |
129 |
SLOT="0" |
130 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sh ~x86 ~x86-fbsd ~x64-macos" |
131 |
IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac |
132 |
- fluidsynth gme +id3tag inotify ipv6 jack lame mms libmpdclient |
133 |
+ fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient |
134 |
libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus |
135 |
oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd |
136 |
twolame unicode vorbis wavpack wildmidi zeroconf zip" |
137 |
@@ -40,7 +40,10 @@ |
138 |
cdio? ( dev-libs/libcdio-paranoia ) |
139 |
curl? ( net-misc/curl ) |
140 |
faad? ( media-libs/faad2 ) |
141 |
- ffmpeg? ( virtual/ffmpeg ) |
142 |
+ ffmpeg? ( |
143 |
+ libav? ( media-video/libav:0= ) |
144 |
+ !libav? ( media-video/ffmpeg:0= ) |
145 |
+ ) |
146 |
flac? ( media-libs/flac[ogg?] ) |
147 |
fluidsynth? ( media-sound/fluidsynth ) |
148 |
gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) |
149 |
|
150 |
|
151 |
|
152 |
1.371 media-sound/mpd/ChangeLog |
153 |
|
154 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/ChangeLog?rev=1.371&view=markup |
155 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/ChangeLog?rev=1.371&content-type=text/plain |
156 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/ChangeLog?r1=1.370&r2=1.371 |
157 |
|
158 |
Index: ChangeLog |
159 |
=================================================================== |
160 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v |
161 |
retrieving revision 1.370 |
162 |
retrieving revision 1.371 |
163 |
diff -u -r1.370 -r1.371 |
164 |
--- ChangeLog 8 Dec 2014 19:13:10 -0000 1.370 |
165 |
+++ ChangeLog 27 Feb 2015 22:24:32 -0000 1.371 |
166 |
@@ -1,6 +1,11 @@ |
167 |
# ChangeLog for media-sound/mpd |
168 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
169 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.370 2014/12/08 19:13:10 angelos Exp $ |
170 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
171 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.371 2015/02/27 22:24:32 mgorny Exp $ |
172 |
+ |
173 |
+ 27 Feb 2015; Michał Górny <mgorny@g.o> mpd-0.18.16.ebuild, |
174 |
+ mpd-0.18.20.ebuild, mpd-0.19.6.ebuild: |
175 |
+ Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in |
176 |
+ https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62. |
177 |
|
178 |
*mpd-0.19.6 (08 Dec 2014) |
179 |
*mpd-0.18.20 (08 Dec 2014) |