diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-07-13 18:37:35 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-07-13 22:05:03 +0530 |
| commit | 88719a0990c6504a1566cad65d420606faa26eeb (patch) | |
| tree | 333083a92cd0cea095843ed5f7b036a3b5f729ff | |
| parent | 3b6d436c66b223d69c65d3b80a3b7379a16fc625 (diff) | |
recipes: Fix patch references in libsrtp and openh264
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/554>
| -rw-r--r-- | recipes/graphene.recipe | 4 | ||||
| -rw-r--r-- | recipes/libsrtp.recipe | 1 | ||||
| -rw-r--r-- | recipes/openh264.recipe | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/recipes/graphene.recipe b/recipes/graphene.recipe index d6fd740c..5a962460 100644 --- a/recipes/graphene.recipe +++ b/recipes/graphene.recipe @@ -81,8 +81,8 @@ class Recipe(recipe.Recipe): 'include', arch) if not os.path.exists(arch_dir): os.makedirs(arch_dir) - shutil.copyfile(os.path.join(self.meson_dir, 'src', 'graphene-config.h'), - os.path.join(arch_dir, 'graphene-config.h')) + shutil.copyfile(os.path.join(self.meson_dir, 'include', 'graphene-config.h'), + os.path.join(arch_dir, 'graphene-config.h')) with open(os.path.join(self.config.prefix, 'lib', 'graphene-1.0', 'include', 'graphene-config.h'), 'w+') as f: f.write(GRAPHENE_CONFIG_UNVERSAL) diff --git a/recipes/libsrtp.recipe b/recipes/libsrtp.recipe index ee817e14..4c076eca 100644 --- a/recipes/libsrtp.recipe +++ b/recipes/libsrtp.recipe @@ -21,7 +21,6 @@ class Recipe(recipe.Recipe): } patches = [ - # https://gitlab.freedesktop.org/gstreamer/meson-ports/libsrtp # https://github.com/cisco/libsrtp/pull/495 'libsrtp/libsrtp-meson-port.patch', 'libsrtp/0001-meson-Fix-check-for-size_t-on-MSVC.patch', diff --git a/recipes/openh264.recipe b/recipes/openh264.recipe index 7a05748f..72a05bc7 100644 --- a/recipes/openh264.recipe +++ b/recipes/openh264.recipe @@ -17,7 +17,7 @@ class Recipe(recipe.Recipe): # https://github.com/cisco/openh264/pull/3247 name + "/0001-meson-add-support-for-android-ios-macos.patch", name + "/0001-depend-on-gnustl-for-android.patch", - # Depend on the above patches, submit after they're merged + # https://github.com/cisco/openh264/pull/3301 name + "/0001-meson-Bump-requirement-to-0.50.patch", name + "/0002-meson-Add-support-for-Windows-ARM-and-ARM64.patch", ] |