diff options
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia')
26 files changed, 538 insertions, 180 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb index 4765c6c9c..d36f2f48d 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb @@ -1,9 +1,12 @@ SUMMARY = "Freeware Advanced Audio Coder (MPEG2-AAC, MPEG4-AAC)" SECTION = "libs" LICENSE = "LGPLv2+" +HOMEPAGE = "http://www.audiocoding.com/faac.html" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://libfaac/coder.h;beginline=5;endline=17;md5=fa1fd6a5fa8cdc877d63a12530d273e0" +LICENSE_FLAGS = "commercial" + inherit autotools SRC_URI = " \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.10.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.11.bb index 0ec4c49ce..4df310275 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.10.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.11.bb @@ -10,7 +10,7 @@ SRC_URI = " \ git://github.com/FluidSynth/fluidsynth.git;branch=1.1.x \ file://0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \ " -SRCREV = "f5a0fee6f7f2b2ab4c866df1acb649333464b3fd" +SRCREV = "f65c6ba25fb2c7e37c89fc6a4afc5aa645e208c2" S = "${WORKDIR}/git" inherit cmake pkgconfig lib_package @@ -20,5 +20,5 @@ EXTRA_OECMAKE = "-Denable-floats=ON -DLIB_SUFFIX=${@d.getVar('baselib').replace( PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" PACKAGECONFIG[sndfile] = "-Denable-libsndfile-support=ON,-Denable-libsndfile-support=OFF,libsndfile1" PACKAGECONFIG[jack] = "-Denable-jack-support=ON,-Denable-jack-support=OFF,jack" -PACKAGECONFIG[pulseaudio] = "-Denable-pulseaudio=ON,--Denable-pulseaudio=OFF,pulseaudio" +PACKAGECONFIG[pulseaudio] = "-Denable-pulseaudio=ON,-Denable-pulseaudio=OFF,pulseaudio" PACKAGECONFIG[portaudio] = "-Denable-portaudio=ON,-Denable-portaudio=OFF,portaudio-v19" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb index 5f97a20fd..56d82205e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb @@ -45,9 +45,6 @@ oe_runconf_prepend() { # mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ #} -RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" - FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/ ${libexecdir}/gstreamer-0.10/.debug/" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.2.1.bb new file mode 100644 index 000000000..5409f3204 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.2.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "Gst-Shark Tracers" +DESCRIPTION = "Benchmarks and profiling tools for GStreamer" +HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=GstShark" +SECTION = "multimedia" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=e1caa368743492879002ad032445fa97" + +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad " + +SRCBRANCH ?= "master" + +SRCREV_base = "a60b3996fe3376d42334fc89014e9d6f6af62899" +SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0" + +SRC_URI = " \ + git://github.com/RidgeRun/gst-shark.git;protocol=https;branch=${SRCBRANCH};name=base \ + git://anongit.freedesktop.org/git/gstreamer/common.git;protocol=https;destsuffix=git/common;name=common; \ + " + +S = "${WORKDIR}/git" + +PACKAGECONFIG_CONFARGS = " \ + --disable-graphviz \ + --enable-gtk-doc=no \ +" + +FILES_${PN} += "\ + ${libdir}/gstreamer-1.0/libgstsharktracers.so \ + ${libdir}/gstreamer-1.0/libgstsharktracers.la \ +" + +inherit autotools gettext + +do_configure() { + ${S}/autogen.sh --noconfigure + oe_runconf +} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc index 10ee5bcb2..455d89684 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc @@ -7,19 +7,15 @@ LICENSE = "GPLv2+" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon" SRCBRANCH ?= "master" -SRCREV = "097a086a8606dcb368c7d38c7ec4fefc2497401b" +SRCREV = "3526d0ffdbccc375db7d5fe33a72c68b134657c2" SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-gstd-yocto-compatibility.patch" - + file://0001-gstd-yocto-compatibility.patch \ + file://0001-Look-for-gtk-doc.make-in-builddir.patch \ + " S = "${WORKDIR}/git" -PACKAGECONFIG_CONFARGS = " \ - --disable-gtk-doc \ -" - -inherit autotools pkgconfig gettext +inherit autotools pkgconfig gettext gtk-doc -do_configure() { -${S}/autogen.sh -oe_runconf +do_configure_prepend() { + sed -i -e "s|include \$(top_builddir)/docs/gtk-doc.make||g" ${S}/docs/reference/gstd/Makefile.am } diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-Look-for-gtk-doc.make-in-builddir.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-Look-for-gtk-doc.make-in-builddir.patch new file mode 100644 index 000000000..5a2861642 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-Look-for-gtk-doc.make-in-builddir.patch @@ -0,0 +1,32 @@ +From a84e9a6e1dca685eda072d58b58556b5b35cb4c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 10 Sep 2018 21:16:50 -0700 +Subject: [PATCH] Look for gtk-doc.make in builddir + +this is evident when S != B because gtkdocize +generates this file and its actually built into +build area + +Upstream-Status: Submitted [https://github.com/RidgeRun/gstd-1.x/pull/39] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + docs/reference/gstd/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/reference/gstd/Makefile.am b/docs/reference/gstd/Makefile.am +index f860fa1..62870da 100644 +--- a/docs/reference/gstd/Makefile.am ++++ b/docs/reference/gstd/Makefile.am +@@ -66,7 +66,7 @@ GTKDOC_LIBS=$(top_builddir)/gstd/libgstd-core.la + + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/docs/gtk-doc.make ++include $(top_builddir)/docs/gtk-doc.make + + # Comment this out if you want 'make check' to test you doc status + # and run some sanity checks +-- +2.18.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch index ddc183193..ffcc6ea94 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch @@ -4,47 +4,9 @@ Date: Fri, 15 Dec 2017 10:14:05 -0600 Subject: [PATCH] gstd:yocto compatibility --- - autogen.sh | 8 +++++++- - docs/reference/gstd/Makefile.am | 2 +- gstd/Makefile.am | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) -diff --git a/autogen.sh b/autogen.sh -index 66dbd42..793ee2f 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -21,7 +21,11 @@ - # ACLOCAL, AUTOPOINT and/or LIBTOOLIZE to the right versions, or leave them - # unset and get the defaults - --gtkdocize || exit 1 -+test -n "$srcdir" || srcdir=`dirname "$0"` -+test -n "$srcdir" || srcdir=. -+ -+olddir=`pwd` -+cd "$srcdir" - - autoreconf --verbose --force --install || { - echo 'autogen.sh failed'; -@@ -31,3 +35,5 @@ autoreconf --verbose --force --install || { - echo - echo "Now run './configure' with your system settings followed by 'make' to compile this module." - echo -+ -+cd "$olddir" -diff --git a/docs/reference/gstd/Makefile.am b/docs/reference/gstd/Makefile.am -index f860fa1..153a13b 100644 ---- a/docs/reference/gstd/Makefile.am -+++ b/docs/reference/gstd/Makefile.am -@@ -66,7 +66,7 @@ GTKDOC_LIBS=$(top_builddir)/gstd/libgstd-core.la - - - # This includes the standard gtk-doc make rules, copied by gtkdocize. --include $(top_srcdir)/docs/gtk-doc.make -+# include $(top_srcdir)/docs/gtk-doc.make - - # Comment this out if you want 'make check' to test you doc status - # and run some sanity checks diff --git a/gstd/Makefile.am b/gstd/Makefile.am index 13c551d..11fe202 100644 --- a/gstd/Makefile.am diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb index 8a9e9a1d7..b6bb447bc 100755 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64" # libsdl to provide sdl.m4 with AM_PATH_SDL DEPENDS += "libusb1 libraw1394 libsdl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv virtual/libx11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'libglu', '', d)} \ " PV = "2.2.5+gitr${SRCPV}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/files/run-ptest b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/files/run-ptest new file mode 100644 index 000000000..84981b22c --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/files/run-ptest @@ -0,0 +1,9 @@ +#!/bin/sh + +./libopenmpttest >/dev/null 2>&1 + +if [ $? -eq 0 ]; then + echo "PASS: libopenmpttest" +else + echo "FAIL: libopenmpttest" +fi diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb new file mode 100644 index 000000000..d14246f32 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb @@ -0,0 +1,104 @@ +SUMMARY = "C and C++ cross-platform library for decoding tracked music files (modules)" +DESCRIPTION = "libopenmpt is a cross-platform C++ and C library to decode tracked \ +music files (modules) into a raw PCM audio stream. It also comes with openmpt123, a \ +cross-platform command-line or terminal based module file player, and libopenmpt_modplug, \ +a wrapper around libopenmpt that provides an interface that is ABI compatile with \ +libmodplug. libopenmpt is based on the player code of the OpenMPT project." +HOMEPAGE = "https://lib.openmpt.org/libopenmpt/" +SECTION = "libs" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e804150573f149befef6c07e173f20c3" + +DEPENDS = "virtual/libiconv" + +SRC_URI = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${PV}+release.autotools.tar.gz \ + file://run-ptest \ + " +SRC_URI[md5sum] = "66bbc6fbb5f27a554cb145d805e9ef9d" +SRC_URI[sha256sum] = "14a137b8d1a20e1b6a5e67cbc9467ab7e5e4e67d5aa38a247afc825685c53939" + +S = "${WORKDIR}/libopenmpt-${PV}+release.autotools" + +inherit autotools pkgconfig ptest + +PACKAGECONFIG ??= " \ + libopenmpt-modplug openmpt123 \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ + flac mpg123 ogg sndfile vorbis vorbisfile zlib \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ +" + +# libopenmpt_modplug is a library that wraps libopenmpt calls into +# functions that are ABI compatible with libmodplug. This allows for +# using modplug headers and linking against libopenmpt_modplug +# instead of against the original libmodplug library. +# NOTE: The wrapper is compatible to the ABI from libmodplug version +# 0.8.8 and newer. +PACKAGECONFIG[libopenmpt-modplug] = "--enable-libopenmpt_modplug,--disable-libopenmpt_modplug" +PACKAGECONFIG[openmpt123] = "--enable-openmpt123,--disable-openmpt123" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" + +# These packageconfigs affect openmpt123 +PACKAGECONFIG[flac] = "--with-flac,--without-flac,flac" +PACKAGECONFIG[mpg123] = "--with-mpg123,--without-mpg123,mpg123" +PACKAGECONFIG[ogg] = "--with-ogg,--without-ogg,libogg" +PACKAGECONFIG[portaudio] = "--with-portaudio,--without-portaudio,portaudio-v19" +PACKAGECONFIG[pulseaudio] = "--with-pulseaudio,--without-pulseaudio,pulseaudio" +PACKAGECONFIG[sdl] = "--with-sdl,--without-sdl,virtual/libsdl" +PACKAGECONFIG[sdl2] = "--with-sdl2,--without-sdl2,virtual/libsdl2" +PACKAGECONFIG[sndfile] = "--with-sndfile,--without-sndfile,libsndfile1" +PACKAGECONFIG[vorbis] = "--with-vorbis,--without-vorbis,libvorbis" +PACKAGECONFIG[vorbisfile] = "--with-vorbisfile,--without-vorbisfile,libvorbis" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" + +# --disable-libmodplug is necessary, since otherwise we'd +# have a collision with the libmodplug package, because of the +# libmodplug.so file. (libmodplug.so from libopenmpt isintended +# to be used as a drop-in replacement, and according to the +# documentation, is not complete.) +EXTRA_OECONF += " \ + --disable-doxygen-doc \ + --disable-examples \ + --disable-libmodplug \ + --without-portaudiocpp \ +" + +do_compile_ptest() { + oe_runmake ${PARALLEL_MAKE} libopenmpttest +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + install -m 0755 ${B}/libopenmpttest ${D}${PTEST_PATH} + install -m 0644 ${S}/test/test.mptm ${D}${PTEST_PATH}/test + install -m 0644 ${S}/test/test.s3m ${D}${PTEST_PATH}/test + install -m 0644 ${S}/test/test.xm ${D}${PTEST_PATH}/test + + install -d ${D}${PTEST_PATH}/libopenmpt + install -m 0644 ${S}/libopenmpt/libopenmpt_version.mk ${D}${PTEST_PATH}/libopenmpt +} + +python __anonymous() { + packageconfig = (d.getVar("PACKAGECONFIG") or "").split() + if ("sdl" in packageconfig) and ("sdl2" in packageconfig): + bb.error("sdl and sdl2 packageconfigs cannot be both enabled") +} + +PACKAGES =+ "${PN}-modplug ${PN}-openmpt123 ${PN}-openmpt123-doc" +FILES_${PN}-modplug = "${libdir}/libopenmpt_modplug.so.*" +FILES_${PN}-openmpt123 = "${bindir}/openmpt123" +FILES_${PN}-openmpt123-doc = "${mandir}/man1/openmpt123*" + +# Since version 0.3, libopenmpt uses SemVer 2.0.0 versioning. +# The SemVer versioning scheme is incompatible with Debian/Ubuntu +# package version names. +DEBIAN_NOAUTONAME_${PN} = "1" +DEBIAN_NOAUTONAME_${PN}-modplug = "1" + +RDEPENDS_${PN}_libc-glibc = " \ + glibc-gconv-cp1252 \ + glibc-gconv-ibm437 \ + glibc-gconv-iso8859-1 \ + glibc-gconv-iso8859-15 \ +" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc new file mode 100644 index 000000000..187ff536a --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -0,0 +1,41 @@ +DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \ +being fully compliant with DLNA/UPnP-AV clients." +LICENSE = "GPL-2.0|BSD" +DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis" + +# because it depends on libav which has commercial flag +LICENSE_FLAGS = "commercial" + +inherit gettext autotools-brokensep update-rc.d systemd + +SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ + file://minidlna-daemon.init.d \ + file://minidlna.service \ + file://0001-Update-Gettext-version.patch \ + " + +S = "${WORKDIR}/git" + +# This remove "--exclude=autopoint" option from autoreconf argument to avoid +# configure.ac:30: error: required file './ABOUT-NLS' not found +EXTRA_AUTORECONF = "" + +do_install_append(){ + install -d ${D}${sysconfdir} + install -m 0755 minidlna.conf ${D}${sysconfdir} + +# Systemd script + install -d ${D}${nonarch_base_libdir}/systemd/system + install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system + +# Sysvinit script + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna + +} + +SYSTEMD_SERVICE_${PN} = "minidlna.service" + +INITSCRIPT_NAME = "minidlna" +INITSCRIPT_PARAMS = "defaults 90" + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch new file mode 100644 index 000000000..c18095d42 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch @@ -0,0 +1,34 @@ +From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001 +From: Baptiste Durand <baptiste.durand@gmail.com> +Date: Sun, 9 Sep 2018 20:50:41 +0200 +Subject: [PATCH] Update Gettext version + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Baptiste Durand <baptiste.durand@gmail.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f343d21..a556b33 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,7 @@ + # License along with MiniDLNA; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + # USA. +-AC_INIT(MiniDLNA,1.1.3,,minidlna) ++AC_INIT(MiniDLNA,1.2.1,,minidlna) + #LT_INIT + + AC_CANONICAL_TARGET +@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS]) + + AM_ICONV + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION(0.18) ++AM_GNU_GETTEXT_VERSION(0.19) + + # Checks for programs. + AC_PROG_AWK diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d new file mode 100644 index 000000000..9e64a20fd --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d @@ -0,0 +1,54 @@ +#!/bin/sh + +NAME="minidlna" +DAEMON=/usr/sbin/minidlnad +SCRIPTNAME=/etc/init.d/$NAME +PIDFILE=/var/run/$NAME.pid +CONF=/etc/$NAME.conf +ARGS="-f $CONF" + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +start_function() { + + export PATH=$PWD:$PATH + + if [ -f ${PIDFILE} ]; then + echo "$SCRIPTNAME already running with PID #`cat $PIDFILE` ( according to ${PIDFILE} )"; + exit 0 + fi + + $DAEMON $ARGS + + pid=$! + + if [ "$pid" != "" ]; then + echo -n "$pid" > ${PIDFILE} + fi +} + +stop_function() { + + export PATH=$PWD:$PATH + + if [ ! -e "${PIDFILE}" ]; then + echo "${SCRIPTNAME} not running ( according to ${PIDFILE} )"; + exit 1; + fi + PID=`cat ${PIDFILE}` + kill -INT ${PID} + rm -f ${PIDFILE} +} + +case $1 in + "start") + start_function + ;; + "stop") + stop_function + ;; + *) + echo "Usage: $0 {start | stop}" + +esac diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/minidlna.service b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/minidlna.service new file mode 100644 index 000000000..656100bb6 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/minidlna.service @@ -0,0 +1,10 @@ +[Unit] +Description=Minidlna Daemon +After=network.target + +[Service] +Type=notify +ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb new file mode 100644 index 000000000..999d85ce7 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb @@ -0,0 +1,4 @@ +require ${BPN}.inc + +SRCREV = "c760a338e07ebd11d62fef701e3de824a91f8625" +LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb index 16e52134b..ca9d94a19 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb @@ -22,10 +22,12 @@ do_configure_prepend() { git clean -dfx -e /.pc/ -e /patches/ . mkdir build-native cd build-native - cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \ + LDFLAGS="${BUILD_LDFLAGS}" \ + cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \ -DCMAKE_C_COMPILER=${BUILD_CC} \ -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \ -DCMAKE_CXX_COMPILER=${BUILD_CXX} \ + -DCMAKE_EXE_LINKER_FLAGS=${BUILD_LDFLAGS} \ .. make make-c-interface cd .. diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb new file mode 100644 index 000000000..455e76fcb --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb @@ -0,0 +1,22 @@ +SUMMARY = "C client library for the Music Player Daemon" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=06b9dfd2f197dc514d8ef06549684b77" +HOMEPAGE = "https://www.musicpd.org/libs/libmpdclient/" + +inherit meson + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/libmpdclient \ +" +SRCREV = "4e8d990eb5239566ee948f1cd79b7248e008620a" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "tcp" +PACKAGECONFIG[tcp] = "-Dtcp=true,-Dtcp=false" + +do_install_append() { + # libmpdclient's Vala bindings are outdated and unmaintained; it + # is likely that nobody will ever use them, so let's not install + # them + rm -rf ${D}${datadir}/vala +} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb new file mode 100644 index 000000000..41abe7108 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb @@ -0,0 +1,16 @@ +SUMMARY = "A minimalist command line interface to the Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE = "https://www.musicpd.org/clients/mpc/" + +inherit meson + +DEPENDS += " \ + libmpdclient \ +" + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/mpc \ +" +SRCREV = "59875acdf34e5f0eac0c11453c49daef54f78413" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb deleted file mode 100644 index 6754f347e..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb +++ /dev/null @@ -1,100 +0,0 @@ -SUMMARY = "Music Player Daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -HOMEPAGE ="http://www.musicpd.org" - -inherit autotools useradd systemd pkgconfig - -DEPENDS += " \ - alsa-lib \ - libsamplerate0 \ - libsndfile1 \ - libvorbis \ - libogg \ - faad2 \ - ffmpeg \ - curl \ - sqlite \ - bzip2 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ - tcp-wrappers \ - openal-soft \ - yajl \ - jack \ - faad2 \ - flac \ - libao \ - fluidsynth \ - libcdio \ - wavpack \ - libopus \ - mpg123 \ - libmms \ - libmodplug \ - boost \ - icu \ - dbus \ - expat \ - zlib \ - libupnp \ -" - -# While this item does not require it, it depends on mpg123 which does -LICENSE_FLAGS = "commercial" - -SRC_URI = " \ - http://www.musicpd.org/download/${BPN}/0.20/${BP}.tar.xz \ - file://mpd.conf.in \ -" -SRC_URI[md5sum] = "8dc87ba95473fd738f2aff9bd69cc212" -SRC_URI[sha256sum] = "6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434" - -EXTRA_OECONF = "enable_bzip2=yes" -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - -PACKAGECONFIG[audiofile] = "--enable-audiofile,--disable-audiofile,audiofile" -PACKAGECONFIG[cdioparanoia] = "--enable-cdio-paranoia,--disable-cdio-paranoia,libcdio-paranoia" -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" -PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" -PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba" - -do_configure_prepend() { - sed -i -e 's|libsystemd-daemon|libsystemd|' ${S}/configure.ac -} - -do_install_append() { - install -d ${D}/${localstatedir}/lib/mpd/music - chmod 775 ${D}/${localstatedir}/lib/mpd/music - install -d ${D}/${localstatedir}/lib/mpd/playlists - chown -R mpd ${D}/${localstatedir}/lib/mpd - chown mpd:mpd ${D}/${localstatedir}/lib/mpd/music - - install -d ${D}/${sysconfdir} - install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf - sed -i \ - -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ - -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ - -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ - -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ - -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ - ${D}/${sysconfdir}/mpd.conf - - if [ -e ${D}/${systemd_unitdir}/system/mpd.service ] ; then - sed -i \ - 's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \ - ${D}/${systemd_unitdir}/system/mpd.service - fi -} - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "mpd.socket" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = " \ - --system --no-create-home \ - --home ${localstatedir}/lib/mpd \ - --groups audio \ - --user-group mpd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb new file mode 100644 index 000000000..6c6ad4237 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb @@ -0,0 +1,99 @@ +SUMMARY = "Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE ="http://www.musicpd.org" + +inherit autotools useradd systemd pkgconfig + +DEPENDS += " \ + curl \ + sqlite3 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ + yajl \ + boost \ + icu \ + dbus \ + expat \ +" + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/MPD;branch=v0.20.x \ + file://mpd.conf.in \ +" +SRCREV = "9274bc15bc41bbe490fde847f8422468cc20375d" +S = "${WORKDIR}/git" + +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" + +PACKAGECONFIG ??= "alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib" +PACKAGECONFIG += "${@bb.utils.contains('LICENSE_FLAGS', 'commercial', 'aac', '', d)}" + +PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,faad2" +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[ao] = "--enable-ao,--disable-ao,libao" +PACKAGECONFIG[audiofile] = "--enable-audiofile,--disable-audiofile,audiofile" +PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" +PACKAGECONFIG[cdioparanoia] = "--enable-cdio-paranoia,--disable-cdio-paranoia,libcdio-paranoia" +PACKAGECONFIG[daemon] = "--enable-daemon,--disable-daemon" +PACKAGECONFIG[ffmpeg] = "--enable-ffmpeg,--disable-ffmpeg,ffmpeg" +PACKAGECONFIG[fifo] = "--enable-fifo,--disable-fifo" +PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" +PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" +PACKAGECONFIG[httpd] = "--enable-httpd-output,--disable-httpd-output" +PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" +PACKAGECONFIG[iso9660] = "--enable-iso9660,--disable-iso9660,libcdio" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" +PACKAGECONFIG[libsamplerate] = "--enable-lsr,--disable-lsr,libsamplerate0" +PACKAGECONFIG[libwrap] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" +PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" +PACKAGECONFIG[mms] = "--enable-mms,--disable-mms,libmms" +PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" +PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" +PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus libogg" +PACKAGECONFIG[oss] = "--enable-oss,--disable-oss," +PACKAGECONFIG[recorder] = "--enable-recorder-output,--disable-recorder-output" +PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba" +PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" +PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" +PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" + +do_configure_prepend() { + sed -i -e 's|libsystemd-daemon|libsystemd|' ${S}/configure.ac +} + +do_install_append() { + install -o mpd -d \ + ${D}/${localstatedir}/lib/mpd \ + ${D}/${localstatedir}/lib/mpd/playlists + install -m775 -o mpd -g mpd -d \ + ${D}/${localstatedir}/lib/mpd/music + + install -d ${D}/${sysconfdir} + install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf + sed -i \ + -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ + -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ + -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ + -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ + -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ + ${D}/${sysconfdir}/mpd.conf + + # we don't need the icon + rm -rf ${D}${datadir}/icons +} + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "mpd.socket" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = " \ + --system --no-create-home \ + --home ${localstatedir}/lib/mpd \ + --groups audio \ + --user-group mpd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb new file mode 100644 index 000000000..8468d125d --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb @@ -0,0 +1,37 @@ +SUMMARY = "A curses client for the Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/" + +inherit meson + +DEPENDS += " \ + boost \ + ncurses \ + libmpdclient \ +" + +PACKAGECONFIG ??= "colors locale mouse nls regex help_screen artist_screen search_screen song_screen key_screen lyrics_screen outputs_screen" + +PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false" +PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc" +PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled" +PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false" +PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled" +PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native" +PACKAGECONFIG[regex] = "-Dregex=enabled,-Dregex=disabled,pcre" + +PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false" +PACKAGECONFIG[artist_screen] = "-Dartist_screen=true,-Dartist_screen=false" +PACKAGECONFIG[search_screen] = "-Dsearch_screen=true,-Dsearch_screen=false" +PACKAGECONFIG[song_screen] = "-Dsong_screen=true,-Dsong_screen=false" +PACKAGECONFIG[key_screen] = "-Dkey_screen=true,-Dkey_screen=false" +PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false" +PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" +PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/ncmpc \ +" +SRCREV = "8e98f89ff07b140e6357dab2a9a9f6432ae0e521" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch index bb3d8b0ef..6e11c9752 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch @@ -8,11 +8,11 @@ Index: git/librtmp/Makefile =================================================================== --- git.orig/librtmp/Makefile +++ git/librtmp/Makefile -@@ -107,6 +107,7 @@ install_base: librtmp.a librtmp.pc +@@ -115,6 +115,7 @@ install_base: librtmp.a librtmp.pc cp librtmp.3 $(MANDIR)/man3 - install_so: librtmp.$(SO_EXT) + install_so: librtmp$(SO_EXT) + -mkdir -p $(SODIR) - cp librtmp.$(SO_EXT) $(SODIR) - cd $(SODIR); ln -sf librtmp.$(SO_EXT) librtmp.$(SOX) - + cp librtmp$(SO_EXT) $(SODIR) + $(INSTALL_IMPLIB) + cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb index c5513b025..a72b0d651 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb @@ -5,9 +5,9 @@ HOMEPAGE = "http://rtmpdump.mplayerhq.hu/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "openssl zlib" +DEPENDS = "openssl10 zlib" -SRCREV = "3121324046e4ca1934e7e28293fc8326475d5053" +SRCREV = "fa8646daeb19dfd12c181f7d19de708d623704c0" SRC_URI = " \ git://git.ffmpeg.org/rtmpdump \ file://fix-racing-build-issue.patch" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb index 66b95db00..157e4c91f 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb @@ -6,23 +6,19 @@ SECTION = "libs/multimedia" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://NOTICE;md5=dbdefe400d894b510a9de14813181d0b" -S = "${WORKDIR}/git" -SRCREV = "df11091086b56e5fb71887f2fa320e1d2ffeff58" -SRC_URI = "git://github.com/tinyalsa/tinyalsa.git;protocol=https;" +SRCREV = "67b9210d344c34e8d1aa0cfe638abce71c5221ca" +SRC_URI = "git://github.com/tinyalsa/tinyalsa" +PV = "1.1.1+git${SRCPV}" -do_configure() { - : -} +S = "${WORKDIR}/git" -do_compile() { - oe_runmake CC='${CC}' LD='${CC}' AR='${AR}' -} +inherit cmake -do_install() { - oe_runmake install \ - PREFIX="${prefix}" DESTDIR="${D}" INCDIR="${includedir}/tinyalsa" \ - LIBDIR="${libdir}" BINDIR="${bindir}" MANDIR="${mandir}" -} +# tinyalsa is built as a static library. Enable PIC to avoid relocation +# errors like these: +# +# unresolvable R_AARCH64_ADR_PREL_PG_HI21 relocation against symbol `stderr@@GLIBC_2.17' +CFLAGS += " -fPIC -DPIC " PACKAGES =+ "${PN}-tools" FILES_${PN}-tools = "${bindir}/*" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 8e82b3bd3..f13c0ead6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -5,7 +5,7 @@ SECTION = "multimedia" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \ +DEPENDS = "fribidi libtool libgcrypt libgcrypt-native \ dbus dbus-glib libxml2 gnutls \ tremor faad2 ffmpeg flac fluidsynth alsa-lib \ lua-native lua libidn \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb index e43cb4032..8e9914b49 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb @@ -8,7 +8,7 @@ SECTION = "multimedia" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libogg libvorbis curl libao" +DEPENDS = "libogg libvorbis" SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \ file://0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch \ @@ -20,6 +20,7 @@ SRC_URI[sha256sum] = "a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a0 inherit autotools pkgconfig gettext -PACKAGECONFIG ??= "flac" +PACKAGECONFIG ??= "flac ogg123" PACKAGECONFIG[flac] = ",--without-flac,flac,libflac" PACKAGECONFIG[speex] = ",--without-speex,speex,speex" +PACKAGECONFIG[ogg123] = "--enable-ogg123,--disable-ogg123,libao curl" |
