Stuart Henderson <s...@spacehopper.org> wrote:
>> Below is an update for mpv-0.18.0. While at it, I fixed several issues with
>> the
>> port:
>>
>> - Now X11BASE is hooked up explicitly, so that several tests in waf don't
>> fail.
>> - WRKBUILD is set to subdirectory of WRKSRC, so that mpv does not get
>> relinked
>> during "make install".
>>
>> Comments? OKs?
>
> Fails for me:
I forgot about the patch. Updated diff follows.
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 4 May 2016 09:13:10 -0000 1.27
+++ Makefile 8 Jul 2016 13:20:53 -0000
@@ -7,8 +7,7 @@ COMMENT = movie player based on MPlayer
GH_ACCOUNT = mpv-player
GH_PROJECT = mpv
-GH_TAGNAME = v0.17.0
-REVISION = 0
+GH_TAGNAME = v0.18.0
CATEGORIES = multimedia x11
@@ -29,7 +28,7 @@ WANTLIB += EGL GL SDL2 X11 X11-xcb Xau X
WANTLIB += Xinerama Xrandr Xrender Xss Xv Xxf86vm ass avcodec
WANTLIB += avdevice avfilter avformat avresample avutil bluray
WANTLIB += c cdio cdio_cdda cdio_paranoia drm dvdnav dvdread expat
-WANTLIB += fontconfig freetype fribidi jpeg lcms2 m opus postproc
+WANTLIB += fontconfig freetype fribidi gbm jpeg lcms2 m opus postproc
WANTLIB += pthread pthread-stubs smbclient sndio speex swresample
WANTLIB += swscale v4l2 v4lconvert vpx x264 x265 xcb xcb-dri2
WANTLIB += xcb-glx z ${MODLUA_WANTLIB}
@@ -69,9 +68,7 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONF
--enable-zsh-comp \
--disable-alsa \
--disable-caca \
- --disable-dxva2-hwaccel \
--disable-enca \
- --disable-gpl3 \
--disable-jack \
--disable-libarchive \
--disable-libguess \
@@ -96,12 +93,14 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONF
--disable-videotoolbox-gl \
--disable-wayland
-MAKE_ENV += LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_ENV += CPPFLAGS="-I${LOCALBASE}/include"
+MAKE_ENV += LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MAKE_ENV += CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
MAKE_FLAGS = -o "${WRKBUILD}" -t "${WRKSRC}" --destdir="${DESTDIR}"
USE_GROFF = Yes
NO_TEST = Yes
+
+WRKBUILD = ${WRKSRC}/${MACHINE_ARCH}
.if ${MACHINE_ARCH} == "i386"
CFLAGS += -march=i586
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 27 Apr 2016 11:39:04 -0000 1.13
+++ distinfo 8 Jul 2016 11:38:52 -0000
@@ -1,4 +1,4 @@
-SHA256 (mpv-0.17.0.tar.gz) = YCzSsPX8fkNHMjT7uW4/e7tkGPFeuPpyDZQzzOMeum4=
+SHA256 (mpv-0.18.0.tar.gz) = tlZjjU9rziYhuqrLYNi+OEqkkvzYbf1DmWqqLBb+4Cs=
SHA256 (waf-1.8.19) = LtVHGgjfJY+FV4dXYarWfoCy3IRkgtwRE1o1x3yRtLM=
-SIZE (mpv-0.17.0.tar.gz) = 2882629
+SIZE (mpv-0.18.0.tar.gz) = 2758960
SIZE (waf-1.8.19) = 100743
Index: patches/patch-waftools_detections_compiler_py
===================================================================
RCS file: patches/patch-waftools_detections_compiler_py
diff -N patches/patch-waftools_detections_compiler_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-waftools_detections_compiler_py 8 Jul 2016 12:14:38
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- waftools/detections/compiler.py.orig Fri Jul 8 14:14:10 2016
++++ waftools/detections/compiler.py Fri Jul 8 14:14:33 2016
+@@ -41,9 +41,7 @@ def __add_generic_flags__(ctx):
+ def __add_gcc_flags__(ctx):
+ ctx.env.CFLAGS += ["-Wall", "-Wundef", "-Wmissing-prototypes", "-Wshadow",
+ "-Wno-switch", "-Wparentheses", "-Wpointer-arith",
+- "-Wno-pointer-sign",
+- # GCC bug 66425
+- "-Wno-unused-result"]
++ "-Wno-pointer-sign"]
+
+ def __add_clang_flags__(ctx):
+ ctx.env.CFLAGS += ["-Wno-logical-op-parentheses", "-fcolor-diagnostics",
