diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-multimedia')
9 files changed, 8 insertions, 233 deletions
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch deleted file mode 100644 index 835b26601..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 54b1c2e27bf81f94c727b4923d4ed592110e2796 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sun, 29 May 2011 21:05:15 +0200 - ---- - alsa/stdioemu.c | 8 +++++++- - configure.ac | 6 ++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/alsa/stdioemu.c b/alsa/stdioemu.c -index f7f9ab5..b673fe3 100644 ---- a/alsa/stdioemu.c -+++ b/alsa/stdioemu.c -@@ -37,7 +37,9 @@ - #endif - - #include <stdio.h> -- -+#ifdef HAVE_LIBIO_H -+#include <libio.h> -+#endif - struct fd_cookie { - int fd; - }; -@@ -98,7 +100,11 @@ static FILE *fake_fopen(const char *path, const char *mode, int flags) - - if (open_mode && fdc->fd > 0) { - result = fopencookie (fdc,"w", fns); -+#ifdef HAVE_FILENO - result->_fileno = fdc->fd; /* ugly patchy slimy kludgy hack */ -+#else -+ result->__filedes = fdc->fd; -+#endif - } - return result; - } -diff --git a/configure.ac b/configure.ac -index 583b95f..60a1025 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -35,6 +35,12 @@ if test "$with_aoss" = "yes"; then - LIBS="$OLD_LIBS" - fi - -+AC_CHECK_HEADERS_ONCE([libio.h]) -+ -+AC_CHECK_MEMBER([struct _IO_FILE._fileno], -+ [AC_DEFINE([HAVE_FILENO], [1],[Define if _fileno exists.])], -+ [],[]) -+ - AC_OUTPUT(Makefile alsa/Makefile alsa/aoss alsa/aoss.old \ - oss-redir/Makefile test/Makefile \ - alsa/testaoss test/testaoss) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb index 46ab50316..e6b9d6b5b 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb @@ -1,34 +1,10 @@ -# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. -# The following is the difference between the old and the new license text. -# Please update the LICENSE value if needed, and summarize the changes in -# the commit message via 'License-Update:' tag. -# (example: 'License-Update: copyright years updated.') -# -# The changes: -# -# --- COPYING -# +++ COPYING -# @@ -2,7 +2,8 @@ -# Version 2, June 1991 -# -# Copyright (C) 1989, 1991 Free Software Foundation, Inc. -# - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -# + -# Everyone is permitted to copy and distribute verbatim copies -# of this license document, but changing it is not allowed. -# -# -# - SUMMARY = "Alsa OSS Compatibility Package" SECTION = "libs/multimedia" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=ed055b4eff93da784176a01582e6ec1a" DEPENDS = "alsa-lib" -SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ - file://libio.patch \ +SRC_URI = "https://www.alsa-project.org/files/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ " SRC_URI[md5sum] = "9ec4bb783fdce19032aace086d65d874" SRC_URI[sha256sum] = "64adcef5927e848d2e024e64c4bf85b6f395964d9974ec61905ae4cb8d35d68e" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch b/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch deleted file mode 100644 index 130f3c229..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 945df2da87a412758ceab4ac5711abbb269a47c1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 8 Jun 2017 23:09:51 -0700 -Subject: [PATCH] audio_alsa09.c: alsa drain fix - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - audio_alsa09.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/audio_alsa09.c b/audio_alsa09.c -index 534e3db..d9450e6 100644 ---- a/audio_alsa09.c -+++ b/audio_alsa09.c -@@ -506,7 +506,7 @@ void esd_audio_flush(void) - } - - if (alsa_playback_handle != NULL) -- snd_pcm_drain( alsa_playback_handle ); -+ snd_pcm_drop( alsa_playback_handle ); - - if (alsadbg) - print_state(); diff --git a/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch b/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch deleted file mode 100644 index 10a6ba03a..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e218d5a0a545ebb9623d62da5cfca478f9c90fce Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 8 Jun 2017 23:11:31 -0700 -Subject: [PATCH] Undefine open64 and fopen64 - -Since the signatures do not match with libc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - esddsp.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/esddsp.c b/esddsp.c -index d3c6ea9..17b5949 100644 ---- a/esddsp.c -+++ b/esddsp.c -@@ -290,6 +290,7 @@ open (const char *pathname, int flags, ...) - return open_wrapper(func, pathname, flags, mode); - } - -+#undef open64 - int - open64 (const char *pathname, int flags, ...) - { -@@ -374,6 +375,7 @@ fopen (const char *path, const char *mode) - return fopen_wrapper(func, path, mode); - } - -+#undef fopen64 - FILE * - fopen64 (const char *path, const char *mode) - { diff --git a/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch b/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch deleted file mode 100644 index 83365b4e6..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 89c62db54716d514e639f9e1bfd3c1f7d82641dd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 8 Jun 2017 23:12:36 -0700 -Subject: [PATCH] Use -I=<path> in configure - -This helps to use proper sysroot in -cross build environment - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5645dce..d374cda 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -208,7 +208,7 @@ if test "x$enable_local_sound" = "xyes"; then - AC_CHECK_HEADERS(CoreAudio/CoreAudio.h) - # mme_api.h directly includes other files from the mme subdir - xCPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS -I/usr/include/mme" -+ CPPFLAGS="$CPPFLAGS -I=/usr/include/mme" - AC_CHECK_HEADERS(mme/mme_api.h) - CPPFLAGS="$xCPPFLAGS" - AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no) -@@ -269,7 +269,7 @@ if test "x$enable_local_sound" = "xyes"; then - osf*) - found_sound=yes - AC_DEFINE(DRIVER_OSF, 1, [Defined if OSF backend is enabled]) -- CPPFLAGS="$CPPFLAGS -I/usr/include/mme" -+ CPPFLAGS="$CPPFLAGS -I=/usr/include/mme" - SOUND_LIBS=-lmme - esac - fi diff --git a/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/no-docs.patch b/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/no-docs.patch deleted file mode 100644 index 8a546e6db..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/no-docs.patch +++ /dev/null @@ -1,19 +0,0 @@ -From bfcaa9bdc70440db96f10afc0c2a792870f75acb Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Fri, 3 Jun 2011 19:39:02 +0200 - ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 08c4c94..ede9d26 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,5 +1,5 @@ - --SUBDIRS = docs -+SUBDIRS = - - ACLOCAL_AMFLAGS = -I m4 - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb b/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb deleted file mode 100644 index d703f23d9..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Enlightened Sound Daemon" -SECTION = "gpe/base" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "audiofile" - -inherit gnome - -SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/${BP}.tar.bz2;name=archive \ - file://no-docs.patch \ - file://0001-audio_alsa09.c-alsa-drain-fix.patch \ - file://0002-Undefine-open64-and-fopen64.patch \ - file://0003-Use-I-path-in-configure.patch \ - " -SRC_URI[archive.md5sum] = "8d9aad3d94d15e0d59ba9dc0ea990c6c" -SRC_URI[archive.sha256sum] = "5eb5dd29a64b3462a29a5b20652aba7aa926742cef43577bf0796b787ca34911" - -EXTRA_OECONF += " \ - --disable-arts \ - --disable-artstest \ -" -EXTRA_OECONF_remove = "--disable-schemas-install" - -CFLAGS += "-lm" - -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[libwrap] = "--with-libwrap,--without-libwrap,tcp-wrappers," -PACKAGECONFIG[alsa] = "--enable-alsa --disable-oss,--disable-alsa,alsa-lib," - -PACKAGECONFIG ??= "libwrap alsa \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ -" -PACKAGES =+ "esddsp esd esd-utils" - -FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*" -FILES_esd = "${bindir}/esd" -FILES_esd-utils = "${bindir}/*" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb index 6586e352e..d334956a8 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb @@ -14,15 +14,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" # While this item does not require it, it depends on ffmpeg which does LICENSE_FLAGS = "commercial" +SRCREV_mpv = "4db82f04502cbcd20d9a975df9dfde91d8c389e3" SRC_URI = " \ - https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ - http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;downloadfilename=waf;subdir=${BPN}-${PV} \ + git://github.com/mpv-player/mpv;name=mpv \ + http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;downloadfilename=waf;subdir=git \ " -SRC_URI[mpv.md5sum] = "038d0b660de07ff645ad6a741704ecab" -SRC_URI[mpv.sha256sum] = "daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46" SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" +S = "${WORKDIR}/git" + inherit waf pkgconfig pythonnative distro_features_check LUA ?= "lua" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb index 6a8274405..421ea9d5c 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb @@ -2,9 +2,9 @@ DESCRIPTION = "PulseAudio Volume Control (pavucontrol) is a simple GTK based vol LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "intltool-native gtkmm3 libcanberra pulseaudio" +DEPENDS = "intltool-native gtk+3-native gtkmm3 libcanberra pulseaudio" -inherit gnome distro_features_check +inherit gnomebase distro_features_check REQUIRED_DISTRO_FEATURES = "x11" |