Update mpv to 0.33.0

Feedback from cwen@, WANTLIB tweak by me, initial update diff from Brad
This commit is contained in:
rsadowski 2020-12-21 08:57:20 +00:00
parent 8303f9761b
commit fd8fd2bf81
4 changed files with 15 additions and 18 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.65 2020/11/10 16:40:18 sthen Exp $ # $OpenBSD: Makefile,v 1.66 2020/12/21 08:57:20 rsadowski Exp $
COMMENT = movie player based on MPlayer/mplayer2 COMMENT = movie player based on MPlayer/mplayer2
GH_ACCOUNT = mpv-player GH_ACCOUNT = mpv-player
GH_PROJECT = mpv GH_PROJECT = mpv
GH_TAGNAME = v0.32.0 GH_TAGNAME = v0.33.0
REVISION = 2
SHARED_LIBS += mpv 0.1 # 1.107 SHARED_LIBS += mpv 0.2 # 1.107
CATEGORIES = multimedia x11 CATEGORIES = multimedia x11
@ -25,9 +24,10 @@ WANTLIB += EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
WANTLIB += Xinerama Xrandr Xrender Xss Xv Xxf86vm archive ass WANTLIB += Xinerama Xrandr Xrender Xss Xv Xxf86vm archive ass
WANTLIB += avcodec avdevice avfilter avformat avresample avutil WANTLIB += avcodec avdevice avfilter avformat avresample avutil
WANTLIB += bluray c cdio cdio_cdda cdio_paranoia drm dvdnav dvdread WANTLIB += bluray c cdio cdio_cdda cdio_paranoia drm dvdnav dvdread
WANTLIB += epoxy expat fontconfig freetype fribidi gbm iconv jpeg WANTLIB += epoxy expat fontconfig freetype fribidi gbm glib-2.0
WANTLIB += lcms2 lua5.1 m placebo postproc pthread sndio swresample WANTLIB += graphite2 harfbuzz iconv intl jpeg lcms2 ${MODLUA_WANTLIB} m pcre
WANTLIB += swscale xcb xcb-dri2 xcb-glx xml2 z WANTLIB += placebo postproc pthread swresample swscale xcb xcb-dri2
WANTLIB += xcb-glx xml2 z
MODULES = lang/lua \ MODULES = lang/lua \
lang/python lang/python
@ -66,7 +66,6 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONFDIR}/mpv \
--enable-cdda \ --enable-cdda \
--enable-dvdnav \ --enable-dvdnav \
--enable-libmpv-shared \ --enable-libmpv-shared \
--enable-sndio \
--enable-sdl2 \ --enable-sdl2 \
--disable-alsa \ --disable-alsa \
--disable-caca \ --disable-caca \
@ -75,12 +74,10 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONFDIR}/mpv \
--disable-gl-wayland \ --disable-gl-wayland \
--disable-jack \ --disable-jack \
--disable-rubberband \ --disable-rubberband \
--disable-oss-audio \
--disable-openal \ --disable-openal \
--disable-optimize \ --disable-optimize \
--disable-pulse \ --disable-pulse \
--disable-rsound \ --disable-sixel \
--disable-libsmbclient \
--disable-uchardet \ --disable-uchardet \
--disable-vaapi \ --disable-vaapi \
--disable-vaapi-drm \ --disable-vaapi-drm \

View File

@ -1,4 +1,4 @@
SHA256 (mpv-0.32.0.tar.gz) = kWP2SDIibSLiS7xIdOvWrAI3LNcXvvFcKKCqhYxf5ZI= SHA256 (mpv-0.33.0.tar.gz) = 8bm69dwu6vN2WXwopigfrPbtmP89Vn45Vclb8kWVILQ=
SHA256 (waf-2.0.20) = v5cemO3CQUloomLGqmuIVBomw80khonIn0xXNwlV7n8= SHA256 (waf-2.0.20) = v5cemO3CQUloomLGqmuIVBomw80khonIn0xXNwlV7n8=
SIZE (mpv-0.32.0.tar.gz) = 3148730 SIZE (mpv-0.33.0.tar.gz) = 3259387
SIZE (waf-2.0.20) = 104725 SIZE (waf-2.0.20) = 104725

View File

@ -1,15 +1,15 @@
$OpenBSD: patch-libmpv_client_h,v 1.5 2020/01/29 06:52:21 ajacoutot Exp $ $OpenBSD: patch-libmpv_client_h,v 1.6 2020/12/21 08:57:20 rsadowski Exp $
Set shared library version. Set shared library version.
Index: libmpv/client.h Index: libmpv/client.h
--- libmpv/client.h.orig --- libmpv/client.h.orig
+++ libmpv/client.h +++ libmpv/client.h
@@ -229,7 +229,7 @@ extern "C" { @@ -235,7 +235,7 @@ extern "C" {
* relational operators (<, >, <=, >=). * relational operators (<, >, <=, >=).
*/ */
#define MPV_MAKE_VERSION(major, minor) (((major) << 16) | (minor) | 0UL) #define MPV_MAKE_VERSION(major, minor) (((major) << 16) | (minor) | 0UL)
-#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(1, 107) -#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(1, 109)
+#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(${LMAJ}, ${LMIN}) +#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(${LMAJ}, ${LMIN})
/** /**

View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.9 2020/01/29 06:52:21 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.10 2020/12/21 08:57:20 rsadowski Exp $
@bin bin/mpv @bin bin/mpv
include/mpv/ include/mpv/
include/mpv/client.h include/mpv/client.h
include/mpv/opengl_cb.h include/mpv/opengl_cb.h
include/mpv/qthelper.hpp
include/mpv/render.h include/mpv/render.h
include/mpv/render_gl.h include/mpv/render_gl.h
include/mpv/stream_cb.h include/mpv/stream_cb.h
@ -20,6 +19,7 @@ share/examples/mpv/mpv.conf
share/examples/mpv/mpv_identify.sh share/examples/mpv/mpv_identify.sh
share/examples/mpv/restore-old-bindings.conf share/examples/mpv/restore-old-bindings.conf
share/examples/mpv/umpv share/examples/mpv/umpv
share/icons/hicolor/128x128/apps/mpv.png
share/icons/hicolor/16x16/apps/mpv.png share/icons/hicolor/16x16/apps/mpv.png
share/icons/hicolor/32x32/apps/mpv.png share/icons/hicolor/32x32/apps/mpv.png
share/icons/hicolor/64x64/apps/mpv.png share/icons/hicolor/64x64/apps/mpv.png