diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-multimedia')
21 files changed, 226 insertions, 493 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index f0efc51e19..c0f220fa6c 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8" SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch \ file://0001-genisoimage-Fix-fprintf-format-errors.patch \ + file://0001-define-__THROW-to-avoid-build-issue-with-musl.patch \ + file://0002-Do-not-use-rcmd-on-build-with-musl.patch \ " SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch new file mode 100644 index 0000000000..b3beb069eb --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch @@ -0,0 +1,47 @@ +From 7c3036609494296f7c29413bf3acba829c81f62c Mon Sep 17 00:00:00 2001 +From: Romain Naour <romain.naour@openwide.fr> +Date: Sat, 8 Aug 2015 22:58:57 +0200 +Subject: [PATCH 1/2] define __THROW to avoid build issue with musl + +Fixes: +http://autobuild.buildroot.net/results/d27/d2781e70b04a207e2e9397d888032294c7285034/build-end.log + +Signed-off-by: Romain Naour <romain.naour@openwide.fr> +--- + genisoimage/sha256.h | 4 ++++ + genisoimage/sha512.h | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/genisoimage/sha256.h b/genisoimage/sha256.h +index e7f4cb9..bcae7ef 100644 +--- a/genisoimage/sha256.h ++++ b/genisoimage/sha256.h +@@ -29,6 +29,10 @@ + #include <stdint.h> + #include <stdio.h> + ++/* define __THROW to avoid build issue when it's not available from the libc */ ++#ifndef __THROW ++# define __THROW ++#endif + + /* Structure to save state of computation between the single steps. */ + struct sha256_ctx +diff --git a/genisoimage/sha512.h b/genisoimage/sha512.h +index 7298355..8cee8b0 100644 +--- a/genisoimage/sha512.h ++++ b/genisoimage/sha512.h +@@ -29,6 +29,10 @@ + #include <stdint.h> + #include <stdio.h> + ++/* define __THROW to avoid build issue when it's not available from the libc */ ++#ifndef __THROW ++# define __THROW ++#endif + + /* Structure to save state of computation between the single steps. */ + struct sha512_ctx +-- +2.14.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch new file mode 100644 index 0000000000..547a21c67f --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch @@ -0,0 +1,31 @@ +From 510838b2c96a9b097b3ee2694cba1c3623b0bac7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Sep 2017 22:38:05 -0700 +Subject: [PATCH 2/2] Do not use rcmd on build with musl + +cdrkit unconditionally enables code using rcmd(3), which isn't available +on musl. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/xconfig.h.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/xconfig.h.in b/include/xconfig.h.in +index 476c00b..6b4b298 100644 +--- a/include/xconfig.h.in ++++ b/include/xconfig.h.in +@@ -186,8 +186,9 @@ + * Instead use the tests AC_SMALL_FSEEKO/AC_SMALL/STELLO and make sure + * they are placed before the large file tests. + */ +- ++#ifdef __GLIBC__ + #define HAVE_RCMD 1 /* rcmd() is present in libc/libsocket */ ++#endif + #define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */ + #define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */ + #define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */ +-- +2.14.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch new file mode 100644 index 0000000000..6c7f3bd30d --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch @@ -0,0 +1,26 @@ +From a860fe0796c43e35eac9783140fcb563cab9f55a 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 1/3] 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(); +-- +2.13.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-replace-missing-AM_PATH_AUDIOFILE-by-PKG_CHECK_MODUL.patch b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-replace-missing-AM_PATH_AUDIOFILE-by-PKG_CHECK_MODUL.patch deleted file mode 100644 index 89c97a4fc4..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-replace-missing-AM_PATH_AUDIOFILE-by-PKG_CHECK_MODUL.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 218e0702d6ce4d2cb20d5d108daa16afca2b7c41 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 16 Dec 2016 13:22:51 +0100 -Subject: [PATCH] replace missing AM_PATH_AUDIOFILE by PKG_CHECK_MODULES( -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstrem-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 486c492..dccfd1b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -353,7 +353,7 @@ echo "---------------------------------------------------------------------" - echo "--- Checking for the audiofile library. NOTE: This library is now" - echo "--- REQUIRED from proper compilation of the esound package." - --AM_PATH_AUDIOFILE(0.1.5, [ -+PKG_CHECK_MODULES(AUDIOFILE, audiofile, [ - - build_esdplay=true - echo "--- libaudiofile found. Building esound with audiofile support" --- -2.7.4 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch new file mode 100644 index 0000000000..337546abe9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch @@ -0,0 +1,35 @@ +From 1fbee6e96384f340b816e221fe1c2f3ff0b487bf 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 2/3] 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) + { +-- +2.13.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch new file mode 100644 index 0000000000..62c880d9d0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch @@ -0,0 +1,38 @@ +From 979a02d9ec9c28686021cd2b49ca55d2195c9dce 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 3/3] 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 +-- +2.13.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/configure-fix.patch b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/configure-fix.patch deleted file mode 100644 index 8fdc35ad5e..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/configure-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/configure.ac 2008-06-02 16:46:55.640793306 +0200 -+++ esound-0.2.36/configure.ac 2008-06-02 16:47:26.030793494 +0200 -@@ -29,6 +29,7 @@ - AC_SUBST(pkgdocdir) - - AC_PROG_CC -+AC_PROG_CXX - AC_PROG_CPP - AC_LIBTOOL_WIN32_DLL - AM_PROG_LIBTOOL diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/esound_0.2.36-1ubuntu5.diff.gz b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/esound_0.2.36-1ubuntu5.diff.gz Binary files differdeleted file mode 100644 index 719f5d09de..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/esound_0.2.36-1ubuntu5.diff.gz +++ /dev/null diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb deleted file mode 100644 index d19ba8223c..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Enlightened Sound Daemon" -SECTION = "gpe/base" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "audiofile" - -inherit gnome binconfig - -PR = "r1" - -SRC_URI = " \ - ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2;name=archive \ - file://esound_0.2.36-1ubuntu5.diff.gz \ - file://no-docs.patch \ - file://configure-fix.patch \ - file://0001-replace-missing-AM_PATH_AUDIOFILE-by-PKG_CHECK_MODUL.patch \ -" - -SRC_URI[archive.md5sum] = "3facb5aa0115cc1c31771b9ad454ae76" -SRC_URI[archive.sha256sum] = "68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76" - -EXTRA_OECONF = " \ - --disable-alsa \ - --disable-arts \ - --disable-artstest \ -" - -CFLAGS += "-lm" - -do_configure_prepend() { - sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' ${S}/configure.ac -} - -PACKAGES =+ "esddsp esd esd-utils" - -FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*" -FILES_esd = "${bindir}/esd" -FILES_esd-utils = "${bindir}/*" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb new file mode 100644 index 0000000000..0ddf94f2da --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb @@ -0,0 +1,37 @@ +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/${P}.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/import-layers/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc index daae8d786b..14ea664422 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc @@ -16,12 +16,9 @@ MIRRORS += "http://www.live555.com/liveMedia/public/ http://distcache.FreeBSD.or S = "${WORKDIR}/live" TARGET_CC_ARCH += "${LDFLAGS}" -XLOCALE_libc-musl = " -DXLOCALE_NOT_USED" -XLOCALE ?= "" - do_configure() { cp ${WORKDIR}/config.linux-cross . - echo "COMPILE_OPTS+=" -fPIC ${XLOCALE}"" >> config.linux-cross + echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross ./genMakefiles linux-cross } diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna.inc b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna.inc deleted file mode 100644 index b333fce0bb..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna.inc +++ /dev/null @@ -1,39 +0,0 @@ -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 " - -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/import-layers/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb deleted file mode 100644 index 81d700a7b1..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc - -SRCREV = "v1_1_5" -LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" - -PNBLACKLIST[minidlna] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130630/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch deleted file mode 100644 index e232595cd9..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3541649b711a773aa2e42ac80d9b4c1b36fce23f Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 27 Mar 2014 00:08:54 +0100 -Subject: [PATCH] configure: don't disable ASS support when explicitly enabled - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 60fd308..2f7df3b 100755 ---- a/configure -+++ b/configure -@@ -4346,7 +4346,7 @@ fi - - - echocheck "SSA/ASS support" --if test "$_ass" = auto ; then -+if test "$_ass" = auto -o "$_ass" = yes ; then - if pkg_config_add libass ; then - _ass=yes - def_ass='#define CONFIG_ASS 1' --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch deleted file mode 100644 index b4d98412f2..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 0571bb4f1a6e1934ee7e093ce7aa517b9bac8e6a Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Sun, 17 Jan 2016 14:46:10 +0500 -Subject: [PATCH] demux_ogg: partially port libtheora glue code to Theora 1.0 - API - -This partially backports the following commit to allow building -with gcc-5.x and otherwise fails to find the definition of -the _ilog function the way it is used. - -https://github.com/pigoz/mplayer-svn/commit/85e51408cd00979fc209da8e3a39b6f0e7f325bc - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - libmpdemux/demux_ogg.c | 52 ++++++++++++++++++++++++++------------------------ - 1 file changed, 27 insertions(+), 25 deletions(-) - -diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c -index 9eea061..9144426 100644 ---- a/libmpdemux/demux_ogg.c -+++ b/libmpdemux/demux_ogg.c -@@ -50,8 +50,7 @@ - #endif - - #ifdef CONFIG_OGGTHEORA --#include <theora/theora.h> --int _ilog (unsigned int); /* defined in many places in theora/lib/ */ -+#include <theora/theoradec.h> - #endif - - #define BLOCK_SIZE 4096 -@@ -62,9 +61,10 @@ int _ilog (unsigned int); /* defined in many places in theora/lib/ */ - */ - #ifdef CONFIG_OGGTHEORA - typedef struct theora_struct_st { -- theora_state st; -- theora_comment cc; -- theora_info inf; -+ th_setup_info *tsi; -+ th_dec_ctx *tctx; -+ th_comment tc; -+ th_info ti; - } theora_struct_t; - #endif - -@@ -117,7 +117,7 @@ typedef struct ogg_stream { - float samplerate; /// granulpos 2 time - int64_t lastpos; - int32_t lastsize; -- int keyframe_frequency_force; -+ int keyframe_granule_shift; - - // Logical stream state - ogg_stream_state stream; -@@ -300,11 +300,10 @@ static unsigned char *demux_ogg_read_packet(ogg_stream_t *os, ogg_packet *pack, - have theora_state st, until all header packets were passed to the - decoder. */ - if (!pack->bytes || !(*data&0x80)) { -- int keyframe_granule_shift = _ilog(os->keyframe_frequency_force - 1); -- int64_t iframemask = (1 << keyframe_granule_shift) - 1; -+ int64_t iframemask = iframemask = (1 << os->keyframe_granule_shift) - 1; - - if (pack->granulepos >= 0) { -- os->lastpos = pack->granulepos >> keyframe_granule_shift; -+ os->lastpos = pack->granulepos >> os->keyframe_granule_shift; - os->lastpos += pack->granulepos & iframemask; - *keyframe = (pack->granulepos & iframemask) == 0; - } else { -@@ -888,14 +887,15 @@ int demux_ogg_open(demuxer_t *demuxer) - #ifdef CONFIG_OGGTHEORA - } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) { - int errorCode = 0; -- theora_info inf; -- theora_comment cc; -+ th_info ti; -+ th_comment tc; -+ th_setup_info *tsi = NULL; - -- theora_info_init (&inf); -- theora_comment_init (&cc); -+ th_info_init (&ti); -+ th_comment_init (&tc); - -- errorCode = theora_decode_header (&inf, &cc, &pack); -- if (errorCode) { -+ errorCode = th_decode_headerin(&ti, &tc, &tsi, &pack); -+ if (errorCode < 0) { - mp_msg(MSGT_DEMUX, MSGL_ERR, - "Theora header parsing failed: %i \n", errorCode); - } else { -@@ -904,30 +904,32 @@ int demux_ogg_open(demuxer_t *demuxer) - sh_v->bih = calloc(1, sizeof(*sh_v->bih)); - sh_v->bih->biSize = sizeof(*sh_v->bih); - sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA; -- sh_v->fps = ((double)inf.fps_numerator) / (double)inf.fps_denominator; -- sh_v->frametime = ((double)inf.fps_denominator) / (double)inf.fps_numerator; -- sh_v->disp_w = sh_v->bih->biWidth = inf.frame_width; -- sh_v->disp_h = sh_v->bih->biHeight = inf.frame_height; -+ sh_v->fps = ((double)ti.fps_numerator) / (double)ti.fps_denominator; -+ sh_v->frametime = ((double)ti.fps_denominator) / (double)ti.fps_numerator; -+ sh_v->i_bps = ti.target_bitrate / 8; -+ sh_v->disp_w = sh_v->bih->biWidth = ti.frame_width; -+ sh_v->disp_h = sh_v->bih->biHeight = ti.frame_height; - sh_v->bih->biBitCount = 24; - sh_v->bih->biPlanes = 3; - sh_v->bih->biSizeImage = ((sh_v->bih->biBitCount / 8) * sh_v->bih->biWidth * sh_v->bih->biHeight); - ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps; - ogg_d->subs[ogg_d->num_sub].theora = 1; -- ogg_d->subs[ogg_d->num_sub].keyframe_frequency_force = inf.keyframe_frequency_force; -+ ogg_d->subs[ogg_d->num_sub].keyframe_granule_shift = ti.keyframe_granule_shift; - ogg_d->subs[ogg_d->num_sub].id = n_video; - n_video++; - mp_msg(MSGT_DEMUX, MSGL_INFO, - "[Ogg] stream %d: video (Theora v%d.%d.%d), -vid %d\n", - ogg_d->num_sub, -- (int)inf.version_major, -- (int)inf.version_minor, -- (int)inf.version_subminor, -+ (int)ti.version_major, -+ (int)ti.version_minor, -+ (int)ti.version_subminor, - n_video - 1); - if (mp_msg_test(MSGT_HEADER, MSGL_V)) - print_video_header(sh_v->bih, MSGL_V); - } -- theora_comment_clear(&cc); -- theora_info_clear(&inf); -+ th_comment_clear(&tc); -+ th_info_clear(&ti); -+ th_setup_free(tsi); - #endif /* CONFIG_OGGTHEORA */ - } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) { - sh_a = new_sh_audio_aid(demuxer, ogg_d->num_sub, n_audio); --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb deleted file mode 100644 index 1a4ae27e61..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ /dev/null @@ -1,159 +0,0 @@ -SUMMARY = "Open Source multimedia player" -SECTION = "multimedia" -HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "libvpx libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \ - libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \ - libxv virtual/libx11 libass speex faad2 libxscrnsaver" - -RDEPENDS_${PN} = "mplayer-common" -PROVIDES = "mplayer" -RPROVIDES_${PN} = "mplayer" -RCONFLICTS_${PN} = "mplayer" - -# Depends on xsp, libxv, virtual/libx11, libxscrnsaver -REQUIRED_DISTRO_FEATURES = "x11" - -# because it depends on libpostproc/libav which has commercial flag -LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "git://repo.or.cz/mplayer.git \ - file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \ - file://0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch \ -" - -SRCREV = "2c378c71a4d9b1df382db9aa787b646628b4e3f9" - -ARM_INSTRUCTION_SET = "arm" - -PV = "2.0+gitr${SRCPV}" -PR = "r13" - -PARALLEL_MAKE = "" - -S = "${WORKDIR}/git" - -FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/" -CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \ - /usr/etc/mplayer/example.conf \ - /usr/etc/mplayer/codecs.conf \ -" - -inherit autotools-brokensep pkgconfig python3native - -EXTRA_OECONF = " \ - --prefix=/usr \ - --mandir=${mandir} \ - --target=${SIMPLE_TARGET_SYS} \ - \ - --disable-lirc \ - --disable-lircc \ - --disable-joystick \ - --disable-vm \ - --disable-xf86keysym \ - --enable-tv \ - --enable-tv-v4l2 \ - --disable-tv-bsdbt848 \ - --enable-rtc \ - --enable-networking \ - --disable-smb \ - --disable-dvdnav \ - --enable-dvdread \ - --disable-dvdread-internal \ - --disable-libdvdcss-internal \ - --disable-enca \ - --disable-ftp \ - --disable-vstream \ - \ - --disable-gif \ - --enable-png \ - --enable-jpeg \ - --disable-libcdio \ - --disable-qtx \ - --disable-xanim \ - --disable-real \ - --disable-xvid \ - \ - --enable-speex \ - --enable-theora \ - --disable-ladspa \ - --disable-libdv \ - --enable-mad \ - --disable-xmms \ - --disable-musepack \ - \ - --disable-gl \ - --enable-sdl \ - --disable-caca \ - --disable-directx \ - --disable-dvb \ - --enable-xv \ - --disable-vm \ - --disable-xinerama \ - --enable-x11 \ - --disable-directfb \ - --disable-tga \ - --disable-pnm \ - --disable-md5sum \ - \ - --enable-alsa \ - --enable-ossaudio \ - --disable-pulse \ - --disable-jack \ - --disable-openal \ - --enable-select \ - --enable-libass \ - \ - --extra-libs=' -lXext -lX11 -lvorbis -ltheoradec -lasound ' \ -" -# -ltheoradec is missing in: -# libmpcodecs/vd_theora.o: undefined reference to symbol 'theora_decode_init@@libtheora.so.1.0' - -EXTRA_OECONF_append_armv6 = " --enable-armv6" -EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" - -PACKAGECONFIG ??= "vorbis postproc" -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52" -PACKAGECONFIG[lame] = ",,lame" -PACKAGECONFIG[postproc] = ",--disable-libpostproc,libpostproc" -PACKAGECONFIG[vorbis] = ",--disable-libvorbis,libvorbis" -PACKAGECONFIG[portaudio] = ",--disable-portaudio,portaudio-v19" -PACKAGECONFIG[mpg123] = ",--disable-mpg123,mpg123" -PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" -BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" - -CFLAGS_append = " -I${S}/libdvdread4 " - -do_configure() { - sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure - sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure - sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure - sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure - sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure - sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile - sed -i 's|extra_cflags="-I. $extra_cflags"|extra_cflags="-I. -I${STAGING_INCDIR}/directfb $extra_cflags"|g' ${S}/configure - export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)" - ./configure ${EXTRA_OECONF} - -} - -do_compile () { - oe_runmake -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install-no-man - install -d ${D}/usr/etc/mplayer - install ${S}/etc/input.conf ${D}/usr/etc/mplayer/ - install ${S}/etc/example.conf ${D}/usr/etc/mplayer/ - install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/ - [ -e ${D}/usr/lib ] && rmdir ${D}/usr/lib -} - -# http://errors.yoctoproject.org/Errors/Details/40734/ -PNBLACKLIST[mplayer2] ?= "Not compatible with currently used ffmpeg 3 - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch deleted file mode 100644 index ab2b5347f5..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 212f6c8206bd4dcc7d8970c5f1632823ae4e783a Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Sun, 12 Feb 2017 23:01:21 -0800 -Subject: [PATCH] Fix build with HAVE_GL==0 - -video/out/opengl/hwdec.h includes video/out/opengl/common.h, which tries -to include opengl headers. - -Upstream-Status: Backport ---- - options/options.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/options/options.c b/options/options.c -index b711156..0bb36ad 100644 ---- a/options/options.c -+++ b/options/options.c -@@ -40,7 +40,6 @@ - #include "stream/stream.h" - #include "video/csputils.h" - #include "video/hwdec.h" --#include "video/out/opengl/hwdec.h" - #include "video/image_writer.h" - #include "sub/osd.h" - #include "audio/filter/af.h" -@@ -53,6 +52,10 @@ - #include "video/out/drm_common.h" - #endif - -+#if HAVE_GL -+#include "video/out/opengl/hwdec.h" -+#endif -+ - extern const char mp_help_text[]; - - static void print_version(struct mp_log *log) --- -2.9.3 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb index b1da2175d5..44d92a0988 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb @@ -11,13 +11,15 @@ REQUIRED_DISTRO_FEATURES = "x11" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" +# While this item does not require it, it depends on ffmpeg which does +LICENSE_FLAGS = "commercial" + 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;subdir=${BPN}-${PV} \ - file://0001-Fix-build-with-HAVE_GL-0.patch \ " -SRC_URI[mpv.md5sum] = "5c85d1163911e49315a5bf1ca1fae13d" -SRC_URI[mpv.sha256sum] = "a41854fa0ac35b9c309ad692aaee67c8d4495c3546f11cb4cdd0a124195d3f15" +SRC_URI[mpv.md5sum] = "038d0b660de07ff645ad6a741704ecab" +SRC_URI[mpv.sha256sum] = "daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46" SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb index b408bb0a9d..57cfb1318f 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb @@ -7,6 +7,8 @@ PROVIDES = "libv4l media-ctl" DEPENDS = "jpeg \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" DEPENDS_append_libc-musl = " argp-standalone" +DEPENDS_append_class-target = " udev" +LDFLAGS_append = " -pthread" inherit autotools gettext pkgconfig diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb index 648818e722..e17cda1a97 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" SRC_URI += "http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${BP}.tar.bz2 \ file://libvpx-configure-support-blank-prefix.patch \ " -SRC_URI[md5sum] = "49e59dd184caa255886683facea56fca" -SRC_URI[sha256sum] = "306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797" +SRC_URI[md5sum] = "a19518c8111fa93bdabdd85259162611" +SRC_URI[sha256sum] = "1c2c0c2a97fba9474943be34ee39337dee756780fc12870ba1dc68372586a819" # ffmpeg links with this and fails # sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4' |