diff options
Diffstat (limited to 'meta-oe/recipes-multimedia')
48 files changed, 912 insertions, 300 deletions
diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb deleted file mode 100644 index 4c38df4027..0000000000 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Alsa OSS Compatibility Package" -SECTION = "libs/multimedia" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=ed055b4eff93da784176a01582e6ec1a" -DEPENDS = "alsa-lib" - -SRC_URI = "https://www.alsa-project.org/files/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ -" -SRC_URI[md5sum] = "9ec4bb783fdce19032aace086d65d874" -SRC_URI[sha256sum] = "64adcef5927e848d2e024e64c4bf85b6f395964d9974ec61905ae4cb8d35d68e" - -inherit autotools - -LEAD_SONAME = "libaoss.so.0" - -do_configure:prepend () { - touch NEWS README AUTHORS ChangeLog - sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in -} - -# http://errors.yoctoproject.org/Errors/Details/186961/ -COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb b/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb index e91c81d703..a09f84381e 100644 --- a/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb +++ b/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb @@ -19,6 +19,8 @@ SRC_URI[sha256sum] = "ea2449ad3f201ec590d811db9da6d02ffc5e87a677d06b92ab15363d8c inherit autotools lib_package pkgconfig +CXXFLAGS += "-std=c++14" + DEPENDS = " \ asciidoc-native \ alsa-lib \ diff --git a/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch b/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch index ecb3108050..4792a15e86 100644 --- a/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch +++ b/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch @@ -14,6 +14,8 @@ Upstrem-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + libaudiofile/modules/SimpleModule.h | 2 +- test/FloatToInt.cpp | 2 +- test/IntToFloat.cpp | 2 +- diff --git a/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch b/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch index 2c66cf4d00..dea8187ccb 100644 --- a/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch +++ b/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch @@ -14,6 +14,8 @@ Upstrem-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + test/NeXT.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 757f99d1ff..9fd91114d7 100644 --- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -12,6 +12,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0002-Do-not-use-rcmd-on-build-with-musl.patch \ file://0001-genisoimage-Add-missing-extern-definition.patch \ file://0001-add-new-option-eltorito-platform.patch \ + file://0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch \ " SRC_URI:append:class-nativesdk = " \ file://0001-install-netscsid-to-bin-for-nativesdk.patch \ diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch index b3beb069eb..95a5ddd7dd 100644 --- a/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch @@ -8,6 +8,8 @@ http://autobuild.buildroot.net/results/d27/d2781e70b04a207e2e9397d888032294c7285 Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- +Upstream-Status: Pending + genisoimage/sha256.h | 4 ++++ genisoimage/sha512.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch new file mode 100644 index 0000000000..b999577265 --- /dev/null +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch @@ -0,0 +1,44 @@ +From f28b8ec20c3485068f1617ff93b497bafe5264e1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 3 Sep 2022 00:50:17 -0700 +Subject: [PATCH] genisoimage: Add checksum.h and md5.h for function prototypes + +Needed for parse_checksum_algo and calculate_md5sum + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + genisoimage/genisoimage.c | 2 ++ + genisoimage/jte.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c +index 84ac3c2..5c9f7f3 100644 +--- a/genisoimage/genisoimage.c ++++ b/genisoimage/genisoimage.c +@@ -59,6 +59,8 @@ + #include "udf.h" + #endif + ++#include "checksum.h" ++ + #ifdef NEED_O_BINARY + #include <io.h> /* for setmode() prototype */ + #endif +diff --git a/genisoimage/jte.c b/genisoimage/jte.c +index 0dff289..1f03ad3 100644 +--- a/genisoimage/jte.c ++++ b/genisoimage/jte.c +@@ -36,6 +36,8 @@ + #include "vms.h" + #endif + ++#include "md5.h" ++ + /* Different types used in building our state list below */ + #define JTET_FILE_MATCH 1 + #define JTET_NOMATCH 2 +-- +2.37.3 + diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch index f52f71b632..1a2c1a91cf 100644 --- a/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch @@ -5,6 +5,8 @@ Subject: [PATCH] genisoimage: Fix fprintf format errors Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + genisoimage/genisoimage.c | 4 ++-- genisoimage/tree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch b/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch index 547a21c67f..47c12928b7 100644 --- a/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch +++ b/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch @@ -8,6 +8,8 @@ on musl. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + include/xconfig.h.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb b/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb index 56d5e1201e..bec9b75ebd 100644 --- a/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb +++ b/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb @@ -7,8 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=381c8cbe277a7bc1ee2ae6083a04c958" LICENSE_FLAGS = "commercial" -SRC_URI = "${SOURCEFORGE_MIRROR}/faac/faad2-src/faad2-2.8.0/${BP}.tar.gz" -SRC_URI[md5sum] = "28f6116efdbe9378269f8a6221767d1f" -SRC_URI[sha256sum] = "985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d" +PV .= "+git" -inherit autotools lib_package +SRC_URI = "git://github.com/knik0/faad2.git;branch=master;protocol=https" +SRCREV = "216f00e8ddba6f2c64caf481a04f1ddd78b93e78" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch b/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch index 09edecc964..c8b546b179 100644 --- a/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch +++ b/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch @@ -1,6 +1,6 @@ Add a description to the AC_DEFINE statements so that it appears in config.h and silences a fatal warning. -Upstream-Status:Pending +Upstream-Status: Pending Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> --- configure.in | 6 +++--- diff --git a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb index a7d645f59f..379c7e1b63 100644 --- a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb +++ b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb @@ -4,7 +4,6 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" DEPENDS = "zlib" -PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz;name=archive \ ${DEBIAN_MIRROR}/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-16.2.debian.tar.xz;name=patch;subdir=${BP} \ diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-Conceal-imp-warnings-in-Python3.patch b/meta-oe/recipes-multimedia/jack/jack/0001-Conceal-imp-warnings-in-Python3.patch new file mode 100644 index 0000000000..8411d12caf --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/jack/0001-Conceal-imp-warnings-in-Python3.patch @@ -0,0 +1,34 @@ +From f864a2aa29377a77c3aef61ce917cc03d099c430 Mon Sep 17 00:00:00 2001 +From: Thomas Nagy <tnagy@waf.io> +Date: Wed, 14 Aug 2019 22:05:45 +0200 +Subject: [PATCH] Conceal imp warnings in Python3 + +--- +Upstream-Status: Backport [from waflib not jack: https://gitlab.com/ita1024/waf/-/commit/d2060dfd8af4edb5824153ff24e207b39ecd67a2.patch] + + waflib/Context.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/waflib/Context.py b/waflib/Context.py +index 761b521f..38ab03f1 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -6,10 +6,17 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, sys + from waflib import Utils, Errors, Logs + import waflib.Node + ++if sys.hexversion > 0x3040000: ++ import types ++ class imp(object): ++ new_module = lambda x: types.ModuleType(x) ++else: ++ import imp ++ + # the following 3 constants are updated on each new release (do not touch) + HEXVERSION=0x2000c00 + """Constant updated on new releases""" diff --git a/meta-oe/recipes-multimedia/jack/jack/0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch b/meta-oe/recipes-multimedia/jack/jack/0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch new file mode 100644 index 0000000000..cbced56a67 --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/jack/0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch @@ -0,0 +1,229 @@ +From bcba27168d99a3919b730e6a533cf79ab3b24eee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micka=C3=ABl=20Schoentgen?= <contact@tiger-222.fr> +Date: Sat, 5 Jan 2019 12:02:42 +0100 +Subject: [PATCH] Fix all DeprecationWarning: invalid escape sequence +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> +--- +Upstream-Status: Backport [from waflib not jack: https://gitlab.com/ita1024/waf/-/commit/412a9b819e86a0061f990c7245f0f5db76d0eda3] + + waflib/Build.py | 2 +- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 2 +- + waflib/Task.py | 2 +- + waflib/TaskGen.py | 2 +- + waflib/Tools/c_config.py | 2 +- + waflib/Tools/c_preproc.py | 6 +++--- + waflib/Tools/msvc.py | 16 ++++++++-------- + waflib/Utils.py | 2 +- + waflib/ansiterm.py | 2 +- + 10 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/waflib/Build.py b/waflib/Build.py +index c9661df1..9e733c9e 100644 +--- a/waflib/Build.py ++++ b/waflib/Build.py +@@ -104,7 +104,7 @@ class BuildContext(Context.Context): + """Amount of jobs to run in parallel""" + + self.targets = Options.options.targets +- """List of targets to build (default: \*)""" ++ """List of targets to build (default: \\*)""" + + self.keep = Options.options.keep + """Whether the build should continue past errors""" +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index 84736c9c..901fba6c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -11,7 +11,7 @@ The values put in :py:class:`ConfigSet` must be serializable (dicts, lists, stri + + import copy, re, os + from waflib import Logs, Utils +-re_imp = re.compile('^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) ++re_imp = re.compile(r'^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) + + class ConfigSet(object): + """ +diff --git a/waflib/Context.py b/waflib/Context.py +index 38ab03f1..5799a60a 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -614,7 +614,7 @@ class Context(ctx): + Logs.pprint(color, msg) + + def load_special_tools(self, var, ban=[]): +- """ ++ r""" + Loads third-party extensions modules for certain programming languages + by trying to list certain files in the extras/ directory. This method + is typically called once for a programming language group, see for +diff --git a/waflib/Task.py b/waflib/Task.py +index 6aebc607..0c5cb994 100644 +--- a/waflib/Task.py ++++ b/waflib/Task.py +@@ -1044,7 +1044,7 @@ def funex(c): + exec(c, dc) + return dc['f'] + +-re_cond = re.compile('(?P<var>\w+)|(?P<or>\|)|(?P<and>&)') ++re_cond = re.compile(r'(?P<var>\w+)|(?P<or>\|)|(?P<and>&)') + re_novar = re.compile(r'^(SRC|TGT)\W+.*?$') + reg_act = re.compile(r'(?P<backslash>\\)|(?P<dollar>\$\$)|(?P<subst>\$\{(?P<var>\w+)(?P<code>.*?)\})', re.M) + def compile_fun_shell(line): +diff --git a/waflib/TaskGen.py b/waflib/TaskGen.py +index a74e6431..3776bac1 100644 +--- a/waflib/TaskGen.py ++++ b/waflib/TaskGen.py +@@ -727,7 +727,7 @@ def sequence_order(self): + self.bld.prev = self + + +-re_m4 = re.compile('@(\w+)@', re.M) ++re_m4 = re.compile(r'@(\w+)@', re.M) + + class subst_pc(Task.Task): + """ +diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py +index d2b3c0d8..60cc0ecd 100644 +--- a/waflib/Tools/c_config.py ++++ b/waflib/Tools/c_config.py +@@ -239,7 +239,7 @@ def validate_cfg(self, kw): + + @conf + def exec_cfg(self, kw): +- """ ++ r""" + Executes ``pkg-config`` or other ``-config`` applications to collect configuration flags: + + * if atleast_pkgconfig_version is given, check that pkg-config has the version n and return +diff --git a/waflib/Tools/c_preproc.py b/waflib/Tools/c_preproc.py +index 7e04b4a7..68e5f5ae 100644 +--- a/waflib/Tools/c_preproc.py ++++ b/waflib/Tools/c_preproc.py +@@ -75,13 +75,13 @@ re_lines = re.compile( + re.IGNORECASE | re.MULTILINE) + """Match #include lines""" + +-re_mac = re.compile("^[a-zA-Z_]\w*") ++re_mac = re.compile(r"^[a-zA-Z_]\w*") + """Match macro definitions""" + + re_fun = re.compile('^[a-zA-Z_][a-zA-Z0-9_]*[(]') + """Match macro functions""" + +-re_pragma_once = re.compile('^\s*once\s*', re.IGNORECASE) ++re_pragma_once = re.compile(r'^\s*once\s*', re.IGNORECASE) + """Match #pragma once statements""" + + re_nl = re.compile('\\\\\r*\n', re.MULTILINE) +@@ -660,7 +660,7 @@ def extract_macro(txt): + # empty define, assign an empty token + return (v, [[], [('T','')]]) + +-re_include = re.compile('^\s*(<(?:.*)>|"(?:.*)")') ++re_include = re.compile(r'^\s*(<(?:.*)>|"(?:.*)")') + def extract_include(txt, defs): + """ + Process a line in the form:: +diff --git a/waflib/Tools/msvc.py b/waflib/Tools/msvc.py +index 17b347d4..ff58449d 100644 +--- a/waflib/Tools/msvc.py ++++ b/waflib/Tools/msvc.py +@@ -281,7 +281,7 @@ def gather_wince_supported_platforms(): + + def gather_msvc_detected_versions(): + #Detected MSVC versions! +- version_pattern = re.compile('^(\d\d?\.\d\d?)(Exp)?$') ++ version_pattern = re.compile(r'^(\d\d?\.\d\d?)(Exp)?$') + detected_versions = [] + for vcver,vcvar in (('VCExpress','Exp'), ('VisualStudio','')): + prefix = 'SOFTWARE\\Wow6432node\\Microsoft\\' + vcver +@@ -367,7 +367,7 @@ def gather_wsdk_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^v..?.?\...?.?') ++ version_pattern = re.compile(r'^v..?.?\...?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Microsoft\\Microsoft SDKs\\Windows') + except OSError: +@@ -525,7 +525,7 @@ def gather_icl_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\....?.?') ++ version_pattern = re.compile(r'^...?.?\....?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Compilers\\C++') + except OSError: +@@ -579,7 +579,7 @@ def gather_intel_composer_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\...?.?.?') ++ version_pattern = re.compile(r'^...?.?\...?.?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Suites') + except OSError: +@@ -683,7 +683,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + if not is_static and ltdict.get('library_names', ''): + dllnames=ltdict['library_names'].split() + dll=dllnames[0].lower() +- dll=re.sub('\.dll$', '', dll) ++ dll=re.sub(r'\.dll$', '', dll) + return (lt_libdir, dll, False) + elif ltdict.get('old_library', ''): + olib=ltdict['old_library'] +@@ -700,7 +700,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + @conf + def libname_msvc(self, libname, is_static=False): + lib = libname.lower() +- lib = re.sub('\.lib$','',lib) ++ lib = re.sub(r'\.lib$','',lib) + + if lib in g_msvc_systemlibs: + return lib +@@ -747,11 +747,11 @@ def libname_msvc(self, libname, is_static=False): + for libn in libnames: + if os.path.exists(os.path.join(path, libn)): + Logs.debug('msvc: lib found: %s', os.path.join(path,libn)) +- return re.sub('\.lib$', '',libn) ++ return re.sub(r'\.lib$', '',libn) + + #if no lib can be found, just return the libname as msvc expects it + self.fatal('The library %r could not be found' % libname) +- return re.sub('\.lib$', '', libname) ++ return re.sub(r'\.lib$', '', libname) + + @conf + def check_lib_msvc(self, libname, is_static=False, uselib_store=None): +diff --git a/waflib/Utils.py b/waflib/Utils.py +index a0cc2a09..da1b73e7 100644 +--- a/waflib/Utils.py ++++ b/waflib/Utils.py +@@ -730,7 +730,7 @@ def unversioned_sys_platform(): + if s == 'cli' and os.name == 'nt': + # ironpython is only on windows as far as we know + return 'win32' +- return re.split('\d+$', s)[0] ++ return re.split(r'\d+$', s)[0] + + def nada(*k, **kw): + """ +diff --git a/waflib/ansiterm.py b/waflib/ansiterm.py +index 0d20c637..027f0ad6 100644 +--- a/waflib/ansiterm.py ++++ b/waflib/ansiterm.py +@@ -264,7 +264,7 @@ else: + 'u': pop_cursor, + } + # Match either the escape sequence or text not containing escape sequence +- ansi_tokens = re.compile('(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') ++ ansi_tokens = re.compile(r'(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') + def write(self, text): + try: + wlock.acquire() diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb b/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb index 452f066559..bb844e4ff1 100644 --- a/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb +++ b/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb @@ -6,16 +6,23 @@ flow model and lock-free programming techniques for graph access have \ been used to have a more dynamic and robust system." SECTION = "libs/multimedia" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = " \ - file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \ - file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ + file://common/JackControlAPI.cpp;beginline=5;endline=19;md5=9d1921199e203163f160313243f853d6 \ + file://common/JackControlAPI.h;beginline=4;endline=18;md5=9d1921199e203163f160313243f853d6 \ + file://common/jack/jack.h;beginline=2;endline=17;md5=0a668d22ce661159cad28d1c3b8e66af \ + file://common/JackServer.h;beginline=2;endline=17;md5=9bf0870727804a994ee2d19fd368d940 \ " -DEPENDS = "libsamplerate0 libsndfile1 readline" +DEPENDS = "libsamplerate0 libsndfile1" -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" -SRCREV = "a2fe7ec2fdbd315f112c8035282d94a429451178" +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ + file://0001-Conceal-imp-warnings-in-Python3.patch \ + file://0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch \ +" +SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" @@ -49,3 +56,4 @@ FILES:jack-server = " \ FILES:jack-utils = "${bindir}/*" FILES:${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*" + diff --git a/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb b/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb index 0e62307363..800ad1b15e 100644 --- a/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb +++ b/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb @@ -5,23 +5,20 @@ SECTION = "libs/multimedia" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75" -DEPENDS = "enca fontconfig freetype libpng fribidi" +DEPENDS = "fontconfig freetype fribidi harfbuzz" -SRC_URI = "git://github.com/libass/libass.git;branch=master;protocol=https" -SRCREV = "73284b676b12b47e17af2ef1b430527299e10c17" +SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=0.17.1-branch" +SRCREV = "e8ad72accd3a84268275a9385beb701c9284e5b3" S = "${WORKDIR}/git" inherit autotools pkgconfig -PACKAGECONFIG ??= "" -PACKAGECONFIG[harfbuzz] = "--enable-harfbuzz,--disable-harfbuzz,harfbuzz" - -EXTRA_OECONF = " \ - --enable-fontconfig \ -" +PACKAGECONFIG[asm] = "--enable-asm,--disable-asm,nasm-native" +# use larger tiles in the rasterizer (better performance, slightly worse quality) +PACKAGECONFIG[largetiles] = "--enable-large-tiles,--disable-large-tiles" -# Disable compiling with ASM for x86 to avoid textrel -EXTRA_OECONF:append:x86 = " --disable-asm" +PACKAGECONFIG ??= "" +PACKAGECONFIG:append:x86-64 = " asm" PACKAGES =+ "${PN}-tests" diff --git a/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb b/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb deleted file mode 100644 index 99eda69643..0000000000 --- a/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Library for reading, mastering and writing optical discs" -HOMEPAGE = "http://libburnia-project.org/" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" - -SRC_URI = "http://files.libburnia-project.org/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "454d03ce31addb5b7dca62d213c9660e" -SRC_URI[sha256sum] = "525059d10759c5cb8148eebc863bb510e311c663603da7bd2d21c46b7cf63b54" - -inherit autotools pkgconfig diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch b/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch new file mode 100644 index 0000000000..0b25dff75e --- /dev/null +++ b/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch @@ -0,0 +1,43 @@ +From 08c1768aaeea86c522c0ef1705b9b6d434ebd3ae Mon Sep 17 00:00:00 2001 +From: Chris Lamb <chris@chris-lamb.co.uk> +Date: Fri, 28 Jul 2017 11:49:13 +0100 +Subject: [PATCH] Drop LIBCDIO_SOURCE_PATH by dropping STRIP_FROM_PATH Doxygen + setup; it's not used as FULL_PATH_NAMES = no + +Source: https://sources.debian.org/data/main/libc/libcdio/2.1.0-4/debian/patches/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 5 ----- + doc/doxygen/Doxyfile.in | 2 +- + 2 files changed, 1 insertion(+), 6 deletions(-) + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -557,11 +557,6 @@ AC_SUBST(HAVE_SOLARIS_CDROM) + AC_SUBST(HAVE_WIN32_CDROM) + AC_SUBST(HAVE_OS2_CDROM) + +-LIBCDIO_SOURCE_PATH="`pwd`" +-AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH", +- [Full path to libcdio top_sourcedir.]) +-AC_SUBST(LIBCDIO_SOURCE_PATH) +- + AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \ + getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \ + seteuid setegid snprintf setenv strndup unsetenv tzset sleep \ +Index: b/doc/doxygen/Doxyfile.in +=================================================================== +--- a/doc/doxygen/Doxyfile.in ++++ b/doc/doxygen/Doxyfile.in +@@ -138,7 +138,7 @@ FULL_PATH_NAMES = NO + # If left blank the directory from which doxygen is run is used as the + # path to strip. + +-STRIP_FROM_PATH = @LIBCDIO_SOURCE_PATH@ ++STRIP_FROM_PATH = + + # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of + # the path mentioned in the documentation of a class, which tells diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb index 1facd47d8f..8562462cba 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2 \ file://0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch \ + file://Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch \ " SRC_URI[md5sum] = "aa7629e8f73662a762f64c444b901055" @@ -18,6 +19,9 @@ PACKAGECONFIG[cdda-player] = "--with-cdda-player,--without-cdda-player,ncurses" PACKAGECONFIG[cddb] = "--enable-cddb,--disable-cddb,libcddb" PACKAGECONFIG[vcd-info] = "--enable-vcd-info,--disable-vcd-info,vcdimager" +# add -D_LARGEFILE64_SOURCE for 32bit targets +CFLAGS += "${@['-D_LARGEFILE64_SOURCE',''][d.getVar('SITEINFO_BITS') != '32']}" + PACKAGES += "${PN}-utils" FILES:${PN} = "${libdir}/${BPN}${SOLIB}" diff --git a/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb b/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.3.bb index 054fe4a482..9090cabb12 100644 --- a/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb +++ b/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.3.bb @@ -4,8 +4,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2" -SRC_URI[md5sum] = "034581479968405ed415c34a50d00224" -SRC_URI[sha256sum] = "cc190f553758ced7571859e301f802cb4821f164d02bfacfd320c14a4e0da763" +SRC_URI[sha256sum] = "ce35454997a208cbe50e91232f0e73fb1ac3471965813a13b8730a8f18a15369" inherit autotools lib_package binconfig pkgconfig diff --git a/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb index 2f7edfb75c..850918d319 100644 --- a/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb +++ b/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63" SECTION = "libs" DEPENDS = "zlib gperf-native" -PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \ file://addpkgconfig.patch \ diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb b/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb new file mode 100644 index 0000000000..eced6c7726 --- /dev/null +++ b/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb @@ -0,0 +1,39 @@ +SUMMARY = "Reference implementation of JPEG XL (encoder and decoder)" +HOMEPAGE = "https://github.com/libjxl/libjxl/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a905a337cc228a1f68f0b5416f52a7f" + +inherit cmake pkgconfig mime + +DEPENDS = "highway brotli" + +SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1" + +SRCREV = "e1489592a770b989303b0edc5cc1dc447bbe0515" +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=Release \ + -DJPEGXL_ENABLE_PLUGINS=ON \ + -DBUILD_TESTING=OFF \ + -DJPEGXL_WARNINGS_AS_ERRORS=OFF \ + -DJPEGXL_ENABLE_SIZELESS_VECTORS=ON \ + -DJPEGXL_ENABLE_SJPEG=OFF \ + -DJPEGXL_ENABLE_BENCHMARK=OFF \ + -DJPEGXL_ENABLE_EXAMPLES=OFF \ + -DJPEGXL_ENABLE_MANPAGES=OFF \ + -DJPEGXL_ENABLE_SKCMS=ON \ + -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \ + -DJPEGXL_FORCE_SYSTEM_HWY=ON \ + -DJPEGXL_ENABLE_JNI=OFF \ + -DJPEGXL_ENABLE_TCMALLOC=OFF \ + -DJPEGXL_ENABLE_TOOLS=OFF \ +" + +PACKAGECONFIG ?= "mime gdk-pixbuf-loader" +PACKAGECONFIG[gdk-pixbuf-loader] = "-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=ON,-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=OFF,gdk-pixbuf" +PACKAGECONFIG[gimp] = "-DJPEGXL_ENABLE_PLUGIN_GIMP210=ON,-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF,gimp" +PACKAGECONFIG[mime] = "-DJPEGXL_ENABLE_PLUGIN_MIME=ON,-DJPEGXL_ENABLE_PLUGIN_MIME=OFF" + +FILES:${PN} += "${libdir}/gdk-pixbuf-2.0 ${datadir}" diff --git a/meta-oe/recipes-multimedia/libmad/libmad/0001-configure-Respect-the-cflags-from-environment.patch b/meta-oe/recipes-multimedia/libmad/libmad/0001-configure-Respect-the-cflags-from-environment.patch new file mode 100644 index 0000000000..586782a348 --- /dev/null +++ b/meta-oe/recipes-multimedia/libmad/libmad/0001-configure-Respect-the-cflags-from-environment.patch @@ -0,0 +1,47 @@ +From 26342d1c775205f661f5cf005b7e054a04f5d32e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 16 May 2023 10:14:57 -0700 +Subject: [PATCH] configure: Respect the cflags from environment + +This is needed with OE like cross-build envs where certain important +flags maybe passed as global policy to aid cross compiling or +reproducibility etc. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -73,12 +73,9 @@ debug="" + optimize="" + profile="" + +-set -- $CFLAGS +-CFLAGS="" +- + if test "$GCC" = yes + then +- CFLAGS="-Wall" ++ CFLAGS="$CFLAGS -Wall" + fi + + while test $# -gt 0 +@@ -115,10 +112,13 @@ do + optimize="$optimize $1" + shift + ;; +- *) ++ -*) + CFLAGS="$CFLAGS $1" + shift + ;; ++ *) ++ shift ++ ;; + esac + done + diff --git a/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch b/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch index 70723f2d08..b9a444dc32 100644 --- a/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch +++ b/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch @@ -4,6 +4,8 @@ Date: Tue, 16 Sep 2014 12:28:47 +0300 Subject: [PATCH 4/4] Remove clang unsupported compiler flags --- +Upstream-Status: Pending + configure.ac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb index d3ac85ee0b..e70c8e3ed1 100644 --- a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb +++ b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb @@ -1,6 +1,6 @@ SUMMARY = "MPEG Audio Decoder library" -HOMEPAGE = "http://sourceforge.net/projects/mad/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" +HOMEPAGE = "https://sourceforge.net/projects/mad/" +BUGTRACKER = "https://sourceforge.net/tracker/?group_id=12349&atid=112349" LICENSE = "GPL-2.0-or-later" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ @@ -8,18 +8,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://version.h;beginline=1;endline=8;md5=aa07311dd39288d4349f28e1de516454" SECTION = "libs" DEPENDS = "libid3tag" -PR = "r3" -SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz \ +SRC_URI = "https://downloads.sourceforge.net/mad/libmad-${PV}.tar.gz \ file://no-force-mem.patch \ file://add-pkgconfig.patch \ file://fix_for_mips_with_gcc-4.5.0.patch \ file://obsolete_automake_macros.patch \ file://automake-foreign.patch \ + file://0001-configure-Respect-the-cflags-from-environment.patch \ " SRC_URI:append:toolchain-clang = " file://0004-Remove-clang-unsupported-compiler-flags.patch " -SRC_URI[md5sum] = "1be543bc30c56fb6bea1d7bf6a64e66c" SRC_URI[sha256sum] = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690" S = "${WORKDIR}/libmad-${PV}" diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch b/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch new file mode 100644 index 0000000000..dfdaf810d8 --- /dev/null +++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch @@ -0,0 +1,38 @@ +From 7a25d5def379db387de9237f0b03605b3ae277b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Jan 2023 11:32:59 -0800 +Subject: [PATCH] fastmix: Drop 'register' storage class keyword + +It has been dropped from laters C/C++ standards ( c++17 and newer ) + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/fastmix.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/fastmix.cpp b/src/fastmix.cpp +index d693d20..aa51c4a 100644 +--- a/src/fastmix.cpp ++++ b/src/fastmix.cpp +@@ -288,7 +288,7 @@ CzWINDOWEDFIR sfir; + // MIXING MACROS + // ---------------------------------------------------------------------------- + #define SNDMIX_BEGINSAMPLELOOP8\ +- register MODCHANNEL * const pChn = pChannel;\ ++ MODCHANNEL * const pChn = pChannel;\ + nPos = pChn->nPosLo;\ + const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\ + if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ +@@ -296,7 +296,7 @@ CzWINDOWEDFIR sfir; + do { + + #define SNDMIX_BEGINSAMPLELOOP16\ +- register MODCHANNEL * const pChn = pChannel;\ ++ MODCHANNEL * const pChn = pChannel;\ + nPos = pChn->nPosLo;\ + const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\ + if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ +-- +2.39.0 + diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb index 144c737e76..e04e763776 100644 --- a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb +++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb @@ -4,8 +4,9 @@ HOMEPAGE = "http://modplug-xmms.sf.net" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685" -SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" -SRC_URI[md5sum] = "5ba16981e6515975e9a68a58d5ba69d1" +SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz \ + file://0001-fastmix-Drop-register-storage-class-keyword.patch" + SRC_URI[sha256sum] = "457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de" inherit autotools pkgconfig diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.5.2.bb index 830bc04734..02958ef023 100644 --- a/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb +++ b/meta-oe/recipes-multimedia/libopus/libopus_1.5.2.bb @@ -6,11 +6,10 @@ technology from Skype's SILK codec and Xiph.Org's CELT codec." HOMEPAGE = "http://www.opus-codec.org/" SECTION = "libs/multimedia" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b365c2155d66e550e1447075d6744a5" SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz" -SRC_URI[md5sum] = "d7c07db796d21c9cf1861e0c2b0c0617" -SRC_URI[sha256sum] = "65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d" +SRC_URI[sha256sum] = "65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1" S = "${WORKDIR}/opus-${PV}" @@ -30,8 +29,8 @@ EXTRA_OECONF = " \ # ne10 is available only for armv7a, armv7ve and aarch64 DEPENDS:append:aarch64 = " ne10" -DEPENDS:append:armv7a = " ne10" -DEPENDS:append:armv7ve = " ne10" +DEPENDS:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" +DEPENDS:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" python () { if d.getVar('TARGET_FPU') in [ 'soft' ]: @@ -53,3 +52,5 @@ python () { ARM_INSTRUCTION_SET:armv5 = "arm" BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT += "opus-codec:opus" diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb index c600e88f88..0f50a6e8fe 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb @@ -11,18 +11,14 @@ DEPENDS = " \ libass \ " -DEPENDS += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' virtual/libx11 xsp libxv libxscrnsaver libxinerama', '', d)} \ -" - LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV_mpv = "349e437466163cb52f7d0aa227d4606edd9db501" -SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.34;protocol=https \ - https://waf.io/waf-2.0.20;name=waf;subdir=git \ +SRCREV_mpv = "140ec21c89d671d392877a7f3b91d67e7d7b9239" +SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.35;protocol=https \ + https://waf.io/waf-2.0.25;name=waf;subdir=git \ " -SRC_URI[waf.sha256sum] = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f" +SRC_URI[waf.sha256sum] = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5" S = "${WORKDIR}/git" @@ -46,7 +42,7 @@ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ " -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" +PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext" PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv" PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" @@ -102,8 +98,12 @@ EXTRA_OECONF = " \ ${PACKAGECONFIG_CONFARGS} \ " +do_configure:append() { + sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h +} + link_waf() { - ln -s waf-2.0.20 ${S}/waf + ln -s waf-2.0.25 ${S}/waf } do_unpack[postfuncs] += "link_waf" @@ -111,5 +111,6 @@ FILES:${PN} += " \ ${datadir}/icons \ ${datadir}/zsh \ ${datadir}/bash-completion \ + ${datadir}/metainfo \ " EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" diff --git a/meta-oe/recipes-multimedia/pulseaudio/paprefs_1.2.bb b/meta-oe/recipes-multimedia/pulseaudio/paprefs_1.2.bb new file mode 100644 index 0000000000..6e4321dd7d --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/paprefs_1.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "PulseAudio Preferences (paprefs) is a simple GTK based configuration dialog for the PulseAudio sound server." +HOMEPAGE = "https://freedesktop.org/software/pulseaudio/paprefs/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "pulseaudio gtkmm3 gtk+3 libsigc++-3 glibmm" + +inherit meson pkgconfig features_check + +# paprefs.cc includes gdk/gdkx.h and gdkx.h isn't provided by gtk3 without x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://freedesktop.org/software/pulseaudio/paprefs/${BP}.tar.xz" + +SRC_URI[sha256sum] = "b3f21e40dc3936d15e3ffc910fb0c07c14b88e8c287715b456a948c17638f633" + +EXTRA_OEMESON = "-Dlynx=false" + +RDEPENDS:${PN} += "pulseaudio-server" diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-pavucontrol-remove-canberra-gtk-support.patch b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-pavucontrol-remove-canberra-gtk-support.patch new file mode 100644 index 0000000000..44169240c5 --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-pavucontrol-remove-canberra-gtk-support.patch @@ -0,0 +1,112 @@ +From 87992a57e5f517d5ceb5dfabaea662ac64983720 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Fri, 27 May 2022 18:37:53 +0200 +Subject: [PATCH] pavucontrol: remove canberra-gtk support + +libcanberra-gtk3 module isn't buildable for wayland. +Remove its dpendency. + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Inappropriate +--- + configure.ac | 2 +- + src/pavuapplication.cc | 2 -- + src/pavucontrol.cc | 4 ---- + src/sinkwidget.cc | 17 ----------------- + 4 files changed, 1 insertion(+), 24 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 056ba5e..e857563 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -41,7 +41,7 @@ AC_TYPE_SIGNAL + AC_HEADER_STDC + AX_CXX_COMPILE_STDCXX_11 + +-PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 >= 3.22 sigc++-2.0 libcanberra-gtk3 >= 0.16 json-glib-1.0 ]) ++PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 >= 3.22 sigc++-2.0 json-glib-1.0 ]) + AC_SUBST(GUILIBS_CFLAGS) + AC_SUBST(GUILIBS_LIBS) + +diff --git a/src/pavuapplication.cc b/src/pavuapplication.cc +index 6773b53..60c016c 100644 +--- a/src/pavuapplication.cc ++++ b/src/pavuapplication.cc +@@ -24,8 +24,6 @@ + + #include "i18n.h" + +-#include <canberra-gtk.h> +- + #include "pavuapplication.h" + #include "pavucontrol.h" + #include "mainwindow.h" +diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc +index 18d5400..10ab646 100644 +--- a/src/pavucontrol.cc ++++ b/src/pavucontrol.cc +@@ -29,8 +29,6 @@ + #include <json-glib/json-glib.h> + #endif + +-#include <canberra-gtk.h> +- + #include "pavucontrol.h" + #include "i18n.h" + #include "minimalstreamwidget.h" +@@ -916,8 +914,6 @@ MainWindow* pavucontrol_get_window(pa_glib_mainloop *m, bool maximize, bool _ret + tab_number = _tab_number; + retry = _retry; + +- ca_context_set_driver(ca_gtk_context_get(), "pulse"); +- + mainWindow = MainWindow::create(maximize); + + api = pa_glib_mainloop_get_api(m); +diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc +index f30bd37..482fd1f 100644 +--- a/src/sinkwidget.cc ++++ b/src/sinkwidget.cc +@@ -24,7 +24,6 @@ + + #include "sinkwidget.h" + +-#include <canberra-gtk.h> + #if HAVE_EXT_DEVICE_RESTORE_API + # include <pulse/format.h> + # include <pulse/ext-device-restore.h> +@@ -111,7 +110,6 @@ SinkWidget* SinkWidget::create(MainWindow* mainWindow) { + void SinkWidget::executeVolumeUpdate() { + pa_operation* o; + char dev[64]; +- int playing = 0; + + if (!(o = pa_context_set_sink_volume_by_index(get_context(), index, &volume, NULL, NULL))) { + show_error(_("pa_context_set_sink_volume_by_index() failed")); +@@ -120,22 +118,7 @@ void SinkWidget::executeVolumeUpdate() { + + pa_operation_unref(o); + +- ca_context_playing(ca_gtk_context_get(), 2, &playing); +- if (playing) +- return; +- + snprintf(dev, sizeof(dev), "%lu", (unsigned long) index); +- ca_context_change_device(ca_gtk_context_get(), dev); +- +- ca_gtk_play_for_widget(GTK_WIDGET(gobj()), +- 2, +- CA_PROP_EVENT_DESCRIPTION, _("Volume Control Feedback Sound"), +- CA_PROP_EVENT_ID, "audio-volume-change", +- CA_PROP_CANBERRA_CACHE_CONTROL, "permanent", +- CA_PROP_CANBERRA_ENABLE, "1", +- NULL); +- +- ca_context_change_device(ca_gtk_context_get(), NULL); + } + + void SinkWidget::onMuteToggleButton() { +-- +2.25.1 + diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb index 5f9d7a6ba4..012fc3a94d 100644 --- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb @@ -8,16 +8,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" # AM_GLIB_GNU_GETTEXT macro in configure.ac. That macro is deprecated, so the # glib-2.0-native dependency may go away at some point (something to keep in # mind when doing version upgrades). -DEPENDS = "libxml-parser-perl-native intltool-native glib-2.0-native gtkmm3 libcanberra pulseaudio" +DEPENDS = "libxml-parser-perl-native intltool-native glib-2.0-native gtkmm3 pulseaudio json-glib" inherit autotools features_check perlnative pkgconfig -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz \ - " -SRC_URI[md5sum] = "9dcc2c76292e7e5e075d51b8dcb20202" -SRC_URI[sha256sum] = "8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2" +SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" +SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-pavucontrol-remove-canberra-gtk-support.patch', '', d)}" + +SRC_URI[sha256sum] = "ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = ",,libcanberra" EXTRA_OECONF = "--disable-lynx " diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch deleted file mode 100644 index 8ac8fbe19e..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0d5c0e9a75eca43667b0e29155b635e50622b66a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 27 Feb 2015 21:55:36 +0000 -Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and - - libv4l2subdev" - -This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Conflicts: - utils/media-ctl/Makefile.am - ---- - utils/media-ctl/Makefile.am | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index c48c8d6..e255e16 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -1,8 +1,7 @@ --noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la -- -+lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la - libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h --libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) --libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) -+libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) -+libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) - - media-bus-format-names.h: ../../include/linux/media-bus-format.h - $(AM_V_GEN) sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ -@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES) - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) - libv4l2subdev_la_SOURCES = libv4l2subdev.c - libv4l2subdev_la_LIBADD = libmediactl.la --libv4l2subdev_la_CFLAGS = -static --libv4l2subdev_la_LDFLAGS = -static -- - mediactl_includedir=$(includedir)/mediactl - noinst_HEADERS = mediactl.h v4l2subdev.h - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch new file mode 100644 index 0000000000..64c01e4977 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch @@ -0,0 +1,46 @@ +From 502c0302827cec3d2b2a69fb25189646685ef2ff Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <festevam@denx.de> +Date: Fri, 12 Jan 2024 00:17:14 -0300 +Subject: [PATCH] keytable: meson: Restrict the installation of + 50-rc_keymap.conf + +Currently, meson tries to install 50-rc_keymap.conf even if systemd +is not used. + +Commit 01f2c6c58e6f ("keytable: restrict installation of 50-rc_keymap.conf"), +only allowed 50-rc_keymap.conf to be installed when both BPF and systemd +were used. + +Apply the same logic in meson to fix the problem. + +Signed-off-by: Fabio Estevam <festevam@denx.de> +Signed-off-by: Sean Young <sean@mess.org> +Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=a21924ec424c4744af6f2a794e0677eba35dd168] +--- + utils/keytable/meson.build | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build +index 4130a4bea514..76ce329eae8e 100644 +--- a/utils/keytable/meson.build ++++ b/utils/keytable/meson.build +@@ -69,6 +69,8 @@ ir_keytable_udev_rules = files( + install_data(ir_keytable_udev_rules, + install_dir : ir_keytable_system_dir / 'rules.d') + ++if ir_bpf_enabled ++if dep_systemd.found() + if have_udevdsyscallfilter + ir_keytable_systemd_files = files( + '50-rc_keymap.conf', +@@ -76,6 +78,8 @@ if have_udevdsyscallfilter + install_data(ir_keytable_systemd_files, + install_dir : systemd_systemdir / 'systemd-udevd.service.d') + endif ++endif ++endif + + # Install non-existing directory to create empty directory structure + # See: https://github.com/mesonbuild/meson/issues/2904 +-- +2.34.1 diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch deleted file mode 100644 index 52fc2d7a8d..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 320b8378ee30eb5e0fe83a8b397f822f2f88a4c1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 1 Mar 2015 22:25:07 +0000 -Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch - ---- - utils/media-ctl/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index e255e16..ff7b417 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la - mediactl_includedir=$(includedir)/mediactl - noinst_HEADERS = mediactl.h v4l2subdev.h - -+pkgconfig_DATA = libmediactl.pc - bin_PROGRAMS = media-ctl - media_ctl_SOURCES = media-ctl.c options.c options.h tools.h - media_ctl_LDADD = libmediactl.la libv4l2subdev.la diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch deleted file mode 100644 index 39dc338350..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f7109d6b2fcb291824d795071c04a492d9fbc45b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 1 Mar 2015 22:25:07 +0000 -Subject: [PATCH] %% original patch: export-mediactl-headers.patch - ---- - utils/media-ctl/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index ff7b417..6ce656f 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES) - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) - libv4l2subdev_la_SOURCES = libv4l2subdev.c - libv4l2subdev_la_LIBADD = libmediactl.la --mediactl_includedir=$(includedir)/mediactl --noinst_HEADERS = mediactl.h v4l2subdev.h -+otherincludedir = $(includedir)/mediactl -+otherinclude_HEADERS = mediactl.h v4l2subdev.h - - pkgconfig_DATA = libmediactl.pc - bin_PROGRAMS = media-ctl diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch deleted file mode 100644 index d8d1b8d184..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e4582c11f76b9390a3e172dcf0741dca90a9dc8d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Nov 2019 18:50:34 -0800 -Subject: [PATCH] Do not use getsubopt - -POSIX says that behavior when subopts list is empty is undefined. -musl libs will set value to NULL which leads to crash. - -Simply avoid getsubopt, since we cannot rely on it. - -Imported from Alpine Linux - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - utils/v4l2-ctl/v4l2-ctl-common.cpp | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp -index c940171..49c0f39 100644 ---- a/utils/v4l2-ctl/v4l2-ctl-common.cpp -+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp -@@ -956,15 +956,17 @@ static bool parse_subset(char *optarg) - - static bool parse_next_subopt(char **subs, char **value) - { -- static char *const subopts[] = { -- nullptr -- }; -- int opt = getsubopt(subs, subopts, value); -+ char *p = *subs; -+ *value = *subs; - -- if (opt < 0 || *value) -- return false; -- fprintf(stderr, "Missing suboption value\n"); -- return true; -+ while (*p && *p != ',') -+ p++; -+ -+ if (*p) -+ *p++ = '\0'; -+ -+ *subs = p; -+ return false; - } - - void common_cmd(const std::string &media_bus_info, int ch, char *optarg) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.22.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.22.1.bb deleted file mode 100644 index 741e1030cf..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.22.1.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "v4l2 and IR applications" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ - file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0" -PROVIDES = "libv4l media-ctl" - -DEPENDS = "jpeg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" -DEPENDS:append:libc-musl = " argp-standalone" -DEPENDS:append:class-target = " udev" -LDFLAGS:append = " -pthread" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG ??= "media-ctl" -PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," - -SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ - file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ - file://0002-original-patch-mediactl-pkgconfig.patch \ - file://0003-original-patch-export-mediactl-headers.patch \ - file://0007-Do-not-use-getsubopt.patch \ - " - -SRC_URI[md5sum] = "8aa73287320a49e9170a8255d7b2c7e6" -SRC_URI[sha256sum] = "65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31" - -EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev \ - --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" - -VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" - -PACKAGES =+ "media-ctl ir-keytable rc-keymaps libv4l libv4l-dev" - -RPROVIDES:${PN}-dbg += "libv4l-dbg" - -FILES:media-ctl = "${bindir}/media-ctl ${libdir}/libmediactl.so.*" - -FILES:ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules" -RDEPENDS:ir-keytable += "${VIRTUAL-RUNTIME_ir-keytable-keymaps}" - -FILES:rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" - -FILES:${PN} = "${bindir} ${sbindir}" - -FILES:libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ - ${libdir}/libdvbv5*${SOLIBS} \ - ${libdir}/libv4l/*-decomp" - -FILES:libv4l-dev += "${includedir} ${libdir}/pkgconfig \ - ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ - ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la" - -PARALLEL_MAKE:class-native = "" -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb new file mode 100644 index 0000000000..52759ef18e --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb @@ -0,0 +1,85 @@ +SUMMARY = "v4l2 and IR applications" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ + file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0" +PROVIDES = "libv4l media-ctl" + +DEPENDS = "jpeg \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ + ${@bb.utils.contains_any('PACKAGECONFIG', 'qv4l2 qvidcap', 'qtbase qtbase-native', '', d)}" + +DEPENDS:append:libc-musl = " argp-standalone" +DEPENDS:append:class-target = " udev" +LDFLAGS:append = " -pthread" +# v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to +# both 32 and 64 bit file APIs. But it does not handle the time side? +# Needs further investigation +GLIBC_64BIT_TIME_FLAGS = "" + +inherit meson gettext pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[qv4l2] = ",-Dqv4l2=disabled" +PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled" +PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" + +SRC_URI = "\ + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ + file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \ +" + +SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" + +PV .= "+git" + +S = "${WORKDIR}/git" + +EXTRA_OEMESON = "-Dudevdir=${base_libdir}/udev -Dv4l2-compliance-32=false -Dv4l2-ctl-32=false" + +# Disable the erroneous installation of gconv-modules that would break glib +# like it is done in Debian and ArchLinux. +EXTRA_OEMESON += "-Dgconv=disabled" + +VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" + +PACKAGES =+ "media-ctl ir-keytable rc-keymaps libv4l libv4l-dev qv4l2 qvidcap" + +RPROVIDES:${PN}-dbg += "libv4l-dbg" + +FILES:media-ctl = "${bindir}/media-ctl ${libdir}/libmediactl.so.*" +FILES:qv4l2 = "\ + ${bindir}/qv4l2 \ + ${datadir}/applications/qv4l2.desktop \ + ${datadir}/icons/hicolor/*/apps/qv4l2.* \ +" +FILES:qvidcap = "\ + ${bindir}/qvidcap \ + ${datadir}/applications/qvidcap.desktop \ + ${datadir}/icons/hicolor/*/apps/qvidcap.* \ +" + +FILES:ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules" +RDEPENDS:ir-keytable += "${VIRTUAL-RUNTIME_ir-keytable-keymaps}" +RDEPENDS:qv4l2 += "\ + ${@bb.utils.contains('PACKAGECONFIG', 'qv4l2', 'qtbase', '', d)}" +RDEPENDS:qvidcap += "\ + ${@bb.utils.contains('PACKAGECONFIG', 'qvidcap', 'qtbase', '', d)}" + +FILES:rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" + +FILES:${PN} = "${bindir} ${sbindir}" + +FILES:libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ + ${libdir}/libdvbv5*${SOLIBS} \ + ${libdir}/libv4l/*-decomp \ + ${libdir}/libv4l2tracer.so \ +" + +FILES:libv4l-dev += "${includedir} ${libdir}/pkgconfig \ + ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ + ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la" + +PARALLEL_MAKE:class-native = "" +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb index 10176634bd..3069528301 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb @@ -7,7 +7,6 @@ SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master \ SRCREV = "65f740aa1758531fd810339bc1b7d1d33666e28a" PV = "0.0" -PR = "r2" S = "${WORKDIR}/git" EXTRA_OEMAKE = "-e MAKEFLAGS=" diff --git a/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch b/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch new file mode 100644 index 0000000000..d66ad4f268 --- /dev/null +++ b/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch @@ -0,0 +1,35 @@ +From 25e12cf5918884f232cebc34c92bd548fe40c2b3 Mon Sep 17 00:00:00 2001 +From: Anonymous Maarten <anonymous.maarten@gmail.com> +Date: Fri, 9 Dec 2022 19:13:09 +0100 +Subject: [PATCH] cmake: extract libtool from configure.ac and convert to + SOVERSION + +Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/25e12cf5918884f232cebc34c92bd548fe40c2b3] +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + CMakeLists.txt | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index adc73b09..7ae5043f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,18 @@ cmake_minimum_required(VERSION 3.2) + + project(WavPack VERSION 5.6.0) + ++file(READ "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC) ++string(REGEX MATCH "LT_CURRENT=([0-9]+)" LT_CURRENT "${CONFIGURE_AC}") ++set(LT_CURRENT "${CMAKE_MATCH_1}") ++string(REGEX MATCH "LT_REVISION=([0-9]+)" LT_REVISION "${CONFIGURE_AC}") ++set(LT_REVISION "${CMAKE_MATCH_1}") ++string(REGEX MATCH "LT_AGE=([0-9]+)" LT_AGE "${CONFIGURE_AC}") ++set(LT_AGE "${CMAKE_MATCH_1}") ++ ++math(EXPR SOVERSION_MAJOR "${LT_CURRENT}-${LT_AGE}") ++math(EXPR SOVERSION_MINOR "${LT_AGE}") ++math(EXPR SOVERSION_MICRO "${LT_REVISION}") ++ + # Languages + + include(CheckLanguage) diff --git a/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch b/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch new file mode 100644 index 0000000000..faddb7b754 --- /dev/null +++ b/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch @@ -0,0 +1,26 @@ +From 7c1dd729302b7f77f65884df4e79301df1490423 Mon Sep 17 00:00:00 2001 +From: Anonymous Maarten <anonymous.maarten@gmail.com> +Date: Fri, 9 Dec 2022 19:23:51 +0100 +Subject: [PATCH] cmake: set SOVERSION and VERSION property of wavpack + +This is used to version .so libraries on Linux + +Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/7c1dd729302b7f77f65884df4e79301df1490423] +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ae5043f..285b295b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -361,6 +361,8 @@ if(BUILD_SHARED_LIBS) + target_link_directories(wavpack PRIVATE "-Wl,-exported_symbols_list,${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym") + endif() + else() ++ set_target_properties(wavpack PROPERTIES SOVERSION "${SOVERSION_MAJOR}") ++ set_target_properties(wavpack PROPERTIES VERSION "${SOVERSION_MAJOR}.${SOVERSION_MINOR}.${SOVERSION_MICRO}") + set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym;\n};\n\nVERS_2 {\n global: sym;\n} VERS_1;\n") + file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") + check_c_linker_flag("-Wl,--version-script=${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map" COMPILER_SUPPORTS_SYMBOL_MAPS) diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb deleted file mode 100644 index 021496bd43..0000000000 --- a/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://license.txt;md5=f596650807588c61fcab60bec8242df8" - -SRC_URI = "http://wavpack.com/wavpack-${PV}.tar.bz2" -SRC_URI[md5sum] = "7bb1528f910e4d0003426c02db856063" -SRC_URI[sha256sum] = "175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5" - -inherit autotools lib_package - diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb new file mode 100644 index 0000000000..7384d2892f --- /dev/null +++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://license.txt;md5=bb5d037e3ad41a3c84c9f2d8bb65a7b4" + +DEPENDS = "openssl" + +SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https \ + file://set-soversion-and-version.patch \ + file://extract-libtool-and-convert-to-soversion.patch \ + " + +SRCREV = "e03e8e29dc618e08e7baba9636e57ba1254874ce" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig lib_package + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch index 6ad7f2b478..463651aa4a 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch +++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch @@ -1,19 +1,20 @@ -From dc0a5c3d2dd4e79d12a150a246a95c4dc88326f1 Mon Sep 17 00:00:00 2001 +From 2829e6998b7595dd2108c1497fdd02485ef99e2c Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Tue, 16 Aug 2011 16:04:35 +0200 Subject: [PATCH] Upstream: not yet Fix configure to accept "--prefix=" (a blank prefix). +Upstream-Status: Pending --- build/make/configure.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/build/make/configure.sh b/build/make/configure.sh -index 007e020..04d5cbf 100644 +index b645a666f..0b99a8b38 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -581,6 +581,8 @@ process_common_cmdline() { +@@ -658,6 +658,8 @@ process_common_cmdline() { ;; --prefix=*) prefix="${optval}" @@ -22,7 +23,7 @@ index 007e020..04d5cbf 100644 ;; --libdir=*) libdir="${optval}" -@@ -614,13 +616,23 @@ process_cmdline() { +@@ -687,13 +689,23 @@ process_cmdline() { } post_process_common_cmdline() { diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.11.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb index 8fd4f698d7..b4d49842ea 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.11.0.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRCREV = "626ff35955c2c35b806b3e0ecf551a1a8611cdbf" +SRCREV = "602e2e8979d111b02c959470da5322797dd96a19" SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ file://libvpx-configure-support-blank-prefix.patch \ " @@ -19,13 +19,12 @@ S = "${WORKDIR}/git" ARM_INSTRUCTION_SET = "arm" CFLAGS += "-fPIC" +BUILD_LDFLAGS += "-pthread" export CC export LD = "${CC}" -VPXTARGET:armv5te = "armv5te-linux-gcc" -VPXTARGET:armv6 = "armv6-linux-gcc" -VPXTARGET:armv7a = "armv7-linux-gcc" +VPXTARGET:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7-linux-gcc","generic-gnu",d)}" VPXTARGET ?= "generic-gnu" CONFIGUREOPTS = " \ @@ -48,3 +47,5 @@ do_install() { oe_runmake install DESTDIR=${D} chown -R root:root ${D} } + +BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch b/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch index da5841a132..ea9326946e 100644 --- a/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch +++ b/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- configure.ac.old 2005-06-03 12:53:28.000000000 +0200 +++ configure.ac 2005-06-03 12:54:29.000000000 +0200 @@ -25,9 +25,9 @@ diff --git a/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch b/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch index 18bc67cdd9..995f03113b 100644 --- a/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch +++ b/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- Xsp/xsp.pc.in~ 2009-01-07 13:06:07.000000000 +0100 +++ Xsp/xsp.pc.in 2009-01-07 13:06:07.000000000 +0100 @@ -6,5 +6,5 @@ |