diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-multimedia')
32 files changed, 546 insertions, 252 deletions
diff --git a/import-layers/meta-openembedded/meta-multimedia/README b/import-layers/meta-openembedded/meta-multimedia/README index b59dfe0df..20f4fb863 100644 --- a/import-layers/meta-openembedded/meta-multimedia/README +++ b/import-layers/meta-openembedded/meta-multimedia/README @@ -1,20 +1,19 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: rocko +branch: master revision: HEAD URI: git://github.com/openembedded/meta-oe.git layers: meta-oe -branch: rocko +branch: master revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia][rocko]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject' When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-multimedia][rocko][PATCH +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-multimedia][PATCH You are encouraged to fork the mirror on github https://github.com/openembedded/meta-oe/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch <remote>' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -rocko Branch Maintainer: -Armin Kuster <akuster808@gmail.com> +Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com> diff --git a/import-layers/meta-openembedded/meta-multimedia/conf/layer.conf b/import-layers/meta-openembedded/meta-multimedia/conf/layer.conf index d68b13f7f..cfedf2f6b 100644 --- a/import-layers/meta-openembedded/meta-multimedia/conf/layer.conf +++ b/import-layers/meta-openembedded/meta-multimedia/conf/layer.conf @@ -29,3 +29,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core" +LAYERSERIES_COMPAT_multimedia-layer = "sumo" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb index 9360d65b5..3ddb818df 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb @@ -8,4 +8,6 @@ RRECOMMENDS_${PN} = "adwaita-icon-theme" SRC_URI = "http://download.gnome.org/sources/${BPN}/0.8/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "212d85ebce89b32468b59e1164050d40" SRC_URI[sha256sum] = "aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed" -inherit autotools pkgconfig gettext +inherit distro_features_check autotools pkgconfig gettext + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch deleted file mode 100644 index 0493cea0e..000000000 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Tue, 9 Jun 2015 12:20:45 -0700 -Subject: [PATCH] Fix builds when using separate source and build directories. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - configure.ac | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a8731b5..54a3c3d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -744,9 +744,9 @@ AC_OUTPUT - # - # Files copied for windows compilation. - # --echo "configure: copying \"autoconfig.h\" to \"build/inc/autoconfig.h\"" --test -d build/inc || mkdir -p build/inc --cp autoconfig.h build/inc/autoconfig.h --echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\"" --cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h -+echo "configure: copying \"autoconfig.h\" to \"\$srcdir/build/inc/autoconfig.h\"" -+test -d $srcdir/build/inc || mkdir -p $srcdir/build/inc -+cp autoconfig.h $srcdir/build/inc/autoconfig.h -+echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"\$srcdir/build/inc/upnpconfig.h\"" -+cp upnp/inc/upnpconfig.h $srcdir/build/inc/upnpconfig.h - --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb deleted file mode 100644 index c1b0429bd..000000000 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Portable SDK for UPnP* Devices" -DESCRIPTION = "The Portable SDK for UPnP Devices is an SDK for development of \ -UPnP device and control point applications. It consists of the core UPnP \ -protocols along with a UPnP-specific eXtensible Markup Language (XML) parser \ -supporting the Document Object Model (DOM) Level 2 API and an optional, \ -integrated mini web server for serving UPnP related documents." -HOMEPAGE = "http://pupnp.sourceforge.net/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b3190d5244e08e78e4c8ee78544f4863" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/libupnp-${PV}.tar.bz2 \ - file://sepbuildfix.patch \ -" - -SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e" -SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b" - -S = "${WORKDIR}/libupnp-${PV}" - -inherit autotools diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb index d2eda6bf9..e94c9ff8d 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb @@ -30,6 +30,7 @@ PACKAGECONFIG[ruih] = "--enable-ruih-plugin,--disable-ruih-plugin" PACKAGECONFIG[media-export] = "--enable-media-export-plugin,--disable-media-export-plugin" PACKAGECONFIG[gst-launch] = "--enable-gst-launch-plugin,--disable-gst-launch-plugin" PACKAGECONFIG[gtk+3] = ",--without-ui,gtk+3" +PACKAGECONFIG[lms] = "--enable-lms-plugin,--disable-lms-plugin" LIBV = "2.6" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb index 5158f05b6..295618914 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb @@ -6,60 +6,59 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=930e2a5f63425d8dd72dbd7391c43c46" FILESPATH =. "${FILE_DIRNAME}/kodi-17:" DEPENDS = " \ - cmake-native \ - curl-native \ - gperf-native \ - jsonschemabuilder-native \ - nasm-native \ - swig-native \ - unzip-native \ - yasm-native \ - zip-native \ - avahi \ - boost \ - bzip2 \ - crossguid \ - curl \ - dcadec \ - enca \ - expat \ - faad2 \ - ffmpeg \ - fontconfig \ - fribidi \ - giflib \ - jasper \ - libass \ - libcdio \ - libcec \ - libmad \ - libmicrohttpd \ - libmms \ - libmms \ - libmodplug \ - libpcre \ - libplist \ - libsamplerate0 \ - libsdl-image \ - libsdl-mixer \ - libsquish \ - libssh \ - libtinyxml \ - libusb1 \ - libxslt \ - lzo \ - mpeg2dec \ - python \ - samba \ - sqlite3 \ - taglib \ - virtual/egl \ - virtual/libsdl \ - wavpack \ - yajl \ - zlib \ - ${@enable_glew(bb, d)} \ - " + cmake-native \ + curl-native \ + gperf-native \ + jsonschemabuilder-native \ + nasm-native \ + swig-native \ + unzip-native \ + yasm-native \ + zip-native \ + avahi \ + boost \ + bzip2 \ + crossguid \ + curl \ + dcadec \ + enca \ + expat \ + faad2 \ + ffmpeg \ + fontconfig \ + fribidi \ + giflib \ + jasper \ + libass \ + libcdio \ + libcec \ + libmad \ + libmicrohttpd \ + libmms \ + libmms \ + libmodplug \ + libpcre \ + libplist \ + libsamplerate0 \ + libsdl-image \ + libsdl-mixer \ + libsquish \ + libssh \ + libtinyxml \ + libusb1 \ + libxslt \ + lzo \ + mpeg2dec \ + python \ + sqlite3 \ + taglib \ + virtual/egl \ + virtual/libsdl \ + wavpack \ + yajl \ + zlib \ + ${@enable_glew(bb, d)} \ +" PROVIDES = "xbmc" @@ -67,24 +66,24 @@ SRCREV = "6abeebd5ba371547c8f04272296433f5e4e28e86" PV = "17.3+gitr${SRCPV}" ADDONSPV = "17.1" SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Krypton \ - https://repo.voidlinux.eu/distfiles/${BPN}-${ADDONSPV}-generated-addons.tar.xz;name=addons;unpack=0 \ - file://0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \ - file://0004-handle-SIGTERM.patch \ - file://0005-add-support-to-read-frequency-output-if-using-intel-.patch \ - file://0006-Disable-DVD-support.patch \ - file://0007-Always-compile-libcpluff-as-PIC.patch \ - file://0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch \ - file://0009-build-Add-support-for-musl-triplets.patch \ - file://0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch \ - file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \ - file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \ - file://0001-change-order-of-detecting-libegl-and-libgles2.patch \ - file://0013-FTPParse.cpp-use-std-string.patch \ + https://repo.voidlinux.eu/distfiles/${BPN}-${ADDONSPV}-generated-addons.tar.xz;name=addons;unpack=0 \ + file://0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \ + file://0004-handle-SIGTERM.patch \ + file://0005-add-support-to-read-frequency-output-if-using-intel-.patch \ + file://0006-Disable-DVD-support.patch \ + file://0007-Always-compile-libcpluff-as-PIC.patch \ + file://0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch \ + file://0009-build-Add-support-for-musl-triplets.patch \ + file://0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch \ + file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \ + file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \ + file://0001-change-order-of-detecting-libegl-and-libgles2.patch \ + file://0013-FTPParse.cpp-use-std-string.patch \ " SRC_URI_append_libc-musl = " \ - file://0001-Fix-file_Emu-on-musl.patch \ - file://0002-Remove-FILEWRAP.patch \ + file://0001-Fix-file_Emu-on-musl.patch \ + file://0002-Remove-FILEWRAP.patch \ " SRC_URI[addons.md5sum] = "719614fa764011a18665d08af5c8c92f" SRC_URI[addons.sha256sum] = "350da57408c27473eaf40e7f544bc94841bf101dc4346085260c5c4af0adac97" @@ -102,8 +101,10 @@ ACCEL ?= "" ACCEL_x86 = "vaapi vdpau" ACCEL_x86-64 = "vaapi vdpau" -PACKAGECONFIG ??= "${ACCEL} opengl" -PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' x11', ' openglesv2', d)}" +PACKAGECONFIG ??= "${ACCEL} opengl \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'openglesv2', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'samba', '', d)} \ +" PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles," PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl,virtual/egl" @@ -113,6 +114,7 @@ PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxinerama libxmu libxrandr libxtst" PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" PACKAGECONFIG[lcms] = "--enable-lcms2,--disable-lcms2,lcms" +PACKAGECONFIG[samba] = "--enable-samba,--disable-samba,samba" EXTRA_OECONF = " \ --disable-debug \ @@ -183,29 +185,31 @@ FILES_${PN}-dbg += "${libdir}/kodi/.debug ${libdir}/kodi/*/.debug ${libdir}/kodi # kodi uses some kind of dlopen() method for libcec so we need to add it manually # OpenGL builds need glxinfo, that's in mesa-demos -RRECOMMENDS_${PN}_append = " libcec \ - python \ - python-ctypes \ - python-lang \ - python-re \ - python-netclient \ - python-html \ - python-difflib \ - python-json \ - python-zlib \ - python-shell \ - python-sqlite3 \ - python-compression \ - libcurl \ - ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'xrandr xdpyinfo', '', d)} \ +RRECOMMENDS_${PN}_append = " \ + libcec \ + python \ + python-ctypes \ + python-lang \ + python-re \ + python-netclient \ + python-html \ + python-difflib \ + python-json \ + python-zlib \ + python-shell \ + python-sqlite3 \ + python-compression \ + libcurl \ + ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'xrandr xdpyinfo', '', d)} \ +" +RRECOMMENDS_${PN}_append_libc-glibc = " \ + glibc-charmap-ibm850 \ + glibc-gconv-ibm850 \ + glibc-gconv-unicode \ + glibc-gconv-utf-32 \ + glibc-charmap-utf-8 \ + glibc-localedata-en-us \ " -RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 \ - glibc-gconv-ibm850 \ - glibc-gconv-unicode \ - glibc-gconv-utf-32 \ - glibc-charmap-utf-8 \ - glibc-localedata-en-us \ - " RPROVIDES_${PN} += "xbmc" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch new file mode 100644 index 000000000..bd5e1b603 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch @@ -0,0 +1,50 @@ +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/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb index 29167d1aa..fe864c49c 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb @@ -7,6 +7,7 @@ SRC_URI = "http://quitte.de/dsp/${PN}_${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" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch new file mode 100644 index 000000000..0e1846e31 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch @@ -0,0 +1,76 @@ +From 2de7e128fbdf528716b500cf27ed9a4358c931c9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 24 Nov 2017 00:05:35 +0100 +Subject: [PATCH 2/2] Use ARM-NEON accelaration for float-multithreaded setups +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + src/rvoice/fluid_rvoice_mixer.c | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/src/rvoice/fluid_rvoice_mixer.c b/src/rvoice/fluid_rvoice_mixer.c +index 9616518..dbf8057 100644 +--- a/src/rvoice/fluid_rvoice_mixer.c ++++ b/src/rvoice/fluid_rvoice_mixer.c +@@ -27,6 +27,10 @@ + #include "fluid_ladspa.h" + #include "fluid_synth.h" + ++#if defined(__ARM_NEON__) ++#include "arm_neon.h" ++#endif ++ + + #define ENABLE_MIXER_THREADS 1 + +@@ -794,20 +798,42 @@ fluid_mixer_buffers_mix(fluid_mixer_buffers_t* dest, fluid_mixer_buffers_t* src) + if (minbuf > src->buf_count) + minbuf = src->buf_count; + for (i=0; i < minbuf; i++) { ++#if defined(__ARM_NEON__) && defined(WITH_FLOAT) ++ for (j=0; j < scount; j+=4) { ++ float32x4_t vleft = vld1q_f32(&dest->left_buf[i][j]); ++ float32x4_t vright = vld1q_f32(&dest->right_buf[i][j]); ++ vleft = vaddq_f32(vleft, vld1q_f32(&src->left_buf[i][j])); ++ vright = vaddq_f32(vright, vld1q_f32(&src->right_buf[i][j])); ++ vst1q_f32(&dest->left_buf[i][j], vleft); ++ vst1q_f32(&dest->right_buf[i][j], vright); ++ } ++#else + for (j=0; j < scount; j++) { + dest->left_buf[i][j] += src->left_buf[i][j]; + dest->right_buf[i][j] += src->right_buf[i][j]; + } ++#endif + } + + minbuf = dest->fx_buf_count; + if (minbuf > src->fx_buf_count) + minbuf = src->fx_buf_count; + for (i=0; i < minbuf; i++) { ++#if defined(__ARM_NEON__) && defined(WITH_FLOAT) ++ for (j=0; j < scount; j+=4) { ++ float32x4_t vleft = vld1q_f32(&dest->fx_left_buf[i][j]); ++ float32x4_t vright = vld1q_f32(&dest->fx_right_buf[i][j]); ++ vleft = vaddq_f32(vleft, vld1q_f32(&src->fx_left_buf[i][j])); ++ vright = vaddq_f32(vright, vld1q_f32(&src->fx_right_buf[i][j])); ++ vst1q_f32(&dest->fx_left_buf[i][j], vleft); ++ vst1q_f32(&dest->fx_right_buf[i][j], vright); ++ } ++#else + for (j=0; j < scount; j++) { + dest->fx_left_buf[i][j] += src->fx_left_buf[i][j]; + dest->fx_right_buf[i][j] += src->fx_right_buf[i][j]; + } ++#endif + } + } + +-- +2.9.5 + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.10.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.10.bb new file mode 100644 index 000000000..0ec4c49ce --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.10.bb @@ -0,0 +1,24 @@ +SUMMARY = "Fluidsynth is a software synthesizer" +HOMEPAGE = "http://www.fluidsynth.org/" +SECTION = "libs/multimedia" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" + +DEPENDS = "alsa-lib ncurses glib-2.0" + +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" +S = "${WORKDIR}/git" + +inherit cmake pkgconfig lib_package + +EXTRA_OECMAKE = "-Denable-floats=ON -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" + +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[portaudio] = "-Denable-portaudio=ON,-Denable-portaudio=OFF,portaudio-v19" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb deleted file mode 100644 index 88981e44b..000000000 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Fluidsynth is a software synthesizer" -HOMEPAGE = "http://www.fluidsynth.org/" -SECTION = "libs/multimedia" -LICENSE = "LGPL-2.0+" -LIC_FILES_CHKSUM = "file://COPYING;md5=e198e9aac94943d0ec29a7dae8c29416" - -DEPENDS = "alsa-lib ncurses glib-2.0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BP}/${BP}.tar.gz" -SRC_URI[md5sum] = "ae5aca6de824b4173667cbd3a310b263" -SRC_URI[sha256sum] = "50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bccee2171c" - -inherit autotools-brokensep pkgconfig lib_package - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" -PACKAGECONFIG[sndfile] = "--enable-libsndfile-support,--disable-libsndfile-support,libsndfile1" -PACKAGECONFIG[jack] = "--enable-jack-support,--disable-jack-support,jack" -PACKAGECONFIG[pulseaudio] = "--enable-pulse-support,--disable-pulse-support,pulseaudio" -PACKAGECONFIG[portaudio] = "--enable-portaudio-support,--disable-portaudio-support,portaudio-v19" - -do_configure_prepend () { - rm -f ${S}/m4/* -} diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff deleted file mode 100644 index 5f08afe59..000000000 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff +++ /dev/null @@ -1,16 +0,0 @@ -Lower the rank of ffmpeg plugin so codecs that hook into accelerated pieces (e.g. dsp or hw engines) can get picked over this -Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> - -Upstream-Status: Inappropriate [embedded specific] - ---- /tmp/gstffmpegdec.c 2009-03-05 09:31:15.000000000 +0100 -+++ gst-ffmpeg-0.10.6/ext/ffmpeg/gstffmpegdec.c 2009-03-05 09:33:09.000000000 +0100 -@@ -2588,7 +2588,7 @@ - case CODEC_ID_MSMPEG4V3: - case CODEC_ID_H264: - case CODEC_ID_COOK: -- rank = GST_RANK_PRIMARY; -+ rank = GST_RANK_SECONDARY; - break; - case CODEC_ID_DVVIDEO: - /* we have a good dv decoder, fast on both ppc as well as x86. they say diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb index a3bfa5fe8..f2354648d 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb @@ -25,7 +25,6 @@ EXTRA_OECONF += "--disable-freetypetest" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs" PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" PACKAGECONFIG[x11] = "--enable-x --enable-xvideo,--disable-x --disable-xvideo,virtual/libx11 libxv libsm libice" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch index 3afca4ec9..69b21dd87 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch @@ -1,34 +1,38 @@ index gst-rtsp_0.10.8/bindings/python/Makefile.am ---- gst-rtsp_0.10.8.orig/bindings/python/Makefile.am -+++ gst-rtsp_0.10.8/bindings/python/Makefile.am +Index: gst-rtsp-0.10.8/bindings/python/Makefile.am +=================================================================== +--- gst-rtsp-0.10.8.orig/bindings/python/Makefile.am ++++ gst-rtsp-0.10.8/bindings/python/Makefile.am @@ -14,7 +14,7 @@ defs_DATA = $(DEFS) defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs OVERRIDES = rtspserver.override - + -INCLUDES = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES) - + rtspserver_la_CFLAGS = -I$(top_srcdir)/src \ - $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -index gst-rtsp_0.10.8/examples/Makefile.am ---- gst-rtsp_0.10.8.orig/examples/Makefile.am -+++ gst-rtsp_0.10.8/examples/Makefile.am + $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +Index: gst-rtsp-0.10.8/examples/Makefile.am +=================================================================== +--- gst-rtsp-0.10.8.orig/examples/Makefile.am ++++ gst-rtsp-0.10.8/examples/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = test-video test-ogg test-mp4 test-readme test-launch test-sdp test-uri test-auth - + -INCLUDES = -I$(top_srcdir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) - + AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) AM_LDFLAGS = \ -index gst-rtsp_0.10.8/tests/Makefile.am ---- gst-rtsp_0.10.8.orig/tests/Makefile.am -+++ gst-rtsp_0.10.8/tests/Makefile.am +Index: gst-rtsp-0.10.8/tests/Makefile.am +=================================================================== +--- gst-rtsp-0.10.8.orig/tests/Makefile.am ++++ gst-rtsp-0.10.8/tests/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = test-cleanup - + -INCLUDES = -I$(top_srcdir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) - + AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) AM_LDFLAGS = \ diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc new file mode 100644 index 000000000..10ee5bcb2 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "Gstreamer Daemon 1.0" +SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages" +HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0" +SECTION = "multimedia" +LICENSE = "GPLv2+" + +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon" + +SRCBRANCH ?= "master" +SRCREV = "097a086a8606dcb368c7d38c7ec4fefc2497401b" +SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \ + file://0001-gstd-yocto-compatibility.patch" + +S = "${WORKDIR}/git" + +PACKAGECONFIG_CONFARGS = " \ + --disable-gtk-doc \ +" + +inherit autotools pkgconfig gettext + +do_configure() { +${S}/autogen.sh +oe_runconf +} diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch new file mode 100644 index 000000000..ddc183193 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch @@ -0,0 +1,63 @@ +From eaf51d6420c63713f62025583681007c3502d387 Mon Sep 17 00:00:00 2001 +From: Carlos <carlos.rodriguez@ridgerun.com> +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 ++++ b/gstd/Makefile.am +@@ -49,7 +49,7 @@ bin_PROGRAMS = gstd + + gstd_SOURCES = gstd.c + gstd_CFLAGS = $(GST_CFLAGS) $(GIO_CFLAGS) $(GJSON_CFLAGS) +-gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GJSON_LIBS) -Wl,-rpath -Wl,$(libdir) ++gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GJSON_LIBS) + gstd_LDADD = libgstd-core.la + + gstdincludedir = $(includedir)/gstd +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb new file mode 100644 index 000000000..94f6b575b --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb @@ -0,0 +1,3 @@ +require gstd.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch index 89133adec..df0c2355d 100755 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch @@ -1,9 +1,9 @@ Index: libdc1394/examples/Makefile.am =================================================================== ---- libdc1394.orig/examples/Makefile.am 2012-06-30 17:50:46.000000000 -0700 -+++ libdc1394/examples/Makefile.am 2012-06-30 19:02:13.822646430 -0700 -@@ -36,8 +36,7 @@ - AM_LDFLAGS = -framework CoreFoundation -framework Carbon +--- libdc1394.orig/examples/Makefile.am ++++ libdc1394/examples/Makefile.am +@@ -36,8 +36,7 @@ if HAVE_MACOSX + AM_LDFLAGS = -framework CoreFoundation $(FRAMEWORK_IOKIT) endif -noinst_PROGRAMS = $(A) diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb new file mode 100644 index 000000000..cd075ffe1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "libde265 is an open source implementation of the h.265 \ +video codec. It is written from scratch and has a plain C API to enable a \ +simple integration into other software." +HOMEPAGE = "http://www.libde265.org/" +SECTION = "libs/multimedia" + +LICENSE = "LGPLv3" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://COPYING;md5=852f345c1c52c9160f9a7c36bb997546" + +SRC_URI = "https://github.com/strukturag/libde265/releases/download/v${PV}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "93520b378df25f3a94e962f2b54872cc" +SRC_URI[sha256sum] = "eaa0348839c2935dd90647d72c6dd4a043e36361cb3c33d2b04df10fbcebd3cb" + +EXTRA_OECONF = "--disable-sherlock265 --disable-dec265" + +inherit autotools-brokensep pkgconfig + +PACKAGES =+ "${PN}-tools" +FILES_${PN}-tools = "${bindir}/*" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch index d59d12e69..db4d6e8c9 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch @@ -6,11 +6,11 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Kumar Gala <galak@kernel.crashing.org> -Index: libmusicbrainz-3.0.3/CMakeLists.txt +Index: git/CMakeLists.txt =================================================================== ---- libmusicbrainz-3.0.3.orig/CMakeLists.txt -+++ libmusicbrainz-3.0.3/CMakeLists.txt -@@ -26,7 +26,7 @@ FIND_PACKAGE(DiscId) +--- git.orig/CMakeLists.txt ++++ git/CMakeLists.txt +@@ -36,7 +36,7 @@ FIND_PACKAGE(LibXml2 REQUIRED) SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) @@ -18,4 +18,4 @@ Index: libmusicbrainz-3.0.3/CMakeLists.txt +SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries") SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz3.pc) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz5.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc) diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb index 2eb21a369..6754f347e 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb @@ -16,7 +16,7 @@ DEPENDS += " \ curl \ sqlite \ bzip2 \ - pulseaudio \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ tcp-wrappers \ openal-soft \ yajl \ @@ -36,18 +36,18 @@ DEPENDS += " \ dbus \ expat \ zlib \ - libupnp1.6 \ + 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.19/${BP}.tar.xz \ + http://www.musicpd.org/download/${BPN}/0.20/${BP}.tar.xz \ file://mpd.conf.in \ " -SRC_URI[md5sum] = "fc19f76b512bd471b6af5214965ff7c5" -SRC_URI[sha256sum] = "8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730" +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)}" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb new file mode 100644 index 000000000..44c46f81e --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "OpenH264 is a codec library which supports H.264 encoding and \ +decoding. It is suitable for use in real time applications such as WebRTC." +HOMEPAGE = "http://www.openh264.org/" +SECTION = "libs/multimedia" + +DEPENDS_x86 += "nasm-native" +DEPENDS_x86-64 += "nasm-native" + +LICENSE = "BSD-2-Clause" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf" + +S = "${WORKDIR}/git" +SRCREV = "a180c9d4d6f1a4830ca9eed9d159d54996bd63cb" +BRANCH = "openh264v1.7" +SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH};" + +COMPATIBLE_MACHINE_armv7a = "(.*)" +COMPATIBLE_MACHINE_aarch64 = "(.*)" +COMPATIBLE_MACHINE_x86 = "(.*)" +COMPATIBLE_MACHINE_x86-64 = "(.*)" +COMPATIBLE_MACHINE_mips = "(.*)" +COMPATIBLE_MACHINE_mips64 = "(.*)" + +EXTRA_OEMAKE_armv7a = "ARCH=arm" +EXTRA_OEMAKE_aarch64 = "ARCH=arm64" +EXTRA_OEMAKE_x86 = "ARCH=i386" +EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" +EXTRA_OEMAKE_mips = "ARCH=mips" +EXTRA_OEMAKE_mips64 = "ARCH=mips64" + +do_configure() { + : +} + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${prefix} +} diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb new file mode 100644 index 000000000..189dc87c4 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Library for opening, seeking, and decoding opus audio files" +HOMEPAGE = "https://www.opus-codec.org/" +SECTION = "audio" + +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[md5sum] = "ab3f7d15d766f5b36b0951ee435f9ebf" +SRC_URI[sha256sum] = "48e03526ba87ef9cf5f1c47b5ebe3aa195bd89b912a57060c36184a6cd19412f" + +inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch index 2ed8d22c6..838400f07 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch @@ -5,10 +5,10 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Upstream-Status: Inappropriate [configuration] -Index: schroedinger-1.0.9/configure.ac +Index: schroedinger-1.0.11/configure.ac =================================================================== ---- schroedinger-1.0.9.orig/configure.ac -+++ schroedinger-1.0.9/configure.ac +--- schroedinger-1.0.11.orig/configure.ac ++++ schroedinger-1.0.11/configure.ac @@ -54,7 +54,7 @@ if test "x${HAVE_ORC}" != xyes ; then AC_ERROR([orc-0.4 >= $ORC_VER is required]) fi @@ -16,5 +16,5 @@ Index: schroedinger-1.0.9/configure.ac -ORCC=`$PKG_CONFIG --variable=orcc orc-0.4` +ORCC=$STAGING_DIR`$PKG_CONFIG --variable=orcc orc-0.4` AC_SUBST(ORCC) + AM_CONDITIONAL(HAVE_ORCC, test "x$cross_compiling" != xyes) - AC_ARG_WITH([thread], diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch new file mode 100644 index 000000000..44c6b19be --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch @@ -0,0 +1,34 @@ +From b1809d82031aa7c5bcaad58bcb4b59e082e0446e Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Sun, 5 Nov 2017 15:40:16 +0000 +Subject: [PATCH] Update exported symbol list + +commit 5c58413544 ("Don't export (most) internal libsox symbols") +breaks dynamic flac builds as flac.c references lsx.error, so add it +to the list of exceptions. + +| .libs/flac.o: In function `decoder_read_callback': +| /usr/src/debug/sox/14.4.2-r0/sox-14.4.2/src/flac.c:63: undefined reference to `lsx_error' + +Upstream-Status: Backport [https://bogomips.org/sox.git ("pu" branch)] + +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 7cceaafd..a3a04ed1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -95,7 +95,7 @@ libsox_la_LIBADD += @GOMP_LIBS@ + + libsox_la_CFLAGS = @WARN_CFLAGS@ + libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \ +- -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' ++ -export-symbols-regex '^(sox_.*|lsx_(([cm]|re)alloc|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|error|fail_errno|filelength|find_(enum_(text|value)|file_extension)|flush|getopt(_init)?|id3_read_tag|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|rewind|seeki|sigfigs3p?|strcasecmp|strdup|tell|unreadb|write(b|_b_buf|buf|s)))$$' + + if HAVE_WIN32_LTDL + libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h +-- +2.16.2 + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch index 605863a22..4f02a66fc 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch @@ -1,4 +1,4 @@ -From c2aed28e3e14329ad0a8c4371fdcce9934013f21 Mon Sep 17 00:00:00 2001 +From d0313be5fb947df399a4db24a5f9244510d2ce87 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 12 Jul 2017 16:36:06 -0700 Subject: [PATCH] remove the #error line and live without file-type detection @@ -12,17 +12,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 deletion(-) diff --git a/src/formats.c b/src/formats.c -index 7e231ca..b13f0d5 100644 +index 724a4cda..f683a922 100644 --- a/src/formats.c +++ b/src/formats.c -@@ -416,7 +416,6 @@ static void UNUSED rewind_pipe(FILE * fp) +@@ -422,7 +422,6 @@ static void UNUSED rewind_pipe(FILE * fp) /* To fix this #error, either simply remove the #error line and live without * file-type detection with pipes, or add support for your compiler in the - * lines above. Test with cat monkey.au | ./sox --info - */ + * lines above. Test with cat monkey.wav | ./sox --info - */ - #error FIX NEEDED HERE #define NO_REWIND_PIPE (void)fp; #endif -- -2.13.2 +2.16.2 diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb index 3eb1856e0..21fddd1e1 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb @@ -4,13 +4,11 @@ and can apply different effects and filters to the audio data." HOMEPAGE = "http://sox.sourceforge.net" SECTION = "audio" -DEPENDS = "libpng ffmpeg libsndfile1 libvorbis" +DEPENDS = "libpng ffmpeg libsndfile1" # While this item does not require it, it depends on ffmpeg which does LICENSE_FLAGS = "commercial" -PR = "r2" - PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \ magic \ " @@ -20,6 +18,8 @@ PACKAGECONFIG[wavpack] = "--with-wavpack=dyn,--with-wavpack=no,wavpack," PACKAGECONFIG[flac] = "--with-flac=dyn,--with-flac=no,flac," PACKAGECONFIG[amrwb] = "--with-amrwb=dyn,--with-amrwb=no,opencore-amr," PACKAGECONFIG[amrnb] = "--with-amrnb=dyn,--with-amrnb=no,opencore-amr," +PACKAGECONFIG[oggvorbis] = "--with-oggvorbis=dyn,--with-oggvorbis=no,libvorbis" +PACKAGECONFIG[opus] = "--with-opus=dyn,--with-opus=no,opusfile" PACKAGECONFIG[magic] = "--with-magic,--without-magic,file," PACKAGECONFIG[mad] = "--with-mad,--without-mad,libmad," PACKAGECONFIG[id3tag] = "--with-id3tag,--without-id3tag,libid3tag," @@ -32,11 +32,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ file://0001-remove-the-error-line-and-live-without-file-type-det.patch \ + file://0001-Update-exported-symbol-list.patch \ " -SRC_URI[md5sum] = "b0c15cff7a4ba0ec17fdc74e6a1f9cf1" -SRC_URI[sha256sum] = "3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3" - -inherit autotools - -BBCLASSEXTEND = "native" +SRC_URI[md5sum] = "d04fba2d9245e661f245de0577f48a33" +SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c" +inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb new file mode 100644 index 000000000..66b95db00 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "TinyALSA is a small library to interface with ALSA in \ +the Linux kernel. It is a lightweight alternative to libasound." +HOMEPAGE = "https://github.com/tinyalsa/tinyalsa" +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;" + +do_configure() { + : +} + +do_compile() { + oe_runmake CC='${CC}' LD='${CC}' AR='${AR}' +} + +do_install() { + oe_runmake install \ + PREFIX="${prefix}" DESTDIR="${D}" INCDIR="${includedir}/tinyalsa" \ + LIBDIR="${libdir}" BINDIR="${bindir}" MANDIR="${mandir}" +} + +PACKAGES =+ "${PN}-tools" +FILES_${PN}-tools = "${bindir}/*" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc index acb3ccd1d..8e82b3bd3 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -57,7 +57,6 @@ PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" PACKAGECONFIG[qt4] = "--enable-qt,--disable-qt, qt4-x11-free" PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" -PACKAGECONFIG[gnome-vfs] = "--enable-gnomevfs,--disable-gnomevfs, gnome-vfs" PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_0.2.3.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_0.2.3.bb index b6cdc4f14..07d0c5561 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_0.2.3.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_0.2.3.bb @@ -5,18 +5,16 @@ SECTION = "multimedia" LICENSE = "LGPL-3.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "https://github.com/kirushyk/gst-instruments/archive/${PV}.tar.gz" - -SRC_URI[md5sum] = "14a394dec25642848b17f9999f1b4999" -SRC_URI[sha256sum] = "5565658a33ff9596946541304fbdd3b3683dbb82171a0e6ce56f42b64a01e58d" +DEPENDS = "gstreamer1.0" -S = "${WORKDIR}/gst-instruments-${PV}" +S = "${WORKDIR}/git" +SRCREV = "4ce8092636ee6572148b5fa044080734cf5a6b8d" +SRC_URI = "git://github.com/kirushyk/gst-instruments.git;protocol=https;" +FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*a" FILES_${PN} += "${libdir}/*" INSANE_SKIP_${PN} = "dev-so" -DEPENDS = "gstreamer1.0" - inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb index 8abaa1284..ee8c68bc1 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb @@ -5,11 +5,11 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=15bc16b9d2e305974dde47e733883714" -SRC_URI = "https://github.com/cisco/libsrtp/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ +S = "${WORKDIR}/git" +SRCREV = "e806a66bad35f4b215b7a825c24ef0ec4cc19569" +SRC_URI = "git://github.com/cisco/libsrtp.git;protocol=https; \ file://0001-Rename-conflicting-variable-mips.patch \ " -SRC_URI[md5sum] = "2309aa6027992810a4285b042c71e644" -SRC_URI[sha256sum] = "86e1efe353397c0751f6bdd709794143bd1b76494412860f16ff2b6d9c304eda" inherit autotools @@ -18,3 +18,5 @@ do_install[postfuncs] += " rm_unused_bindir " rm_unused_bindir() { rmdir ${D}/${bindir} } + +ALLOW_EMPTY_${PN} = "1" |