Skip to contentSkip to conversation

openh264: Upgrade to 2.1.0

PATCH New Khem Raj 1 participant 1 message Apr 19, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 openh264: Upgrade to 2.1.0

Drop mips64 build patches as they are not needed anymore Add logic for building on rv64

---
 ...-poke-at-host-gcc-for-target-options.patch | 25 -------
 .../0001-codec-Disable-asm-for-mips.patch     | 70 -------------------
 .../{openh264_2.0.0.bb => openh264_2.1.0.bb}  |  7 +-
 3 files changed, 3 insertions(+), 99 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch
 delete mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch
 rename meta-multimedia/recipes-multimedia/openh264/{openh264_2.0.0.bb => openh264_2.1.0.bb} (85%)
meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch deleted +0 -25
deleted file mode 100644
index 5f590596d9..0000000000
@@ -1,25 +0,0 @@
-From af9bd9201c755e0b01251021f4e7642d3fec9c1c Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 4 Mar 2020 08:38:46 -0800
-Subject: [PATCH] Makefile: Do not poke at host gcc for target options
-
-Signed-off-by: Khem Raj <[email protected]>
----
- build/arch.mk | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/build/arch.mk b/build/arch.mk
-index 8ac3e70a..b80cee8c 100644
---- a/build/arch.mk
-+++ b/build/arch.mk
-@@ -35,7 +35,6 @@ ifneq ($(filter mips mips64, $(ARCH)),)
- ifeq ($(USE_ASM), Yes)
- ASM_ARCH = mips
- ASMFLAGS += -I$(SRC_PATH)codec/common/mips/
--LOONGSON3A = $(shell g++ -dM -E - < /dev/null | grep '_MIPS_TUNE ' | cut -f 3 -d " ")
- ifeq ($(LOONGSON3A), "loongson3a")
- CFLAGS += -DHAVE_MMI
- endif
--- 
-2.25.1
-
meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch deleted +0 -70

70 lines not on this page · raw message

meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb renamed from meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb +3 -4
similarity index 85%
rename from meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb
rename to meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb
index 31b9da269f..3c65ef2479 100644
@@ -11,12 +11,10 @@ LICENSE_FLAGS = "commercial"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf"
 
 S = "${WORKDIR}/git"
-SRCREV = "71374015cdf13f7aab4bc2d820f77905b3becfb8"
-BRANCH = "openh264v2.0.0"
+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 \
-           file://0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch \
-           file://0001-codec-Disable-asm-for-mips.patch \
            "
 
 COMPATIBLE_MACHINE_armv7a = "(.*)"
@@ -33,6 +31,7 @@ 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() {
Signature · 1 line
2.26.1