From 6fbc2c7c6ed8977c0cdac35c6da3ba1ead90733c Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 10 Apr 2017 22:51:00 +0200 Subject: mpv: update 0.15.0 -> 0.24.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../mpv/0001-Fix-build-with-HAVE_GL-0.patch | 39 ++++++++++++++ meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 61 ---------------------- meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb | 61 ++++++++++++++++++++++ 3 files changed, 100 insertions(+), 61 deletions(-) create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch delete mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch b/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch new file mode 100644 index 0000000000..ab2b5347f5 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv/0001-Fix-build-with-HAVE_GL-0.patch @@ -0,0 +1,39 @@ +From 212f6c8206bd4dcc7d8970c5f1632823ae4e783a Mon Sep 17 00:00:00 2001 +From: Michael Forney +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/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb deleted file mode 100644 index f51df778a1..0000000000 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "Open Source multimedia player" -DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more." -SECTION = "multimedia" -HOMEPAGE = "http://www.mpv.io/" -DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv \ - libxscrnsaver libv4l libxinerama libvdpau \ -" - -REQUIRED_DISTRO_FEATURES = "x11" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" - -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} \ -" -SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101" -SRC_URI[mpv.sha256sum] = "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc" -SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" -SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" - -inherit waf pkgconfig pythonnative distro_features_check - -# Note: both lua and libass are required to get on-screen-display (controls) -PACKAGECONFIG ??= "lua libass" -PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" -PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" -PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" -PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack" -PACKAGECONFIG[vaapi] = "--enable-vaapi, --disable-vaapi,libva" - -SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" -EXTRA_OECONF = " \ - --prefix=${prefix} \ - --target=${SIMPLE_TARGET_SYS} \ - --confdir=${sysconfdir} \ - --datadir=${datadir} \ - --disable-manpage-build \ - --disable-gl \ - --disable-libsmbclient \ - --disable-encoding \ - --disable-libbluray \ - --disable-dvdread \ - --disable-dvdnav \ - --disable-cdda \ - --disable-enca \ - --disable-libguess \ - --disable-uchardet \ - --disable-rubberband \ - --disable-lcms2 \ - --disable-vapoursynth \ - --disable-vapoursynth-lazy \ - ${PACKAGECONFIG_CONFARGS} \ -" - -do_configure_prepend () { - ln -sf waf-1.8.12 ${S}/waf - chmod +x ${S}/waf -} - -FILES_${PN} += "${datadir}/icons" diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb new file mode 100644 index 0000000000..3f46dc187d --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.24.0.bb @@ -0,0 +1,61 @@ +SUMMARY = "Open Source multimedia player" +DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more." +SECTION = "multimedia" +HOMEPAGE = "http://www.mpv.io/" +DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv \ + libxscrnsaver libv4l libxinerama libvdpau \ +" + +REQUIRED_DISTRO_FEATURES = "x11" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" + +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[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" +SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" + +inherit waf pkgconfig pythonnative distro_features_check + +# Note: both lua and libass are required to get on-screen-display (controls) +PACKAGECONFIG ??= "lua libass" +PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" +PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" +PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" +PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack" +PACKAGECONFIG[vaapi] = "--enable-vaapi, --disable-vaapi,libva" + +SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" +EXTRA_OECONF = " \ + --prefix=${prefix} \ + --target=${SIMPLE_TARGET_SYS} \ + --confdir=${sysconfdir} \ + --datadir=${datadir} \ + --disable-manpage-build \ + --disable-gl \ + --disable-libsmbclient \ + --disable-encoding \ + --disable-libbluray \ + --disable-dvdread \ + --disable-dvdnav \ + --disable-cdda \ + --disable-uchardet \ + --disable-rubberband \ + --disable-lcms2 \ + --disable-vapoursynth \ + --disable-vapoursynth-lazy \ + ${PACKAGECONFIG_CONFARGS} \ +" + +do_configure_prepend () { + ln -sf waf-1.8.12 ${S}/waf + chmod +x ${S}/waf +} + +FILES_${PN} += "${datadir}/icons" -- cgit v1.2.3-54-g00ecf