On Tue Dec 15, 2020 at 12:16:13AM +0100, Charlene Wendling wrote:
> Hi,
>
> On Mon, 14 Dec 2020 15:02:38 +0100
> Rafael Sadowski wrote:
>
> > On Mon Dec 14, 2020 at 02:44:29AM -0500, Brad Smith wrote:
> > > Here is an update to mpv 0.33.0.
> > >
> > > Any testing would be appreciated.
>
> This builds and works fine on macppc and amd64.
>
> I've found out that port-lib-depends-check complains about missing
> items:
>
> WANTLIB += glib-2.0 graphite2 harfbuzz intl pcre
>
> > >
> > > Index: Makefile
> > > ===================================================================
> > > RCS file: /home/cvs/ports/multimedia/mpv/Makefile,v
> > > retrieving revision 1.65
> > > diff -u -p -u -p -r1.65 Makefile
> > > --- Makefile 10 Nov 2020 16:40:18 -0000 1.65
> > > +++ Makefile 22 Nov 2020 21:48:18 -0000
> > > @@ -4,10 +4,9 @@ COMMENT = movie player based on
> > > MPlayer
> > > GH_ACCOUNT = mpv-player
> > > GH_PROJECT = mpv
> > > -GH_TAGNAME = v0.32.0
> > > -REVISION = 2
> > > +GH_TAGNAME = v0.33.0
> > >
> > > -SHARED_LIBS += mpv 0.1 # 1.107
> > > +SHARED_LIBS += mpv 0.2 # 1.107
> > >
> > > CATEGORIES = multimedia x11
> > >
> > > @@ -26,7 +25,7 @@ WANTLIB += Xinerama Xrandr Xrender Xss X
> > > WANTLIB += avcodec avdevice avfilter avformat avresample avutil
> > > WANTLIB += bluray c cdio cdio_cdda cdio_paranoia drm dvdnav dvdread
> > > WANTLIB += epoxy expat fontconfig freetype fribidi gbm iconv jpeg
> > > -WANTLIB += lcms2 lua5.1 m placebo postproc pthread sndio swresample
> > > +WANTLIB += lcms2 lua5.1 m placebo postproc pthread swresample
> >
> > s/lua5.1/${MODLUA_WANTLIB}/ ?
>
>
Based on Brad's diff with adjusted WANTLIB section:
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 Makefile
--- Makefile 10 Nov 2020 16:40:18 -0000 1.65
+++ Makefile 15 Dec 2020 06:44:50 -0000
@@ -4,10 +4,9 @@ COMMENT = movie player based on MPlayer
GH_ACCOUNT = mpv-player
GH_PROJECT = mpv
-GH_TAGNAME = v0.32.0
-REVISION = 2
+GH_TAGNAME = v0.33.0
-SHARED_LIBS += mpv 0.1 # 1.107
+SHARED_LIBS += mpv 0.2 # 1.107
CATEGORIES = multimedia x11
@@ -25,9 +24,10 @@ WANTLIB += EGL GL SDL2 X11 X11-xcb Xau X
WANTLIB += Xinerama Xrandr Xrender Xss Xv Xxf86vm archive ass
WANTLIB += avcodec avdevice avfilter avformat avresample avutil
WANTLIB += bluray c cdio cdio_cdda cdio_paranoia drm dvdnav dvdread
-WANTLIB += epoxy expat fontconfig freetype fribidi gbm iconv jpeg
-WANTLIB += lcms2 lua5.1 m placebo postproc pthread sndio swresample
-WANTLIB += swscale xcb xcb-dri2 xcb-glx xml2 z
+WANTLIB += epoxy expat fontconfig freetype fribidi gbm glib-2.0
+WANTLIB += graphite2 harfbuzz iconv intl jpeg lcms2 ${MODLUA_WANTLIB} m pcre
+WANTLIB += placebo postproc pthread swresample swscale xcb xcb-dri2
+WANTLIB += xcb-glx xml2 z
MODULES = lang/lua \
lang/python
@@ -45,6 +45,7 @@ LIB_DEPENDS = archivers/libarchive \
audio/libcdio \
audio/libcdio-paranoia \
converters/libiconv \
+ devel/harfbuzz \
devel/sdl2 \
graphics/ffmpeg>=4.1.1 \
graphics/jpeg \
@@ -66,7 +67,6 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONF
--enable-cdda \
--enable-dvdnav \
--enable-libmpv-shared \
- --enable-sndio \
--enable-sdl2 \
--disable-alsa \
--disable-caca \
@@ -75,12 +75,10 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONF
--disable-gl-wayland \
--disable-jack \
--disable-rubberband \
- --disable-oss-audio \
--disable-openal \
--disable-optimize \
--disable-pulse \
- --disable-rsound \
- --disable-libsmbclient \
+ --disable-sixel \
--disable-uchardet \
--disable-vaapi \
--disable-vaapi-drm \
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 distinfo
--- distinfo 29 Oct 2020 13:44:14 -0000 1.24
+++ distinfo 15 Dec 2020 06:44:50 -0000
@@ -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=
-SIZE (mpv-0.32.0.tar.gz) = 3148730
+SIZE (mpv-0.33.0.tar.gz) = 3259387
SIZE (waf-2.0.20) = 104725
Index: patches/patch-libmpv_client_h
===================================================================
RCS file: /cvs/ports/multimedia/mpv/patches/patch-libmpv_client_h,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-libmpv_client_h
--- patches/patch-libmpv_client_h 29 Jan 2020 06:52:21 -0000 1.5
+++ patches/patch-libmpv_client_h 15 Dec 2020 06:44:50 -0000
@@ -5,11 +5,11 @@ Set shared library version.
Index: libmpv/client.h
--- libmpv/client.h.orig
+++ libmpv/client.h
-@@ -229,7 +229,7 @@ extern "C" {
+@@ -235,7 +235,7 @@ extern "C" {
* relational operators (<, >, <=, >=).
*/
#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})
/**
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/mpv/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 29 Jan 2020 06:52:21 -0000 1.9
+++ pkg/PLIST 15 Dec 2020 06:44:50 -0000
@@ -3,7 +3,6 @@
include/mpv/
include/mpv/client.h
include/mpv/opengl_cb.h
-include/mpv/qthelper.hpp
include/mpv/render.h
include/mpv/render_gl.h
include/mpv/stream_cb.h
@@ -20,6 +19,7 @@ share/examples/mpv/mpv.conf
share/examples/mpv/mpv_identify.sh
share/examples/mpv/restore-old-bindings.conf
share/examples/mpv/umpv
+share/icons/hicolor/128x128/apps/mpv.png
share/icons/hicolor/16x16/apps/mpv.png
share/icons/hicolor/32x32/apps/mpv.png
share/icons/hicolor/64x64/apps/mpv.png
