diff options
| author | Stéphane Cerveau <scerveau@igalia.com> | 2022-11-04 12:30:19 +0100 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-12-07 17:53:00 +0000 |
| commit | b1e2ea5e48868f35cc1d8fc5579b44b0a1c97881 (patch) | |
| tree | 03ab81a32ffff02691265d7af5914a4b0c6e43db | |
| parent | 500dabdc86af5123970c8c3a6904fede9a0389b0 (diff) | |
ffmpeg: add patch to generate the pc files properly
The pc files should be generated using prefix
in libdir and includedir
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1040>
| -rw-r--r-- | recipes/ffmpeg.recipe | 4 | ||||
| -rw-r--r-- | recipes/ffmpeg/0001-pkgconfig-fix-generation-to-use-prefix.patch | 27 |
2 files changed, 30 insertions, 1 deletions
diff --git a/recipes/ffmpeg.recipe b/recipes/ffmpeg.recipe index ed44d5f5..693ade2f 100644 --- a/recipes/ffmpeg.recipe +++ b/recipes/ffmpeg.recipe @@ -8,7 +8,9 @@ class Recipe(recipe.Recipe): stype = SourceType.TARBALL url = 'https://ffmpeg.org/releases/%(name)s-%(version)s.tar.xz' tarball_checksum = '06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909' - patches = [] + patches = [ + name + '/0001-pkgconfig-fix-generation-to-use-prefix.patch', + ] btype = BuildType.MAKEFILE configure_tpl = './configure --prefix=%(prefix)s --libdir=%(libdir)s \ diff --git a/recipes/ffmpeg/0001-pkgconfig-fix-generation-to-use-prefix.patch b/recipes/ffmpeg/0001-pkgconfig-fix-generation-to-use-prefix.patch new file mode 100644 index 00000000..c7d670fb --- /dev/null +++ b/recipes/ffmpeg/0001-pkgconfig-fix-generation-to-use-prefix.patch @@ -0,0 +1,27 @@ +From 8f5d2c0283c4cbc430ac30a6efef999c33bdb2c9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <scerveau@igalia.com> +Date: Fri, 4 Nov 2022 12:20:25 +0100 +Subject: [PATCH] pkgconfig: fix generation to use prefix + +--- + ffbuild/pkgconfig_generate.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ffbuild/pkgconfig_generate.sh b/ffbuild/pkgconfig_generate.sh +index e5de671..679413e 100755 +--- a/ffbuild/pkgconfig_generate.sh ++++ b/ffbuild/pkgconfig_generate.sh +@@ -29,8 +29,8 @@ version=$(grep ${name}_VERSION= $name/${name}.version | cut -d= -f2) + cat <<EOF > $name/$fullname.pc + prefix=$prefix + exec_prefix=\${prefix} +-libdir=$libdir +-includedir=$incdir ++libdir=\${prefix}/lib ++includedir=\${prefix}/include + + Name: $fullname + Description: $comment +-- +2.34.1 + |