[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild ffmpeg-2.2.3-r1.ebuild ffmpeg-0.10.12.ebuild ffmpeg-0.10.13.ebuild ffmpeg-1.2.6-r1.ebuild ChangeLog - gentoo-commits

From:	"Michal Gorny (mgorny)" <mgorny@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild ffmpeg-2.2.3-r1.ebuild ffmpeg-0.10.12.ebuild ffmpeg-0.10.13.ebuild ffmpeg-1.2.6-r1.ebuild ChangeLog
Date:	Thu, 19 Jun 2014 13:14:53
Message-Id:	`20140619131449.C4BC62004E@flycatcher.gentoo.org`

1

mgorny      14/06/19 13:14:49

2

3

  Modified:             ffmpeg-9999.ebuild ffmpeg-2.2.3-r1.ebuild

4

                        ffmpeg-0.10.12.ebuild ffmpeg-0.10.13.ebuild

5

                        ffmpeg-1.2.6-r1.ebuild ChangeLog

6

  Log:

7

  Fix multilib dependencies to use safe versions, bug #513718.

8

9

  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

10

11

Revision  Changes    Path

12

1.158                media-video/ffmpeg/ffmpeg-9999.ebuild

13

14

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.158&view=markup

15

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.158&content-type=text/plain

16

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.157&r2=1.158

17

18

Index: ffmpeg-9999.ebuild

19

===================================================================

20

RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v

21

retrieving revision 1.157

22

retrieving revision 1.158

23

diff -u -r1.157 -r1.158

24

--- ffmpeg-9999.ebuild	16 Jun 2014 22:00:35 -0000	1.157

25

+++ ffmpeg-9999.ebuild	19 Jun 2014 13:14:49 -0000	1.158

26

@@ -1,6 +1,6 @@

27

 # Copyright 1999-2014 Gentoo Foundation

28

 # Distributed under the terms of the GNU General Public License v2

29

-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.157 2014/06/16 22:00:35 mgorny Exp $

30

+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.158 2014/06/19 13:14:49 mgorny Exp $

31

32

 EAPI="5"

33

34

@@ -74,84 +74,84 @@

35

 done

36

37

 RDEPEND="

38

-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )

39

-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )

40

-	bluray? ( media-libs/libbluray[${MULTILIB_USEDEP}] )

41

-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )

42

+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )

43

+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )

44

+	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )

45

+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )

46

 	cdio? (

47

 		|| (

48

-			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]

49

+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]

50

 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]

51

)

52

)

53

-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )

54

+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )

55

 	encode? (

56

-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )

57

-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )

58

-		amrenc? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )

59

-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )

60

-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )

61

+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )

62

+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )

63

+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )

64

+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )

65

+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )

66

 		theora? (

67

 			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]

68

-			media-libs/libogg[${MULTILIB_USEDEP}]

69

+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]

70

)

71

-		twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )

72

-		wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )

73

-		webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )

74

-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )

75

-		x265? ( >=media-libs/x265-0.9:=[${MULTILIB_USEDEP}] )

76

-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )

77

+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )

78

+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )

79

+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )

80

+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )

81

+		x265? ( >=media-libs/x265-1.0:=[${MULTILIB_USEDEP}] )

82

+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )

83

)

84

 	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )

85

-	flite? ( app-accessibility/flite[${MULTILIB_USEDEP}] )

86

-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )

87

+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )

88

+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )

89

 	frei0r? ( media-plugins/frei0r-plugins )

90

-	gme? ( media-libs/game-music-emu[${MULTILIB_USEDEP}] )

91

-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )

92

-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )

93

-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )

94

+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )

95

+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )

96

+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )

97

+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )

98

 	iec61883? (

99

-		media-libs/libiec61883[${MULTILIB_USEDEP}]

100

-		sys-libs/libraw1394[${MULTILIB_USEDEP}]

101

-		sys-libs/libavc1394[${MULTILIB_USEDEP}]

102

+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]

103

+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]

104

+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]

105

)

106

 	ieee1394? (

107

-		media-libs/libdc1394[${MULTILIB_USEDEP}]

108

-		sys-libs/libraw1394[${MULTILIB_USEDEP}]

109

+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]

110

+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]

111

)

112

-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )

113

-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )

114

-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )

115

-	libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] )

116

-	libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] )

117

-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )

118

-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )

119

-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )

120

-	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )

121

-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )

122

-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )

123

-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )

124

+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )

125

+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )

126

+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )

127

+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )

128

+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )

129

+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )

130

+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )

131

+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )

132

+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )

133

+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )

134

+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )

135

+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )

136

 	quvi? ( media-libs/libquvi:0.4 )

137

-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )

138

-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )

139

-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )

140

-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )

141

-	ssh? ( net-libs/libssh[${MULTILIB_USEDEP}] )

142

-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )

143

-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )

144

-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )

145

+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )

146

+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )

147

+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )

148

+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )

149

+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )

150

+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )

151

+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )

152

+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )

153

 	vorbis? (

154

-		media-libs/libvorbis[${MULTILIB_USEDEP}]

155

-		media-libs/libogg[${MULTILIB_USEDEP}]

156

+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]

157

+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]

158

)

159

-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )

160

+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )

161

 	X? (

162

-		x11-libs/libX11[${MULTILIB_USEDEP}]

163

-		x11-libs/libXext[${MULTILIB_USEDEP}]

164

-		x11-libs/libXfixes[${MULTILIB_USEDEP}]

165

+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]

166

+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]

167

+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]

168

)

169

-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )

170

-	zvbi? ( media-libs/zvbi[${MULTILIB_USEDEP}] )

171

+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )

172

+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )

173

 	!media-video/qt-faststart

174

 	!media-libs/libpostproc

175

"

176

@@ -159,16 +159,16 @@

177

 DEPEND="${RDEPEND}

178

 	>=sys-devel/make-3.81

179

 	doc? ( app-text/texi2html )

180

-	fontconfig? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

181

-	gnutls? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

182

-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

183

-	ladspa? ( media-libs/ladspa-sdk[${MULTILIB_USEDEP}] )

184

-	libv4l? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

185

+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

186

+	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

187

+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

188

+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )

189

+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

190

 	mmx? ( >=dev-lang/yasm-1.2 )

191

-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

192

-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

193

+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

194

+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

195

 	test? ( net-misc/wget )

196

-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

197

+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

198

 	v4l? ( sys-kernel/linux-headers )

199

"

1.5                  media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild

205

206

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild?rev=1.5&view=markup

207

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild?rev=1.5&content-type=text/plain

208

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild?r1=1.4&r2=1.5

209

210

Index: ffmpeg-2.2.3-r1.ebuild

211

===================================================================

212

RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v

213

retrieving revision 1.4

214

retrieving revision 1.5

215

diff -u -r1.4 -r1.5

216

--- ffmpeg-2.2.3-r1.ebuild	16 Jun 2014 22:00:35 -0000	1.4

217

+++ ffmpeg-2.2.3-r1.ebuild	19 Jun 2014 13:14:49 -0000	1.5

218

@@ -1,6 +1,6 @@

219

 # Copyright 1999-2014 Gentoo Foundation

220

 # Distributed under the terms of the GNU General Public License v2

221

-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v 1.4 2014/06/16 22:00:35 mgorny Exp $

222

+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v 1.5 2014/06/19 13:14:49 mgorny Exp $

223

224

 EAPI="5"

225

226

@@ -74,84 +74,84 @@

227

 done

228

229

 RDEPEND="

230

-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )

231

-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )

232

-	bluray? ( media-libs/libbluray[${MULTILIB_USEDEP}] )

233

-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )

234

+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )

235

+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )

236

+	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )

237

+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )

238

 	cdio? (

239

 		|| (

240

-			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]

241

+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]

242

 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]

243

)

244

)

245

-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )

246

+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )

247

 	encode? (

248

-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )

249

-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )

250

-		amrenc? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )

251

-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )

252

-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )

253

+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )

254

+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )

255

+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )

256

+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )

257

+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )

258

 		theora? (

259

 			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]

260

-			media-libs/libogg[${MULTILIB_USEDEP}]

261

+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]

262

)

263

-		twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )

264

-		wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )

265

-		webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )

266

-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )

267

-		x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )

268

-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )

269

+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )

270

+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )

271

+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )

272

+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )

273

+		x265? ( >=media-libs/x265-0.8:=[${MULTILIB_USEDEP}] )

274

+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )

275

)

276

 	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )

277

-	flite? ( app-accessibility/flite[${MULTILIB_USEDEP}] )

278

-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )

279

+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )

280

+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )

281

 	frei0r? ( media-plugins/frei0r-plugins )

282

-	gme? ( media-libs/game-music-emu[${MULTILIB_USEDEP}] )

283

-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )

284

-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )

285

-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )

286

+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )

287

+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )

288

+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )

289

+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )

290

 	iec61883? (

291

-		media-libs/libiec61883[${MULTILIB_USEDEP}]

292

-		sys-libs/libraw1394[${MULTILIB_USEDEP}]

293

-		sys-libs/libavc1394[${MULTILIB_USEDEP}]

294

+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]

295

+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]

296

+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]

297

)

298

 	ieee1394? (

299

-		media-libs/libdc1394[${MULTILIB_USEDEP}]

300

-		sys-libs/libraw1394[${MULTILIB_USEDEP}]

301

+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]

302

+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]

303

)

304

-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )

305

-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )

306

-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )

307

-	libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] )

308

-	libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] )

309

-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )

310

-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )

311

-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )

312

-	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )

313

-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )

314

-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )

315

-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )

316

+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )

317

+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )

318

+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )

319

+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )

320

+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )

321

+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )

322

+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )

323

+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )

324

+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )

325

+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )

326

+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )

327

+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )

328

 	quvi? ( media-libs/libquvi:0.4 )

329

-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )

330

-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )

331

-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )

332

-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )

333

-	ssh? ( net-libs/libssh[${MULTILIB_USEDEP}] )

334

-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )

335

-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )

336

-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )

337

+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )

338

+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )

339

+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )

340

+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )

341

+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )

342

+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )

343

+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )

344

+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )

345

 	vorbis? (

346

-		media-libs/libvorbis[${MULTILIB_USEDEP}]

347

-		media-libs/libogg[${MULTILIB_USEDEP}]

348

+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]

349

+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]

350

)

351

-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )

352

+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )

353

 	X? (

354

-		x11-libs/libX11[${MULTILIB_USEDEP}]

355

-		x11-libs/libXext[${MULTILIB_USEDEP}]

356

-		x11-libs/libXfixes[${MULTILIB_USEDEP}]

357

+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]

358

+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]

359

+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]

360

)

361

-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )

362

-	zvbi? ( media-libs/zvbi[${MULTILIB_USEDEP}] )

363

+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )

364

+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )

365

 	!media-video/qt-faststart

366

 	!media-libs/libpostproc

367

"

368

@@ -159,16 +159,16 @@

369

 DEPEND="${RDEPEND}

370

 	>=sys-devel/make-3.81

371

 	doc? ( app-text/texi2html )

372

-	fontconfig? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

373

-	gnutls? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

374

-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

375

-	ladspa? ( media-libs/ladspa-sdk[${MULTILIB_USEDEP}] )

376

-	libv4l? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

377

+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

378

+	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

379

+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

380

+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )

381

+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

382

 	mmx? ( >=dev-lang/yasm-1.2 )

383

-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

384

-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

385

+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

386

+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

387

 	test? ( net-misc/wget )

388

-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

389

+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

390

 	v4l? ( sys-kernel/linux-headers )

391

"

1.3                  media-video/ffmpeg/ffmpeg-0.10.12.ebuild

397

398

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.12.ebuild?rev=1.3&view=markup

399

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.12.ebuild?rev=1.3&content-type=text/plain

400

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.12.ebuild?r1=1.2&r2=1.3

401

402

Index: ffmpeg-0.10.12.ebuild

403

===================================================================

404

RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.12.ebuild,v

405

retrieving revision 1.2

406

retrieving revision 1.3

407

diff -u -r1.2 -r1.3

408

--- ffmpeg-0.10.12.ebuild	15 May 2014 17:11:09 -0000	1.2

409

+++ ffmpeg-0.10.12.ebuild	19 Jun 2014 13:14:49 -0000	1.3

410

@@ -1,6 +1,6 @@

411

 # Copyright 1999-2014 Gentoo Foundation

412

 # Distributed under the terms of the GNU General Public License v2

413

-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.12.ebuild,v 1.2 2014/05/15 17:11:09 ulm Exp $

414

+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.12.ebuild,v 1.3 2014/06/19 13:14:49 mgorny Exp $

415

416

 EAPI="5"

417

418

@@ -47,45 +47,45 @@

419

 DOCS=""

420

421

 RDEPEND="

422

-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )

423

-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )

424

-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )

425

-	cdio? ( dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] )

426

-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )

427

-	dirac? ( media-video/dirac[${MULTILIB_USEDEP}] )

428

+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )

429

+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )

430

+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )

431

+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )

432

+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )

433

+	dirac? ( >=media-video/dirac-1.0.2-r1[${MULTILIB_USEDEP}] )

434

 	encode? (

435

-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )

436

-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )

437

-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )

438

-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )

439

-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )

440

-		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )

441

-		vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )

442

-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )

443

-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )

444

+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )

445

+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )

446

+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )

447

+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )

448

+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )

449

+		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )

450

+		vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )

451

+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )

452

+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )

453

)

454

 	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )

455

-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )

456

-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )

457

-	ieee1394? ( media-libs/libdc1394[${MULTILIB_USEDEP}] sys-libs/libraw1394[${MULTILIB_USEDEP}] )

458

-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )

459

-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )

460

-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )

461

-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )

462

-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )

463

-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )

464

-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )

465

-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )

466

-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )

467

-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )

468

-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )

469

-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )

470

-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )

471

-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )

472

-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )

473

-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )

474

-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}] )

475

-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )

476

+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )

477

+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )

478

+	ieee1394? ( >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] )

479

+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )

480

+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )

481

+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )

482

+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )

483

+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )

484

+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )

485

+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )

486

+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )

487

+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )

488

+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )

489

+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )

490

+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )

491

+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )

492

+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )

493

+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )

494

+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )

495

+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )

496

+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )

497

 	!<media-video/ffmpeg-1.2

498

 	!<media-video/libav-9

499

 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11

1.2                  media-video/ffmpeg/ffmpeg-0.10.13.ebuild

504

505

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.13.ebuild?rev=1.2&view=markup

506

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.13.ebuild?rev=1.2&content-type=text/plain

507

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.13.ebuild?r1=1.1&r2=1.2

508

509

Index: ffmpeg-0.10.13.ebuild

510

===================================================================

511

RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.13.ebuild,v

512

retrieving revision 1.1

513

retrieving revision 1.2

514

diff -u -r1.1 -r1.2

515

--- ffmpeg-0.10.13.ebuild	14 Jun 2014 09:49:09 -0000	1.1

516

+++ ffmpeg-0.10.13.ebuild	19 Jun 2014 13:14:49 -0000	1.2

517

@@ -1,6 +1,6 @@

518

 # Copyright 1999-2014 Gentoo Foundation

519

 # Distributed under the terms of the GNU General Public License v2

520

-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.13.ebuild,v 1.1 2014/06/14 09:49:09 aballier Exp $

521

+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.13.ebuild,v 1.2 2014/06/19 13:14:49 mgorny Exp $

522

523

 EAPI="5"

524

525

@@ -47,45 +47,45 @@

526

 DOCS=""

527

528

 RDEPEND="

529

-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )

530

-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )

531

-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )

532

-	cdio? ( dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] )

533

-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )

534

-	dirac? ( media-video/dirac[${MULTILIB_USEDEP}] )

535

+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )

536

+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )

537

+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )

538

+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )

539

+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )

540

+	dirac? ( >=media-video/dirac-1.0.2-r1[${MULTILIB_USEDEP}] )

541

 	encode? (

542

-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )

543

-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )

544

-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )

545

-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )

546

-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )

547

-		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )

548

-		vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )

549

-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )

550

-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )

551

+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )

552

+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )

553

+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )

554

+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )

555

+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )

556

+		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )

557

+		vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )

558

+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )

559

+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )

560

)

561

 	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )

562

-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )

563

-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )

564

-	ieee1394? ( media-libs/libdc1394[${MULTILIB_USEDEP}] sys-libs/libraw1394[${MULTILIB_USEDEP}] )

565

-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )

566

-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )

567

-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )

568

-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )

569

-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )

570

-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )

571

-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )

572

-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )

573

-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )

574

-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )

575

-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )

576

-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )

577

-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )

578

-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )

579

-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )

580

-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )

581

-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}] )

582

-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )

583

+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )

584

+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )

585

+	ieee1394? ( >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] )

586

+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )

587

+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )

588

+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )

589

+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )

590

+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )

591

+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )

592

+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )

593

+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )

594

+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )

595

+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )

596

+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )

597

+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )

598

+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )

599

+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )

600

+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )

601

+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )

602

+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )

603

+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )

604

 	!<media-video/ffmpeg-1.2

605

 	!<media-video/libav-9

606

 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11

1.3                  media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild

611

612

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?rev=1.3&view=markup

613

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?rev=1.3&content-type=text/plain

614

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?r1=1.2&r2=1.3

615

616

Index: ffmpeg-1.2.6-r1.ebuild

617

===================================================================

618

RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v

619

retrieving revision 1.2

620

retrieving revision 1.3

621

diff -u -r1.2 -r1.3

622

--- ffmpeg-1.2.6-r1.ebuild	16 Jun 2014 22:00:35 -0000	1.2

623

+++ ffmpeg-1.2.6-r1.ebuild	19 Jun 2014 13:14:49 -0000	1.3

624

@@ -1,6 +1,6 @@

625

 # Copyright 1999-2014 Gentoo Foundation

626

 # Distributed under the terms of the GNU General Public License v2

627

-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.2 2014/06/16 22:00:35 mgorny Exp $

628

+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.3 2014/06/19 13:14:49 mgorny Exp $

629

630

 EAPI="4"

631

632

@@ -52,76 +52,76 @@

633

 done

634

635

 RDEPEND="

636

-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )

637

-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )

638

-	bluray? ( media-libs/libbluray[${MULTILIB_USEDEP}] )

639

-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )

640

+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )

641

+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )

642

+	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )

643

+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )

644

 	cdio? (

645

 		|| (

646

-			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]

647

+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]

648

 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]

649

)

650

)

651

-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )

652

+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )

653

 	encode? (

654

-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )

655

-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )

656

-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )

657

-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )

658

-		fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] )

659

-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )

660

+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )

661

+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )

662

+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )

663

+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )

664

+		fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )

665

+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )

666

 		theora? (

667

 			>=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP},encode]

668

-			media-libs/libogg[${MULTILIB_USEDEP}]

669

+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]

670

)

671

-		twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )

672

-		x264? ( >=media-libs/x264-0.0.20111017[${MULTILIB_USEDEP}] )

673

-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )

674

+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )

675

+		x264? ( >=media-libs/x264-0.0.20130506[${MULTILIB_USEDEP}] )

676

+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )

677

)

678

-	flite? ( app-accessibility/flite[${MULTILIB_USEDEP}] )

679

-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )

680

+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )

681

+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )

682

 	frei0r? ( media-plugins/frei0r-plugins )

683

-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )

684

-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )

685

-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )

686

+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )

687

+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )

688

+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )

689

 	iec61883? (

690

-		media-libs/libiec61883[${MULTILIB_USEDEP}]

691

-		sys-libs/libraw1394[${MULTILIB_USEDEP}]

692

-		sys-libs/libavc1394[${MULTILIB_USEDEP}]

693

+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]

694

+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]

695

+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]

696

)

697

 	ieee1394? (

698

-		media-libs/libdc1394[${MULTILIB_USEDEP}]

699

-		sys-libs/libraw1394[${MULTILIB_USEDEP}]

700

+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]

701

+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]

702

)

703

-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )

704

-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )

705

-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )

706

-	libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] )

707

-	libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] )

708

-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )

709

-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )

710

-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )

711

-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )

712

-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )

713

-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )

714

-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )

715

-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )

716

-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )

717

-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )

718

-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )

719

-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )

720

-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )

721

+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )

722

+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )

723

+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )

724

+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )

725

+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )

726

+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )

727

+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )

728

+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )

729

+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )

730

+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )

731

+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )

732

+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )

733

+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )

734

+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )

735

+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )

736

+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )

737

+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )

738

+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )

739

 	vorbis? (

740

-		media-libs/libvorbis[${MULTILIB_USEDEP}]

741

-		media-libs/libogg[${MULTILIB_USEDEP}]

742

+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]

743

+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]

744

)

745

-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )

746

+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )

747

 	X? (

748

-		x11-libs/libX11[${MULTILIB_USEDEP}]

749

-		x11-libs/libXext[${MULTILIB_USEDEP}]

750

-		x11-libs/libXfixes[${MULTILIB_USEDEP}]

751

+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]

752

+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]

753

+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]

754

)

755

-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )

756

+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )

757

 	!media-video/qt-faststart

758

 	!media-libs/libpostproc

759

"

760

@@ -129,15 +129,15 @@

761

 DEPEND="${RDEPEND}

762

 	>=sys-devel/make-3.81

763

 	doc? ( app-text/texi2html )

764

-	fontconfig? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

765

-	gnutls? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

766

-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

767

-	libv4l? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

768

+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

769

+	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

770

+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

771

+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

772

 	mmx? ( dev-lang/yasm )

773

-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

774

-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

775

+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

776

+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

777

 	test? ( net-misc/wget )

778

-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )

779

+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

780

 	v4l? ( sys-kernel/linux-headers )

781

"

1.753                media-video/ffmpeg/ChangeLog

787

788

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.753&view=markup

789

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.753&content-type=text/plain

790

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.752&r2=1.753

791

792

Index: ChangeLog

793

===================================================================

794

RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v

795

retrieving revision 1.752

796

retrieving revision 1.753

797

diff -u -r1.752 -r1.753

798

--- ChangeLog	16 Jun 2014 22:00:35 -0000	1.752

799

+++ ChangeLog	19 Jun 2014 13:14:49 -0000	1.753

800

@@ -1,6 +1,11 @@

801

 # ChangeLog for media-video/ffmpeg

802

 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2

803

-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.752 2014/06/16 22:00:35 mgorny Exp $

804

+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.753 2014/06/19 13:14:49 mgorny Exp $

805

+

806

+  19 Jun 2014; Michał Górny <mgorny@g.o> ffmpeg-0.10.12.ebuild,

807

+  ffmpeg-0.10.13.ebuild, ffmpeg-1.2.6-r1.ebuild, ffmpeg-2.2.3-r1.ebuild,

808

+  ffmpeg-9999.ebuild:

809

+  Fix multilib dependencies to use safe versions, bug #513718.

810

811

   16 Jun 2014; Michał Górny <mgorny@g.o> ffmpeg-1.2.6-r1.ebuild,

812

   ffmpeg-2.2.3-r1.ebuild, ffmpeg-9999.ebuild:

Gentoo Archives: gentoo-commits