From: Yann E. MORIN Date: Mon, 13 Apr 2020 22:58:56 +0200 Subject: [Buildroot] [PATCH 1/1] package/libopenh264: bump version to 2.1.0 In-Reply-To: <20200413101713.661856-1-bernd.kuhls@t-online.de> References: <20200413101713.661856-1-bernd.kuhls@t-online.de> Message-ID: <20200413205856.GB5853@scaer> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Bernd, All, On 2020-04-13 12:17 +0200, Bernd Kuhls spake thusly: > Removed patch applied upstream in updated form: > https://github.com/cisco/openh264/commit/2122fe08cc8fe69899c3e257d0ee030c28a64174 > > Added new patch to fix subsequent build error on mips. > > Signed-off-by: Bernd Kuhls This one was the second patch I was considering not applying, because of the dubiously forced -march flag. In the end I applied... Regards, Yann E. MORIN. > --- > Build occured with these defconfigs: > > br-mips32r6-el-hf-glibc [17/44]: FAILED > br-mips64r6-el-hf-glibc [19/44]: FAILED > > .../0002-Adjust-the-mmi-msa-detection-m.patch | 385 ------------------ > package/libopenh264/0002-fix-mips-build.patch | 73 ++++ > package/libopenh264/libopenh264.hash | 2 +- > package/libopenh264/libopenh264.mk | 2 +- > 4 files changed, 75 insertions(+), 387 deletions(-) > delete mode 100644 package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch > create mode 100644 package/libopenh264/0002-fix-mips-build.patch > > diff --git a/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch b/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch > deleted file mode 100644 > index 895a97e93b..0000000000 > --- a/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch > +++ /dev/null > @@ -1,385 +0,0 @@ > -From 576b64d6a4253f900d4846503df55dba051063ab Mon Sep 17 00:00:00 2001 > -From: gxw > -Date: Tue, 22 Oct 2019 19:20:19 +0800 > -Subject: [PATCH] Adjust the mmi/msa detection mode for mips platform. > - > -Using mips-simd-check.sh to test the current compiler support mmi/msa > -or not before make. If supported, enable mmi/msa. > -According to the model name in /proc/cpuinfo to test the current > -cpu support mmi/msa or not for runtime detection. > -Now We can use the following make instructions on mips platform: > -1. make (automatic detection mmi/msa) > -2. make ENABLE_MMI=No (disable mmi) > -3. make ENABLE_MSA=No (disable msa) > -4. make ENABLE_MMI=No ENABLE_MSA=No (disable mmi and msa) > - > -Change-Id: Ibd348ebc11912d7fca1b548c76838675d69b7c40 > - > -Downloaded from upstream PR: > -https://github.com/cisco/openh264/pull/3175 > - > -Signed-off-by: gxw > -[Bernd: rebased on top of patch 0001] > -Signed-off-by: Bernd Kuhls > ---- > - Makefile | 2 ++ > - build/arch.mk | 18 ++++++++++++---- > - build/mips-simd-check.sh | 32 +++++++++++++++++++++++++++ > - build/mktargets.py | 43 ++++++++++++++++++++++++++----------- > - codec/common/inc/cpu_core.h | 1 + > - codec/common/src/cpu.cpp | 37 +++++++++++++++++++++++++------ > - codec/common/targets.mk | 18 ++++++++++++---- > - codec/decoder/targets.mk | 18 ++++++++++++---- > - codec/encoder/targets.mk | 18 ++++++++++++---- > - codec/processing/targets.mk | 18 ++++++++++++---- > - 10 files changed, 166 insertions(+), 39 deletions(-) > - create mode 100755 build/mips-simd-check.sh > - > -diff --git a/Makefile b/Makefile > -index 74ff029d9..65d13630b 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -35,6 +35,8 @@ GTEST_VER=release-1.8.1 > - STATIC_LDFLAGS=-lstdc++ > - STRIP ?= strip > - USE_STACK_PROTECTOR = Yes > -+ENABLE_MMI=Yes > -+ENABLE_MSA=Yes > - > - SHAREDLIB_MAJORVERSION=5 > - FULL_VERSION := 2.0.0 > -diff --git a/build/arch.mk b/build/arch.mk > -index 8ac3e70a5..555e4afec 100644 > ---- a/build/arch.mk > -+++ b/build/arch.mk > -@@ -30,14 +30,24 @@ CFLAGS += -DHAVE_NEON_AARCH64 > - endif > - endif > - > --#for loongson > -+#for mips > - 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 > -+#mmi > -+ifeq ($(ENABLE_MMI), Yes) > -+ENABLE_MMI = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) mmi) > -+ifeq ($(ENABLE_MMI), Yes) > -+CFLAGS += -march=loongson3a -DHAVE_MMI > -+endif > -+endif > -+#msa > -+ifeq ($(ENABLE_MSA), Yes) > -+ENABLE_MSA = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) msa) > -+ifeq ($(ENABLE_MSA), Yes) > -+CFLAGS += -mmsa -DHAVE_MSA > -+endif > - endif > - endif > - endif > -diff --git a/build/mips-simd-check.sh b/build/mips-simd-check.sh > -new file mode 100755 > -index 000000000..cbc29e3d3 > ---- /dev/null > -+++ b/build/mips-simd-check.sh > -@@ -0,0 +1,32 @@ > -+#!/bin/bash > -+#********************************************************************************** > -+# This script is using in build/arch.mk for mips to detect the simd instructions: > -+# mmi, msa (maybe more in the future). > -+# > -+# --usage: > -+# ./mips-simd-check.sh $(CC) mmi > -+# or ./mips-simd-check.sh $(CC) msa > -+# > -+# date: 10/17/2019 Created > -+#********************************************************************************** > -+ > -+TMPC=$(mktemp test.XXXXXX.c) > -+TMPO=$(mktemp test.XXXXXX.o) > -+if [ $2 == "mmi" ] > -+then > -+ echo "void main(void){ __asm__ volatile(\"punpcklhw \$f0, \$f0, \$f0\"); }" > $TMPC > -+ $1 -march=loongson3a $TMPC -o $TMPO &> /dev/null > -+ if test -s $TMPO > -+ then > -+ echo "Yes" > -+ fi > -+elif [ $2 == "msa" ] > -+then > -+ echo "void main(void){ __asm__ volatile(\"addvi.b \$w0, \$w1, 1\"); }" > $TMPC > -+ $1 -mmsa $TMPC -o $TMPO &> /dev/null > -+ if test -s $TMPO > -+ then > -+ echo "Yes" > -+ fi > -+fi > -+rm -f $TMPC $TMPO > -diff --git a/build/mktargets.py b/build/mktargets.py > -index 593280c09..518909d3d 100755 > ---- a/build/mktargets.py > -+++ b/build/mktargets.py > -@@ -119,9 +119,9 @@ def find_sources(): > - armfiles.append(file) > - mipsfiles = [] > - for file in cfiles: > -- c = file.split('/') > -- if 'mips' in c: > -- mipsfiles.append(file) > -+ c = file.split('/') > -+ if 'mips' in c: > -+ mipsfiles.append(file) > - cfiles = [x for x in cfiles if x not in mipsfiles] > - > - > -@@ -181,15 +181,34 @@ def find_sources(): > - f.write("OBJS += $(%s_OBJSARM64)\n\n"%(PREFIX)) > - > - if len(mipsfiles) > 0: > -- f.write("%s_ASM_MIPS_SRCS=\\\n"%(PREFIX)) > -- for c in mipsfiles: > -- f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c)) > -- f.write("\n") > -- f.write("%s_OBJSMIPS += $(%s_ASM_MIPS_SRCS:.c=.$(OBJ))\n"%(PREFIX, PREFIX)) > -- f.write("ifeq ($(ASM_ARCH), mips)\n") > -- f.write("%s_OBJS += $(%s_OBJSMIPS)\n"%(PREFIX,PREFIX)) > -- f.write("endif\n") > -- f.write("OBJS += $(%s_OBJSMIPS)\n\n"%(PREFIX)) > -+ mmifiles = [] > -+ for file in mipsfiles: > -+ if '_mmi' in file: > -+ mmifiles.append(file) > -+ f.write("%s_ASM_MIPS_MMI_SRCS=\\\n"%(PREFIX)) > -+ for c in mmifiles: > -+ f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c)) > -+ f.write("\n") > -+ f.write("%s_OBJSMIPS_MMI += $(%s_ASM_MIPS_MMI_SRCS:.c=.$(OBJ))\n\n"%(PREFIX, PREFIX)) > -+ msafiles = [] > -+ for file in mipsfiles: > -+ if '_msa' in file: > -+ msafiles.append(file) > -+ f.write("%s_ASM_MIPS_MSA_SRCS=\\\n"%(PREFIX)) > -+ for c in msafiles: > -+ f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c)) > -+ f.write("\n") > -+ f.write("%s_OBJSMIPS_MSA += $(%s_ASM_MIPS_MSA_SRCS:.c=.$(OBJ))\n"%(PREFIX, PREFIX)) > -+ f.write("ifeq ($(ASM_ARCH), mips)\n") > -+ f.write("ifeq ($(ENABLE_MMI), Yes)\n") > -+ f.write("%s_OBJS += $(%s_OBJSMIPS_MMI)\n"%(PREFIX,PREFIX)) > -+ f.write("endif\n") > -+ f.write("ifeq ($(ENABLE_MSA), Yes)\n") > -+ f.write("%s_OBJS += $(%s_OBJSMIPS_MSA)\n"%(PREFIX,PREFIX)) > -+ f.write("endif\n") > -+ f.write("endif\n") > -+ f.write("OBJS += $(%s_OBJSMIPS_MMI)\n"%(PREFIX)) > -+ f.write("OBJS += $(%s_OBJSMIPS_MSA)\n\n"%(PREFIX)) > - > - f.write("OBJS += $(%s_OBJS)\n\n"%(PREFIX)) > - write_cpp_rule_pattern(f) > -diff --git a/codec/common/inc/cpu_core.h b/codec/common/inc/cpu_core.h > -index e5906c62b..f25787b04 100644 > ---- a/codec/common/inc/cpu_core.h > -+++ b/codec/common/inc/cpu_core.h > -@@ -86,6 +86,7 @@ > - > - /* For loongson */ > - #define WELS_CPU_MMI 0x00000001 /* mmi */ > -+#define WELS_CPU_MSA 0x00000002 /* msa */ > - > - /* > - * Interfaces for CPU core feature detection as below > -diff --git a/codec/common/src/cpu.cpp b/codec/common/src/cpu.cpp > -index a39fd0645..94bb2d5d3 100644 > ---- a/codec/common/src/cpu.cpp > -+++ b/codec/common/src/cpu.cpp > -@@ -309,12 +309,37 @@ uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) { > - > - #elif defined(mips) > - /* for loongson */ > -+static uint32_t get_cpu_flags_from_cpuinfo(void) > -+{ > -+ uint32_t flags = 0; > -+ > -+# ifdef __linux__ > -+ FILE* fp = fopen("/proc/cpuinfo", "r"); > -+ if (!fp) > -+ return flags; > -+ > -+ char buf[200]; > -+ memset(buf, 0, sizeof(buf)); > -+ while (fgets(buf, sizeof(buf), fp)) { > -+ if (!strncmp(buf, "model name", strlen("model name"))) { > -+ if (strstr(buf, "3A4000")) { > -+ flags |= WELS_CPU_MSA | WELS_CPU_MMI; > -+ } else if (strstr(buf, "2K1000")) { > -+ flags |= WELS_CPU_MSA | WELS_CPU_MMI; > -+ } else if (strstr(buf, "Loongson-3A") || strstr(buf, "Loongson-3B")) { > -+ flags |= WELS_CPU_MMI; > -+ } > -+ break; > -+ } > -+ } > -+ fclose(fp); > -+# endif > -+ > -+ return flags; > -+} > -+ > - uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) { > --#if defined(HAVE_MMI) > -- return WELS_CPU_MMI; > --#else > -- return 0; > --#endif > -+ return get_cpu_flags_from_cpuinfo(); > - } > - > - #else /* Neither X86_ASM, HAVE_NEON, HAVE_NEON_AARCH64 nor mips */ > -@@ -324,5 +349,3 @@ uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) { > - } > - > - #endif > -- > -- > -diff --git a/codec/common/targets.mk b/codec/common/targets.mk > -index 96843cd9d..f2cd192fd 100644 > ---- a/codec/common/targets.mk > -+++ b/codec/common/targets.mk > -@@ -66,18 +66,28 @@ COMMON_OBJS += $(COMMON_OBJSARM64) > - endif > - OBJS += $(COMMON_OBJSARM64) > - > --COMMON_ASM_MIPS_SRCS=\ > -+COMMON_ASM_MIPS_MMI_SRCS=\ > - $(COMMON_SRCDIR)/mips/copy_mb_mmi.c\ > - $(COMMON_SRCDIR)/mips/deblock_mmi.c\ > - $(COMMON_SRCDIR)/mips/expand_picture_mmi.c\ > - $(COMMON_SRCDIR)/mips/intra_pred_com_mmi.c\ > - $(COMMON_SRCDIR)/mips/satd_sad_mmi.c\ > - > --COMMON_OBJSMIPS += $(COMMON_ASM_MIPS_SRCS:.c=.$(OBJ)) > -+COMMON_OBJSMIPS_MMI += $(COMMON_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) > -+ > -+COMMON_ASM_MIPS_MSA_SRCS=\ > -+ > -+COMMON_OBJSMIPS_MSA += $(COMMON_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) > - ifeq ($(ASM_ARCH), mips) > --COMMON_OBJS += $(COMMON_OBJSMIPS) > -+ifeq ($(ENABLE_MMI), Yes) > -+COMMON_OBJS += $(COMMON_OBJSMIPS_MMI) > -+endif > -+ifeq ($(ENABLE_MSA), Yes) > -+COMMON_OBJS += $(COMMON_OBJSMIPS_MSA) > -+endif > - endif > --OBJS += $(COMMON_OBJSMIPS) > -+OBJS += $(COMMON_OBJSMIPS_MMI) > -+OBJS += $(COMMON_OBJSMIPS_MSA) > - > - OBJS += $(COMMON_OBJS) > - > -diff --git a/codec/decoder/targets.mk b/codec/decoder/targets.mk > -index c01618411..88dc5afb1 100644 > ---- a/codec/decoder/targets.mk > -+++ b/codec/decoder/targets.mk > -@@ -57,14 +57,24 @@ DECODER_OBJS += $(DECODER_OBJSARM64) > - endif > - OBJS += $(DECODER_OBJSARM64) > - > --DECODER_ASM_MIPS_SRCS=\ > -+DECODER_ASM_MIPS_MMI_SRCS=\ > - $(DECODER_SRCDIR)/core/mips/dct_mmi.c\ > - > --DECODER_OBJSMIPS += $(DECODER_ASM_MIPS_SRCS:.c=.$(OBJ)) > -+DECODER_OBJSMIPS_MMI += $(DECODER_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) > -+ > -+DECODER_ASM_MIPS_MSA_SRCS=\ > -+ > -+DECODER_OBJSMIPS_MSA += $(DECODER_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) > - ifeq ($(ASM_ARCH), mips) > --DECODER_OBJS += $(DECODER_OBJSMIPS) > -+ifeq ($(ENABLE_MMI), Yes) > -+DECODER_OBJS += $(DECODER_OBJSMIPS_MMI) > -+endif > -+ifeq ($(ENABLE_MSA), Yes) > -+DECODER_OBJS += $(DECODER_OBJSMIPS_MSA) > -+endif > - endif > --OBJS += $(DECODER_OBJSMIPS) > -+OBJS += $(DECODER_OBJSMIPS_MMI) > -+OBJS += $(DECODER_OBJSMIPS_MSA) > - > - OBJS += $(DECODER_OBJS) > - > -diff --git a/codec/encoder/targets.mk b/codec/encoder/targets.mk > -index 1f053280e..4fb2e690e 100644 > ---- a/codec/encoder/targets.mk > -+++ b/codec/encoder/targets.mk > -@@ -82,16 +82,26 @@ ENCODER_OBJS += $(ENCODER_OBJSARM64) > - endif > - OBJS += $(ENCODER_OBJSARM64) > - > --ENCODER_ASM_MIPS_SRCS=\ > -+ENCODER_ASM_MIPS_MMI_SRCS=\ > - $(ENCODER_SRCDIR)/core/mips/dct_mmi.c\ > - $(ENCODER_SRCDIR)/core/mips/quant_mmi.c\ > - $(ENCODER_SRCDIR)/core/mips/score_mmi.c\ > - > --ENCODER_OBJSMIPS += $(ENCODER_ASM_MIPS_SRCS:.c=.$(OBJ)) > -+ENCODER_OBJSMIPS_MMI += $(ENCODER_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) > -+ > -+ENCODER_ASM_MIPS_MSA_SRCS=\ > -+ > -+ENCODER_OBJSMIPS_MSA += $(ENCODER_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) > - ifeq ($(ASM_ARCH), mips) > --ENCODER_OBJS += $(ENCODER_OBJSMIPS) > -+ifeq ($(ENABLE_MMI), Yes) > -+ENCODER_OBJS += $(ENCODER_OBJSMIPS_MMI) > -+endif > -+ifeq ($(ENABLE_MSA), Yes) > -+ENCODER_OBJS += $(ENCODER_OBJSMIPS_MSA) > -+endif > - endif > --OBJS += $(ENCODER_OBJSMIPS) > -+OBJS += $(ENCODER_OBJSMIPS_MMI) > -+OBJS += $(ENCODER_OBJSMIPS_MSA) > - > - OBJS += $(ENCODER_OBJS) > - > -diff --git a/codec/processing/targets.mk b/codec/processing/targets.mk > -index 300de2d80..0f8873335 100644 > ---- a/codec/processing/targets.mk > -+++ b/codec/processing/targets.mk > -@@ -58,14 +58,24 @@ PROCESSING_OBJS += $(PROCESSING_OBJSARM64) > - endif > - OBJS += $(PROCESSING_OBJSARM64) > - > --PROCESSING_ASM_MIPS_SRCS=\ > -+PROCESSING_ASM_MIPS_MMI_SRCS=\ > - $(PROCESSING_SRCDIR)/src/mips/vaa_mmi.c\ > - > --PROCESSING_OBJSMIPS += $(PROCESSING_ASM_MIPS_SRCS:.c=.$(OBJ)) > -+PROCESSING_OBJSMIPS_MMI += $(PROCESSING_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) > -+ > -+PROCESSING_ASM_MIPS_MSA_SRCS=\ > -+ > -+PROCESSING_OBJSMIPS_MSA += $(PROCESSING_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) > - ifeq ($(ASM_ARCH), mips) > --PROCESSING_OBJS += $(PROCESSING_OBJSMIPS) > -+ifeq ($(ENABLE_MMI), Yes) > -+PROCESSING_OBJS += $(PROCESSING_OBJSMIPS_MMI) > -+endif > -+ifeq ($(ENABLE_MSA), Yes) > -+PROCESSING_OBJS += $(PROCESSING_OBJSMIPS_MSA) > -+endif > - endif > --OBJS += $(PROCESSING_OBJSMIPS) > -+OBJS += $(PROCESSING_OBJSMIPS_MMI) > -+OBJS += $(PROCESSING_OBJSMIPS_MSA) > - > - OBJS += $(PROCESSING_OBJS) > - > diff --git a/package/libopenh264/0002-fix-mips-build.patch b/package/libopenh264/0002-fix-mips-build.patch > new file mode 100644 > index 0000000000..c4927d567b > --- /dev/null > +++ b/package/libopenh264/0002-fix-mips-build.patch > @@ -0,0 +1,73 @@ > +From 9d5981eecde2133b9d6099eb99f96b1c29c3e520 Mon Sep 17 00:00:00 2001 > +From: Bernd Kuhls > +Date: Mon, 13 Apr 2020 12:03:01 +0200 > +Subject: [PATCH] fix mips build > + > +In total three PR were sent upstream to fix mips builds: > +https://github.com/cisco/openh264/pull/3185 > +https://github.com/cisco/openh264/pull/3217 > +https://github.com/cisco/openh264/pull/3225 > + > +Buildroot used the first version > +https://git.buildroot.net/buildroot/commit/package/libopenh264?id=e8d0df569e1844f7ba28918a53ee38027b325b8f > +downloaded from https://github.com/cisco/openh264/pull/3185 > + > +During discussion the gcc option '-march=loongson3a' was changed to > +'-Wa,-mloongson-mmi,-mloongson-ext': > +https://github.com/cisco/openh264/pull/3185#discussion_r337818960 > + > +This causes build errors with gcc version 8.3.0 (Buildroot 2020.02) > + > +tmp/cctgEQaw.s:662: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L22' > +/tmp/cctgEQaw.s:1679: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L27' > +/tmp/cctgEQaw.s:2218: Error: opcode not supported on this processor: loongson3a (mips64r2) `jrc $31' > + > +This patch partly reverts the change to fix mips build. > + > +$ /home/bernd/buildroot/br5/output/host/bin/mips64el-linux-gcc -v > + > +Using built-in specs. > +COLLECT_GCC=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/mips64el-linux-gcc.br_real > +COLLECT_LTO_WRAPPER=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/../libexec/gcc/mips64el-buildroot-linux-gnu/8.3.0/lto-wrapper > +Target: mips64el-buildroot-linux-gnu > +Configured with: ./configure --prefix=/opt/br-mips64r6-n64-el-hf-2020.02 --sysconfdir=/opt/br-mips64r6-n64-el-hf-2020.02/etc --enable-static --target=mips64el-buildroot-linux-gnu --with-sysroot=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --with-gmp=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpc=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpfr=/opt/br-mips64r6-n64-el-hf-2020.02 --with-pkgversion='Buildroot 2020.02' --with-bugurl=http://bugs.buildroot.net/ --disable-libquadmath --enable-tls --enable-threads --without-isl --without-cloog --with-arch=mips64r6 --with-abi=64 --with-nan=2008 --enable-languages=c,c++ --with-build-time-tools=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/bin --enable-shared --disable-libgomp > +Thread model: posix > +gcc version 8.3.0 (Buildroot 2020.02) > + > +Patch sent upstream: https://github.com/cisco/openh264/pull/3267 > + > +Signed-off-by: Bernd Kuhls > +--- > + build/arch.mk | 2 +- > + build/mips-simd-check.sh | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/build/arch.mk b/build/arch.mk > +index 1bf318ab..c6570ed4 100644 > +--- a/build/arch.mk > ++++ b/build/arch.mk > +@@ -41,7 +41,7 @@ ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ > + ifeq ($(ENABLE_MMI), Yes) > + ENABLE_MMI = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) mmi) > + ifeq ($(ENABLE_MMI), Yes) > +-CFLAGS += -DHAVE_MMI -Wa,-mloongson-mmi,-mloongson-ext > ++CFLAGS += -DHAVE_MMI -march=loongson3a > + endif > + endif > + #msa > +diff --git a/build/mips-simd-check.sh b/build/mips-simd-check.sh > +index 5efffbef..d0d72f9e 100755 > +--- a/build/mips-simd-check.sh > ++++ b/build/mips-simd-check.sh > +@@ -15,7 +15,7 @@ TMPO=$(mktemp tmp.XXXXXX.o) > + if [ $2 == "mmi" ] > + then > + echo "void main(void){ __asm__ volatile(\"punpcklhw \$f0, \$f0, \$f0\"); }" > $TMPC > +- $1 -Wa,-mloongson-mmi $TMPC -o $TMPO &> /dev/null > ++ $1 -march=loongson3a $TMPC -o $TMPO &> /dev/null > + if test -s $TMPO > + then > + echo "Yes" > +-- > +2.25.0 > + > diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash > index fdb03d2f77..9259b1ec8c 100644 > --- a/package/libopenh264/libopenh264.hash > +++ b/package/libopenh264/libopenh264.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 73c35f80cc487560d11ecabb6d31ad828bd2f59d412f9cd726cc26bfaf4561fd libopenh264-2.0.0.tar.gz > +sha256 27f185d478066bad0c8837f4554cd8d69cca1d55d5f3dc6a43a8cef1fe6c005f libopenh264-2.1.0.tar.gz > sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE > diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk > index 307dbc589f..07196e3dd5 100644 > --- a/package/libopenh264/libopenh264.mk > +++ b/package/libopenh264/libopenh264.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBOPENH264_VERSION = 2.0.0 > +LIBOPENH264_VERSION = 2.1.0 > LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) > LIBOPENH264_LICENSE = BSD-2-Clause > LIBOPENH264_LICENSE_FILES = LICENSE > -- > 2.25.0 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'