diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-multimedia')
9 files changed, 68 insertions, 27 deletions
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 3b10e978e..ebb95cf78 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -10,6 +10,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0001-genisoimage-Fix-fprintf-format-errors.patch \ file://0001-define-__THROW-to-avoid-build-issue-with-musl.patch \ file://0002-Do-not-use-rcmd-on-build-with-musl.patch \ + file://0001-genisoimage-Add-missing-extern-definition.patch \ " SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch new file mode 100644 index 000000000..809d3afd7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch @@ -0,0 +1,29 @@ +From fd5251cc8b82ce7a5f907c5129969097d75609fe Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Aug 2020 17:38:59 -0700 +Subject: [PATCH] genisoimage: Add missing extern definition + +Fixed build with gcc10 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + genisoimage/genisoimage.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h +index bbedfb0..82c859b 100644 +--- a/genisoimage/genisoimage.h ++++ b/genisoimage/genisoimage.h +@@ -376,7 +376,7 @@ extern int use_fileversion; + extern int split_SL_component; + extern int split_SL_field; + extern char *trans_tbl; +-char *outfile; ++extern char *outfile; + + #define JMAX 64 /* maximum Joliet file name length (spec) */ + #define JLONGMAX 103 /* out of spec Joliet file name length */ +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb new file mode 100644 index 000000000..596c5fe86 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Opus Audio Codec" +DESCRIPTION = "The libopusenc libraries provide a high-level API for encoding \ + .opus files. libopusenc depends only on libopus." +HOMEPAGE = "http://www.opus-codec.org/" +SECTION = "libs/multimedia" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=174b92049c2c697eb73112801662a07c" + +DEPENDS = "libopus" + +UPSTREAM_CHECK_URI = "https://github.com/xiph/libopusenc/releases" + +SRC_URI = "https://ftp.osuosl.org/pub/xiph/releases/opus/libopusenc-${PV}.tar.gz" +SRC_URI[md5sum] = "f038ea0f4168d184c76b42d293697c57" +SRC_URI[sha256sum] = "8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9" + +S = "${WORKDIR}/libopusenc-${PV}" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/files/config.linux-cross b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555/config.linux-cross index d1277da8d..fe6a28604 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/files/config.linux-cross +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555/config.linux-cross @@ -12,6 +12,6 @@ CONSOLE_LINK_OPTS = $(LINK_OPTS) LIBRARY_LINK = $(LD) -o LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic LIB_SUFFIX = a -LIBS_FOR_CONSOLE_APPLICATION = +LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto LIBS_FOR_GUI_APPLICATION = EXE = diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb deleted file mode 100644 index 1da61c0cf..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb +++ /dev/null @@ -1,11 +0,0 @@ -require live555.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - " -# SRC_URI[md5sum] = "a84ca3946d899f5592c7d31012ed2fe3" -# SRC_URI[sha256sum] = "0bd0c26d980425d9a419d835193e292a08a968f175da1902da4b495f126d5abd" - -SRC_URI[md5sum] = "a593f915664793b3ba41299b17b8bedc" -SRC_URI[sha256sum] = "a3dcd157865186cf883c3a80b4bb09637e91fff96b234b2c780a7f7dcc7a35dc" - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb index e08d11b0c..c746b6e97 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb @@ -7,13 +7,23 @@ HOMEPAGE = "http://live.com/" LICENSE = "LGPLv3" SECTION = "devel" +DEPENDS = "openssl" + URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}" SRC_URI = "https://download.videolan.org/pub/contrib/live555/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://download.videolan.org/contrib/live555/ \n" +SRC_URI[sha256sum] = "af3af7f2510b0b45f38892c232abca2cee2ab36a62503e7085b47ed2c3c2c537" + S = "${WORKDIR}/live" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + " + TARGET_CC_ARCH += "${LDFLAGS}" do_configure() { @@ -22,10 +32,6 @@ do_configure() { ./genMakefiles linux-cross } -do_compile() { - oe_runmake -} - do_install() { install -d ${D}${includedir}/BasicUsageEnvironment install -d ${D}${includedir}/groupsock diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb index f7b0f30fb..973a978b1 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb @@ -18,11 +18,13 @@ LICENSE_FLAGS = "commercial" SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7" SRC_URI = " \ git://github.com/mpv-player/mpv;name=mpv \ + https://waf.io/waf-2.0.20;name=waf;subdir=git \ " +SRC_URI[waf.sha256sum] = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f" S = "${WORKDIR}/git" -inherit waf pkgconfig features_check mime-xdg +inherit waf pkgconfig mime-xdg LUA ?= "lua" LUA_mips64 = "" @@ -42,7 +44,6 @@ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ " -PACKAGECONFIG_remove_aarch64 = "lua" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv" PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" @@ -101,14 +102,10 @@ EXTRA_OECONF = " \ ${PACKAGECONFIG_CONFARGS} \ " -do_patch[postfuncs] += "get_waf" - -get_waf() { - cd ${S} - ./bootstrap.py - sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/waf - cd - +link_waf() { + ln -s waf-2.0.20 ${S}/waf } +do_unpack[postfuncs] += "link_waf" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb index 098b08d47..e4fb4ff02 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb @@ -9,7 +9,7 @@ DEPENDS = "glib-2.0 intltool-native" inherit autotools gettext -DEPENDS += "glib-2.0-native intltool-native" +DEPENDS += "glib-2.0-native" SRC_URI = "http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb index 006e73af4..4a98ec17d 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRCREV = "8ae686757b708cd8df1d10c71586aff5355cfe1e" +SRCREV = "7ec7a33a081aeeb53fed1a8d87e4cbd189152527" SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https \ file://libvpx-configure-support-blank-prefix.patch \ " |