Merge branch 'edge' into next

4 files changed, 171 insertions, 6 deletions

diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index a21b17e58acf..e33e302959b1 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,5 +1,7 @@
 AUX ffmpeg4.patch 28911 BLAKE2B f1189589a39ea9801e1620bd138499f5f5a29429cc7372ebf65b38901f1f4f0b71957a216a65367108660709ea5ca001e5ce68d67dfd478ed471963acef087a3 SHA512 1550b2de1ca0265703513d3b7fca3441f6216d89792dc68e224f5f2d99386275cdfdf7ef7b01abaf69f5de5d9af1f221617697aff6345d3d1b2e5a06d30e1f6d
+AUX transcode-1.1.7-swresample.patch 674 BLAKE2B 733a3490d2a25b20555cce3624f8e1753d22e3ae945a9656b835a5bf0eabf1b2f16fc1df1f817931dfc618b644c9e359c1c37939ef169f3f59006455a4fa2c75 SHA512 a9a79215082506882f1d1549cbe51706670f7ccf9d5da1400f9bf81482d4f410a855772183eeac8d9fa865d5d6086e10cbe8f4d7176802959a0a8b5df0759abb
 DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d
 DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
-EBUILD transcode-1.1.7-r3.ebuild 4176 BLAKE2B 888248858ca78b0d19100fc4fc3dfe83d0f659e636a021e75d9a1710b93af7dafdf7121ee5b970bb2a8be82714c5065772e9c803231270a37865c946464428c5 SHA512 b58e9bb75201e8655ca88ddd86d780b61934136ccf057976a561ce79775c079e94c616024349414921bb087fd96311e56dd9d5df4cdb765b666fd644003d7b69
+EBUILD transcode-1.1.7-r4.ebuild 4131 BLAKE2B ebcdf29ad43555dc557fc9f05c8830efa680cf8f50286850b3d0d8b36ae0c931293f2e7ac69f95b471b2ef458470ab75a465757323ae6fe05d3f329846c41733 SHA512 1134536dcfcbbc4418bd8b9a4a7fac6aa2e87f7c4aa1c2897a373fa46a5e0f48692859b67dcf696634a36dbb89e3fa89821e6cec54d778a4156112a8f2939f18
+EBUILD transcode-1.1.7-r5.ebuild 4189 BLAKE2B a25f43e7bd15eb2b45a4414a4d8b4350f3d8539d471d16ac82fa5c201e5e3bf3ef79dd7ca08ae5020ba57be9b149f1dec56eee24fb9ea0a867e71637922b242d SHA512 db8f579e41169dbee17b34835a8244d872ae514f2f135497409a50ef5a9976fb9ae88dc102de65661ae2909a7b55e9fe7f3e062c1a86cea3137a6a8a2d1b44f0
 MISC metadata.xml 619 BLAKE2B fa440f0f00bd7afe2834108078f48dc93dfe5ea38d343587267e2b45f4c4187762fdf16e1f023e4fc3af69d181ec77cbedec4a39df98eb8d4a098b98248c7b56 SHA512 043d39001850f8088e33e7277a579af7cb45b6fd2b3fe4483eb7771340dae8eab14927184f0fab9aedc8934a6d2599ce6231726308079d0ae16e7710f826ad1b
diff --git a/media-video/transcode/files/transcode-1.1.7-swresample.patch b/media-video/transcode/files/transcode-1.1.7-swresample.patch
new file mode 100644
index 000000000000..b9a908d122ef
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-swresample.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/722296
+https://git.archlinux.org/svntogit/community.git/tree/trunk/transcode-swresample.patch?h=packages/transcode&id=7fb278671fbd0a201de8d32aefee888fd253db44
+
+--- transcode-1.1.7/filter/filter_resample.c
++++ transcode-1.1.7/filter/filter_resample.c
+@@ -37,7 +37,7 @@
+ #include "libtc/optstr.h"
+ #include "libtc/tcavcodec.h"
+ #include "libtc/tcmodule-plugin.h"
+-#include <libavresample/avresample.h>
++#include <libswresample/swresample.h>
+ 
+ 
+ typedef struct {
+@@ -46,7 +46,7 @@
+ 
+     int bytes_per_sample;
+ 
+-    AVAudioResampleContext *resample_ctx;
++    SwrContext *resample_ctx;
+ } ResamplePrivateData;
+ 
+ static const char resample_help[] = ""
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r4.ebuild
index 952e736767f4..1091cd557b80 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit autotools libtool multilib
 
-DESCRIPTION="A suite of utilities for transcoding video and audio codecs in different containers"
+DESCRIPTION="Utilities for transcoding video and audio codecs in different containers"
 HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
 SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
 
 RDEPEND="
-	>=virtual/ffmpeg-0.10
+	>=media-video/ffmpeg-0.10
 	a52? ( media-libs/a52dec )
 	aac? ( media-libs/faac )
 	alsa? ( media-libs/alsa-lib )
@@ -29,7 +29,7 @@ RDEPEND="
 	mp3? ( media-sound/lame )
 	mpeg? ( media-libs/libmpeg2 )
 	ogg? ( media-libs/libogg )
-	postproc? ( >=virtual/ffmpeg-0.10 )
+	postproc? ( >=media-video/ffmpeg-0.10 )
 	quicktime? ( >=media-libs/libquicktime-1 )
 	sdl? ( >=media-libs/libsdl-1.2.5[X?] )
 	theora? ( media-libs/libtheora )
@@ -69,8 +69,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	if has_version '>=media-video/ffmpeg-2.8' ||
-		has_version '>=media-video/libav-12'; then
+	if has_version '>=media-video/ffmpeg-2.8'; then
 		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-ffmpeg29.patch )
 	fi
 
diff --git a/media-video/transcode/transcode-1.1.7-r5.ebuild b/media-video/transcode/transcode-1.1.7-r5.ebuild
new file mode 100644
index 000000000000..7a878b4fd548
--- /dev/null
+++ b/media-video/transcode/transcode-1.1.7-r5.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2002-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool multilib
+
+DESCRIPTION="Utilities for transcoding video and audio codecs in different containers"
+HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
+SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
+
+RDEPEND="
+	>=media-video/ffmpeg-0.10
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faac )
+	alsa? ( media-libs/alsa-lib )
+	dv? ( media-libs/libdv )
+	dvd? ( media-libs/libdvdread:0= )
+	iconv? ( virtual/libiconv )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jpeg? ( virtual/jpeg:0= )
+	lzo? ( >=dev-libs/lzo-2 )
+	mjpeg? ( media-video/mjpegtools )
+	mp3? ( media-sound/lame )
+	mpeg? ( media-libs/libmpeg2 )
+	ogg? ( media-libs/libogg )
+	postproc? ( >=media-video/ffmpeg-0.10 )
+	quicktime? ( >=media-libs/libquicktime-1 )
+	sdl? ( >=media-libs/libsdl-1.2.5[X?] )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2 )
+	v4l? ( media-libs/libv4l )
+	vorbis? ( media-libs/libvorbis )
+	X? ( x11-libs/libXpm x11-libs/libXaw x11-libs/libXv )
+	x264? ( media-libs/x264:= )
+	xml? ( dev-libs/libxml2 )
+	xvid? ( media-libs/xvid )
+	"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	v4l? ( >=sys-kernel/linux-headers-2.6.11 )
+"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx cpu_flags_x86_sse )
+	cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+	nuv? ( lzo )
+	"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg-0.10.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg-0.11.patch
+	"${WORKDIR}"/${P}-patchset/${P}-preset-free.patch
+	"${WORKDIR}"/${P}-patchset/${P}-libav-9.patch
+	"${WORKDIR}"/${P}-patchset/${P}-libav-10.patch
+	"${WORKDIR}"/${P}-patchset/${P}-preset-force.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg2.patch
+	"${WORKDIR}"/${P}-patchset/${P}-freetype251.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg24.patch
+	"${FILESDIR}"/${P}-swresample.patch #722296
+)
+
+src_prepare() {
+	if has_version '>=media-video/ffmpeg-2.8'; then
+		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-ffmpeg29.patch )
+	fi
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-imagemagick7.patch )
+	fi
+
+	if has_version '>=media-video/ffmpeg-4' ;  then
+		PATCHES+=( "${FILESDIR}/ffmpeg4.patch" )
+	fi
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use x86 && myconf="$(use_enable !pic x86-textrels)" #271476
+
+	local myeconfargs=(
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable altivec)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l libv4lconvert)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mpeg libmpeg2convert)
+		--enable-experimental
+		--enable-deprecated
+		$(use_enable v4l)
+		$(use_enable oss)
+		$(use_enable alsa)
+		$(use_enable postproc libpostproc)
+		$(use_enable truetype freetype2)
+		$(use_enable mp3 lame)
+		$(use_enable xvid)
+		$(use_enable x264)
+		$(use_enable ogg)
+		$(use_enable vorbis)
+		$(use_enable theora)
+		$(use_enable dvd libdvdread)
+		$(use_enable dv libdv)
+		$(use_enable quicktime libquicktime)
+		$(use_enable lzo)
+		$(use_enable a52)
+		$(use_enable aac faac)
+		$(use_enable xml libxml2)
+		$(use_enable mjpeg mjpegtools)
+		$(use_enable sdl)
+		$(use_enable imagemagick)
+		$(use_enable jpeg libjpeg)
+		$(use_enable iconv)
+		$(use_enable nuv)
+		$(use_with X x)
+		--with-mod-path=/usr/$(get_libdir)/transcode
+		${myconf}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" docsdir=/usr/share/doc/${PF} install
+	dodoc AUTHORS ChangeLog README STYLE TODO
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}