diff options
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia/openh264')
| -rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch | 32 | ||||
| -rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb (renamed from meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb) | 16 |
2 files changed, 43 insertions, 5 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch new file mode 100644 index 0000000000..92f32948b2 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch @@ -0,0 +1,32 @@ +From 1c3bda45c55d2334af384caf9e7f240b7aaf2eb5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 3 Mar 2020 22:28:25 -0800 +Subject: [PATCH] Makefile: Use cp options to preserve file mode + +This fixes packaging issues e.g. +openh264: /usr/lib/libopenh264.so is owned by uid 1000, which is the same as the user running bitbake + +Upstream-Status: Submitted [https://github.com/cisco/openh264/pull/3245] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 74ff029d..ac643412 100644 +--- a/Makefile ++++ b/Makefile +@@ -306,8 +306,8 @@ install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers $ + mkdir -p $(DESTDIR)$(SHAREDLIB_DIR) + install -m 755 $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXFULLVER) $(DESTDIR)$(SHAREDLIB_DIR) + if [ "$(SHAREDLIBSUFFIXFULLVER)" != "$(SHAREDLIBSUFFIX)" ]; then \ +- cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) $(DESTDIR)$(SHAREDLIB_DIR) ; \ +- cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR) ; \ ++ cp -R --no-dereference --preserve=mode,links $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) $(DESTDIR)$(SHAREDLIB_DIR) ; \ ++ cp -R --no-dereference --preserve=mode,links $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR) ; \ + fi + mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig + install -m 644 $(PROJECT_NAME).pc $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig +-- +2.25.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb index e2f028ac58..3c65ef2479 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb @@ -3,17 +3,19 @@ decoding. It is suitable for use in real time applications such as WebRTC." HOMEPAGE = "http://www.openh264.org/" SECTION = "libs/multimedia" -DEPENDS_x86 += "nasm-native" -DEPENDS_x86-64 += "nasm-native" +DEPENDS_append_x86 = " nasm-native" +DEPENDS_append_x86-64 = " nasm-native" LICENSE = "BSD-2-Clause" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf" S = "${WORKDIR}/git" -SRCREV = "a180c9d4d6f1a4830ca9eed9d159d54996bd63cb" -BRANCH = "openh264v1.7" -SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH};" +SRCREV = "a60e28efe227ea8ea760b1e29a8943e371ebe4b3" +BRANCH = "openh264v2.1.0" +SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ + file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \ + " COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" @@ -29,7 +31,9 @@ EXTRA_OEMAKE_x86 = "ARCH=i386" EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" EXTRA_OEMAKE_mips = "ARCH=mips" EXTRA_OEMAKE_mips64 = "ARCH=mips64" +EXTRA_OEMAKE_riscv64 = "ARCH=riscv64" +EXTRA_OEMAKE_append = " ENABLEPIC=Yes" do_configure() { : } @@ -41,3 +45,5 @@ do_compile() { do_install() { oe_runmake install DESTDIR=${D} PREFIX=${prefix} } + +CLEANBROKEN = "1" |