packagegroup-meta-multimedia: Purge gst 0.10 related rdeps
PATCH 1/5 packagegroup-meta-multimedia: Purge gst 0.10 related rdeps
--- .../packagegroups/packagegroup-meta-multimedia.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +3 -3
@@ -29,9 +29,9 @@ RDEPENDS_packagegroup-meta-multimedia = "\ rtmpdump libopenmpt schroedinger mpd mpc libmpdclient \ ncmpc libmpd dcadec libiec61883 \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna gst-fluendo-mpegdemux vlc", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "vo-aacenc sox libde265 gst-openmax", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "streamripper gst-plugins-ugly gst-fluendo-mp3 gst-plugins-gl", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna vlc", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "vo-aacenc sox libde265", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "streamripper", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "openh264 opencore-amr faac vo-amrwbenc", "", d)} \ "
Signature · 1 line
2.25.1
PATCH 2/5 vlc: Depend on gst-1.0 ugly plugins instead of 0.10
--- meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb +1 -1
@@ -65,7 +65,7 @@ PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" -PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp"
Signature · 1 line
2.25.1
Re: [meta-multimedia][PATCH 2/5] vlc: Depend on gst-1.0 ugly plugins instead of 0.10
meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" · line 68
Quoted 4 lines · Khem Raj
...
meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb +1
-1-PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
The subject should say bad, not ugly (ugly is a different set of plugins).
cu
Adrian
Re: [meta-multimedia][PATCH 2/5] vlc: Depend on gst-1.0 ugly plugins instead of 0.10
Quoted 8 lines · Adrian Bunk
meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" · line 68
Quoted 4 lines · Khem Raj
...
meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb +1
-1-PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"The subject should say bad, not ugly (ugly is a different set of plugins).
Thanks, fixed in master-next
Quoted 3 lines
cu
Adrian
PATCH 3/5 minidlna: Retarget gettext patch to gettex version 0.20
In reply to Khem RajThis fixes
*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20
--- .../minidlna/minidlna/0001-Update-Gettext-version.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch +2 -4
@@ -10,8 +10,6 @@ Signed-off-by: Baptiste Durand <[email protected]> configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index f343d21..a556b33 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@
@@ -23,12 +21,12 @@ index f343d21..a556b33 100644 #LT_INIT AC_CANONICAL_TARGET -@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS]) +@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC AM_ICONV AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.18) -+AM_GNU_GETTEXT_VERSION(0.19) ++AM_GNU_GETTEXT_VERSION(0.20) # Checks for programs. AC_PROG_AWK
Signature · 1 line
2.25.1
PATCH 4/5 openh264: Upgrade to 2.0.0
In reply to Khem Raj- Fix host-user-contaminated QA issues
- make clean is broken so mark it so
- Enable PIC in asm which fixes textrels issue
- Fix build on mips
---
...-poke-at-host-gcc-for-target-options.patch | 25 +++++++
...Use-cp-options-to-preserve-file-mode.patch | 32 +++++++++
.../0001-codec-Disable-asm-for-mips.patch | 70 +++++++++++++++++++
.../{openh264_1.7.0.bb => openh264_2.0.0.bb} | 17 +++--
4 files changed, 139 insertions(+), 5 deletions(-)
create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch
create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch
create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch
rename meta-multimedia/recipes-multimedia/openh264/{openh264_1.7.0.bb => openh264_2.0.0.bb} (68%)meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch new file +25 -0
@@ -0,0 +1,25 @@ +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-Makefile-Use-cp-options-to-preserve-file-mode.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 1c3bda45c55d2334af384caf9e7f240b7aaf2eb5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +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 <[email protected]> +--- + 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 +
meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch new file +70 -0
70 lines not on this page · raw message
meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb renamed from meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb +12 -5
@@ -3,17 +3,21 @@ 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 = "71374015cdf13f7aab4bc2d820f77905b3becfb8" +BRANCH = "openh264v2.0.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 = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)"
@@ -30,6 +34,7 @@ EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" EXTRA_OEMAKE_mips = "ARCH=mips" EXTRA_OEMAKE_mips64 = "ARCH=mips64" +EXTRA_OEMAKE_append = " ENABLEPIC=Yes" do_configure() { : }
@@ -41,3 +46,5 @@ do_compile() { do_install() { oe_runmake install DESTDIR=${D} PREFIX=${prefix} } + +CLEANBROKEN = "1"
Signature · 1 line
2.25.1
PATCH 5/5 x265: Disable assembly on x86
In reply to Khem RajFixes
ERROR: QA Issue: x265: ELF binary /usr/lib/libx265.so.179 has relocations in .text [textrel]
--- meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb +2 -0
@@ -17,6 +17,8 @@ SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b5 inherit lib_package pkgconfig cmake +EXTRA_OECMAKE_append_x86 = " -DENABLE_ASSEMBLY=OFF" + AS[unexport] = "1" COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
Signature · 1 line
2.25.1