diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-multimedia | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-multimedia')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb | 31 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb | 14 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch | 27 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb | 10 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190306.bb (renamed from meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20170410.bb) | 5 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.7.0.bb (renamed from meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb) | 8 |
7 files changed, 58 insertions, 39 deletions
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb b/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb deleted file mode 100644 index 9e5a3817a..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "An open source MPEG-4 and MPEG-2 AAC decoding library" -HOMEPAGE = "http://www.audiocoding.com/faad2.html" -SECTION = "libs" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=381c8cbe277a7bc1ee2ae6083a04c958" - -LICENSE_FLAGS = "commercial" - -PR = "r1" - -inherit autotools - -SRC_URI = "${SOURCEFORGE_MIRROR}/faac/faad2-src/faad2-${PV}/${BP}.tar.bz2;name=faad2 \ -" - -SRC_URI[faad2.md5sum] = "4c332fa23febc0e4648064685a3d4332" -SRC_URI[faad2.sha256sum] = "14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5" - -PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" - -FILES_${PN} = "${bindir}/faad" - -FILES_libfaad = "${libdir}/libfaad.so.*" -FILES_libfaad-dev = "${libdir}/libfaad.so ${libdir}/libfaad.la ${includedir}/faad.h" -FILES_libfaad-staticdev = "${libdir}/libfaad.a" - -FILES_libmp4ff = "${libdir}/libmp4ff.so.*" -FILES_libmp4ff-dev = "${libdir}/libmp4ff.so ${libdir}/libmp4ff.la ${includedir}/mp4ff.h" -FILES_libmp4ff-staticdev = "${libdir}/libmp4ff.a" - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb new file mode 100644 index 000000000..8b3aafc3b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb @@ -0,0 +1,14 @@ +SUMMARY = "An open source MPEG-4 and MPEG-2 AAC decoding library" +HOMEPAGE = "http://www.audiocoding.com/faad2.html" +SECTION = "libs" +LICENSE = "GPLv2" + +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" + +inherit autotools lib_package diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch new file mode 100644 index 000000000..d9a3ab7cc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch @@ -0,0 +1,27 @@ +From dd65685c24bb25a800ed42388ed0a1e8792b2ed2 Mon Sep 17 00:00:00 2001 +From: falkTX <falktx@gmail.com> +Date: Sat, 24 Nov 2018 14:29:58 +0100 +Subject: [PATCH] Fix OSX build + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [https://github.com/jackaudio/jack2/commit/d851fada460d42508a6f82b19867f63853062583] +--- + posix/JackNetUnixSocket.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/posix/JackNetUnixSocket.cpp b/posix/JackNetUnixSocket.cpp +index 7a5585ef..a4cb5036 100644 +--- a/posix/JackNetUnixSocket.cpp ++++ b/posix/JackNetUnixSocket.cpp +@@ -169,7 +169,7 @@ namespace Jack + + int JackNetUnixSocket::Bind() + { +- return bind(fSockfd, reinterpret_cast<socket_address_t*>(&fRecvAddr), sizeof(socket_address_t)); ++ return ::bind(fSockfd, reinterpret_cast<socket_address_t*>(&fRecvAddr), sizeof(socket_address_t)); + } + + int JackNetUnixSocket::BindWith(const char* ip) +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb index 52559cb36..477af8ced 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb @@ -16,6 +16,7 @@ DEPENDS = "libsamplerate0 libsndfile1 readline" SRC_URI = "git://github.com/jackaudio/jack2.git \ file://0001-Python-3.7-fixes-2126.patch \ + file://0001-Fix-OSX-build.patch \ " SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" PV = "1.9.12" @@ -25,6 +26,8 @@ inherit waf pkgconfig PACKAGECONFIG ??= "alsa" PACKAGECONFIG[alsa] = "--alsa=yes,--alsa=no,alsa-lib" +# --dbus only stops building jackd -> add --classic +PACKAGECONFIG[dbus] = "--dbus --classic,,dbus" PACKAGECONFIG[opus] = "--opus=yes,--opus=no,libopus" # portaudio is for windows builds only @@ -35,6 +38,11 @@ PACKAGES =+ "libjack jack-server jack-utils" RDEPENDS_jack-dev_remove = "${PN} (= ${EXTENDPKGV})" FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" -FILES_jack-server = "${bindir}/jackd" +FILES_jack-server = " \ + ${datadir}/dbus-1/services \ + ${bindir}/jackdbus \ + ${bindir}/jackd \ +" FILES_jack-utils = "${bindir}/*" + FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/* " diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc index 14ea66442..4fe744c1a 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc @@ -8,7 +8,7 @@ LICENSE = "LGPLv3" SECTION = "devel" URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}" -SRC_URI = "http://www.live555.com/liveMedia/public/live.${URLV}.tar.gz \ +SRC_URI = "http://www.live555.com/live.${URLV}.tar.gz \ file://config.linux-cross" # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older MIRRORS += "http://www.live555.com/liveMedia/public/ http://distcache.FreeBSD.org/ports-distfiles/ \n" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20170410.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190306.bb index 27fc42987..fa6057dc2 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20170410.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190306.bb @@ -3,7 +3,6 @@ require live555.inc LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " - -SRC_URI[md5sum] = "b7084a72aeb09549c8b248f8cc308841" -SRC_URI[sha256sum] = "4c37d9c828f9028403997272e49968c260385dbbaef62e28ba24faef0dda868b" +SRC_URI[md5sum] = "a84ca3946d899f5592c7d31012ed2fe3" +SRC_URI[sha256sum] = "0bd0c26d980425d9a419d835193e292a08a968f175da1902da4b495f126d5abd" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.7.0.bb index e17cda1a9..1d04ed1bd 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.7.0.bb @@ -7,11 +7,13 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRC_URI += "http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${BP}.tar.bz2 \ +# SRCREV for 1.7.0 +SRCREV = "133f83e2c34b8d770ae06aa595cef3e254173fcb" +SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https \ file://libvpx-configure-support-blank-prefix.patch \ " -SRC_URI[md5sum] = "a19518c8111fa93bdabdd85259162611" -SRC_URI[sha256sum] = "1c2c0c2a97fba9474943be34ee39337dee756780fc12870ba1dc68372586a819" + +S = "${WORKDIR}/git" # ffmpeg links with this and fails # sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4' |