diff options
Diffstat (limited to 'meta-openembedded/meta-multimedia')
22 files changed, 29 insertions, 753 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 bd5e1b603..000000000 --- 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 1a050af91..000000000 --- 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 0404bd515..46bcf6c6a 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 ff9eabbb5..2aa7ccebf 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 5786ffa44..000000000 --- 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 810ca997e..234be02ca 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 04cf43620..28729f6b1 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 c8ae53468..becd0bf79 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 189dc87c4..3f6dbb8e9 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 b048ac667..365618d95 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 d38eb9477..d026c69a8 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 19ac8206c..9bbc6685d 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 3db3df34b..000000000 --- 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 77a7d6173..000000000 --- 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 1ae213ff3..fcd321cb0 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 \ diff --git a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch deleted file mode 100644 index aff1cb184..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -From 1921498bcc06408e8b051a3a9e9ce4182998f748 Mon Sep 17 00:00:00 2001 -From: David Schleef <ds@schleef.org> -Date: Fri, 8 Apr 2011 10:05:49 -0700 -Subject: [PATCH 10/10] Fix --enable-vfp flag - -Patch from Christophe Lyon, fixes #36084. ---- - configure.ac | 4 ++-- - liboil/arm/Makefile.am | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 98c81fb..407d88c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -188,8 +188,8 @@ fi - AC_ARG_ENABLE(vfp, - AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]), - enable_vfp=$enableval,enable_vfp=yes) --if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then -- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"], -+if test "x$enable_vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then -+ AS_COMPILER_FLAG(["-mfpu=vfp"], - [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"], - true) - #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"], -diff --git a/liboil/arm/Makefile.am b/liboil/arm/Makefile.am -index ead08ed..cd8d9fa 100644 ---- a/liboil/arm/Makefile.am -+++ b/liboil/arm/Makefile.am -@@ -6,4 +6,5 @@ libarm_la_SOURCES = \ - math_vfp_asm.S - - libarm_la_CFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS) -+libarm_la_CCASFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS) - --- -1.7.6 - diff --git a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/0001-math_vfp_asm.S-Convert-fldmia-fstmia-instructions-to.patch b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/0001-math_vfp_asm.S-Convert-fldmia-fstmia-instructions-to.patch deleted file mode 100644 index 05903807e..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/0001-math_vfp_asm.S-Convert-fldmia-fstmia-instructions-to.patch +++ /dev/null @@ -1,257 +0,0 @@ -From 02a138f0b247fb08b799f32c49b35912b2921321 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Feb 2019 11:38:46 -0800 -Subject: [PATCH] math_vfp_asm.S: Convert fldmia/fstmia instructions to UAL - syntax for clang - -This is flagged with clang internal assembler, since it does not allow -non UAL syntax - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - liboil/arm/math_vfp_asm.S | 94 +++++++++++++++++++-------------------- - 1 file changed, 47 insertions(+), 47 deletions(-) - -diff --git a/liboil/arm/math_vfp_asm.S b/liboil/arm/math_vfp_asm.S -index ae5c803..3dd14d9 100644 ---- a/liboil/arm/math_vfp_asm.S -+++ b/liboil/arm/math_vfp_asm.S -@@ -25,7 +25,7 @@ - */ - - #if defined(__VFP_FP__) && !defined(__SOFTFP__) --/* -+/* - ** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp - ** - ** void vfp_add_f32 (float *d, const float *s1, const float *s2, int n); -@@ -48,10 +48,10 @@ - ands ip, r3, #7; /* ip = n % 8 */ \ - beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \ - vfp_ ## fname ## _loop1: \ -- fldmias r1!, {s0}; \ -- fldmias r2!, {s1}; \ -+ vldmia.f32 r1!, {s0}; \ -+ vldmia.f32 r2!, {s1}; \ - ## finst ##s s2, s0, s1; \ -- fstmias r0!, {s2}; \ -+ vstmia.f32 r0!, {s2}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop1; \ - vfp_ ## fname ## _unroll: /* unroll by 8 */ \ -@@ -62,15 +62,15 @@ - orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \ - fmxr fpscr, fp; \ - vfp_ ## fname ## _loop2: \ -- fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \ -- fldmias r2!, {s16, s17, s18, s19, s20, s21, s22, s23}; \ -+ vldmia.f32 r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \ -+ vldmia.f32 r2!, {s16, s17, s18, s19, s20, s21, s22, s23}; \ - ## finst ##s s24, s8, s16; \ -- fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \ -+ vstmia.f32 r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop2; \ - fmxr fpscr, lr; /* restore original fpscr */ \ - vfp_ ## fname ## _end: \ -- ldmia sp!, {fp, pc}; /* recovering from stack and return */ -+ ldmia sp!, {fp, pc}; /* recovering from stack and return */ - - #define UNROLL_F64_TEMPLATE(fname,finst) \ - .global vfp_ ## fname ## ; \ -@@ -79,10 +79,10 @@ - ands ip, r3, #3; /* ip = n % 3 */ \ - beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \ - vfp_ ## fname ## _loop1: \ -- fldmiad r1!, {d0}; \ -- fldmiad r2!, {d1}; \ -+ vldmia.f64 r1!, {d0}; \ -+ vldmia.f64 r2!, {d1}; \ - ## finst ##d d2, d0, d1; \ -- fstmiad r0!, {d2}; \ -+ vstmia.f64 r0!, {d2}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop1; \ - vfp_ ## fname ## _unroll: /* unroll by 4 */ \ -@@ -93,15 +93,15 @@ - orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \ - fmxr fpscr, fp; \ - vfp_ ## fname ## _loop2: \ -- fldmiad r1!, {d4, d5, d6, d7}; \ -- fldmiad r2!, {d8, d9, d10, d11}; \ -+ vldmia.f64 r1!, {d4, d5, d6, d7}; \ -+ vldmia.f64 r2!, {d8, d9, d10, d11}; \ - ## finst ##d d12, d4, d8; \ -- fstmiad r0!, {d12, d13, d14, d15}; \ -+ vstmia.f64 r0!, {d12, d13, d14, d15}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop2; \ - fmxr fpscr, lr; /* restore original fpscr */ \ - vfp_ ## fname ## _end: \ -- ldmia sp!, {fp, pc}; /* recovering from stack and return */ -+ ldmia sp!, {fp, pc}; /* recovering from stack and return */ - - .align 2 - UNROLL_F32_TEMPLATE(add_f32,fadd); -@@ -119,7 +119,7 @@ UNROLL_F64_TEMPLATE(subtract_f64,fsub); - #undef UNROLL_F32_TEMPLATE - #undef UNROLL_F64_TEMPLATE - --/* -+/* - ** - ** void vfp_scalaradd_f32_ns (float *d, const float *s1, const float *s2_1, int n); - ** void vfp_scalaradd_f64_ns (double *d, const double *s1, const double *s2_1, int n); -@@ -133,13 +133,13 @@ UNROLL_F64_TEMPLATE(subtract_f64,fsub); - .global vfp_ ## fname ## ; \ - vfp_ ## fname ## : \ - stmdb sp!, {fp, lr}; /* save registers to stack */ \ -- fldmias r2, {s1}; /* load scalar value */ \ -+ vldmia.f32 r2, {s1}; /* load scalar value */ \ - ands ip, r3, #7; /* ip = n % 8 */ \ - beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \ - vfp_ ## fname ## _loop1: \ -- fldmias r1!, {s0}; \ -+ vldmia.f32 r1!, {s0}; \ - ## finst ##s s2, s0, s1; \ -- fstmias r0!, {s2}; \ -+ vstmia.f32 r0!, {s2}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop1; \ - vfp_ ## fname ## _unroll: /* unroll by 8 */ \ -@@ -150,26 +150,26 @@ UNROLL_F64_TEMPLATE(subtract_f64,fsub); - orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \ - fmxr fpscr, fp; \ - vfp_ ## fname ## _loop2: \ -- fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \ -+ vldmia.f32 r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \ - ## finst ##s s24, s8, s1; \ -- fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \ -+ vstmia.f32 r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop2; \ - fmxr fpscr, lr; /* restore original fpscr */ \ - vfp_ ## fname ## _end: \ -- ldmia sp!, {fp, pc}; /* recovering from stack and return */ -+ ldmia sp!, {fp, pc}; /* recovering from stack and return */ - - #define UNROLL_F64_TEMPLATE(fname,finst) \ - .global vfp_ ## fname ## ; \ - vfp_ ## fname ## : \ - stmdb sp!, {fp, lr}; /* save registers to stack */ \ -- fldmiad r2, {d1}; /* load scalar value */ \ -+ vldmia.f64 r2, {d1}; /* load scalar value */ \ - ands ip, r3, #3; /* ip = n % 3 */ \ - beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \ - vfp_ ## fname ## _loop1: \ -- fldmiad r1!, {d0}; \ -+ vldmia.f64 r1!, {d0}; \ - ## finst ##d d2, d0, d1; \ -- fstmiad r0!, {d2}; \ -+ vstmia.f64 r0!, {d2}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop1; \ - vfp_ ## fname ## _unroll: /* unroll by 4 */ \ -@@ -180,14 +180,14 @@ UNROLL_F64_TEMPLATE(subtract_f64,fsub); - orr fp, lr, fp, lsl #16; /* set vector lenght to 4 */ \ - fmxr fpscr, fp; \ - vfp_ ## fname ## _loop2: \ -- fldmiad r1!, {d4, d5, d6, d7}; \ -+ vldmia.f64 r1!, {d4, d5, d6, d7}; \ - ## finst ##d d12, d4, d1; \ -- fstmiad r0!, {d12, d13, d14, d15}; \ -+ vstmia.f64 r0!, {d12, d13, d14, d15}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop2; \ - fmxr fpscr, lr; /* restore original fpscr */ \ - vfp_ ## fname ## _end: \ -- ldmia sp!, {fp, pc}; /* recovering from stack and return */ -+ ldmia sp!, {fp, pc}; /* recovering from stack and return */ - - UNROLL_F32_TEMPLATE(scalaradd_f32_ns,fadd); - UNROLL_F64_TEMPLATE(scalaradd_f64_ns,fadd); -@@ -198,7 +198,7 @@ UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul); - #undef UNROLL_F32_TEMPLATE - #undef UNROLL_F64_TEMPLATE - --/* -+/* - ** - ** void vfp_abs_f32_f32_ns(float *d, const float *s, int n); - ** void vfp_abs_f64_f64_ns(double *d, const double *s, int n); -@@ -215,9 +215,9 @@ UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul); - ands ip, r2, #7; /* ip = n % 8 */ \ - beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \ - vfp_ ## fname ## _loop1: \ -- fldmias r1!, {s0}; \ -- ## finst ##s s2, s0; \ -- fstmias r0!, {s2}; \ -+ vldmia.f32 r1!, {s0}; \ -+ ## finst ##.f32 s2, s0; \ -+ vstmia.f32 r0!, {s2}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop1; \ - vfp_ ## fname ## _unroll: /* unroll by 8 */ \ -@@ -228,14 +228,14 @@ UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul); - orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \ - fmxr fpscr, fp; \ - vfp_ ## fname ## _loop2: \ -- fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \ -- ## finst ##s s24, s8; \ -- fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \ -+ vldmia.f32 r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \ -+ ## finst ##.f32 s24, s8; \ -+ vstmia.f32 r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop2; \ - fmxr fpscr, lr; /* restore original fpscr */ \ - vfp_ ## fname ## _end: \ -- ldmia sp!, {fp, pc}; /* recovering from stack and return */ -+ ldmia sp!, {fp, pc}; /* recovering from stack and return */ - - #define UNROLL_F64_TEMPLATE(fname,finst) \ - .global vfp_ ## fname ## ; \ -@@ -244,9 +244,9 @@ UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul); - ands ip, r2, #3; /* ip = n % 3 */ \ - beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \ - vfp_ ## fname ## _loop1: \ -- fldmiad r1!, {d0}; \ -- ## finst ##d d2, d0; \ -- fstmiad r0!, {d2}; \ -+ vldmia.f64 r1!, {d0}; \ -+ ## finst ##.f64 d2, d0; \ -+ vstmia.f64 r0!, {d2}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop1; \ - vfp_ ## fname ## _unroll: /* unroll by 4 */ \ -@@ -257,20 +257,20 @@ UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul); - orr fp, lr, fp, lsl #16; /* set vector lenght to 4 */ \ - fmxr fpscr, fp; \ - vfp_ ## fname ## _loop2: \ -- fldmiad r1!, {d4, d5, d6, d7}; \ -- ## finst ##d d12, d4; \ -- fstmiad r0!, {d12, d13, d14, d15}; \ -+ vldmia.f64 r1!, {d4, d5, d6, d7}; \ -+ ## finst ##.f64 d12, d4; \ -+ vstmia.f64 r0!, {d12, d13, d14, d15}; \ - subs ip, ip, #1; \ - bne vfp_ ## fname ## _loop2; \ - fmxr fpscr, lr; /* restore original fpscr */ \ - vfp_ ## fname ## _end: \ -- ldmia sp!, {fp, pc}; /* recovering from stack and return */ -+ ldmia sp!, {fp, pc}; /* recovering from stack and return */ - --UNROLL_F32_TEMPLATE(abs_f32_f32_ns,fabs); --UNROLL_F64_TEMPLATE(abs_f64_f64_ns,fabs); -+UNROLL_F32_TEMPLATE(abs_f32_f32_ns,vabs); -+UNROLL_F64_TEMPLATE(abs_f64_f64_ns,vabs); - --UNROLL_F32_TEMPLATE(negative_f32,fneg); --UNROLL_F64_TEMPLATE(negative_f64,fneg); -+UNROLL_F32_TEMPLATE(negative_f32,vneg); -+UNROLL_F64_TEMPLATE(negative_f64,vneg); - - #undef UNROLL_F32_TEMPLATE - #undef UNROLL_F64_TEMPLATE diff --git a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch deleted file mode 100644 index c8e3c1f72..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=31358 - -configure: fix whitelisting of x86_64 unaligned memory access - -Fix typo in whitelist so cross-compile works for x86_64. - -Upstream-Status: Inappropriate [configuration] - ---- liboil-0.3.17/m4/as-unaligned-access.m4.orig 2009-02-26 14:40:08.000000000 -0500 -+++ liboil-0.3.17/m4/as-unaligned-access.m4 2010-11-03 12:19:55.000000000 -0400 -@@ -9,7 +9,7 @@ - _AS_ECHO_N([(blacklisted) ]) - as_cv_unaligned_access=no - ;; -- i?86*|x86_64|amd64|powerpc*|m68k*|cris*) -+ i?86*|x86_64*|amd64*|powerpc*|m68k*|cris*) - _AS_ECHO_N([(whitelisted) ]) - as_cv_unaligned_access=yes - ;; diff --git a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/fix_riscv_unaligned_access.patch b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/fix_riscv_unaligned_access.patch deleted file mode 100644 index 448bde73f..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/fix_riscv_unaligned_access.patch +++ /dev/null @@ -1,15 +0,0 @@ -RISC-V supports unaligned accesses, therefore enable it - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/m4/as-unaligned-access.m4 -+++ b/m4/as-unaligned-access.m4 -@@ -5,7 +5,7 @@ AC_DEFUN([AS_UNALIGNED_ACCESS], [ - AC_MSG_CHECKING([if unaligned memory access works correctly]) - if test x"$as_cv_unaligned_access" = x ; then - case $host in -- alpha*|arm*|hp*|mips*|sh*|sparc*|ia64*) -+ alpha*|arm*|hp*|mips*|riscv*|sh*|sparc*|ia64*) - _AS_ECHO_N([(blacklisted) ]) - as_cv_unaligned_access=no - ;; diff --git a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch deleted file mode 100644 index 473380e9f..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch +++ /dev/null @@ -1,222 +0,0 @@ -Upstream-Status: Pending - -Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors. - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -2011/12/01 - - -Index: liboil-0.3.17/liboil/amd64/wavelet.c -=================================================================== ---- liboil-0.3.17.orig/liboil/amd64/wavelet.c -+++ liboil-0.3.17/liboil/amd64/wavelet.c -@@ -21,14 +21,14 @@ deinterleave2_asm (int16_t *d1, int16_t - asm volatile ("\n" - " sub $2, %%rcx\n" - "1:\n" -- " movw (%1,%%rcx,4), %%ax\n" -- " movw %%ax, (%0,%%rcx,2)\n" -- " movw 2(%1,%%rcx,4), %%ax\n" -- " movw %%ax, (%2,%%rcx,2)\n" -- " movw 4(%1,%%rcx,4), %%ax\n" -- " movw %%ax, 2(%0,%%rcx,2)\n" -- " movw 6(%1,%%rcx,4), %%ax\n" -- " movw %%ax, 2(%2,%%rcx,2)\n" -+ " movw (%q1,%%rcx,4), %%ax\n" -+ " movw %%ax, (%q0,%%rcx,2)\n" -+ " movw 2(%q1,%%rcx,4), %%ax\n" -+ " movw %%ax, (%q2,%%rcx,2)\n" -+ " movw 4(%q1,%%rcx,4), %%ax\n" -+ " movw %%ax, 2(%q0,%%rcx,2)\n" -+ " movw 6(%q1,%%rcx,4), %%ax\n" -+ " movw %%ax, 2(%q2,%%rcx,2)\n" - " sub $2, %%rcx\n" - " jge 1b\n" - : "+r" (d1), "+r" (s_2xn), "+r" (d2), "+c" (n) -@@ -53,20 +53,20 @@ deinterleave2_mmx (int16_t *d1, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%1,%%rcx,4), %%mm0\n" -- " movq 8(%1,%%rcx,4), %%mm1\n" -+ " movq (%q1,%%rcx,4), %%mm0\n" -+ " movq 8(%q1,%%rcx,4), %%mm1\n" - " pslld $16, %%mm0\n" - " pslld $16, %%mm1\n" - " psrad $16, %%mm0\n" - " psrad $16, %%mm1\n" - " packssdw %%mm1, %%mm0\n" -- " movq %%mm0, (%0,%%rcx,2)\n" -- " movq (%1,%%rcx,4), %%mm0\n" -- " movq 8(%1,%%rcx,4), %%mm1\n" -+ " movq %%mm0, (%q0,%%rcx,2)\n" -+ " movq (%q1,%%rcx,4), %%mm0\n" -+ " movq 8(%q1,%%rcx,4), %%mm1\n" - " psrad $16, %%mm0\n" - " psrad $16, %%mm1\n" - " packssdw %%mm1, %%mm0\n" -- " movq %%mm0, (%2,%%rcx,2)\n" -+ " movq %%mm0, (%q2,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %3, %%ecx\n" - " jl 1b\n" -@@ -93,10 +93,10 @@ deinterleave2_mmx_2 (int16_t *d1, int16_ - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " pshufw $0xd8, (%1,%%rcx,4), %%mm0\n" -- " movd %%mm0, (%0,%%rcx,2)\n" -- " pshufw $0x8d, (%1,%%rcx,4), %%mm0\n" -- " movd %%mm0, (%2,%%rcx,2)\n" -+ " pshufw $0xd8, (%q1,%%rcx,4), %%mm0\n" -+ " movd %%mm0, (%q0,%%rcx,2)\n" -+ " pshufw $0x8d, (%q1,%%rcx,4), %%mm0\n" -+ " movd %%mm0, (%q2,%%rcx,2)\n" - " add $2, %%rcx\n" - " cmp %3, %%ecx\n" - " jl 1b\n" -@@ -123,16 +123,16 @@ deinterleave2_mmx_3 (int16_t *d1, int16_ - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%1,%%rcx,4), %%mm1\n" -- " movq (%1,%%rcx,4), %%mm2\n" -- " movq 8(%1,%%rcx,4), %%mm0\n" -+ " movq (%q1,%%rcx,4), %%mm1\n" -+ " movq (%q1,%%rcx,4), %%mm2\n" -+ " movq 8(%q1,%%rcx,4), %%mm0\n" - " punpcklwd %%mm0, %%mm1\n" - " punpckhwd %%mm0, %%mm2\n" - " movq %%mm1, %%mm0\n" - " punpcklwd %%mm2, %%mm0\n" - " punpckhwd %%mm2, %%mm1\n" -- " movq %%mm0, (%0,%%rcx,2)\n" -- " movq %%mm1, (%2,%%rcx,2)\n" -+ " movq %%mm0, (%q0,%%rcx,2)\n" -+ " movq %%mm1, (%q2,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %3, %%ecx\n" - " jl 1b\n" -@@ -159,26 +159,26 @@ deinterleave2_mmx_4 (int16_t *d1, int16_ - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%1,%%rcx,4), %%mm1\n" -+ " movq (%q1,%%rcx,4), %%mm1\n" - " movq %%mm1, %%mm2\n" -- " movq 8(%1,%%rcx,4), %%mm0\n" -- " movq 16(%1,%%rcx,4), %%mm5\n" -+ " movq 8(%q1,%%rcx,4), %%mm0\n" -+ " movq 16(%q1,%%rcx,4), %%mm5\n" - " punpcklwd %%mm0, %%mm1\n" - " movq %%mm5, %%mm6\n" - " punpckhwd %%mm0, %%mm2\n" -- " movq 24(%1,%%rcx,4), %%mm4\n" -+ " movq 24(%q1,%%rcx,4), %%mm4\n" - " movq %%mm1, %%mm0\n" - " punpcklwd %%mm4, %%mm5\n" - " punpcklwd %%mm2, %%mm0\n" - " punpckhwd %%mm4, %%mm6\n" - " punpckhwd %%mm2, %%mm1\n" - " movq %%mm5, %%mm4\n" -- " movq %%mm0, (%0,%%rcx,2)\n" -+ " movq %%mm0, (%q0,%%rcx,2)\n" - " punpcklwd %%mm6, %%mm4\n" -- " movq %%mm1, (%2,%%rcx,2)\n" -+ " movq %%mm1, (%q2,%%rcx,2)\n" - " punpckhwd %%mm6, %%mm5\n" -- " movq %%mm4, 8(%0,%%rcx,2)\n" -- " movq %%mm5, 8(%2,%%rcx,2)\n" -+ " movq %%mm4, 8(%q0,%%rcx,2)\n" -+ " movq %%mm5, 8(%q2,%%rcx,2)\n" - " add $8, %%rcx\n" - " cmp %3, %%ecx\n" - " jl 1b\n" -@@ -252,13 +252,13 @@ interleave2_mmx (int16_t *d_2xn, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%1,%%rcx,2), %%mm0\n" -- " movq (%2,%%rcx,2), %%mm1\n" -+ " movq (%q1,%%rcx,2), %%mm0\n" -+ " movq (%q2,%%rcx,2), %%mm1\n" - " movq %%mm0, %%mm2\n" - " punpckhwd %%mm1, %%mm0\n" - " punpcklwd %%mm1, %%mm2\n" -- " movq %%mm2, (%0,%%rcx,4)\n" -- " movq %%mm0, 8(%0,%%rcx,4)\n" -+ " movq %%mm2, (%q0,%%rcx,4)\n" -+ " movq %%mm0, 8(%q0,%%rcx,4)\n" - " add $4, %%rcx\n" - " cmp %3, %%ecx\n" - " jl 1b\n" -@@ -285,12 +285,12 @@ lift_add_shift1_mmx (int16_t *d, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%2,%%rcx,2), %%mm1\n" -- " movq (%3,%%rcx,2), %%mm2\n" -+ " movq (%q2,%%rcx,2), %%mm1\n" -+ " movq (%q3,%%rcx,2), %%mm2\n" - " paddw %%mm2, %%mm1\n" - " psraw $1, %%mm1\n" -- " paddw (%1,%%rcx,2), %%mm1\n" -- " movq %%mm1, (%0,%%rcx,2)\n" -+ " paddw (%q1,%%rcx,2), %%mm1\n" -+ " movq %%mm1, (%q0,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %4, %%ecx\n" - " jl 1b\n" -@@ -317,13 +317,13 @@ lift_sub_shift1_mmx (int16_t *d, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%2,%%rcx,2), %%mm1\n" -- " movq (%3,%%rcx,2), %%mm2\n" -- " movq (%1,%%rcx,2), %%mm0\n" -+ " movq (%q2,%%rcx,2), %%mm1\n" -+ " movq (%q3,%%rcx,2), %%mm2\n" -+ " movq (%q1,%%rcx,2), %%mm0\n" - " paddw %%mm2, %%mm1\n" - " psraw $1, %%mm1\n" - " psubw %%mm1, %%mm0\n" -- " movq %%mm0, (%0,%%rcx,2)\n" -+ " movq %%mm0, (%q0,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %4, %%ecx\n" - " jl 1b\n" -@@ -350,12 +350,12 @@ lift_add_shift2_mmx (int16_t *d, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%2,%%rcx,2), %%mm1\n" -- " movq (%3,%%rcx,2), %%mm2\n" -+ " movq (%q2,%%rcx,2), %%mm1\n" -+ " movq (%q3,%%rcx,2), %%mm2\n" - " paddw %%mm2, %%mm1\n" - " psraw $2, %%mm1\n" -- " paddw (%1,%%rcx,2), %%mm1\n" -- " movq %%mm1, (%0,%%rcx,2)\n" -+ " paddw (%q1,%%rcx,2), %%mm1\n" -+ " movq %%mm1, (%q0,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %4, %%ecx\n" - " jl 1b\n" -@@ -382,13 +382,13 @@ lift_sub_shift2_mmx (int16_t *d, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%2,%%rcx,2), %%mm1\n" -- " movq (%3,%%rcx,2), %%mm2\n" -- " movq (%1,%%rcx,2), %%mm0\n" -+ " movq (%q2,%%rcx,2), %%mm1\n" -+ " movq (%q3,%%rcx,2), %%mm2\n" -+ " movq (%q1,%%rcx,2), %%mm0\n" - " paddw %%mm2, %%mm1\n" - " psraw $2, %%mm1\n" - " psubw %%mm1, %%mm0\n" -- " movq %%mm0, (%0,%%rcx,2)\n" -+ " movq %%mm0, (%q0,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %4, %%ecx\n" - " jl 1b\n" diff --git a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/no-tests.patch b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/no-tests.patch deleted file mode 100644 index 892d44131..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/no-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - ---- liboil-0.3.9/liboil/liboilfunction.c.old 2006-09-18 13:03:20.000000000 +0100 -+++ liboil-0.3.9/liboil/liboilfunction.c 2006-09-18 13:04:10.000000000 +0100 -@@ -345,7 +345,9 @@ - return; - } - -- test = oil_test_new (klass); -+ klass->chosen_impl = klass->reference_impl; -+ klass->func = klass->reference_impl->func; -+/* test = oil_test_new (klass); - if (test == NULL) { - OIL_ERROR ("failed to test function class %s", klass->name); - return; -@@ -385,7 +387,7 @@ - klass->chosen_impl = min_impl; - klass->func = min_impl->func; - -- oil_test_free (test); -+ oil_test_free (test);*/ - } - - static void diff --git a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil_0.3.17.bb b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil_0.3.17.bb deleted file mode 100644 index 654ee1e88..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil_0.3.17.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Library of simple functions optimized for various CPUs" -HOMEPAGE = "http://liboil.freedesktop.org/" -BUGTRACKER = "https://bugs.freedesktop.org/" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \ - file://liboil/liboil.h;endline=28;md5=95c794a66b88800d949fed17e437d9fb \ - file://liboil/liboilcpu.c;endline=28;md5=89da69a61d88eedcba066f42353fb75a \ - file://examples/example1.c;endline=29;md5=9d4dad9fcbbdf0441ee063f8af5170c9 \ - file://testsuite/trans.c;endline=29;md5=380ecd43121fe3dcc0d8d7e5984f283d" - -DEPENDS = "glib-2.0" -PR = "r5" - -SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \ - file://no-tests.patch \ - file://fix-unaligned-whitelist.patch \ - file://0001-Fix-enable-vfp-flag.patch \ - file://liboil_fix_for_x32.patch \ - file://0001-math_vfp_asm.S-Convert-fldmia-fstmia-instructions-to.patch \ - file://fix_riscv_unaligned_access.patch \ - " - -SRC_URI[md5sum] = "47dc734f82faeb2964d97771cfd2e701" -SRC_URI[sha256sum] = "105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69" - -inherit autotools pkgconfig - -ARM_INSTRUCTION_SET = "arm" |