ffmpeg: bump version

* don't enable libopenmpt on x86_gcc2
* drop deprecated libavresample

media-video/ffmpeg/ffmpeg-4.1.4.recipe

@@ -7,9 +7,9 @@ COPYRIGHT="2000-2003 Fabrice Bellard
 	2003-2019 the FFmpeg developers"
 LICENSE="GNU LGPL v3
 	GNU GPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
-CHECKSUM_SHA256="0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d"
+CHECKSUM_SHA256="f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1"
 PATCHES="ffmpeg-$portVersion.patchset"
 ADDITIONAL_FILES="gcc_runtime.c"
 
@@ -21,7 +21,6 @@ ffmpegLibs="\
 	libavdevice \
 	libavfilter \
 	libavformat \
-	libavresample \
 	libavutil \
 	libpostproc \
 	libswresample \
@@ -33,7 +32,6 @@ libavcodecVersion="58.35.100"
 libavformatVersion="58.20.100"
 libavdeviceVersion="58.5.100"
 libavfilterVersion="7.40.101"
-libavresampleVersion="4.0.0"
 libswscaleVersion="5.3.100"
 libswresampleVersion="3.3.100"
 libpostprocVersion="55.3.100"
@@ -47,7 +45,6 @@ PROVIDES="
 	lib:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat
 	lib:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat
 	lib:libavformat$secondaryArchSuffix = $libavformatVersionCompat
-	lib:libavresample$secondaryArchSuffix = $libavresampleVersionCompat
 	lib:libavutil$secondaryArchSuffix = $libavutilVersionCompat
 	lib:libpostproc$secondaryArchSuffix = $libpostprocVersionCompat
 	lib:libswresample$secondaryArchSuffix = $libswresampleVersionCompat
@@ -57,7 +54,6 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
-	lib:libopenmpt$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
 	lib:libtheoradec$secondaryArchSuffix
 	lib:libtheoraenc$secondaryArchSuffix
@@ -67,8 +63,9 @@ REQUIRES="
 	"
 if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
 	REQUIRES+="
-		lib:libvpx$secondaryArchSuffix
 		lib:libgnutls$secondaryArchSuffix
+		lib:libopenmpt$secondaryArchSuffix
+		lib:libvpx$secondaryArchSuffix
 		"
 fi
 CONFLICTS="
@@ -112,7 +109,6 @@ PROVIDES_devel="
 	devel:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat
 	devel:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat
 	devel:libavformat$secondaryArchSuffix = $libavformatVersionCompat
-	devel:libavresample$secondaryArchSuffix = $libavresampleVersionCompat
 	devel:libavutil$secondaryArchSuffix = $libavutilVersionCompat
 	devel:libpostproc$secondaryArchSuffix = $libpostprocVersionCompat
 	devel:libswresample$secondaryArchSuffix = $libswresampleVersionCompat
@@ -151,7 +147,6 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
-	devel:libopenmpt$secondaryArchSuffix
 	devel:libsdl2$secondaryArchSuffix
 	devel:libspeex$secondaryArchSuffix
 	devel:libtheora$secondaryArchSuffix
@@ -160,8 +155,9 @@ BUILD_REQUIRES="
 	"
 if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
 	BUILD_REQUIRES+="
-		devel:libvpx$secondaryArchSuffix
 		devel:libgnutls$secondaryArchSuffix
+		devel:libopenmpt$secondaryArchSuffix
+		devel:libvpx$secondaryArchSuffix
 		"
 fi
 BUILD_PREREQUIRES="
@@ -196,7 +192,6 @@ defineDebugInfoPackage ffmpeg$secondaryArchSuffix \
 	$libDir/libavcodec.so.$libavcodecVersion \
 	$libDir/libavfilter.so.$libavfilterVersion \
 	$libDir/libavformat.so.$libavformatVersion \
-	$libDir/libavresample.so.$libavresampleVersion \
 	$libDir/libavutil.so.$libavutilVersion \
 	$libDir/libpostproc.so.$libpostprocVersion \
 	$libDir/libswresample.so.$libswresampleVersion \
@@ -234,7 +229,7 @@ BUILD()
 		export CFLAGS="-isystem$(pwd) -isystem$(pwd)/os -isystem$(pwd)/config"
 		export LDFLAGS="$baseLDFLAGS $(pwd)/gcc_runtime.o"
 	else
-		extraArgs="--enable-libvpx --enable-gnutls"
+		extraArgs="--enable-libvpx --enable-gnutls --enable-libopenmpt"
 	fi
 
 	# not an autotools configure
@@ -256,8 +251,6 @@ BUILD()
 		--enable-libvorbis \
 		--enable-libspeex \
 		--enable-libtheora \
-		--enable-avresample \
-		--enable-libopenmpt \
 		$extraArgs
 
 	make $jobArgs