Browse Source

Merge pull request #10105 from neheb/ffm

ffmpeg: Fix pkgconfig files to be more cross compile friendly
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
eed49dad9c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
  1. +1
    -1
      multimedia/ffmpeg/Makefile
  2. +15
    -0
      multimedia/ffmpeg/patches/010-pkgconfig.patch
  3. +0
    -0
      multimedia/ffmpeg/patches/020-ffmpeg-fix-build-with-fdk-aac-2.0.patch

+ 1
- 1
multimedia/ffmpeg/Makefile 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/


+ 15
- 0
multimedia/ffmpeg/patches/010-pkgconfig.patch 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

multimedia/ffmpeg/patches/ffmpeg-fix-build-with-fdk-aac-2.0.patch → multimedia/ffmpeg/patches/020-ffmpeg-fix-build-with-fdk-aac-2.0.patch View File


Loading…
Cancel
Save