diff options
Diffstat (limited to 'meta-oe/recipes-multimedia')
30 files changed, 170 insertions, 178 deletions
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/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-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/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/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch deleted file mode 100644 index d3b203111f..0000000000 --- a/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 415d50fc56b82963e5570c7738c61b22f4a83748 Mon Sep 17 00:00:00 2001 -From: Daan De Meyer <daan.j.demeyer@gmail.com> -Date: Mon, 11 Jul 2022 00:56:28 +0200 -Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python - -The 'U' mode bit is removed in python 3.11. It has been -deprecated for a long time. The 'U' mode bit has no effect -so this change doesn't change any behavior. - -See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api - -Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/884] ---- - waflib/ConfigSet.py | 2 +- - waflib/Context.py | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py -index b300bb56..84736c9c 100644 ---- a/waflib/ConfigSet.py -+++ b/waflib/ConfigSet.py -@@ -312,7 +312,7 @@ class ConfigSet(object): - :type filename: string - """ - tbl = self.table -- code = Utils.readf(filename, m='rU') -+ code = Utils.readf(filename, m='r') - for m in re_imp.finditer(code): - g = m.group - tbl[g(2)] = eval(g(3)) -diff --git a/waflib/Context.py b/waflib/Context.py -index 9fee3fa1..761b521f 100644 ---- a/waflib/Context.py -+++ b/waflib/Context.py -@@ -266,7 +266,7 @@ class Context(ctx): - cache[node] = True - self.pre_recurse(node) - try: -- function_code = node.read('rU', encoding) -+ function_code = node.read('r', encoding) - exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) - finally: - self.post_recurse(node) -@@ -662,7 +662,7 @@ def load_module(path, encoding=None): - - module = imp.new_module(WSCRIPT_FILE) - try: -- code = Utils.readf(path, m='rU', encoding=encoding) -+ code = Utils.readf(path, m='r', encoding=encoding) - except EnvironmentError: - raise Errors.WafError('Could not read the file %r' % path) - diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.21.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb index 808b8259f0..b85b7993d0 100644 --- a/meta-oe/recipes-multimedia/jack/jack_1.19.21.bb +++ b/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb @@ -14,10 +14,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ - file://0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch \ -" -SRCREV = "6b3c96d8aeef8aeb4b20f3aa647e6d01b4000ff8" +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" +SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-multimedia/libass/libass_0.17.0.bb b/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb index c052239cbf..800ad1b15e 100644 --- a/meta-oe/recipes-multimedia/libass/libass_0.17.0.bb +++ b/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75" DEPENDS = "fontconfig freetype fribidi harfbuzz" -SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=master" -SRCREV = "bef4b43ef1882b77f789f611d9cd24271ccdd65b" +SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=0.17.1-branch" +SRCREV = "e8ad72accd3a84268275a9385beb701c9284e5b3" S = "${WORKDIR}/git" inherit autotools pkgconfig 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 62004ac440..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" 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..5b089a0b33 100644 --- a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb +++ b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb @@ -16,6 +16,7 @@ SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz \ 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 " diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.4.bb index 830bc04734..2002117746 100644 --- a/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb +++ b/meta-oe/recipes-multimedia/libopus/libopus_1.4.bb @@ -9,8 +9,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3" SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz" -SRC_URI[md5sum] = "d7c07db796d21c9cf1861e0c2b0c0617" -SRC_URI[sha256sum] = "65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d" +SRC_URI[sha256sum] = "c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f" S = "${WORKDIR}/opus-${PV}" 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/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 index 8ac8fbe19e..52f0cd3388 100644 --- 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 @@ -13,6 +13,8 @@ Conflicts: utils/media-ctl/Makefile.am --- +Upstream-Status: Pending + utils/media-ctl/Makefile.am | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch deleted file mode 100644 index 032bf00c7d..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1d9ce7cd799770981043f656373cbd1bf7558b9a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 26 Jan 2023 17:00:00 -0800 -Subject: [PATCH] media-info: Include missing <cstdint> for uintptr_t - -gcc 13 moved some includes around and as a result <cstdint> is no longer -transitively included [1]. Explicitly include it. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://lore.kernel.org/linux-media/20230127010741.3883339-1-raj.khem@gmail.com/] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/common/media-info.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/common/media-info.cpp b/utils/common/media-info.cpp -index 53e132f5..1a25a4b6 100644 ---- a/utils/common/media-info.cpp -+++ b/utils/common/media-info.cpp -@@ -3,6 +3,7 @@ - * Copyright 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved. - */ - -+#include <cstdint> - #include <cstring> - #include <fstream> - #include <iostream> --- -2.39.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 index 52fc2d7a8d..d52475974f 100644 --- 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 @@ -4,6 +4,8 @@ Date: Sun, 1 Mar 2015 22:25:07 +0000 Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch --- +Upstream-Status: Pending + utils/media-ctl/Makefile.am | 1 + 1 file changed, 1 insertion(+) 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 index 39dc338350..f6fcee92ea 100644 --- 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 @@ -4,6 +4,8 @@ Date: Sun, 1 Mar 2015 22:25:07 +0000 Subject: [PATCH] %% original patch: export-mediactl-headers.patch --- +Upstream-Status: Pending + utils/media-ctl/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch deleted file mode 100644 index 0548e4fba1..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4fe9f6071cd24bcab157a9398adcca474f619f8d Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <pkj@axis.com> -Date: Sat, 15 Oct 2022 02:45:26 +0200 -Subject: [PATCH] configure.ac, Makefile.am: Support building without NLS - -Avoid entering the v4l-utils-po and libdvbv5-po directories if NLS -support is disabled, as the generated Makefiles in those directories are -empty then. - -Upstream-Status: Submitted [https://patchwork.linuxtv.org/project/linux-media/patch/20221015010541.688322-1-pkj@axis.com/] -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> ---- - Makefile.am | 6 +++++- - configure.ac | 1 + - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 7fb443ab..8e924af8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 - AM_MAKEFLAGS = $(word 1, $(subst 1, -w, $(filter 1, $(V))) --no-print-directory) - --SUBDIRS = v4l-utils-po libdvbv5-po lib -+SUBDIRS = lib -+ -+if USE_NLS -+SUBDIRS += v4l-utils-po libdvbv5-po -+endif - - if WITH_V4LUTILS - SUBDIRS += utils contrib -diff --git a/configure.ac b/configure.ac -index 05298981..7c78467f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -99,6 +99,7 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen_libdvbv5.cfg) - ALL_LINGUAS="" - m4_ifdef(AM_GNU_GETTEXT_REQUIRE_VERSION,[AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])],[AM_GNU_GETTEXT_VERSION([0.19.8])]) - AM_GNU_GETTEXT([external]) -+AM_CONDITIONAL([USE_NLS], [test "$USE_NLS" = "yes"]) - - LIBDVBV5_DOMAIN="libdvbv5" - AC_DEFINE([LIBDVBV5_DOMAIN], "libdvbv5", [libdvbv5 domain]) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb index b42300f096..c02645a6b8 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb @@ -26,27 +26,23 @@ PACKAGECONFIG[qv4l2] = ",--disable-qv4l2" PACKAGECONFIG[qvidcap] = ",--disable-qvidcap" SRC_URI = "\ - git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=master \ + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.24 \ 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://0004-Do-not-use-getsubopt.patch \ - file://0005-configure.ac-Makefile.am-Support-building-without-NL.patch \ - file://0001-media-info-Include-missing-cstdint-for-uintptr_t.patch \ " -SRCREV = "fd544473800d02e90bc289434cc44e5aa8fadd0f" +SRCREV = "8799081b143627c9c09dea0c60ad3d1cc17cc848" + +PV .= "+git${SRCPV}" S = "${WORKDIR}/git" -B = "${S}" do_configure:prepend() { - ${S}/bootstrap.sh + cd ${S}; ./bootstrap.sh; cd - } -SRC_URI[md5sum] = "8aa73287320a49e9170a8255d7b2c7e6" -SRC_URI[sha256sum] = "65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31" - EXTRA_OECONF = "--enable-shared --with-udevdir=${base_libdir}/udev \ --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" 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.1.0.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb new file mode 100644 index 0000000000..9096123939 --- /dev/null +++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb @@ -0,0 +1,9 @@ +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=8c1a910e5c2a8b30ec8ffb2ffa63d9b2" + +SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https" +SRCREV = "9ccc3fe4a37d069137ceabe513a4dd9b0a09c1c2" +S = "${WORKDIR}/git" + +inherit autotools lib_package 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..e0fd4fea1b 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 @@ -6,6 +6,8 @@ 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/meta-oe/recipes-multimedia/webm/libvpx_1.12.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.13.0.bb index 066d7cc815..79b330c315 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.12.0.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.13.0.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRCREV = "03265cd42b3783532de72f2ded5436652e6f5ce3" +SRCREV = "d6eb9696aa72473c1a11d34d928d35a3acc0c9a9" SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ file://libvpx-configure-support-blank-prefix.patch \ " @@ -19,6 +19,7 @@ S = "${WORKDIR}/git" ARM_INSTRUCTION_SET = "arm" CFLAGS += "-fPIC" +BUILD_LDFLAGS += "-pthread" export CC export LD = "${CC}" @@ -48,3 +49,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 @@ |