From 436b4fcc7eea5c31a5bcb46f340c6093c99fd7b7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Mar 2025 09:15:38 -0700 Subject: [PATCH] openh264: Upgrade to 2.6.0 - Initialize PSNR to 0 instead of NAN (Commit: cf3b514b, PR: #3836) - Enable PIC in x86 assembly code (Commit: c42fa040, PR: #3831) - Add QEMU test for LoongArch architecture (Commit: e49c0953, PR: #3833) - Add support for calculating PSNR for Y/U/V components (Commit: 33f7f486, PR: #3824) - Add support for PowerPC architecture in meson.build (Commit: 423eb2c3, PR: #3806) - Fix potential bug in the codebase (Commit: 63db555e, PR: #3818) - Pass the actual temporal ID to GMPVideoEncodedFrame (Commit: 1c47e719, PR: #3828) - Use HW_NCPUONLINE on OpenBSD / NetBSD for CPU detection (Commit: fc1605c1, PR: #3813) - Add Windows VSBuildTools VC17 compile support (Commit: 1ebb3f1a, PR: #3823) - Expose temporal layer info via GMP API at encoder initialization and on a per-frame basis (Commit: ad3f6904, PR: #3821) - Remove the use of -Werror to prevent warnings from being treated as errors (Commit: edbef4df, PR: #3809) - Use void casts to silence warnings about memcpy to a class (Commit: 6746bc48, PR: #3800) Signed-off-by: Khem Raj --- ...uild-Enable-PIC-in-x86-assembly-code.patch | 27 ------------------- .../{openh264_2.5.0.bb => openh264_2.6.0.bb} | 3 +-- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-meson.build-Enable-PIC-in-x86-assembly-code.patch rename meta-multimedia/recipes-multimedia/openh264/{openh264_2.5.0.bb => openh264_2.6.0.bb} (83%) diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-meson.build-Enable-PIC-in-x86-assembly-code.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-meson.build-Enable-PIC-in-x86-assembly-code.patch deleted file mode 100644 index 6a195672f3..0000000000 --- a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-meson.build-Enable-PIC-in-x86-assembly-code.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f1ce79e51ae06aee550d86832070172772523633 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 7 Jan 2025 20:09:39 -0800 -Subject: [PATCH] meson.build: Enable PIC in x86 assembly code - -This is needed especially when using asm code and nasm -assembler to compile it. - -Upstream-Status: Submitted [https://github.com/cisco/openh264/pull/3831] -Signed-off-by: Khem Raj ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 5dbefa43..b5e2fabf 100644 ---- a/meson.build -+++ b/meson.build -@@ -68,7 +68,7 @@ if ['linux', 'android', 'ios', 'darwin'].contains(system) - endif - if cpu_family == 'x86' - asm_format = asm_format32 -- asm_args += ['-DX86_32', '-DHAVE_AVX2'] -+ asm_args += ['-DX86_32', '-DX86_32_PICASM', '-DHAVE_AVX2'] - add_project_arguments('-DHAVE_AVX2', language: 'cpp') - add_project_arguments('-DHAVE_AVX2', '-DX86_ASM', '-DX86_32_ASM', language: 'c') - asm_inc = join_paths(meson.current_source_dir(), 'codec', 'common', 'x86', '') diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_2.5.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_2.6.0.bb similarity index 83% rename from meta-multimedia/recipes-multimedia/openh264/openh264_2.5.0.bb rename to meta-multimedia/recipes-multimedia/openh264/openh264_2.6.0.bb index 94594d8916..0226745bbc 100644 --- a/meta-multimedia/recipes-multimedia/openh264/openh264_2.5.0.bb +++ b/meta-multimedia/recipes-multimedia/openh264/openh264_2.6.0.bb @@ -12,10 +12,9 @@ DEPENDS = " nasm-native" inherit meson pkgconfig S = "${WORKDIR}/git" -SRCREV = "8c7008aeb6335e7d36ab0d9a023a63f82a8eaac0" +SRCREV = "19120fcb8f89b16126e9cfee096b2f0751554fdc" BRANCH = "openh264v${PV}" SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ - file://0001-meson.build-Enable-PIC-in-x86-assembly-code.patch \ " COMPATIBLE_MACHINE:powerpc64le = "null"