diff options
Diffstat (limited to 'meta-openembedded/meta-multimedia')
-rw-r--r-- | meta-openembedded/meta-multimedia/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264/0002-Makefile-add-possibility-to-disable-NEON-extension.patch | 103 | ||||
-rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb | 6 | ||||
-rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.79.bb (renamed from meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.77.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb | 2 |
5 files changed, 111 insertions, 4 deletions
diff --git a/meta-openembedded/meta-multimedia/conf/layer.conf b/meta-openembedded/meta-multimedia/conf/layer.conf index 5f9f471428..99f4987179 100644 --- a/meta-openembedded/meta-multimedia/conf/layer.conf +++ b/meta-openembedded/meta-multimedia/conf/layer.conf @@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python" -LAYERSERIES_COMPAT_multimedia-layer = "mickledore" +LAYERSERIES_COMPAT_multimedia-layer = "nanbield" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264/0002-Makefile-add-possibility-to-disable-NEON-extension.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264/0002-Makefile-add-possibility-to-disable-NEON-extension.patch new file mode 100644 index 0000000000..298ac1c013 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264/0002-Makefile-add-possibility-to-disable-NEON-extension.patch @@ -0,0 +1,103 @@ +From bc3a3baeaccfe9c1286848b348baf92dfbd05346 Mon Sep 17 00:00:00 2001 +From: Benjamin Bara <benjamin.bara@skidata.com> +Date: Thu, 31 Aug 2023 09:27:31 +0200 +Subject: [PATCH 2/2] Makefile: add possibility to disable NEON extension + +README states that the NEON extension is optional. However, currently it +cannot be turned off, therefore add an option to disable it. + +Upstream-Status: Submitted [https://github.com/cisco/openh264/pull/3679] +Signed-off-by: Benjamin Bara <benjamin.bara@skidata.com> +--- + Makefile | 1 + + build/arch.mk | 4 ++++ + build/msvc-common.mk | 10 ++++++++-- + build/platform-mingw_nt.mk | 5 ++++- + 4 files changed, 17 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index baed53a7..cc22c4aa 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,6 +35,7 @@ CCASFLAGS=$(CFLAGS) + STATIC_LDFLAGS=-lstdc++ + STRIP ?= strip + USE_STACK_PROTECTOR = Yes ++USE_NEON=Yes + + SHAREDLIB_MAJORVERSION=7 + FULL_VERSION := 2.3.1 +diff --git a/build/arch.mk b/build/arch.mk +index 4e1538c4..fd6a81e4 100644 +--- a/build/arch.mk ++++ b/build/arch.mk +@@ -17,18 +17,22 @@ ifneq ($(filter-out arm64 arm64e, $(filter arm%, $(ARCH))),) + ifeq ($(USE_ASM), Yes) + ASM_ARCH = arm + ASMFLAGS += -I$(SRC_PATH)codec/common/arm/ ++ifeq ($(USE_NEON), Yes) + CFLAGS += -DHAVE_NEON + endif + endif ++endif + + #for arm64 + ifneq ($(filter arm64 aarch64 arm64e, $(ARCH)),) + ifeq ($(USE_ASM), Yes) + ASM_ARCH = arm64 + ASMFLAGS += -I$(SRC_PATH)codec/common/arm64/ ++ifeq ($(USE_NEON), Yes) + CFLAGS += -DHAVE_NEON_AARCH64 + endif + endif ++endif + + #for mips + ifneq ($(filter mips mips64, $(ARCH)),) +diff --git a/build/msvc-common.mk b/build/msvc-common.mk +index 5891ea4e..5a1e2582 100644 +--- a/build/msvc-common.mk ++++ b/build/msvc-common.mk +@@ -10,7 +10,10 @@ else + endif + ifeq ($(ASM_ARCH), arm) + CCAS = gas-preprocessor.pl -as-type armasm -force-thumb -- armasm +-CCASFLAGS = -nologo -DHAVE_NEON -ignore 4509 ++CCASFLAGS = -nologo -ignore 4509 ++ifeq ($(USE_NEON), Yes) ++CCASFLAGS += -DHAVE_NEON ++endif + endif + + CC=cl +@@ -20,7 +23,10 @@ CXX_O=-Fo$@ + + ifeq ($(ASM_ARCH), arm64) + CCAS = clang-cl +-CCASFLAGS = -nologo -DHAVE_NEON_AARCH64 --target=arm64-windows ++CCASFLAGS = -nologo --target=arm64-windows ++ifeq ($(USE_NEON), Yes) ++CCASFLAGS += -DHAVE_NEON_AARCH64 ++endif + endif + + +diff --git a/build/platform-mingw_nt.mk b/build/platform-mingw_nt.mk +index b7a5495d..d73e362a 100644 +--- a/build/platform-mingw_nt.mk ++++ b/build/platform-mingw_nt.mk +@@ -17,7 +17,10 @@ endif + endif + ifeq ($(ASM_ARCH), arm) + CCAS = gas-preprocessor.pl -as-type clang -force-thumb -- $(CC) +-CCASFLAGS = -DHAVE_NEON -mimplicit-it=always ++CCASFLAGS = -mimplicit-it=always ++ifeq ($(USE_NEON), Yes) ++CCASFLAGS += -DHAVE_NEON ++endif + endif + EXEEXT = .exe + +-- +2.34.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb index 3fa87d05f5..6dfd759355 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb @@ -16,6 +16,7 @@ SRCREV = "0a48f4d2e9be2abb4fb01b4c3be83cf44ce91a6e" BRANCH = "openh264v${PV}" SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \ + file://0002-Makefile-add-possibility-to-disable-NEON-extension.patch \ " COMPATIBLE_MACHINE:armv7a = "(.*)" @@ -35,6 +36,9 @@ EXTRA_OEMAKE:mips = "ARCH=mips" EXTRA_OEMAKE:mips64 = "ARCH=mips64" EXTRA_OEMAKE:riscv64 = "ARCH=riscv64" +EXTRA_OEMAKE:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon",""," USE_NEON=No",d)}" +EXTRA_OEMAKE:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon",""," USE_NEON=No",d)}" + EXTRA_OEMAKE:append = " ENABLEPIC=Yes" do_configure() { : @@ -45,7 +49,7 @@ do_compile() { } do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} + oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIBDIR_NAME=${baselib} SHAREDLIB_DIR=${libdir} } CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.77.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.79.bb index 34b372096a..1304c0ac85 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.77.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.79.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "31cd694602cc37ada3a6d02a5a381f4e3933ecef" +SRCREV = "b5c3f217926f9066a1afbee7eb20967dd6896c56" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb b/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb index b845c5f792..8ffe652b22 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb @@ -16,7 +16,7 @@ DEPENDS = " \ inherit meson pkgconfig features_check REQUIRED_DISTRO_FEATURES = "opengl wayland" -SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;nobranch=1 \ +SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;branch=master \ file://0001-screencast-Fix-build-with-older-mesa.patch" S = "${WORKDIR}/git" |