diff options
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia')
15 files changed, 29 insertions, 146 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch deleted file mode 100644 index bd5e1b6030..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0cc7362e171616dcfeb93c6e1576362761bf14e5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 31 Jan 2018 18:37:16 -0800 -Subject: [PATCH] Do not use obsolete pow10f() function - -exp10 name is standardized in TS 18661-4 and its -available in glibc since version 2.1 -it has been now removed from glibc 2.27+ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - dsp/v4f_IIR2.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dsp/v4f_IIR2.h b/dsp/v4f_IIR2.h -index a68ecf5..ebd1234 100644 ---- a/dsp/v4f_IIR2.h -+++ b/dsp/v4f_IIR2.h -@@ -33,7 +33,7 @@ - namespace DSP { - - #ifdef __APPLE__ --inline float pow10f(float f) {return pow(10,f);} -+inline float exp10f(float f) {return __exp10f(f);} - #endif - - class RBJv4 -@@ -142,7 +142,7 @@ class IIR2v4 - /* A = pow (10, gain / 40) */ - v4f_t A = (v4f_t) {.025,.025,.025,.025}; - A *= gain; -- A = v4f_map<pow10f> (A); -+ A = v4f_map<exp10f> (A); - - RBJv4 p (f, Q); - -@@ -429,7 +429,7 @@ class IIR2v4Bank - /* A = pow (10, gain / 40) */ - v4f_t A = (v4f_t) {.025,.025,.025,.025}; - A *= gain[i]; -- A = v4f_map<pow10f> (A); -+ A = v4f_map<exp10f> (A); - - RBJv4 p (f[i], Q[i]); - --- -2.16.1 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch deleted file mode 100644 index 1a050af917..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1ea09653692efdd6443fb6770e8523bf6c9e49b9 Mon Sep 17 00:00:00 2001 -From: Fabio Berton <fabio.berton@ossystems.com.br> -Date: Thu, 6 Oct 2016 11:54:07 -0300 -Subject: Avoid ambiguity in div invocation -Organization: O.S. Systems Software LTDA. - -Patch from: -https://anonscm.debian.org/cgit/pkg-multimedia/caps.git/commit/?id=9a99c225fb813ae69f146e3d90f7b47bdbd97708 - -Upstream-Status: Pending - -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> ---- - AutoFilter.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/AutoFilter.cc b/AutoFilter.cc -index fc087d0..bd6b12f 100644 ---- a/AutoFilter.cc -+++ b/AutoFilter.cc -@@ -69,7 +69,7 @@ AutoFilter::activate() - void - AutoFilter::cycle (uint frames) - { -- div_t qr = div (frames, blocksize); -+ div_t qr = div ((int)frames, (int)blocksize); - int blocks = qr.quot; - if (qr.rem) ++blocks; - double over_blocks = 1./blocks; --- -2.1.4 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.26.bb index 0404bd5159..46bcf6c6a5 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.26.bb @@ -4,14 +4,12 @@ LICENSE = "GPL-3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://quitte.de/dsp/${BPN}_${PV}.tar.bz2 \ - file://Avoid-ambiguity-in-div-invocation.patch \ file://0001-basic.h-Use-c99-supported-stdint-types.patch \ file://append_ldflags.patch \ - file://0001-Do-not-use-obsolete-pow10f-function.patch \ " -SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626" -SRC_URI[sha256sum] = "f746feba57af316b159f0169de5d78b4fd1064c2c0c8017cb5856b2f22e83f20" +SRC_URI[md5sum] = "36b30c7c7db2d2bc5f4f54077e97b5ee" +SRC_URI[sha256sum] = "e7496c5bce05abebe3dcb635926153bbb58a9337a6e423f048d3b61d8a4f98c9" EXTRA_OEMAKE = " \ CC='${CXX}' \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb index ff9eabbb50..2aa7ccebf1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "3d43b280298c39a67d1d889e01e173f52c12da35" SRC_URI = "hg://linuxtv.org/hg;module=dvb-apps;protocol=http \ - file://dvb-fe-xc5000c-4.1.30.7.fw \ file://dvb-scan-table \ file://0001-Fix-generate-keynames.patch \ file://0002-Fix-compiler-warning-flags.patch \ @@ -31,10 +30,6 @@ do_install() { install -d ${D}/${docdir}/dvb-apps/scan install -d ${D}/${docdir}/dvb-apps/szap chmod a+rx ${D}/${libdir}/*.so* - if [ "${DVB_WINTV_TUNER}" = "true" ]; then - install -d ${D}/lib/firmware - install -m 0644 ${WORKDIR}/*.fw ${D}/lib/firmware/ - fi cp -R --no-dereference --preserve=mode,links ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/ cp -R --no-dereference --preserve=mode,links ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ cp -R --no-dereference --preserve=mode,links ${WORKDIR}/dvb-scan-table/* ${D}/usr/share/dvb @@ -64,7 +59,7 @@ RDEPENDS_dvbnet =+ "libdvbapi" RCONFLICTS_dvb-evtest = "evtest" -FILES_${PN} = "${bindir} ${datadir}/dvb lib/firmware" +FILES_${PN} = "${bindir} ${datadir}/dvb" FILES_${PN}-doc = "" FILES_${PN}-dev = "${includedir}" FILES_dvb-evtest = "${bindir}/evtest" @@ -103,5 +98,4 @@ python populate_packages_prepend () { INSANE_SKIP_${PN} = "ldflags" INSANE_SKIP_${PN}-dev = "ldflags" -DVB_WINTV_TUNER = "true" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-fe-xc5000c-4.1.30.7.fw b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-fe-xc5000c-4.1.30.7.fw Binary files differdeleted file mode 100644 index 5786ffa441..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-fe-xc5000c-4.1.30.7.fw +++ /dev/null diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 810ca997e3..234be02caf 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git" -SRCREV = "9671e412feedb90325e038c3aaf5d543eebc20c0" +SRCREV = "7f11a9bf5c7304e04309a6ec9fc515ee815524bf" S = "${WORKDIR}/git" -PV = "2.0.4" +PV = "2.0.5" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service index 04cf436204..28729f6b16 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service @@ -1,10 +1,11 @@ [Unit] Description=Mycroft -DefaultDependencies=no -After=mycroft-setup +RequiresMountsFor=/var +After=mycroft-setup.service [Service] Type=forking +WorkingDirectory=@LIBDIR@/mycroft ExecStartPre=mkdir -p /var/log/mycroft ExecStart=@LIBDIR@/mycroft/start-mycroft.sh all ExecStop=@LIBDIR@/mycroft/stop-mycroft.sh all diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.3.bb index c8ae534681..becd0bf790 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.3.bb @@ -6,7 +6,7 @@ SECTION = "multimedia" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=79aa497b11564d1d419ee889e7b498f6" -SRCREV = "6706c377820912f83c1838d9eb32950ca9e39ec7" +SRCREV = "4b45db34ecd95b62ef2b66a8e5180c66ca791a21" SRC_URI = "git://github.com/MycroftAI/mycroft-core.git;branch=master \ file://0001-Remove-python-venv.patch \ file://0002-pip-requirements-Remove-ones-installed-by-OE.patch \ @@ -63,9 +63,10 @@ RDEPENDS_${PN} += "python3-pip \ python3-xxhash \ " -# Mycroft uses Alsa and PulseAudio +# Mycroft uses Alsa, PulseAudio and Flac RDEPENDS_${PN} += "alsa-oss alsa-utils alsa-plugins alsa-tools" RDEPENDS_${PN} += "pulseaudio pulseaudio-misc pulseaudio-server" +RDEPENDS_${PN} += "flac" # Mycroft can do this itself on the target, but it's quicker to do it here RDEPENDS_${PN} += "mimic" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb index 189dc87c49..3f6dbb8e92 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb @@ -7,7 +7,7 @@ DEPENDS = "libogg openssl libopus" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=6ac22b992dde6a891f8949c3e2da8576" -SRC_URI = "https://downloads.xiph.org/releases/opus/${PN}-${PV}.tar.gz" +SRC_URI = "https://downloads.xiph.org/releases/opus/${BP}.tar.gz" SRC_URI[md5sum] = "ab3f7d15d766f5b36b0951ee435f9ebf" SRC_URI[sha256sum] = "48e03526ba87ef9cf5f1c47b5ebe3aa195bd89b912a57060c36184a6cd19412f" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index b048ac6677..365618d958 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -48,5 +48,5 @@ RDEPENDS_packagegroup-meta-multimedia-mkv = "\ " RDEPENDS_packagegroup-meta-multimedia-support = "\ - liboil libmediaart libmediaart-2.0 gst-instruments libsrtp crossguid \ + libmediaart libmediaart-2.0 gst-instruments libsrtp crossguid \ " diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb index d38eb94773..d026c69a8f 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d91a46405fc074b88c963cc4f2a0aae9 \ file://COPYING.MIT;md5=8b345371b3536b4ce37ead1eafc88221 \ file://COPYING.MPL;md5=0117647fecb9a932c25a7bbfc0333c37" -DEPENDS = "liboil orc-native orc" +DEPENDS = "orc-native orc" SRC_URI = "http://www.diracvideo.org/download/schroedinger/${BP}.tar.gz \ file://configure.ac.patch" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 19ac8206c6..9bbc6685dd 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -36,12 +36,17 @@ EXTRA_OECONF = "\ --enable-realrtsp \ --disable-libtar \ --enable-avcodec \ - ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ - ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ - ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ + ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ + ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ + ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ " -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ?= " \ + live555 dc1394 dv1394 notify fontconfig freetype dvdread png \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" @@ -54,7 +59,7 @@ PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" -PACKAGECONFIG[qt4] = "--enable-qt,--disable-qt, qt4-x11-free" +PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" @@ -76,12 +81,13 @@ PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" -do_configure_prepend() { - cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true -} - do_configure_append() { sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool + + # moc needs support: precreate build paths + for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do + mkdir -p "${B}/modules/gui/qt/$qtpath" + done } # This recipe packages vlc as a library as well, so qt4 dependencies diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch deleted file mode 100644 index 3db3df34b2..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/input/subtitles.c -+++ b/src/input/subtitles.c -@@ -42,6 +42,12 @@ - #include "input_internal.h" - - /** -+ * Drepper's alternative -+ * http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy -+ */ -+#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0' -+ -+/** - * The possible extensions for subtitle files we support - */ - static const char *const sub_exts[] = { SLAVE_SPU_EXTENSIONS, "" }; diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch deleted file mode 100644 index 77a7d61730..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch +++ /dev/null @@ -1,15 +0,0 @@ -* Also look for postprocess.h under libpostproc/ - -Upstream-status: Pending - ---- a/configure.ac -+++ b/configure.ac -@@ -2589,7 +2589,7 @@ then - VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}" - CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" -- AC_CHECK_HEADERS(postproc/postprocess.h) -+ AC_CHECK_HEADERS(postproc/postprocess.h,[],[AC_CHECK_HEADERS(libpostproc/postprocess.h)]) - VLC_ADD_PLUGIN([postproc]) - VLC_RESTORE_FLAGS - ],[ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb index 1ae213ff32..fcd321cb0e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb @@ -1,13 +1,8 @@ require ${BPN}.inc -# work around build failure -EXTRA_OECONF += " --enable-libxml2=no" - LDFLAGS_append_riscv64 = " -pthread" SRC_URI += " \ - file://0002-glibc-does-not-provide-strlcpy.patch \ - file://0005-libpostproc-header-check.patch \ file://0006-make-opencv-configurable.patch \ file://0007-use-vorbisidec.patch \ file://0008-fix-luaL-checkint.patch \ |