From: Rosen Penev <redacted>
Date: Sun, 29 Sep 2019 00:11:27 +0000 (-0700)
Subject: ffmpeg: Fix pkgconfig files to be more cross compile friendly
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7477663489a744d449b95ac34ef0db2b02374172;p=openwrt-packages.git

ffmpeg: Fix pkgconfig files to be more cross compile friendly

Before:

prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib
includedir=/usr/include

After:

prefix=/usr
exec_prefix=/usr
libdir=${exec_prefix}/lib
includedir=${prefix}/include

Numbered the other patch file.

Signed-off-by: Rosen Penev <redacted>
---

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 5d60a50ed..5a18edf1a 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 000000000..48635e169
--- /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 <<EOF > $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