diff options
| author | Edward Hervey <edward@centricular.com> | 2015-04-07 12:32:47 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2015-04-07 12:36:49 +0200 |
| commit | 396bdb02d2e6ea327477506dfb03789dc4df293f (patch) | |
| tree | 16589b05ea8bb743f3ab3832eb34c652ad568cb7 /recipes | |
| parent | f60f71867f64aa0061d0de2010dabe61246c9c7f (diff) | |
recipes: Bump openh264 to 1.4.0
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/openh264.recipe | 5 | ||||
| -rw-r--r-- | recipes/openh264/0002-Don-t-install-the-pkg-config-file-as-readonly.patch | 27 |
2 files changed, 2 insertions, 30 deletions
diff --git a/recipes/openh264.recipe b/recipes/openh264.recipe index 58654eac..9bf22ea6 100644 --- a/recipes/openh264.recipe +++ b/recipes/openh264.recipe @@ -5,7 +5,7 @@ from cerbero.utils import shell class Recipe(recipe.Recipe): name = 'openh264' - version = '1.3.1' + version = '1.4.0' url = 'https://github.com/cisco/%(name)s/archive/v%(version)s.tar.gz' stype = SourceType.TARBALL btype = BuildType.MAKEFILE @@ -15,8 +15,7 @@ class Recipe(recipe.Recipe): # However, upstream didn't want the library to be versioned on Android, so # we'll need to carry forward that bit for ourselves. # 0002: Fixed upstream, remove patch on next update - patches = [name + '/0001-Add-version-suffix.patch', - name + '/0002-Don-t-install-the-pkg-config-file-as-readonly.patch'] + patches = [name + '/0001-Add-version-suffix.patch'] files_libs = ['libopenh264'] files_devel = ['include/wels', 'lib/pkgconfig/openh264.pc'] diff --git a/recipes/openh264/0002-Don-t-install-the-pkg-config-file-as-readonly.patch b/recipes/openh264/0002-Don-t-install-the-pkg-config-file-as-readonly.patch deleted file mode 100644 index ba82eb9f..00000000 --- a/recipes/openh264/0002-Don-t-install-the-pkg-config-file-as-readonly.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a24bac34bd292f88c41c0d3428033fb4ed72e4c4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st> -Date: Fri, 2 Jan 2015 21:52:36 +0200 -Subject: [PATCH] Don't install the pkg-config file as readonly - -This file should be installed just as any other file, protected by -normal user permissions, not by making the file readonly. ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 37ea626..da0e6a3 100644 ---- a/Makefile -+++ b/Makefile -@@ -237,7 +237,7 @@ install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers $ - cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(SHAREDLIB_DIR); \ - fi - mkdir -p $(PREFIX)/lib/pkgconfig -- install -m 444 $(PROJECT_NAME).pc $(PREFIX)/lib/pkgconfig -+ install -m 644 $(PROJECT_NAME).pc $(PREFIX)/lib/pkgconfig - ifneq ($(EXTRA_LIBRARY),) - install -m 644 $(EXTRA_LIBRARY) $(PREFIX)/lib - endif --- -2.1.0 - |