diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 5d60a50ed8..5a18edf1a6 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ffmpeg PKG_VERSION:=3.4.6 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/patches/010-pkgconfig.patch b/multimedia/ffmpeg/patches/010-pkgconfig.patch new file mode 100644 index 0000000000..48635e169a --- /dev/null +++ b/multimedia/ffmpeg/patches/010-pkgconfig.patch @@ -0,0 +1,15 @@ +--- a/ffbuild/pkgconfig_generate.sh ++++ b/ffbuild/pkgconfig_generate.sh +@@ -28,9 +28,9 @@ version=$(grep ${name}_VERSION= $name/${name}.version | cut -d= -f2) + + cat < $name/$fullname.pc + prefix=$prefix +-exec_prefix=\${prefix} +-libdir=$libdir +-includedir=$incdir ++exec_prefix=${prefix} ++libdir=\${exec_prefix}/lib ++includedir=\${prefix}/include + + Name: $fullname + Description: $comment diff --git a/multimedia/ffmpeg/patches/ffmpeg-fix-build-with-fdk-aac-2.0.patch b/multimedia/ffmpeg/patches/020-ffmpeg-fix-build-with-fdk-aac-2.0.patch similarity index 100% rename from multimedia/ffmpeg/patches/ffmpeg-fix-build-with-fdk-aac-2.0.patch rename to multimedia/ffmpeg/patches/020-ffmpeg-fix-build-with-fdk-aac-2.0.patch