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 <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-09-28 17:11:27 -07:00
parent 1086846107
commit 7477663489
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
3 changed files with 16 additions and 1 deletions

View File

@ -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/

View File

@ -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