Re: [UPDATE] multimedia/mpv - bump version v0.37.0

[Jose Maldonado]

El Wed, 21 Feb 2024 10:42:29 +
Stuart Henderson  escribió:
> On 2024/02/20 13:42, Jose Maldonado wrote:
> > El Tue, 20 Feb 2024 13:13:02 +
> > Stuart Henderson  escribió:  
> > > On 2024/02/20 08:52, Jose Maldonado wrote:  
> > > > El Tue, 20 Feb 2024 11:31:54 +
> > > > Stuart Henderson  escribió:  
> > > > > I get this:
> > > > > 
> > > > > $ make port-lib-depends-check
> > > > > 
> > > > > mpv-0.37.0(multimedia/mpv):
> > > > > Extra:  SPIRV-Tools-shared.0 Xinerama.6
> > > > > 
> > > > > Looks like upstream explicitly stopped using Xinerama so that
> > > > > one can be removed.
> > > > > 
> > > > > What's up with SPIRV-Tools-shared and the new LIB_DEPENDS on
> > > > > spirv-tools - I see that the port still uses
> > > > > -Dspirv-cross=disabled, I could have missed something but that
> > > > > does seem to disable anything to do with spirv?
> > > > >   
> > > > 
> > > > Hi @sthen!
> > > > 
> > > > In order to be consistent with the changes in x11/vlc, do we
> > > > also enable wayland support in multimedia/mpv? I can try this
> > > > along with the changes you have indicated  
> > > 
> > > wayland isn't enabled for vlc, it's just the libraries are pulled
> > > in via another dependency (gtk+3 in this case, I think) and so
> > > need to be listed. (Strangely only listed in libnotify_plugin..?)
> > > 
> > > I'd prefer to get the update in first without too many more
> > > changes, just tie up this remaining issue about the spirv libs,
> > > then we can look at whether or not to enable wayland separately
> > > afterwards.
> > > 
> > > $ objdump -p /usr/local/lib/vlc/plugins/notify/libnotify_plugin.so
> > >   
> > 
> > Ok, I understand this. At the rate things are going we will see more
> > and more dependencies on Wayland.
> > 
> > About MPV, I upload a new diff with the corrections. I detail the
> > changes:
> > 
> > 1) Removed Xinerama support (thanks @sthen)
> > 
> > 2) spirv-cross we don't need it, since from what I see in mpv's
> > meson.build, this is a feature aimed at Windows (d3d11).
> > 
> > 3) Vulkan in mpv can be activated without using spirv-tools (I
> > removed it from LIB_DEPENDS and WANTLIB). In this case, libplacebo
> > will take care of making the appropriate shader management
> > arrangements (using shaderc), as appropriate. I have already tested
> > it by playing video with shaders (FSR.glsl) and without these, it
> > works correctly (on OpenGL and Vulkan gpu-api-context)and the spirv
> > shaders are processed by libplacebo as shown in the log.  
> 
> Great, thanks. I think this is a good point to commit so I'll do so,
> happy to look at wayland as new diffs.

I'm sure wayland will continue to make good progress on OpenBSD.

As for mpv, the last time I tried wayland support I was surprised,
--vo=wlshm didn't break or show strange things, but the use of shaders
and color management contexts among other things still needed to be
polished.

Thanks for the guide @sthen


-- 
*
Dios en su cielo, todo bien en la Tierra

Re: [UPDATE] multimedia/mpv - bump version v0.37.0

[Stuart Henderson]

On 2024/02/20 13:42, Jose Maldonado wrote:
> El Tue, 20 Feb 2024 13:13:02 +
> Stuart Henderson  escribió:
> > On 2024/02/20 08:52, Jose Maldonado wrote:
> > > El Tue, 20 Feb 2024 11:31:54 +
> > > Stuart Henderson  escribió:
> > > > I get this:
> > > > 
> > > > $ make port-lib-depends-check
> > > > 
> > > > mpv-0.37.0(multimedia/mpv):
> > > > Extra:  SPIRV-Tools-shared.0 Xinerama.6
> > > > 
> > > > Looks like upstream explicitly stopped using Xinerama so that one
> > > > can be removed.
> > > > 
> > > > What's up with SPIRV-Tools-shared and the new LIB_DEPENDS on
> > > > spirv-tools - I see that the port still uses
> > > > -Dspirv-cross=disabled, I could have missed something but that
> > > > does seem to disable anything to do with spirv?
> > > > 
> > > 
> > > Hi @sthen!
> > > 
> > > In order to be consistent with the changes in x11/vlc, do we also
> > > enable wayland support in multimedia/mpv? I can try this along with
> > > the changes you have indicated
> > 
> > wayland isn't enabled for vlc, it's just the libraries are pulled in
> > via another dependency (gtk+3 in this case, I think) and so need to be
> > listed. (Strangely only listed in libnotify_plugin..?)
> > 
> > I'd prefer to get the update in first without too many more changes,
> > just tie up this remaining issue about the spirv libs, then we can
> > look at whether or not to enable wayland separately afterwards.
> > 
> > $ objdump -p /usr/local/lib/vlc/plugins/notify/libnotify_plugin.so
> > 
> 
> Ok, I understand this. At the rate things are going we will see more
> and more dependencies on Wayland.
> 
> About MPV, I upload a new diff with the corrections. I detail the
> changes:
> 
> 1) Removed Xinerama support (thanks @sthen)
> 
> 2) spirv-cross we don't need it, since from what I see in mpv's
> meson.build, this is a feature aimed at Windows (d3d11).
> 
> 3) Vulkan in mpv can be activated without using spirv-tools (I removed
> it from LIB_DEPENDS and WANTLIB). In this case, libplacebo will take
> care of making the appropriate shader management arrangements (using
> shaderc), as appropriate. I have already tested it by playing video
> with shaders (FSR.glsl) and without these, it works correctly (on
> OpenGL and Vulkan gpu-api-context)and the spirv shaders are processed by
> libplacebo as shown in the log.

Great, thanks. I think this is a good point to commit so I'll do so,
happy to look at wayland as new diffs.

Re: [UPDATE] multimedia/mpv - bump version v0.37.0

[Jose Maldonado]

El Tue, 20 Feb 2024 13:13:02 +
Stuart Henderson  escribió:
> On 2024/02/20 08:52, Jose Maldonado wrote:
> > El Tue, 20 Feb 2024 11:31:54 +
> > Stuart Henderson  escribió:
> > > I get this:
> > > 
> > > $ make port-lib-depends-check
> > > 
> > > mpv-0.37.0(multimedia/mpv):
> > > Extra:  SPIRV-Tools-shared.0 Xinerama.6
> > > 
> > > Looks like upstream explicitly stopped using Xinerama so that one
> > > can be removed.
> > > 
> > > What's up with SPIRV-Tools-shared and the new LIB_DEPENDS on
> > > spirv-tools - I see that the port still uses
> > > -Dspirv-cross=disabled, I could have missed something but that
> > > does seem to disable anything to do with spirv?
> > > 
> > 
> > Hi @sthen!
> > 
> > In order to be consistent with the changes in x11/vlc, do we also
> > enable wayland support in multimedia/mpv? I can try this along with
> > the changes you have indicated
> 
> wayland isn't enabled for vlc, it's just the libraries are pulled in
> via another dependency (gtk+3 in this case, I think) and so need to be
> listed. (Strangely only listed in libnotify_plugin..?)
> 
> I'd prefer to get the update in first without too many more changes,
> just tie up this remaining issue about the spirv libs, then we can
> look at whether or not to enable wayland separately afterwards.
> 
> $ objdump -p /usr/local/lib/vlc/plugins/notify/libnotify_plugin.so
> 

Ok, I understand this. At the rate things are going we will see more
and more dependencies on Wayland.

About MPV, I upload a new diff with the corrections. I detail the
changes:

1) Removed Xinerama support (thanks @sthen)

2) spirv-cross we don't need it, since from what I see in mpv's
meson.build, this is a feature aimed at Windows (d3d11).

3) Vulkan in mpv can be activated without using spirv-tools (I removed
it from LIB_DEPENDS and WANTLIB). In this case, libplacebo will take
care of making the appropriate shader management arrangements (using
shaderc), as appropriate. I have already tested it by playing video
with shaders (FSR.glsl) and without these, it works correctly (on
OpenGL and Vulkan gpu-api-context)and the spirv shaders are processed by
libplacebo as shown in the log.



-- 
*
Dios en su cielo, todo bien en la Tierra
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile	24 Jul 2023 12:40:20 -	1.98
+++ Makefile	20 Feb 2024 17:24:35 -
@@ -2,10 +2,10 @@ COMMENT =		movie player based on MPlayer
 
 GH_ACCOUNT =		mpv-player
 GH_PROJECT =		mpv
-GH_TAGNAME =		v0.36.0
+GH_TAGNAME =		v0.37.0
 USE_NOBTCFI =		Yes
 
-SHARED_LIBS +=		mpv		1.0 # 2.0
+SHARED_LIBS +=		mpv		2.0
 
 CATEGORIES =		multimedia x11
 
@@ -14,11 +14,11 @@ HOMEPAGE =		https://mpv.io/
 # GPLv2+
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += EGL SDL2 X11 Xext Xinerama Xpresent Xrandr Xss Xv archive
+WANTLIB += ${MODLUA_WANTLIB}
+WANTLIB += EGL SDL2 X11 Xext Xpresent Xrandr Xss Xv archive
 WANTLIB += ass avcodec avdevice avfilter avformat avutil bluray
 WANTLIB += c cdio cdio_cdda cdio_paranoia dvdnav iconv jpeg lcms2
-WANTLIB += ${MODLUA_WANTLIB} m placebo pthread sndio swresample
-WANTLIB += swscale z zimg
+WANTLIB += m placebo pthread sndio swresample swscale vulkan z zimg
 
 MODULES =		devel/meson \
 			lang/lua \
@@ -41,6 +41,7 @@ LIB_DEPENDS =		archivers/libarchive \
 			graphics/jpeg \
 			graphics/lcms2 \
 			graphics/libplacebo \
+			graphics/vulkan-loader \
 			graphics/zimg \
 			multimedia/libass \
 			multimedia/libbluray \
@@ -48,6 +49,7 @@ LIB_DEPENDS =		archivers/libarchive \
 
 MODPY_RUNDEP =		No
 RUN_DEPENDS =		devel/desktop-file-utils \
+			graphics/vulkan-loader \
 			www/yt-dlp \
 			x11/gtk+4,-guic
 
@@ -83,10 +85,6 @@ CONFIGURE_ARGS =	-Dlua=lua${MODLUA_DEP_V
 			-Dios-gl=disabled \
 			-Djack=disabled \
 			-Djavascript=disabled \
-			-Dlibplacebo-next=disabled \
-			-Dmacos-10-11-features=disabled \
-			-Dmacos-10-12-2-features=disabled \
-			-Dmacos-10-14-features=disabled \
 			-Dmacos-cocoa-cb=disabled \
 			-Dmacos-media-player=disabled \
 			-Dmacos-touchbar=disabled \
@@ -100,28 +98,30 @@ CONFIGURE_ARGS =	-Dlua=lua${MODLUA_DEP_V
 			-Dshaderc=disabled \
 			-Dsixel=disabled \
 			-Dswift-build=disabled \
+			-Dswift-flags=disabled \
 			-Dsdl2-audio=disabled \
 			-Dspirv-cross=disabled \
 			-Duchardet=disabled \
 			-Dvaapi=disabled \
 			-Dvaapi-drm=disabled \
-			-Dvaapi-x-egl=disabled \
 			-Dvaapi-x11=disabled \
 			-Dvaapi-wayland=disabled \
 			-Dvapoursynth=disabled \
 			-Dvdpau=disabled \
 			-Dvdpau-gl-x11=disabled \
 			-Dvideotoolbox-gl=disabled \
-			-Dvulkan=disabled \
+			-Dvideotoolbox-pl=disabled \
+			-Dvulkan=enabled \
 			-Dvulkan-interop=disabled \
 			-Dwayland=disabled \
-			-Dwin32-internal-pthreads=disabled \
+			-Dwin32-threads=disabled \
 			-Dwasapi=disabled
 
 CFLAGS +=		-I${LOCALBASE}/include
 LDFLAGS +=		-L${LOCALBASE}/lib
 

Re: [UPDATE] multimedia/mpv - bump version v0.37.0

[Stuart Henderson]

On 2024/02/20 08:52, Jose Maldonado wrote:
> El Tue, 20 Feb 2024 11:31:54 +
> Stuart Henderson  escribió:
> > I get this:
> > 
> > $ make port-lib-depends-check
> > 
> > mpv-0.37.0(multimedia/mpv):
> > Extra:  SPIRV-Tools-shared.0 Xinerama.6
> > 
> > Looks like upstream explicitly stopped using Xinerama so that one can
> > be removed.
> > 
> > What's up with SPIRV-Tools-shared and the new LIB_DEPENDS on
> > spirv-tools - I see that the port still uses -Dspirv-cross=disabled,
> > I could have missed something but that does seem to disable anything
> > to do with spirv?
> > 
> 
> Hi @sthen!
> 
> In order to be consistent with the changes in x11/vlc, do we also
> enable wayland support in multimedia/mpv? I can try this along with the
> changes you have indicated

wayland isn't enabled for vlc, it's just the libraries are pulled in
via another dependency (gtk+3 in this case, I think) and so need to be
listed. (Strangely only listed in libnotify_plugin..?)

I'd prefer to get the update in first without too many more changes,
just tie up this remaining issue about the spirv libs, then we can look
at whether or not to enable wayland separately afterwards.

$ objdump -p /usr/local/lib/vlc/plugins/notify/libnotify_plugin.so

/usr/local/lib/vlc/plugins/notify/libnotify_plugin.so: file format 
elf64-x86-64

Program Header:
PHDR off0x0040 vaddr 0x0040 paddr 
0x0040 align 2**3
 filesz 0x0310 memsz 0x0310 flags r--
LOAD off0x vaddr 0x paddr 
0x align 2**12
 filesz 0x1d8c memsz 0x1d8c flags r--
LOAD off0x1d90 vaddr 0x2d90 paddr 
0x2d90 align 2**12
 filesz 0x14a0 memsz 0x14a0 flags --x
LOAD off0x3230 vaddr 0x5230 paddr 
0x5230 align 2**12
 filesz 0x0748 memsz 0x0748 flags rw-
LOAD off0x3978 vaddr 0x6978 paddr 
0x6978 align 2**12
 filesz 0x0048 memsz 0x004d flags rw-
 DYNAMIC off0x32f0 vaddr 0x52f0 paddr 
0x52f0 align 2**3
 filesz 0x04d0 memsz 0x04d0 flags rw-
   RELRO off0x3230 vaddr 0x5230 paddr 
0x5230 align 2**0
 filesz 0x0748 memsz 0x0dd0 flags r--
EH_FRAME off0x19b4 vaddr 0x19b4 paddr 
0x19b4 align 2**2
 filesz 0x009c memsz 0x009c flags r--
OPENBSD_RANDOMIZE off0x3258 vaddr 0x5258 paddr 
0x5258 align 2**3
 filesz 0x0098 memsz 0x0098 flags rw-
   STACK off0x vaddr 0x paddr 
0x align 2**0
 filesz 0x memsz 0x flags rw-
OPENBSD_NOBTCFI off0x vaddr 0x paddr 
0x align 2**0
 filesz 0x memsz 0x flags --x
0x6474e553 off0x0368 vaddr 0x0368 paddr 
0x0368 align 2**3
 filesz 0x0020 memsz 0x0020 flags r--
NOTE off0x0350 vaddr 0x0350 paddr 
0x0350 align 2**2
 filesz 0x0018 memsz 0x0018 flags r--
NOTE off0x0368 vaddr 0x0368 paddr 
0x0368 align 2**3
 filesz 0x0020 memsz 0x0020 flags r--

Dynamic Section:
  NEEDED  libm.so.10.1
  NEEDED  libvlccore.so.4.0
  NEEDED  libexecinfo.so.3.0
  NEEDED  libintl.so.8.0
  NEEDED  libiconv.so.7.1
  NEEDED  libidn.so.18.0
  NEEDED  libpthread.so.27.1
  NEEDED  libdbus-1.so.11.3
  NEEDED  libnotify.so.5.0
  NEEDED  libgdk_pixbuf-2.0.so.3200.3
  NEEDED  libglib-2.0.so.4201.11
  NEEDED  libpcre2-8.so.0.6
  NEEDED  libgobject-2.0.so.4200.18
  NEEDED  libffi.so.2.0
  NEEDED  libgmodule-2.0.so.4200.18
  NEEDED  libgio-2.0.so.4200.18
  NEEDED  libz.so.7.0
  NEEDED  libpng.so.18.0
  NEEDED  libjpeg.so.70.2
  NEEDED  libgtk-3.so.2201.0
  NEEDED  libgdk-3.so.2201.1
  NEEDED  libcairo.so.13.4
  NEEDED  libfontconfig.so.13.1
  NEEDED  libfreetype.so.30.3
  NEEDED  libexpat.so.14.1
  NEEDED  libX11.so.18.0
  NEEDED  libxcb.so.4.1
  NEEDED  libXext.so.13.0
  NEEDED  libXrender.so.6.0
  NEEDED  libXau.so.10.0
  NEEDED  libXdmcp.so.11.0
  NEEDED  libxcb-render.so.1.1
  NEEDED  libxcb-shm.so.1.1
  NEEDED  libpixman-1.so.40.0
  NEEDED  libpango-1.0.so.3801.3
  NEEDED  libfribidi.so.3.1
  NEEDED  libharfbuzz.so.18.7
  NEEDED  libgraphite2.so.2.0
  NEEDED  libc++.so.10.0
  NEEDED  

Re: [UPDATE] multimedia/mpv - bump version v0.37.0

[Jose Maldonado]

El Tue, 20 Feb 2024 11:31:54 +
Stuart Henderson  escribió:
> I get this:
> 
> $ make port-lib-depends-check
> 
> mpv-0.37.0(multimedia/mpv):
> Extra:  SPIRV-Tools-shared.0 Xinerama.6
> 
> Looks like upstream explicitly stopped using Xinerama so that one can
> be removed.
> 
> What's up with SPIRV-Tools-shared and the new LIB_DEPENDS on
> spirv-tools - I see that the port still uses -Dspirv-cross=disabled,
> I could have missed something but that does seem to disable anything
> to do with spirv?
> 

Hi @sthen!

In order to be consistent with the changes in x11/vlc, do we also
enable wayland support in multimedia/mpv? I can try this along with the
changes you have indicated

-- 
*
Dios en su cielo, todo bien en la Tierra

Re: [UPDATE] multimedia/mpv - bump version v0.37.0

[Stuart Henderson]

I get this:

$ make port-lib-depends-check

mpv-0.37.0(multimedia/mpv):
Extra:  SPIRV-Tools-shared.0 Xinerama.6

Looks like upstream explicitly stopped using Xinerama so that one can be
removed.

What's up with SPIRV-Tools-shared and the new LIB_DEPENDS on
spirv-tools - I see that the port still uses -Dspirv-cross=disabled,
I could have missed something but that does seem to disable anything
to do with spirv?

Re: [UPDATE] multimedia/mpv - bump version v0.37.0

[Jose Maldonado]

El Mon, 12 Feb 2024 15:03:03 -0400
Jose Maldonado  escribió:
> El Mon, 12 Feb 2024 14:14:02 -0400
> Jose Maldonado  escribió:
> > Hello everyone!
> > 
> > This is an update for mpv. With the arrival of libplacebo
> > (>=v6.338.0) we can compile mpv-0.37.0 without problems. The new
> > dependencies for libplacebo and the update corresponding to this
> > port have already been sent.
> > 
> > This time I have enabled support for Vulkan in mpv. This should have
> > no problem with normal use of mpv, as it defaults to GPU and OpenGL,
> > even when Vulkan support is enabled. This makes Vulkan a backend
> > that must be activated explicitly (using --gpu-api=vulkan).
> > 
> > Compiled and tested in --current (OpenBSD 7.4 GENERIC.MP#1671 amd64)
> > without problems including the use of GLSL shaders (both using
> > OpenGL and Vulkan).
> > 
> > 
> 
> Sorry, I forget add a new patch for this version, resend the diff with
> the corrections. 
> 
> 

Hi! New revision of diff for new mpv version (0.37.0) 

portcheck ok
build and test ok


-- 
*
Dios en su cielo, todo bien en la Tierra


mpv-0_37_0
Description: Binary data

Re: [UPDATE] multimedia/mpv - bump version v0.37.0

[Jose Maldonado]

El Mon, 12 Feb 2024 14:14:02 -0400
Jose Maldonado  escribió:
> Hello everyone!
> 
> This is an update for mpv. With the arrival of libplacebo (>=v6.338.0)
> we can compile mpv-0.37.0 without problems. The new dependencies for
> libplacebo and the update corresponding to this port have already been
> sent.
> 
> This time I have enabled support for Vulkan in mpv. This should have
> no problem with normal use of mpv, as it defaults to GPU and OpenGL,
> even when Vulkan support is enabled. This makes Vulkan a backend that
> must be activated explicitly (using --gpu-api=vulkan).
> 
> Compiled and tested in --current (OpenBSD 7.4 GENERIC.MP#1671 amd64)
> without problems including the use of GLSL shaders (both using OpenGL
> and Vulkan).
> 
> 

Sorry, I forget add a new patch for this version, resend the diff with
the corrections. 


-- 
*
Dios en su cielo, todo bien en la Tierra
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile	24 Jul 2023 12:40:20 -	1.98
+++ Makefile	12 Feb 2024 18:57:54 -
@@ -2,10 +2,10 @@ COMMENT =		movie player based on MPlayer
 
 GH_ACCOUNT =		mpv-player
 GH_PROJECT =		mpv
-GH_TAGNAME =		v0.36.0
+GH_TAGNAME =		v0.37.0
 USE_NOBTCFI =		Yes
 
-SHARED_LIBS +=		mpv		1.0 # 2.0
+SHARED_LIBS +=		mpv		2.0
 
 CATEGORIES =		multimedia x11
 
@@ -17,8 +17,8 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += EGL SDL2 X11 Xext Xinerama Xpresent Xrandr Xss Xv archive
 WANTLIB += ass avcodec avdevice avfilter avformat avutil bluray
 WANTLIB += c cdio cdio_cdda cdio_paranoia dvdnav iconv jpeg lcms2
-WANTLIB += ${MODLUA_WANTLIB} m placebo pthread sndio swresample
-WANTLIB += swscale z zimg
+WANTLIB += ${MODLUA_WANTLIB} m placebo pthread sndio SPIRV-Tools-shared
+WANTLIB += swresample swscale vulkan z zimg 
 
 MODULES =		devel/meson \
 			lang/lua \
@@ -30,6 +30,7 @@ COMPILER_LANGS =	c
 DEBUG_PACKAGES =	${BUILD_PACKAGES}
 
 BUILD_DEPENDS =		audio/ladspa \
+			graphics/libplacebo \
 			textproc/py-docutils${MODPY_FLAVOR}
 
 LIB_DEPENDS =		archivers/libarchive \
@@ -41,6 +42,7 @@ LIB_DEPENDS =		archivers/libarchive \
 			graphics/jpeg \
 			graphics/lcms2 \
 			graphics/libplacebo \
+			graphics/spirv-tools \
 			graphics/zimg \
 			multimedia/libass \
 			multimedia/libbluray \
@@ -48,6 +50,7 @@ LIB_DEPENDS =		archivers/libarchive \
 
 MODPY_RUNDEP =		No
 RUN_DEPENDS =		devel/desktop-file-utils \
+			graphics/vulkan-loader \
 			www/yt-dlp \
 			x11/gtk+4,-guic
 
@@ -83,10 +86,6 @@ CONFIGURE_ARGS =	-Dlua=lua${MODLUA_DEP_V
 			-Dios-gl=disabled \
 			-Djack=disabled \
 			-Djavascript=disabled \
-			-Dlibplacebo-next=disabled \
-			-Dmacos-10-11-features=disabled \
-			-Dmacos-10-12-2-features=disabled \
-			-Dmacos-10-14-features=disabled \
 			-Dmacos-cocoa-cb=disabled \
 			-Dmacos-media-player=disabled \
 			-Dmacos-touchbar=disabled \
@@ -100,22 +99,23 @@ CONFIGURE_ARGS =	-Dlua=lua${MODLUA_DEP_V
 			-Dshaderc=disabled \
 			-Dsixel=disabled \
 			-Dswift-build=disabled \
+			-Dswift-flags=disabled \
 			-Dsdl2-audio=disabled \
 			-Dspirv-cross=disabled \
 			-Duchardet=disabled \
 			-Dvaapi=disabled \
 			-Dvaapi-drm=disabled \
-			-Dvaapi-x-egl=disabled \
 			-Dvaapi-x11=disabled \
 			-Dvaapi-wayland=disabled \
 			-Dvapoursynth=disabled \
 			-Dvdpau=disabled \
 			-Dvdpau-gl-x11=disabled \
 			-Dvideotoolbox-gl=disabled \
-			-Dvulkan=disabled \
+			-Dvideotoolbox-pl=disabled \
+			-Dvulkan=enabled \
 			-Dvulkan-interop=disabled \
 			-Dwayland=disabled \
-			-Dwin32-internal-pthreads=disabled \
+			-Dwin32-threads=disabled \
 			-Dwasapi=disabled
 
 CFLAGS +=		-I${LOCALBASE}/include
Index: distinfo
===
RCS file: /cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo	24 Jul 2023 12:40:20 -	1.34
+++ distinfo	12 Feb 2024 18:57:54 -
@@ -1,2 +1,2 @@
-SHA256 (mpv-0.36.0.tar.gz) = KavET46+4BO7L5/hTYCzDbGbU0xnkFbkhRzq31pei/Y=
-SIZE (mpv-0.36.0.tar.gz) = 3409178
+SHA256 (mpv-0.37.0.tar.gz) = HS1K268Eii+m7hNFdQMsSy2tmn76/Vs+abiNuTWvrd8=
+SIZE (mpv-0.37.0.tar.gz) = 3384190
Index: patches/patch-meson_build
===
RCS file: /cvs/ports/multimedia/mpv/patches/patch-meson_build,v
retrieving revision 1.6
diff -u -p -r1.6 patch-meson_build
--- patches/patch-meson_build	24 Jul 2023 12:40:20 -	1.6
+++ patches/patch-meson_build	12 Feb 2024 18:57:54 -
@@ -4,11 +4,11 @@ time if present at all, rather than only
 Index: meson.build
 --- meson.build.orig
 +++ meson.build
-@@ -720,7 +720,19 @@ if features['sdl2-gamepad']
- sources += files('input/sdl_gamepad.c')
+@@ -342,7 +342,19 @@ if features['libdl']
  endif
- 
--stdatomic_dep = cc.find_library('atomic', required: false)
+
+ # C11 atomics are mandatory but linking to the library is not 

[UPDATE] multimedia/mpv - bump version v0.37.0

[Jose Maldonado]

Hello everyone!

This is an update for mpv. With the arrival of libplacebo (>=v6.338.0)
we can compile mpv-0.37.0 without problems. The new dependencies for
libplacebo and the update corresponding to this port have already been
sent.

This time I have enabled support for Vulkan in mpv. This should have no
problem with normal use of mpv, as it defaults to GPU and OpenGL, even
when Vulkan support is enabled. This makes Vulkan a backend that must
be activated explicitly (using --gpu-api=vulkan).

Compiled and tested in --current (OpenBSD 7.4 GENERIC.MP#1671 amd64)
without problems including the use of GLSL shaders (both using OpenGL
and Vulkan).


-- 
*
Dios en su cielo, todo bien en la Tierra
? patches/patch-osdep_threads_posix_h
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile	24 Jul 2023 12:40:20 -	1.98
+++ Makefile	12 Feb 2024 18:08:35 -
@@ -2,10 +2,10 @@ COMMENT =		movie player based on MPlayer
 
 GH_ACCOUNT =		mpv-player
 GH_PROJECT =		mpv
-GH_TAGNAME =		v0.36.0
+GH_TAGNAME =		v0.37.0
 USE_NOBTCFI =		Yes
 
-SHARED_LIBS +=		mpv		1.0 # 2.0
+SHARED_LIBS +=		mpv		2.0
 
 CATEGORIES =		multimedia x11
 
@@ -17,8 +17,8 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += EGL SDL2 X11 Xext Xinerama Xpresent Xrandr Xss Xv archive
 WANTLIB += ass avcodec avdevice avfilter avformat avutil bluray
 WANTLIB += c cdio cdio_cdda cdio_paranoia dvdnav iconv jpeg lcms2
-WANTLIB += ${MODLUA_WANTLIB} m placebo pthread sndio swresample
-WANTLIB += swscale z zimg
+WANTLIB += ${MODLUA_WANTLIB} m placebo pthread sndio SPIRV-Tools-shared
+WANTLIB += swresample swscale vulkan z zimg 
 
 MODULES =		devel/meson \
 			lang/lua \
@@ -30,6 +30,7 @@ COMPILER_LANGS =	c
 DEBUG_PACKAGES =	${BUILD_PACKAGES}
 
 BUILD_DEPENDS =		audio/ladspa \
+			graphics/libplacebo \
 			textproc/py-docutils${MODPY_FLAVOR}
 
 LIB_DEPENDS =		archivers/libarchive \
@@ -41,6 +42,7 @@ LIB_DEPENDS =		archivers/libarchive \
 			graphics/jpeg \
 			graphics/lcms2 \
 			graphics/libplacebo \
+			graphics/spirv-tools \
 			graphics/zimg \
 			multimedia/libass \
 			multimedia/libbluray \
@@ -48,6 +50,7 @@ LIB_DEPENDS =		archivers/libarchive \
 
 MODPY_RUNDEP =		No
 RUN_DEPENDS =		devel/desktop-file-utils \
+			graphics/vulkan-loader \
 			www/yt-dlp \
 			x11/gtk+4,-guic
 
@@ -83,10 +86,6 @@ CONFIGURE_ARGS =	-Dlua=lua${MODLUA_DEP_V
 			-Dios-gl=disabled \
 			-Djack=disabled \
 			-Djavascript=disabled \
-			-Dlibplacebo-next=disabled \
-			-Dmacos-10-11-features=disabled \
-			-Dmacos-10-12-2-features=disabled \
-			-Dmacos-10-14-features=disabled \
 			-Dmacos-cocoa-cb=disabled \
 			-Dmacos-media-player=disabled \
 			-Dmacos-touchbar=disabled \
@@ -100,22 +99,23 @@ CONFIGURE_ARGS =	-Dlua=lua${MODLUA_DEP_V
 			-Dshaderc=disabled \
 			-Dsixel=disabled \
 			-Dswift-build=disabled \
+			-Dswift-flags=disabled \
 			-Dsdl2-audio=disabled \
 			-Dspirv-cross=disabled \
 			-Duchardet=disabled \
 			-Dvaapi=disabled \
 			-Dvaapi-drm=disabled \
-			-Dvaapi-x-egl=disabled \
 			-Dvaapi-x11=disabled \
 			-Dvaapi-wayland=disabled \
 			-Dvapoursynth=disabled \
 			-Dvdpau=disabled \
 			-Dvdpau-gl-x11=disabled \
 			-Dvideotoolbox-gl=disabled \
-			-Dvulkan=disabled \
+			-Dvideotoolbox-pl=disabled \
+			-Dvulkan=enabled \
 			-Dvulkan-interop=disabled \
 			-Dwayland=disabled \
-			-Dwin32-internal-pthreads=disabled \
+			-Dwin32-threads=disabled \
 			-Dwasapi=disabled
 
 CFLAGS +=		-I${LOCALBASE}/include
Index: distinfo
===
RCS file: /cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo	24 Jul 2023 12:40:20 -	1.34
+++ distinfo	12 Feb 2024 18:08:35 -
@@ -1,2 +1,2 @@
-SHA256 (mpv-0.36.0.tar.gz) = KavET46+4BO7L5/hTYCzDbGbU0xnkFbkhRzq31pei/Y=
-SIZE (mpv-0.36.0.tar.gz) = 3409178
+SHA256 (mpv-0.37.0.tar.gz) = HS1K268Eii+m7hNFdQMsSy2tmn76/Vs+abiNuTWvrd8=
+SIZE (mpv-0.37.0.tar.gz) = 3384190
Index: patches/patch-meson_build
===
RCS file: /cvs/ports/multimedia/mpv/patches/patch-meson_build,v
retrieving revision 1.6
diff -u -p -r1.6 patch-meson_build
--- patches/patch-meson_build	24 Jul 2023 12:40:20 -	1.6
+++ patches/patch-meson_build	12 Feb 2024 18:08:35 -
@@ -4,11 +4,11 @@ time if present at all, rather than only
 Index: meson.build
 --- meson.build.orig
 +++ meson.build
-@@ -720,7 +720,19 @@ if features['sdl2-gamepad']
- sources += files('input/sdl_gamepad.c')
+@@ -342,7 +342,19 @@ if features['libdl']
  endif
- 
--stdatomic_dep = cc.find_library('atomic', required: false)
+
+ # C11 atomics are mandatory but linking to the library is not always required.
+-dependencies += cc.find_library('atomic', required: false)
 +if cc.links('''
 +#include 
 +int main(void) {
@@ -22,6 +22,6 @@ Index: 

Re: Update: multimedia/mpv, feedback needed

[Jeremie Courreges-Anglas]

"Dmitrij D. Czarkoff"  writes:

> Jeremie Courreges-Anglas  wrote:
>
>>I don't use mpv, but the fact that it uses libsmbclient puts mpv on my
>>plate when I update samba.  Last time I checked I didn't find the
>>smbclient support particularly useful (access files on network
>>filesystems that aren't mounted locally).  I'd be thankful if you just
>>killed any samba support in mpv.
>
> Well, if nobody will be missing samba support in mov, there is no really
> a good reason for "lite" flavor any more:  most of other features I
> disabled in "lite" flavor don't pull a lot of dependencies, and most of
> them may be disabled in config file.  Then a routine update.
>
> OK?

Looks fine ports-wise, ok jca@

I took a closer look and I must say that I'm quite pleased to see mpv
perform better than mplayer on a few large movies I have (automatic
re-sync of video and audio, duh...).  And now that mpv doesn't link with
libsmbclient any more, I have no reason to go back to mplayer.

I see "pthread_mutex_destroy on mutex with waiters!" messages when
switching audio tracks, but I guess they are not new.

Thanks,
-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: Update: multimedia/mpv, feedback needed

[Christian Weisgerber]

On 2016-11-23, "Dmitrij D. Czarkoff"  wrote:

> I was asked off-list to add a "lite" flavor for multimedia/mpv.  This
> diff introduces such version.  This iteration disables the fllowing in
> "lite" FLAVOR:
-snip-

Well, if I was using mpv (as espie urges me to), I would want some
of the removed features, so this particular lite flavor would be
useless for me.

I think it will be hard to get people to agree on a sensible subset
of functionality for such a flavor.  The whole point of MPlayer and
its offsping is that they _are_ a kitchensink of audio/video features.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: Update: multimedia/mpv, feedback needed

[Dmitrij D. Czarkoff]

Jeremie Courreges-Anglas  wrote:

>I don't use mpv, but the fact that it uses libsmbclient puts mpv on my
>plate when I update samba.  Last time I checked I didn't find the
>smbclient support particularly useful (access files on network
>filesystems that aren't mounted locally).  I'd be thankful if you just
>killed any samba support in mpv.

Well, if nobody will be missing samba support in mov, there is no really
a good reason for "lite" flavor any more:  most of other features I
disabled in "lite" flavor don't pull a lot of dependencies, and most of
them may be disabled in config file.  Then a routine update.

OK?

Index: Makefile
===
RCS file: /var/cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile20 Oct 2016 17:28:52 -  1.34
+++ Makefile23 Nov 2016 15:34:42 -
@@ -8,7 +8,7 @@ COMMENT =   movie player based on MPlayer
 
 GH_ACCOUNT =   mpv-player
 GH_PROJECT =   mpv
-GH_TAGNAME =   v0.21.0
+GH_TAGNAME =   v0.22.0
 
 CATEGORIES =   multimedia x11
 
@@ -29,8 +29,8 @@ 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 gbm iconv jpeg lcms2 m opus postproc
-WANTLIB += pthread pthread-stubs smbclient sndio speex swresample
+WANTLIB += fontconfig freetype fribidi gbm iconv jpeg lcms2 m
+WANTLIB += opus postproc pthread pthread-stubs sndio speex swresample
 WANTLIB += swscale v4l2 v4lconvert vpx x264 x265 xcb xcb-dri2
 WANTLIB += xcb-glx z ${MODLUA_WANTLIB}
 
@@ -38,7 +38,6 @@ MODULES = lang/lua \
lang/python
 
 BUILD_DEPENDS =audio/ladspa \
-   graphics/libmng \
textproc/py-docutils
 
 LIB_DEPENDS =  audio/libcdio \
@@ -51,8 +50,7 @@ LIB_DEPENDS = audio/libcdio \
multimedia/libass \
multimedia/libbluray>=0.8.0 \
multimedia/libdvdnav \
-   multimedia/libv4l \
-   net/samba
+   multimedia/libv4l
 
 MODPY_RUNDEP = No
 RUN_DEPENDS =  devel/desktop-file-utils \
@@ -79,6 +77,7 @@ CONFIGURE_ARGS =  --confloaddir=${SYSCONF
--disable-optimize \
--disable-pulse \
--disable-rsound \
+   --disable-libsmbclient \
--disable-uchardet \
--disable-vaapi \
--disable-vaapi-glx \
Index: distinfo
===
RCS file: /var/cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo20 Oct 2016 17:28:52 -  1.18
+++ distinfo23 Nov 2016 15:12:59 -
@@ -1,4 +1,4 @@
-SHA256 (mpv-0.21.0.tar.gz) = 0F+OzoWcUA7xZJzf6pEewVKd8YmLj9o+IXdm3Cjcm9M=
+SHA256 (mpv-0.22.0.tar.gz) = wPmsjw43o5HRkAezM++Hh8L0XXWg1EAcAJjN5SxQgvY=
 SHA256 (waf-1.8.19) = LtVHGgjfJY+FV4dXYarWfoCy3IRkgtwRE1o1x3yRtLM=
-SIZE (mpv-0.21.0.tar.gz) = 2812584
+SIZE (mpv-0.22.0.tar.gz) = 2822645
 SIZE (waf-1.8.19) = 100743
Index: patches/patch-video_out_opengl_context_c
===
RCS file: patches/patch-video_out_opengl_context_c
diff -N patches/patch-video_out_opengl_context_c
--- patches/patch-video_out_opengl_context_c20 Oct 2016 17:28:52 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-video_out_opengl_context_c,v 1.1 2016/10/20 17:28:52 czarkoff 
Exp $
 video/out/opengl/context.c.origWed Oct 19 23:10:13 2016
-+++ video/out/opengl/context.c Thu Oct 20 18:21:42 2016
-@@ -125,7 +125,7 @@ int mpgl_validate_backend_opt(struct mp_log *log, cons
- 
- #if HAVE_C11_TLS
- #define MP_TLS _Thread_local
--#elif defined(__GNUC__)
-+#elif HAVE_GCC_TLS
- #define MP_TLS __thread
- #endif
- 
Index: patches/patch-wscript
===
RCS file: patches/patch-wscript
diff -N patches/patch-wscript
--- patches/patch-wscript   20 Oct 2016 17:28:52 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-wscript,v 1.1 2016/10/20 17:28:52 czarkoff Exp $
 wscript.orig   Wed Oct 19 23:10:13 2016
-+++ wscriptThu Oct 20 18:21:42 2016
-@@ -186,6 +186,10 @@ main_dependencies = [
- 'desc': 'C11 TLS support',
- 'func': check_statement('stddef.h', 'static _Thread_local int x = 0'),
- }, {
-+'name': 'gcc-tls',
-+'desc': 'GCC TLS support',
-+'func': check_statement('stddef.h', 'static __thread int x = 

Re: Update: multimedia/mpv, feedback needed

[Antoine Jacoutot]

On Wed, Nov 23, 2016 at 04:11:10PM +0100, Dmitrij D. Czarkoff wrote:
> Antoine Jacoutot wrote:
> 
> >>> --enable-foo needs to be explicitely set when the dependency \
> >>> is found by configure?
> >> 
> >> And surely if that's the case for some foo, then --disable wouldn't be
> >> needed for that foo..
> >
> >--disable-foo is needed because in case a dependency is \
> >there at build time, you will pick it up.
> 
> With waf all these settings have some default value, so that build
> system may or may not pick a dependency.  Also, there is no guarantee
> that defaults won't change between releases.  So having explicit

Sure, that's what MAINTAINER is for :-)
And that won't prevent new switches in a new release anyway.

> --(en|dis)able-* flags (together with "make port-lib-depends-check")
> help detecting dependency issues during updates.

Alright, I was just asking since that's the only port where I ever saw 
something like this.
I don't mind it, I just found it weird and was just wondering.

-- 
Antoine

Re: Update: multimedia/mpv, feedback needed

[Dmitrij D. Czarkoff]

Antoine Jacoutot wrote:

>>> --enable-foo needs to be explicitely set when the dependency \
>>> is found by configure?
>> 
>> And surely if that's the case for some foo, then --disable wouldn't be
>> needed for that foo..
>
>--disable-foo is needed because in case a dependency is \
>there at build time, you will pick it up.

With waf all these settings have some default value, so that build
system may or may not pick a dependency.  Also, there is no guarantee
that defaults won't change between releases.  So having explicit
--(en|dis)able-* flags (together with "make port-lib-depends-check")
help detecting dependency issues during updates.

Re: Update: multimedia/mpv, feedback needed

[Antoine Jacoutot]

On Wed, Nov 23, 2016 at 02:11:27PM +, Stuart Henderson wrote:
> On 2016/11/23 14:30, Antoine Jacoutot wrote:
> > On Wed, Nov 23, 2016 at 02:05:30PM +0100, Dmitrij D. Czarkoff wrote:
> > > Antoine Jacoutot  wrote:
> > > 
> > > >> +.if ${FLAVOR:L:Mlite}
> > > >> +TOGGLE =disable
> > > >> +.else
> > > >> +TOGGLE =enable
> > > >
> > > >Why using a variable for this?
> > > >Wouldn't this work?
> > > >
> > > >.if ${FLAVOR:L:Mlite}
> > > >CONFIGURE_ARGS +=  --disable-foo \
> > > >   --disable-bar
> > > >...
> > > 
> > > Separate variable is supposed to allow a single list of flags, so that I 
> > > would
> > > not need to sync lists if changes are necessary.
> > 
> > --enable-foo needs to be explicitely set when the dependency is found by 
> > configure?
> 
> And surely if that's the case for some foo, then --disable wouldn't be
> needed for that foo..

--disable-foo is needed because in case a dependency is there at build time, 
you will pick it up.

-- 
Antoine

Re: Update: multimedia/mpv, feedback needed

[Stuart Henderson]

On 2016/11/23 14:30, Antoine Jacoutot wrote:
> On Wed, Nov 23, 2016 at 02:05:30PM +0100, Dmitrij D. Czarkoff wrote:
> > Antoine Jacoutot  wrote:
> > 
> > >> +.if ${FLAVOR:L:Mlite}
> > >> +TOGGLE =disable
> > >> +.else
> > >> +TOGGLE =enable
> > >
> > >Why using a variable for this?
> > >Wouldn't this work?
> > >
> > >.if ${FLAVOR:L:Mlite}
> > >CONFIGURE_ARGS +=  --disable-foo \
> > >   --disable-bar
> > >...
> > 
> > Separate variable is supposed to allow a single list of flags, so that I 
> > would
> > not need to sync lists if changes are necessary.
> 
> --enable-foo needs to be explicitely set when the dependency is found by 
> configure?

And surely if that's the case for some foo, then --disable wouldn't be
needed for that foo..

Re: Update: multimedia/mpv, feedback needed

[Antoine Jacoutot]

On Wed, Nov 23, 2016 at 02:05:30PM +0100, Dmitrij D. Czarkoff wrote:
> Antoine Jacoutot  wrote:
> 
> >> +.if ${FLAVOR:L:Mlite}
> >> +TOGGLE =disable
> >> +.else
> >> +TOGGLE =enable
> >
> >Why using a variable for this?
> >Wouldn't this work?
> >
> >.if ${FLAVOR:L:Mlite}
> >CONFIGURE_ARGS +=  --disable-foo \
> >   --disable-bar
> >...
> 
> Separate variable is supposed to allow a single list of flags, so that I would
> not need to sync lists if changes are necessary.

--enable-foo needs to be explicitely set when the dependency is found by 
configure?

-- 
Antoine

Re: Update: multimedia/mpv, feedback needed

[Josh Grosse]

On Wed, Nov 23, 2016 at 01:49:41AM +0100, Dmitrij D. Czarkoff wrote:
> Hi!
> 
> I was asked off-list to add a "lite" flavor for multimedia/mpv.  This
> diff introduces such version.  This iteration disables the fllowing in
> "lite" FLAVOR:
> 
>  * Lua UI and scripting
>  * Encoding
>  * DVD and BluRay support
>  * CDDA
>  * Samba support
>  * Subtitle reencoding with iconv
>  * SDL2-based drivers
>  * TV via v4l2
> 
> This saves about 38 Mb of dependencies and somewhat reduces the risks.
> 
> Comments?  OKs?

Tested on amd64.  Works for me. :)

Re: Update: multimedia/mpv, feedback needed

[Dmitrij D. Czarkoff]

Antoine Jacoutot  wrote:

>> +.if ${FLAVOR:L:Mlite}
>> +TOGGLE =disable
>> +.else
>> +TOGGLE =enable
>
>Why using a variable for this?
>Wouldn't this work?
>
>.if ${FLAVOR:L:Mlite}
>CONFIGURE_ARGS +=  --disable-foo \
>   --disable-bar
>...

Separate variable is supposed to allow a single list of flags, so that I would
not need to sync lists if changes are necessary.

Re: Update: multimedia/mpv, feedback needed

[Marc Espie]

On Wed, Nov 23, 2016 at 01:49:41AM +0100, Dmitrij D. Czarkoff wrote:
> Hi!
> 
> I was asked off-list to add a "lite" flavor for multimedia/mpv.  This
> diff introduces such version.  This iteration disables the fllowing in
> "lite" FLAVOR:
> 
>  * Lua UI and scripting
>  * Encoding
>  * DVD and BluRay support
>  * CDDA
>  * Samba support
>  * Subtitle reencoding with iconv
>  * SDL2-based drivers
>  * TV via v4l2
> 
> This saves about 38 Mb of dependencies and somewhat reduces the risks.
> 
> Comments?  OKs?

There are some suspicious "disables" in there, like --disable-jpeg, that
this list doesn't talk about.

I'm pretty sure I use that one. I've used mpv as a diaporama for a mix of
videos and photos in the past.

Also subtitle reencoding is fairly useful for non english speaking users.

I don't think those are the most risky nor bulky of the features you want
to remove in the lite flavor.

Re: Update: multimedia/mpv, feedback needed

[Stuart Henderson]

You have a number of libraries repeated in WANTLIB (i.e. once for "lite" 
and again for "no-lite"), could you remove the second one please as it will 
mean things may get missed when WANTLIB are bulk-synced in the future.


Should *input.conf also go to PFRAG.no-lite? I think you disabled all the 
input-related things?



On 23 November 2016 00:49:55 "Dmitrij D. Czarkoff"  wrote:


Hi!

I was asked off-list to add a "lite" flavor for multimedia/mpv.  This
diff introduces such version.  This iteration disables the fllowing in
"lite" FLAVOR:

 * Lua UI and scripting
 * Encoding
 * DVD and BluRay support
 * CDDA
 * Samba support
 * Subtitle reencoding with iconv
 * SDL2-based drivers
 * TV via v4l2

This saves about 38 Mb of dependencies and somewhat reduces the risks.

Comments?  OKs?

--
Dmitrij D. Czarkoff

Index: Makefile
===
RCS file: /var/cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile20 Oct 2016 17:28:52 -  1.34
+++ Makefile22 Nov 2016 19:14:45 -
@@ -8,7 +8,7 @@ COMMENT =   movie player based on MPlayer

 GH_ACCOUNT =   mpv-player
 GH_PROJECT =   mpv
-GH_TAGNAME =   v0.21.0
+GH_TAGNAME =   v0.22.0

 CATEGORIES =   multimedia x11

@@ -25,47 +25,59 @@ EXTRACT_ONLY =  ${DISTNAME}${EXTRACT_SUF
 PERMIT_PACKAGE_CDROM = patents
 PERMIT_PACKAGE_FTP =   Yes

-WANTLIB += EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
-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 gbm iconv 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}
+WANTLIB += EGL GL X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes Xinerama
+WANTLIB += Xrandr Xrender Xss Xv Xxf86vm ass avcodec avfilter
+WANTLIB += avformat avresample avutil c drm expat fontconfig freetype
+WANTLIB += fribidi gbm m opus postproc pthread pthread-stubs sndio
+WANTLIB += speex swresample swscale vpx x264 x265 xcb xcb-dri2
+WANTLIB += xcb-glx z

-MODULES =  lang/lua \
-   lang/python
+MODULES =  lang/python

 BUILD_DEPENDS =audio/ladspa \
-   graphics/libmng \
textproc/py-docutils

-LIB_DEPENDS =  audio/libcdio \
+LIB_DEPENDS =  graphics/ffmpeg>=20151112 \
+   multimedia/libass
+
+MODPY_RUNDEP = No
+RUN_DEPENDS =  devel/desktop-file-utils \
+   x11/gtk+3,-guic
+
+FLAVORS ?= lite
+FLAVOR ?=
+
+.if ${FLAVOR:L:Mlite}
+TOGGLE =   disable
+.else
+TOGGLE =   enable
+
+WANTLIB += SDL2 ass avdevice bluray cdio cdio_cdda cdio_paranoia
+WANTLIB += dvdnav dvdread expat fontconfig freetype fribidi iconv
+WANTLIB += jpeg lcms2 smbclient v4l2 v4lconvert ${MODLUA_WANTLIB}
+
+MODULES += lang/lua
+
+LIB_DEPENDS += audio/libcdio \
converters/libiconv \
devel/libdvdread \
devel/sdl2 \
-   graphics/ffmpeg>=20151112 \
graphics/jpeg \
graphics/lcms2 \
-   multimedia/libass \
multimedia/libbluray>=0.8.0 \
multimedia/libdvdnav \
multimedia/libv4l \
net/samba
+RUN_DEPENDS += www/youtube-dl
+.endif

-MODPY_RUNDEP = No
-RUN_DEPENDS =  devel/desktop-file-utils \
-   x11/gtk+3,-guic

 CONFIGURE_ARGS =   --confloaddir=${SYSCONFDIR}/mpv \
--confdir=${LOCALBASE}/share/examples/mpv \
--mandir=${LOCALBASE}/man \
--docdir=${LOCALBASE}/share/examples/mpv \
--zshdir=${LOCALBASE}/share/zsh/vendor-completions \
-   --enable-encoding \
--enable-sndio \
-   --enable-sdl2 \
--enable-zsh-comp \
--disable-alsa \
--disable-caca \
@@ -92,7 +104,22 @@ CONFIGURE_ARGS =--confloaddir=${SYSCONF
--disable-vdpau-hwaccel \
--disable-videotoolbox-hwaccel \
--disable-videotoolbox-gl \
-   --disable-wayland
+   --disable-wayland \
+   --${TOGGLE}-audio-input \
+   --${TOGGLE}-cdda \
+   --${TOGGLE}-dvdread \
+   --${TOGGLE}-dvdnav \
+

Re: Update: multimedia/mpv, feedback needed

[Antoine Jacoutot]

On Wed, Nov 23, 2016 at 01:49:41AM +0100, Dmitrij D. Czarkoff wrote:
> Hi!
> 
> I was asked off-list to add a "lite" flavor for multimedia/mpv.  This
> diff introduces such version.  This iteration disables the fllowing in
> "lite" FLAVOR:
> 
>  * Lua UI and scripting
>  * Encoding
>  * DVD and BluRay support
>  * CDDA
>  * Samba support
>  * Subtitle reencoding with iconv
>  * SDL2-based drivers
>  * TV via v4l2
> 
> This saves about 38 Mb of dependencies and somewhat reduces the risks.
> 
> Comments?  OKs?
> 
> --
> Dmitrij D. Czarkoff
> 
> Index: Makefile
> ===
> RCS file: /var/cvs/ports/multimedia/mpv/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- Makefile  20 Oct 2016 17:28:52 -  1.34
> +++ Makefile  22 Nov 2016 19:14:45 -
> @@ -8,7 +8,7 @@ COMMENT = movie player based on MPlayer
>  
>  GH_ACCOUNT = mpv-player
>  GH_PROJECT = mpv
> -GH_TAGNAME = v0.21.0
> +GH_TAGNAME = v0.22.0
>  
>  CATEGORIES = multimedia x11
>  
> @@ -25,47 +25,59 @@ EXTRACT_ONLY =${DISTNAME}${EXTRACT_SUF
>  PERMIT_PACKAGE_CDROM =   patents
>  PERMIT_PACKAGE_FTP = Yes
>  
> -WANTLIB += EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
> -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 gbm iconv 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}
> +WANTLIB += EGL GL X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes Xinerama
> +WANTLIB += Xrandr Xrender Xss Xv Xxf86vm ass avcodec avfilter
> +WANTLIB += avformat avresample avutil c drm expat fontconfig freetype
> +WANTLIB += fribidi gbm m opus postproc pthread pthread-stubs sndio
> +WANTLIB += speex swresample swscale vpx x264 x265 xcb xcb-dri2
> +WANTLIB += xcb-glx z
>  
> -MODULES =lang/lua \
> - lang/python
> +MODULES =lang/python
>  
>  BUILD_DEPENDS =  audio/ladspa \
> - graphics/libmng \
>   textproc/py-docutils
>  
> -LIB_DEPENDS =audio/libcdio \
> +LIB_DEPENDS =graphics/ffmpeg>=20151112 \
> + multimedia/libass
> +
> +MODPY_RUNDEP =   No
> +RUN_DEPENDS =devel/desktop-file-utils \
> + x11/gtk+3,-guic
> +
> +FLAVORS ?=   lite
> +FLAVOR ?=
> +
> +.if ${FLAVOR:L:Mlite}
> +TOGGLE = disable
> +.else
> +TOGGLE = enable

Why using a variable for this?
Wouldn't this work?

.if ${FLAVOR:L:Mlite}
CONFIGURE_ARGS +=   --disable-foo \
--disable-bar
...


> +
> +WANTLIB += SDL2 ass avdevice bluray cdio cdio_cdda cdio_paranoia
> +WANTLIB += dvdnav dvdread expat fontconfig freetype fribidi iconv
> +WANTLIB += jpeg lcms2 smbclient v4l2 v4lconvert ${MODLUA_WANTLIB}
> +
> +MODULES +=   lang/lua
> +
> +LIB_DEPENDS +=   audio/libcdio \
>   converters/libiconv \
>   devel/libdvdread \
>   devel/sdl2 \
> - graphics/ffmpeg>=20151112 \
>   graphics/jpeg \
>   graphics/lcms2 \
> - multimedia/libass \
>   multimedia/libbluray>=0.8.0 \
>   multimedia/libdvdnav \
>   multimedia/libv4l \
>   net/samba
> +RUN_DEPENDS +=   www/youtube-dl
> +.endif
>  
> -MODPY_RUNDEP =   No
> -RUN_DEPENDS =devel/desktop-file-utils \
> - x11/gtk+3,-guic
>  
>  CONFIGURE_ARGS = --confloaddir=${SYSCONFDIR}/mpv \
>   --confdir=${LOCALBASE}/share/examples/mpv \
>   --mandir=${LOCALBASE}/man \
>   --docdir=${LOCALBASE}/share/examples/mpv \
>   --zshdir=${LOCALBASE}/share/zsh/vendor-completions \
> - --enable-encoding \
>   --enable-sndio \
> - --enable-sdl2 \
>   --enable-zsh-comp \
>   --disable-alsa \
>   --disable-caca \
> @@ -92,7 +104,22 @@ CONFIGURE_ARGS =  --confloaddir=${SYSCONF
>   --disable-vdpau-hwaccel \
>   --disable-videotoolbox-hwaccel \
>   --disable-videotoolbox-gl \
> - --disable-wayland
> + --disable-wayland \
> + --${TOGGLE}-audio-input \
> + --${TOGGLE}-cdda \
> + --${TOGGLE}-dvdread \
> + 

Re: Update: multimedia/mpv, feedback needed

[trondd]

On Tue, November 22, 2016 7:49 pm, Dmitrij D. Czarkoff wrote:
> Hi!
>
> I was asked off-list to add a "lite" flavor for multimedia/mpv.  This
> diff introduces such version.  This iteration disables the fllowing in
> "lite" FLAVOR:
>
>  * Lua UI and scripting
>  * Encoding
>  * DVD and BluRay support
>  * CDDA
>  * Samba support
>  * Subtitle reencoding with iconv
>  * SDL2-based drivers
>  * TV via v4l2
>
> This saves about 38 Mb of dependencies and somewhat reduces the risks.
>
> Comments?  OKs?
>
> --
> Dmitrij D. Czarkoff
>

I use mpv and I don't think I use any of those features.  I'll build it
and test it out, but I'm in favor of lighter and simpler.

Tim.

Update: multimedia/mpv, feedback needed

[Dmitrij D. Czarkoff]

Hi!

I was asked off-list to add a "lite" flavor for multimedia/mpv.  This
diff introduces such version.  This iteration disables the fllowing in
"lite" FLAVOR:

 * Lua UI and scripting
 * Encoding
 * DVD and BluRay support
 * CDDA
 * Samba support
 * Subtitle reencoding with iconv
 * SDL2-based drivers
 * TV via v4l2

This saves about 38 Mb of dependencies and somewhat reduces the risks.

Comments?  OKs?

--
Dmitrij D. Czarkoff

Index: Makefile
===
RCS file: /var/cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile20 Oct 2016 17:28:52 -  1.34
+++ Makefile22 Nov 2016 19:14:45 -
@@ -8,7 +8,7 @@ COMMENT =   movie player based on MPlayer
 
 GH_ACCOUNT =   mpv-player
 GH_PROJECT =   mpv
-GH_TAGNAME =   v0.21.0
+GH_TAGNAME =   v0.22.0
 
 CATEGORIES =   multimedia x11
 
@@ -25,47 +25,59 @@ EXTRACT_ONLY =  ${DISTNAME}${EXTRACT_SUF
 PERMIT_PACKAGE_CDROM = patents
 PERMIT_PACKAGE_FTP =   Yes
 
-WANTLIB += EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
-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 gbm iconv 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}
+WANTLIB += EGL GL X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes Xinerama
+WANTLIB += Xrandr Xrender Xss Xv Xxf86vm ass avcodec avfilter
+WANTLIB += avformat avresample avutil c drm expat fontconfig freetype
+WANTLIB += fribidi gbm m opus postproc pthread pthread-stubs sndio
+WANTLIB += speex swresample swscale vpx x264 x265 xcb xcb-dri2
+WANTLIB += xcb-glx z
 
-MODULES =  lang/lua \
-   lang/python
+MODULES =  lang/python
 
 BUILD_DEPENDS =audio/ladspa \
-   graphics/libmng \
textproc/py-docutils
 
-LIB_DEPENDS =  audio/libcdio \
+LIB_DEPENDS =  graphics/ffmpeg>=20151112 \
+   multimedia/libass
+
+MODPY_RUNDEP = No
+RUN_DEPENDS =  devel/desktop-file-utils \
+   x11/gtk+3,-guic
+
+FLAVORS ?= lite
+FLAVOR ?=
+
+.if ${FLAVOR:L:Mlite}
+TOGGLE =   disable
+.else
+TOGGLE =   enable
+
+WANTLIB += SDL2 ass avdevice bluray cdio cdio_cdda cdio_paranoia
+WANTLIB += dvdnav dvdread expat fontconfig freetype fribidi iconv
+WANTLIB += jpeg lcms2 smbclient v4l2 v4lconvert ${MODLUA_WANTLIB}
+
+MODULES += lang/lua
+
+LIB_DEPENDS += audio/libcdio \
converters/libiconv \
devel/libdvdread \
devel/sdl2 \
-   graphics/ffmpeg>=20151112 \
graphics/jpeg \
graphics/lcms2 \
-   multimedia/libass \
multimedia/libbluray>=0.8.0 \
multimedia/libdvdnav \
multimedia/libv4l \
net/samba
+RUN_DEPENDS += www/youtube-dl
+.endif
 
-MODPY_RUNDEP = No
-RUN_DEPENDS =  devel/desktop-file-utils \
-   x11/gtk+3,-guic
 
 CONFIGURE_ARGS =   --confloaddir=${SYSCONFDIR}/mpv \
--confdir=${LOCALBASE}/share/examples/mpv \
--mandir=${LOCALBASE}/man \
--docdir=${LOCALBASE}/share/examples/mpv \
--zshdir=${LOCALBASE}/share/zsh/vendor-completions \
-   --enable-encoding \
--enable-sndio \
-   --enable-sdl2 \
--enable-zsh-comp \
--disable-alsa \
--disable-caca \
@@ -92,7 +104,22 @@ CONFIGURE_ARGS =--confloaddir=${SYSCONF
--disable-vdpau-hwaccel \
--disable-videotoolbox-hwaccel \
--disable-videotoolbox-gl \
-   --disable-wayland
+   --disable-wayland \
+   --${TOGGLE}-audio-input \
+   --${TOGGLE}-cdda \
+   --${TOGGLE}-dvdread \
+   --${TOGGLE}-dvdnav \
+   --${TOGGLE}-encoding \
+   --${TOGGLE}-iconv \
+   --${TOGGLE}-jpeg \
+   --${TOGGLE}-lcms2 \
+   --${TOGGLE}-libavdevice \
+   --${TOGGLE}-libbluray \
+   --${TOGGLE}-libsmbclient \
+   --${TOGGLE}-libv4l2 \
+   

Re: Update: multimedia/mpv

[Dmitrij D. Czarkoff]

Stuart Henderson  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
--- Makefile4 May 2016 09:13:10 -   1.27
+++ Makefile8 Jul 2016 13:20:53 -
@@ -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
--- distinfo27 Apr 2016 11:39:04 -  1.13
+++ distinfo8 Jul 2016 11:38:52 -
@@ -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 -
+++ patches/patch-waftools_detections_compiler_py   8 Jul 2016 12:14:38 
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- waftools/detections/compiler.py.orig   Fri Jul  8 14:14:10 2016
 waftools/detections/compiler.pyFri 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",

Re: Update: multimedia/mpv

[Stuart Henderson]

On 2016/07/08 16:13, Dmitrij D. Czarkoff wrote:
> Hi!
> 
> 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:

$ make
===> mpv-0.18.0 depends on: ladspa-* -> ladspa-1.13p0
===> mpv-0.18.0 depends on: libmng-* -> libmng-1.0.10p3
===> mpv-0.18.0 depends on: py-docutils-* -> py-docutils-0.12p0
===> mpv-0.18.0 depends on: lua->=5.1,<5.2 -> lua-5.1.5p6
===> mpv-0.18.0 depends on: python->=2.7,<2.8 -> python-2.7.12
===> mpv-0.18.0 depends on: groff->=1.21 -> groff-1.22.3p2
===> mpv-0.18.0 depends on: libcdio-* -> libcdio-0.80p7
===> mpv-0.18.0 depends on: libdvdread-* -> libdvdread-5.0.3p0
===> mpv-0.18.0 depends on: sdl2-* -> sdl2-2.0.4p0
===> mpv-0.18.0 depends on: ffmpeg->=20151112 -> ffmpeg-20160502
===> mpv-0.18.0 depends on: jpeg-* -> jpeg-1.5.0v0
===> mpv-0.18.0 depends on: lcms2-* -> lcms2-2.7
===> mpv-0.18.0 depends on: libass-* -> libass-0.13.2
===> mpv-0.18.0 depends on: libbluray->=0.8.0 -> libbluray-0.9.3
===> mpv-0.18.0 depends on: libdvdnav-* -> libdvdnav-5.0.3v0
===> mpv-0.18.0 depends on: libv4l-* -> libv4l-1.10.1p0
===> mpv-0.18.0 depends on: samba-* -> samba-4.4.4
===> mpv-0.18.0 depends on: libiconv-* -> libiconv-1.14p3
===>  Verifying specs:  EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes 
Xinerama Xrandr Xrender Xss Xv Xxf86vm ass avcodec avdevice avfilter avformat 
avresample avutil bluray c cdio cdio_cdda cdio_paranoia drm dvdnav dvdread 
expat fontconfig freetype fribidi gbm jpeg lcms2 m opus postproc pthread 
pthread-stubs smbclient sndio speex swresample swscale v4l2 v4lconvert vpx x264 
x265 xcb xcb-dri2 xcb-glx z lua5.1 iconv>=2
===>  found EGL.1.0 GL.17.0 SDL2.0.2 X11.16.1 X11-xcb.2.0 Xau.10.0 Xdamage.4.0 
Xdmcp.11.0 Xext.13.0 Xfixes.6.0 Xinerama.6.0 Xrandr.7.1 Xrender.6.0 Xss.6.0 
Xv.6.0 Xxf86vm.6.0 ass.2.1 avcodec.22.2 avdevice.10.0 avfilter.7.3 
avformat.19.4 avresample.1.0 avutil.12.4 bluray.2.2 c.88.0 cdio.0.1 
cdio_cdda.0.1 cdio_paranoia.0.1 drm.7.1 dvdnav.7.1 dvdread.6.1 expat.11.0 
fontconfig.10.0 freetype.25.0 fribidi.2.0 gbm.0.0 jpeg.68.1 lcms2.1.1 m.9.0 
opus.1.0 postproc.16.1 pthread.22.0 pthread-stubs.2.0 smbclient.4.1 sndio.6.1 
speex.8.0 swresample.1.2 swscale.6.1 v4l2.0.0 v4lconvert.0.0 vpx.7.0 x264.16.0 
x265.6.0 xcb.3.2 xcb-dri2.1.1 xcb-glx.1.0 z.5.0 lua5.1.5.1 iconv.6.0
===>  Checking files for mpv-0.18.0
`/y/Download/ftp/pub/OpenBSD/distfiles/mpv-0.18.0.tar.gz' is up to date.
`/y/Download/ftp/pub/OpenBSD/distfiles/waf-1.8.19' is up to date.
>> (SHA256) mpv-0.18.0.tar.gz: OK
>> (SHA256) waf-1.8.19: OK
===>  Extracting for mpv-0.18.0
===>  Patching for mpv-0.18.0
===>  Configuring for mpv-0.18.0
cp /y/Download/ftp/pub/OpenBSD/distfiles/waf-1.8.19 
/usr/obj/ports/mpv-0.18.0/mpv-0.18.0/waf-1.8.19
cd /usr/obj/ports/mpv-0.18.0/mpv-0.18.0 && /usr/bin/env -i 
LDFLAGS="-L/usr/local/lib -L/usr/X11R6/lib" CPPFLAGS="-I/usr/local/include 
-I/usr/X11R6/include" CC=cc PYTHONUSERBASE=/usr/obj/ports/mpv-0.18.0 
PORTSDIR="/usr/ports" LIBTOOL="/usr/bin/libtool"  
PATH='/usr/obj/ports/mpv-0.18.0/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin'
 PREFIX='/usr/local'  LOCALBASE='/usr/local' X11BASE='/usr/X11R6'  CFLAGS='-O2 
-pipe'  TRUEPREFIX='/usr/local' DESTDIR=''  HOME='/mpv-0.18.0_writes_to_HOME' 
COMPILER_VERSION=gcc4  PICFLAG="-fpic" ASPICFLAG=  BINGRP=bin BINOWN=root 
BINMODE=755 NONBINMODE=644  DIRMODE=755  INSTALL_COPY=-c INSTALL_STRIP=-s  
MANGRP=bin MANOWN=root MANMODE=644 
BSD_INSTALL_PROGRAM="/usr/obj/ports/mpv-0.18.0/bin/install -c -s  -m 755"  
BSD_INSTALL_SCRIPT="/usr/obj/ports/mpv-0.18.0/bin/install -c  -m 755"  
BSD_INSTALL_DATA="/usr/obj/ports/mpv-0.18.0/bin/install -c  -m 644"  
BSD_INSTALL_MAN="/usr/obj/ports/mpv-0.18.0/bin/install -c  -m 644"  
BSD_INSTALL_PROGRAM_DIR="/usr/obj/ports/mpv-0.18.0/bin/install -d  -m 755"  
BSD_INSTALL_SCRIPT_DIR="/usr/obj/ports/mpv-0.18.0/bin/install -d  -m 755"  
BSD_INSTALL_DATA_DIR="/usr/obj/ports/mpv-0.18.0/bin/install -d  -m 755"  
BSD_INSTALL_MAN_DIR="/usr/obj/ports/mpv-0.18.0/bin/install -d  -m 755" 
/usr/local/bin/python2.7 /usr/obj/ports/mpv-0.18.0/mpv-0.18.0/waf-1.8.19  -o 
"/usr/obj/ports/mpv-0.18.0/mpv-0.18.0/amd64" -t 
"/usr/obj/ports/mpv-0.18.0/mpv-0.18.0" 
--destdir="/usr/obj/ports/mpv-0.18.0/fake-amd64" LIBTOOL="/usr/bin/libtool"  
SHARED_LIBS_LOG=/usr/obj/ports/mpv-0.18.0/mpv-0.18.0/amd64/shared_libs.log 
configure --confloaddir=/etc/mpv  --confdir=/usr/local/share/examples/mpv  
--mandir=/usr/local/man  --docdir=/usr/local/share/examples/mpv  
--zshdir=/usr/local/share/zsh/vendor-completions  --enable-encoding  
--enable-sndio  --enable-sdl2  --enable-zsh-comp  --disable-alsa  
--disable-caca  --disable-enca  --disable-jack  --disable-libarchive  
--disable-libguess  --disable-rubberband  --disable-oss-audio  

Update: multimedia/mpv

[Dmitrij D. Czarkoff]

Hi!

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?

--
Dmitrij D. Czarkoff

Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile4 May 2016 09:13:10 -   1.27
+++ Makefile8 Jul 2016 13:20:53 -
@@ -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
--- distinfo27 Apr 2016 11:39:04 -  1.13
+++ distinfo8 Jul 2016 11:38:52 -
@@ -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

Re: Update: multimedia/mpv

[Landry Breuil]

On Mon, Feb 01, 2016 at 08:36:24AM +0100, Jasper Lievisse Adriaanse wrote:
> On Mon, Feb 01, 2016 at 08:13:23AM +0100, Dmitrij D. Czarkoff wrote:
> > Hi!
> > 
> > Attached diff updates multimedia/mpv to version 0.15.0.  Starting from
> > this release mpv does not include old build infrastructure, so waf (!)
> > becomes absolutely required to build this port.
> > 
> > In theory waf is supposed to be included with software.  For some reason
> > mpv people don't do so - they provide a script for fetching waf at
> > configure stage.  Thus I also include a port for waf.  The port contains
> > a module, which is supposed to be useful for waf-based ports.
> Blergh. Would it be possible to talk to upstream to use something halfwhat
> decent like cmake or even scons if they're into SM?
> 
> Removing waf was an intentional decision in the sense that it's a horrible
> "build" system. Putting it back is one thing, adding a module again is
> adding insult to injury IMHO.

I still have nightmares just thinking about waf.

Reading https://github.com/mpv-player/mpv/blob/master/DOCS/waf-buildsystem.rst,
it seems they took waf, and built something on top of it, extending it.
I dont even..  Hell, using jam or scons would be less horrible.
Looking at https://github.com/mpv-player/mpv/issues/2710 they even seem
hostile to the BSDs.

Just put the darn waf tarball in DISTFILES, and yell at them.

Landry

Re: Update: multimedia/mpv

[Dmitrij D. Czarkoff]

Jasper Lievisse Adriaanse said:
> Blergh. Would it be possible to talk to upstream to use something halfwhat
> decent like cmake or even scons if they're into SM?

I tried, but they apparently love waf.  Looking at their wscript and
corresponding infrastructure I would say that investing that much time
into this horrific build system they just can't abandon it.

> Removing waf was an intentional decision in the sense that it's a horrible
> "build" system. Putting it back is one thing, adding a module again is
> adding insult to injury IMHO.

Well, the idea was to allow setting CONFIGURE_STYLE=waf instead of
do-configure, do-build and do-install targets.  The module is supposed
to be useful for ports that bundle waf.  As a side effect, it allows
enabling/disabling color output, which is useful during mpv update but
won't be appreciated by bulk builders.

> If upstream doesn't bundle waf, then it'd be highly appreciated if you could
> either:
> - convince them to do so

I am trying.

> - bundle it yourself

Antoine Jacoutot said:
> Can't we just bundle it at build time (i.e. at it to distfiles and add
> some glue)?

Mpv is distributed only via github, so adding anything to distfiles
requires abandoning GH_* framework.  I'd rather maintain a fork with
bundled waf in my github account.  Would that work for you?

-- 
Dmitrij D. Czarkoff

Re: Update: multimedia/mpv

[Stuart Henderson]

On 2016/02/01 09:02, Dmitrij D. Czarkoff wrote:
> > Can't we just bundle it at build time (i.e. at it to distfiles and add
> > some glue)?
> 
> Mpv is distributed only via github, so adding anything to distfiles
> requires abandoning GH_* framework.  I'd rather maintain a fork with
> bundled waf in my github account.  Would that work for you?

You can still use all other parts of GH_*, you just need to set
DISTFILES yourself.

MASTER_SITES0 = http://whatever/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}{${GH_COMMIT}${EXTRACT_SUFX}} \
wafscript_filename:0

For ports, I think that would be better than doing things in a fork.

Re: Update: multimedia/mpv

[Stuart Henderson]

On 2016/02/01 09:08, Landry Breuil wrote:
> Looking at https://github.com/mpv-player/mpv/issues/2710 they even seem
> hostile to the BSDs.

Or just don't understand them, which is understandable.

The issue there with LDFLAGS prepending rather than appending should
be easy enough to handle though, something like
CPPFLAGS="-I/usr/include -I${LOCALBASE}/include".

It is intentional that the toolchain doesn't look there by defalt,
same reason as
https://github.com/mpv-player/mpv/issues/2710#issuecomment-171088758
about not checking external locations.

Re: Update: multimedia/mpv

[Dmitrij D. Czarkoff]

Stuart Henderson said:
> On 2016/02/01 09:08, Landry Breuil wrote:
> > Looking at https://github.com/mpv-player/mpv/issues/2710 they even seem
> > hostile to the BSDs.
> 
> Or just don't understand them, which is understandable.

This is my impression from that discussion.

> The issue there with LDFLAGS prepending rather than appending should
> be easy enough to handle though, something like
> CPPFLAGS="-I/usr/include -I${LOCALBASE}/include".

Sure.  And that is not even necessary, because the actual name clash is
already solved, and I don't have practical reason to insist on this
"/usr/local" thing any more.

Still, I want to them to add proper way to append {CPP,LD}FLAGS because
(1) things will get broken again when they add another non-unique header
name and (2) I want them to suffer from their decision of using waf and
their abominational framework on top of it, which is yet far worse.

-- 
Dmitrij D. Czarkoff

Re: Update: multimedia/mpv

[Dmitrij D. Czarkoff]

Here follows a diff for mpv with waf as additional distfile.

OKs?

-- 
Dmitrij D. Czarkoff

Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile12 Jan 2016 09:09:57 -  1.22
+++ Makefile1 Feb 2016 14:25:38 -
@@ -5,9 +5,9 @@ ONLY_FOR_ARCHS =alpha amd64 i386 mips64
 
 COMMENT =  movie player based on MPlayer/mplayer2
 
-GH_ACCOUNT=mpv-player
-GH_PROJECT=mpv
-GH_TAGNAME=v0.14.0
+GH_ACCOUNT =   mpv-player
+GH_PROJECT =   mpv
+GH_TAGNAME =   v0.15.0
 
 CATEGORIES =   multimedia x11
 
@@ -15,14 +15,23 @@ HOMEPAGE =  http://mpv.io/
 
 MAINTAINER =   Dmitrij D. Czarkoff 
 
+WAF =  ${WRKSRC}/waf-1.8.19
+MASTER_SITES0 =http://waf.io/
+DISTFILES =${DISTNAME}{${GH_TAGNAME}}${EXTRACT_SUFX} ${WAF:T}:0
+EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
+
 # GPLv2+
 PERMIT_PACKAGE_CDROM = patents
 PERMIT_PACKAGE_FTP =   Yes
 
-WANTLIB += EGL GL SDL2 X11 Xext Xinerama Xrandr Xss Xv ass avcodec
-WANTLIB += avdevice avfilter avformat avutil bluray c cdio cdio_cdda
-WANTLIB += cdio_paranoia dvdnav dvdread jpeg lcms2 m pthread smbclient
-WANTLIB += sndio swresample swscale v4l2 z ${MODLUA_WANTLIB}
+WANTLIB += EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
+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 += pthread pthread-stubs smbclient sndio speex swresample
+WANTLIB += swscale v4l2 v4lconvert vpx x264 x265 xcb xcb-dri2
+WANTLIB += xcb-glx z ${MODLUA_WANTLIB}
 
 MODULES =  converters/libiconv \
lang/lua \
@@ -44,48 +53,70 @@ LIB_DEPENDS =   audio/libcdio \
multimedia/libv4l \
net/samba
 
-# zsh.pl needs to find the binary that was just built
-PORTPATH = \
-   
${WRKDIR}/bin:${WRKBUILD}:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin
-
+MODPY_RUNDEP ?=No
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
 
-CFLAGS +=  -I. -I.. -I${LOCALBASE}/include
-
-CONFIGURE_STYLE =  simple
-CONFIGURE_SCRIPT = TOOLS/old-configure
-CONFIGURE_ARGS +=  --confdir=${SYSCONFDIR}/mpv \
+CONFIGURE_ARGS =   --confloaddir=${SYSCONFDIR}/mpv \
+   --confdir=${LOCALBASE}/share/examples/mpv \
--mandir=${LOCALBASE}/man \
-   --extra-ldflags="`pkg-config --libs sdl2`" \
-   --extra-cflags="`pkg-config --cflags sdl2`" \
+   --docdir=${LOCALBASE}/share/examples/mpv \
+   --zshdir=${LOCALBASE}/share/zsh/vendor-completions \
+   --enable-sndio \
--enable-sdl2 \
+   --enable-zsh-comp \
--disable-alsa \
--disable-caca \
+   --disable-dxva2-hwaccel \
--disable-enca \
+   --disable-gpl3 \
--disable-jack \
--disable-libarchive \
--disable-libguess \
-   --disable-ossaudio \
-   --disable-optimization \
+   --disable-rubberband \
+   --disable-oss-audio \
--disable-openal \
+   --disable-optimize \
--disable-pulse \
--disable-rsound \
-   --disable-uchardet
-CONFIGURE_ENV +=   TMPDIR=${WRKBUILD}
-
-USE_GMAKE =Yes
-MAKE_FLAGS =   V=1
-FAKE_FLAGS =   CONFDIR=${DESTDIR}${PREFIX}/share/examples/mpv
+   --disable-uchardet \
+   --disable-vaapi \
+   --disable-vaapi-glx \
+   --disable-vaapi-hwaccel \
+   --disable-vaapi-x-egl \
+   --disable-vaapi-x11 \
+   --disable-vaapi-wayland \
+   --disable-vapoursynth \
+   --disable-vapoursynth-lazy \
+   --disable-vdpau \
+   --disable-vdpau-hwaccel \
+   --disable-videotoolbox-hwaccel \
+   --disable-videotoolbox-gl \
+   --disable-wayland
+
+MAKE_ENV +=LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV +=CPPFLAGS="-I${LOCALBASE}/include"
+MAKE_FLAGS =   -o "${WRKBUILD}" -t 

Re: Update: multimedia/mpv

[Jasper Lievisse Adriaanse]

On Mon, Feb 01, 2016 at 08:13:23AM +0100, Dmitrij D. Czarkoff wrote:
> Hi!
> 
> Attached diff updates multimedia/mpv to version 0.15.0.  Starting from
> this release mpv does not include old build infrastructure, so waf (!)
> becomes absolutely required to build this port.
> 
> In theory waf is supposed to be included with software.  For some reason
> mpv people don't do so - they provide a script for fetching waf at
> configure stage.  Thus I also include a port for waf.  The port contains
> a module, which is supposed to be useful for waf-based ports.
Blergh. Would it be possible to talk to upstream to use something halfwhat
decent like cmake or even scons if they're into SM?

Removing waf was an intentional decision in the sense that it's a horrible
"build" system. Putting it back is one thing, adding a module again is
adding insult to injury IMHO.

If upstream doesn't bundle waf, then it'd be highly appreciated if you could
either:
- convince them to do so
- bundle it yourself

Cheers

> Comments?  OKs?
> 
> -- 
> Dmitrij D. Czarkoff

> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/mpv/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile  12 Jan 2016 09:09:57 -  1.22
> +++ Makefile  30 Jan 2016 01:58:57 -
> @@ -1,13 +1,13 @@
> -# $OpenBSD: Makefile,v 1.22 2016/01/12 09:09:57 czarkoff Exp $
> +# $OpenBSD$
>  
>  # archs with atomic ops
>  ONLY_FOR_ARCHS = alpha amd64 i386 mips64 mips64el powerpc sparc64
>  
>  COMMENT =movie player based on MPlayer/mplayer2
>  
> -GH_ACCOUNT=  mpv-player
> -GH_PROJECT=  mpv
> -GH_TAGNAME=  v0.14.0
> +GH_ACCOUNT = mpv-player
> +GH_PROJECT = mpv
> +GH_TAGNAME = v0.15.0
>  
>  CATEGORIES = multimedia x11
>  
> @@ -19,12 +19,17 @@ MAINTAINER =  Dmitrij D. Czarkoff   PERMIT_PACKAGE_CDROM =   patents
>  PERMIT_PACKAGE_FTP = Yes
>  
> -WANTLIB += EGL GL SDL2 X11 Xext Xinerama Xrandr Xss Xv ass avcodec
> -WANTLIB += avdevice avfilter avformat avutil bluray c cdio cdio_cdda
> -WANTLIB += cdio_paranoia dvdnav dvdread jpeg lcms2 m pthread smbclient
> -WANTLIB += sndio swresample swscale v4l2 z ${MODLUA_WANTLIB}
> +WANTLIB += EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
> +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 += pthread pthread-stubs smbclient sndio speex swresample
> +WANTLIB += swscale v4l2 v4lconvert vpx x264 x265 xcb xcb-dri2
> +WANTLIB += xcb-glx z ${MODLUA_WANTLIB}
>  
>  MODULES =converters/libiconv \
> + devel/waf \
>   lang/lua \
>   lang/python
>  
> @@ -44,48 +49,60 @@ LIB_DEPENDS = audio/libcdio \
>   multimedia/libv4l \
>   net/samba
>  
> -# zsh.pl needs to find the binary that was just built
> -PORTPATH =   \
> - 
> ${WRKDIR}/bin:${WRKBUILD}:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin
> -
> +MODPY_RUNDEP ?=  No
>  RUN_DEPENDS =devel/desktop-file-utils \
>   x11/gtk+3,-guic
>  
> -CFLAGS +=-I. -I.. -I${LOCALBASE}/include
> -
> -CONFIGURE_STYLE =simple
> -CONFIGURE_SCRIPT =   TOOLS/old-configure
> -CONFIGURE_ARGS +=--confdir=${SYSCONFDIR}/mpv \
> +CONFIGURE_STYLE =waf
> +MODWAF_SYSTEM_WAF =  Yes
> +CONFIGURE_ARGS = --confloaddir=${SYSCONFDIR}/mpv \
> + --confdir=${LOCALBASE}/share/examples/mpv \
>   --mandir=${LOCALBASE}/man \
> - --extra-ldflags="`pkg-config --libs sdl2`" \
> - --extra-cflags="`pkg-config --cflags sdl2`" \
> + --docdir=${LOCALBASE}/share/examples/mpv \
> + --zshdir=${LOCALBASE}/share/zsh/vendor-completions \
> + --enable-sndio \
>   --enable-sdl2 \
> + --enable-zsh-comp \
>   --disable-alsa \
>   --disable-caca \
> + --disable-dxva2-hwaccel \
>   --disable-enca \
> + --disable-gpl3 \
>   --disable-jack \
>   --disable-libarchive \
>   --disable-libguess \
> - --disable-ossaudio \
> - --disable-optimization \
> + --disable-rubberband \
> + --disable-oss-audio \
>   --disable-openal \
> + --disable-optimize \
>   --disable-pulse \
>   --disable-rsound \
> - 

Update: multimedia/mpv

[Dmitrij D. Czarkoff]

Hi!

Attached diff updates multimedia/mpv to version 0.15.0.  Starting from
this release mpv does not include old build infrastructure, so waf (!)
becomes absolutely required to build this port.

In theory waf is supposed to be included with software.  For some reason
mpv people don't do so - they provide a script for fetching waf at
configure stage.  Thus I also include a port for waf.  The port contains
a module, which is supposed to be useful for waf-based ports.

Comments?  OKs?

-- 
Dmitrij D. Czarkoff
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile12 Jan 2016 09:09:57 -  1.22
+++ Makefile30 Jan 2016 01:58:57 -
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.22 2016/01/12 09:09:57 czarkoff Exp $
+# $OpenBSD$
 
 # archs with atomic ops
 ONLY_FOR_ARCHS =   alpha amd64 i386 mips64 mips64el powerpc sparc64
 
 COMMENT =  movie player based on MPlayer/mplayer2
 
-GH_ACCOUNT=mpv-player
-GH_PROJECT=mpv
-GH_TAGNAME=v0.14.0
+GH_ACCOUNT =   mpv-player
+GH_PROJECT =   mpv
+GH_TAGNAME =   v0.15.0
 
 CATEGORIES =   multimedia x11
 
@@ -19,12 +19,17 @@ MAINTAINER =Dmitrij D. Czarkoff 
Index: distinfo
===
RCS file: /cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo12 Jan 2016 09:09:57 -  1.10
+++ distinfo29 Jan 2016 13:18:30 -
@@ -1,2 +1,2 @@
-SHA256 (mpv-0.14.0.tar.gz) = BCk39INgPww9HewR6PAEXown8Z7uRupk2Bo83wHlEjM=
-SIZE (mpv-0.14.0.tar.gz) = 2872619
+SHA256 (mpv-0.15.0.tar.gz) = fTEhe6hXLzZPzqKVVzP4ITdK5tjG2PIvi8Y8RMBAC9w=
+SIZE (mpv-0.15.0.tar.gz) = 2849513
Index: patches/patch-DOCS_man_options_rst
===
RCS file: patches/patch-DOCS_man_options_rst
diff -N patches/patch-DOCS_man_options_rst
--- patches/patch-DOCS_man_options_rst  12 Jan 2016 09:09:57 -  1.6
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-DOCS_man_options_rst,v 1.6 2016/01/12 09:09:57 czarkoff Exp $
 DOCS/man/options.rst.orig  Fri Dec 11 13:20:29 2015
-+++ DOCS/man/options.rst   Tue Dec 15 00:16:05 2015
-@@ -2044,10 +2044,10 @@ Disc Devices
- 
- 
- ``--cdrom-device=``
--Specify the CD-ROM device (default: ``/dev/cdrom``).
-+Specify the CD-ROM device (default: ``/dev/rcd0c``).
- 
- ``--dvd-device=``
--Specify the DVD device or .iso filename (default: ``/dev/dvd``). You can
-+Specify the DVD device or .iso filename (default: ``/dev/rcd0c``). You can
- also specify a directory that contains files previously copied directly
- from a DVD (with e.g. vobcopy).
- 
Index: patches/patch-TOOLS_old-configure
===
RCS file: patches/patch-TOOLS_old-configure
diff -N patches/patch-TOOLS_old-configure
--- patches/patch-TOOLS_old-configure   12 Jan 2016 09:09:57 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,66 +0,0 @@
-$OpenBSD: patch-TOOLS_old-configure,v 1.5 2016/01/12 09:09:57 czarkoff Exp $
-
-- Adjust for BSD fstatfs
-- Disable the use of SSE4 intrinsics
-- Disable the use of C11
-- Disable extra compiler flags
-
 TOOLS/old-configure.orig   Fri Dec 11 19:20:29 2015
-+++ TOOLS/old-configureSat Jan  9 20:35:38 2016
-@@ -379,16 +379,8 @@ cflag_check -pipe -I. && _pipe="-pipe" && echores "yes
- 
- addcflags() { cflag_check "$@" && OURCFLAGS="$OURCFLAGS $@" ; }
- 
--OURCFLAGS="-std=c99 -Wall $_opt"
-+OURCFLAGS="-std=c99 $_opt"
- 
--addcflags -g -g3 -ggdb
--addcflags -Wundef -Wmissing-prototypes -Wshadow -Wno-switch -Wparentheses 
-Wpointer-arith -Wno-redundant-decls -Wno-pointer-sign 
-Werror=implicit-function-declaration -Wno-error=deprecated-declarations 
-Wno-error=unused-function
--# clang
--addcflags -Wno-logical-op-parentheses -fcolor-diagnostics 
-Wno-tautological-compare -Wno-tautological-constant-out-of-range-compare
--# extra
--addcflags -Wno-format-zero-length -Wempty-body -Wdisabled-optimization 
-Wstrict-prototypes
--
--cflag_check -MD -MP && DEPFLAGS="-MD -MP"
- cflag_check -lm && _ld_lm="-lm"
- 
- extra_ldflags="$extra_ldflags $LDFLAGS"
-@@ -827,8 +819,12 @@ check_pkg_config "libavdevice" $_libavdevice LIBAVDEVI
- 
- check_trivial "TV interface" $_tv TV
- 
-+_v4l2_header=linux/videodev2.h
-+if test $(uname -s) = OpenBSD ; then
-+_v4l2_header=sys/videoio.h
-+fi
- check_statement_libs "Video 4 Linux 2 TV interface" $_tv_v4l2 TV_V4L2 \
--"sys/time.h linux/videodev2.h"
-+"sys/time.h ${_v4l2_header}"
- _tv_v4l2=$(defretval)
- check_trivial "TV audio input" $_tv_v4l2 AUDIO_INPUT
- 
-@@ -938,8 +934,8 @@ cat > $TMPC << EOF
- 
- /* we didn't bother to add actual config checks for this, or they are
-for platforms not 

Re: Update: multimedia/mpv

[Antoine Jacoutot]

On Mon, Feb 01, 2016 at 08:13:23AM +0100, Dmitrij D. Czarkoff wrote:
> Hi!
> 
> Attached diff updates multimedia/mpv to version 0.15.0.  Starting from
> this release mpv does not include old build infrastructure, so waf (!)
> becomes absolutely required to build this port.
> 
> In theory waf is supposed to be included with software.  For some reason
> mpv people don't do so - they provide a script for fetching waf at
> configure stage.  Thus I also include a port for waf.  The port contains
> a module, which is supposed to be useful for waf-based ports.
> 
> Comments?  OKs?

I am really really really not happy to put waf back in. It was removed 16+ 
months ago on purpose.
Can't we just bundle it at build time (i.e. at it to distfiles and add some 
glue)?


> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/mpv/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile  12 Jan 2016 09:09:57 -  1.22
> +++ Makefile  30 Jan 2016 01:58:57 -
> @@ -1,13 +1,13 @@
> -# $OpenBSD: Makefile,v 1.22 2016/01/12 09:09:57 czarkoff Exp $
> +# $OpenBSD$
>  
>  # archs with atomic ops
>  ONLY_FOR_ARCHS = alpha amd64 i386 mips64 mips64el powerpc sparc64
>  
>  COMMENT =movie player based on MPlayer/mplayer2
>  
> -GH_ACCOUNT=  mpv-player
> -GH_PROJECT=  mpv
> -GH_TAGNAME=  v0.14.0
> +GH_ACCOUNT = mpv-player
> +GH_PROJECT = mpv
> +GH_TAGNAME = v0.15.0
>  
>  CATEGORIES = multimedia x11
>  
> @@ -19,12 +19,17 @@ MAINTAINER =  Dmitrij D. Czarkoff   PERMIT_PACKAGE_CDROM =   patents
>  PERMIT_PACKAGE_FTP = Yes
>  
> -WANTLIB += EGL GL SDL2 X11 Xext Xinerama Xrandr Xss Xv ass avcodec
> -WANTLIB += avdevice avfilter avformat avutil bluray c cdio cdio_cdda
> -WANTLIB += cdio_paranoia dvdnav dvdread jpeg lcms2 m pthread smbclient
> -WANTLIB += sndio swresample swscale v4l2 z ${MODLUA_WANTLIB}
> +WANTLIB += EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
> +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 += pthread pthread-stubs smbclient sndio speex swresample
> +WANTLIB += swscale v4l2 v4lconvert vpx x264 x265 xcb xcb-dri2
> +WANTLIB += xcb-glx z ${MODLUA_WANTLIB}
>  
>  MODULES =converters/libiconv \
> + devel/waf \
>   lang/lua \
>   lang/python
>  
> @@ -44,48 +49,60 @@ LIB_DEPENDS = audio/libcdio \
>   multimedia/libv4l \
>   net/samba
>  
> -# zsh.pl needs to find the binary that was just built
> -PORTPATH =   \
> - 
> ${WRKDIR}/bin:${WRKBUILD}:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin
> -
> +MODPY_RUNDEP ?=  No
>  RUN_DEPENDS =devel/desktop-file-utils \
>   x11/gtk+3,-guic
>  
> -CFLAGS +=-I. -I.. -I${LOCALBASE}/include
> -
> -CONFIGURE_STYLE =simple
> -CONFIGURE_SCRIPT =   TOOLS/old-configure
> -CONFIGURE_ARGS +=--confdir=${SYSCONFDIR}/mpv \
> +CONFIGURE_STYLE =waf
> +MODWAF_SYSTEM_WAF =  Yes
> +CONFIGURE_ARGS = --confloaddir=${SYSCONFDIR}/mpv \
> + --confdir=${LOCALBASE}/share/examples/mpv \
>   --mandir=${LOCALBASE}/man \
> - --extra-ldflags="`pkg-config --libs sdl2`" \
> - --extra-cflags="`pkg-config --cflags sdl2`" \
> + --docdir=${LOCALBASE}/share/examples/mpv \
> + --zshdir=${LOCALBASE}/share/zsh/vendor-completions \
> + --enable-sndio \
>   --enable-sdl2 \
> + --enable-zsh-comp \
>   --disable-alsa \
>   --disable-caca \
> + --disable-dxva2-hwaccel \
>   --disable-enca \
> + --disable-gpl3 \
>   --disable-jack \
>   --disable-libarchive \
>   --disable-libguess \
> - --disable-ossaudio \
> - --disable-optimization \
> + --disable-rubberband \
> + --disable-oss-audio \
>   --disable-openal \
> + --disable-optimize \
>   --disable-pulse \
>   --disable-rsound \
> - --disable-uchardet
> -CONFIGURE_ENV += TMPDIR=${WRKBUILD}
> + --disable-uchardet \
> + --disable-vaapi \
> + --disable-vaapi-glx \
> + --disable-vaapi-hwaccel \
> + 

Re: Update: multimedia/mpv 0.9.1

[Stuart Henderson]

On 2015/05/04 23:47, Dmitrij D. Czarkoff wrote:
 Hi!
 
 Below is an update to multimedia/mpv (0.8.3 = 0.9.1).  New version has
 several fixes including those we distribute in this port right now.
 
 Comments?  OKs?

works fine here, OK.

Update: multimedia/mpv 0.9.1

[Dmitrij D. Czarkoff]

Hi!

Below is an update to multimedia/mpv (0.8.3 = 0.9.1).  New version has
several fixes including those we distribute in this port right now.

Comments?  OKs?

-- 
Dmitrij D. Czarkoff

Index: Makefile
===
RCS file: /var/cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile27 Mar 2015 08:13:02 -  1.9
+++ Makefile4 May 2015 21:26:53 -
@@ -5,9 +5,8 @@
 ONLY_FOR_ARCHS =   amd64
 
 COMMENT =  movie player based on MPlayer/mplayer2
-V =0.8.3
+V =0.9.1
 DISTNAME = mpv-${V}
-REVISION = 0
 
 GH_ACCOUNT=mpv-player
 GH_PROJECT=mpv
@@ -62,12 +61,12 @@ CONFIGURE_ARGS +=   --confdir=${SYSCONFDIR
--disable-enca \
--disable-jack \
--disable-libguess \
-   --disable-mpg123 \
--disable-ossaudio \
--disable-optimization \
--disable-openal \
--disable-pulse \
--disable-rsound
+CONFIGURE_ENV +=   TMPDIR=${WRKBUILD}
 
 # pkg-config says smbclient's version is 0
 CONFIGURE_ARGS +=  --enable-smb \
Index: distinfo
===
RCS file: /var/cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo27 Mar 2015 06:11:27 -  1.4
+++ distinfo4 May 2015 21:22:06 -
@@ -1,2 +1,2 @@
-SHA256 (mpv-0.8.3.tar.gz) = CRA4yAKGaEjjZH8qUCFfpk6tDcNvkRRFfbizU1KGic8=
-SIZE (mpv-0.8.3.tar.gz) = 2664730
+SHA256 (mpv-0.9.1.tar.gz) = XSNohXXSzESE9/7vYoxpD2gBbjhWIiAYlNAssjjqF54=
+SIZE (mpv-0.9.1.tar.gz) = 2698031
Index: patches/patch-audio_out_ao_sndio_c
===
RCS file: patches/patch-audio_out_ao_sndio_c
diff -N patches/patch-audio_out_ao_sndio_c
--- patches/patch-audio_out_ao_sndio_c  11 Jan 2015 08:21:39 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,39 +0,0 @@
-$OpenBSD: patch-audio_out_ao_sndio_c,v 1.1.1.1 2015/01/11 08:21:39 bentley Exp 
$
 audio/out/ao_sndio.c.orig  Sat Dec 20 12:00:13 2014
-+++ audio/out/ao_sndio.c   Fri Jan  2 14:34:21 2015
-@@ -125,7 +125,7 @@ static int init(struct ao *ao)
- const struct af_to_par *ap;
- int i;
- 
--p-hdl = sio_open(p-dev, SIO_PLAY, 1);
-+p-hdl = sio_open(p-dev, SIO_PLAY, 0);
- if (p-hdl == NULL) {
- MP_ERR(ao, can't open sndio %s\n, p-dev);
- goto error;
-@@ -304,25 +304,7 @@ static void audio_pause(struct ao *ao)
-  */
- static void audio_resume(struct ao *ao)
- {
--struct priv *p = ao-priv;
--int n, count, todo;
--
--/*
-- * we want to start with buffers full, because mpv uses
-- * get_delay() as clock, which would cause video to
-- * accelerate while buffers are filled.
-- */
--todo = p-par.bufsz * p-par.pchan * p-par.bps;
--while (todo  0) {
--count = todo;
--if (count  SILENCE_NMAX)
--count = SILENCE_NMAX;
--n = sio_write(p-hdl, p-silence, count);
--if (n == 0)
--break;
--todo -= n;
--p-delay += n;
--}
-+return;
- }
- 
- #define OPT_BASE_STRUCT struct priv
Index: patches/patch-old-configure
===
RCS file: patches/patch-old-configure
diff -N patches/patch-old-configure
--- patches/patch-old-configure 17 Feb 2015 01:27:11 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,56 +0,0 @@
-$OpenBSD: patch-old-configure,v 1.2 2015/02/17 01:27:11 brad Exp $
 old-configure.orig Mon Jan 26 20:23:08 2015
-+++ old-configure  Fri Feb 13 21:55:41 2015
-@@ -191,7 +191,7 @@ options_state_machine() {
- opt_yes_no _libavresample libavresample (preferred over libswresample)
- opt_yes_no _libswresample libswresample
- opt_yes_no _cacaCACA  video output
--opt_yes_no _sdl2SDL2 video and audio outputs no
-+opt_yes_no _sdl2SDL2 video and audio outputs
- opt_yes_no _xv  Xv video output
- opt_yes_no _vdpau   VDPAU acceleration
- opt_yes_no _vaapi   VAAPI acceleration
-@@ -328,7 +328,7 @@ test -z $_bindir   _bindir=$_prefix/bin
- test -z $_mandir   _mandir=$_prefix/share/man
- test -z $_confdir  _confdir=$_prefix/etc/mpv
- 
--mplayer_tmpdir=$(mktemp -d --tmpdir mpv-configure-)
-+mplayer_tmpdir=$(mktemp -d mpv-configure-XX)
- test -n $mplayer_tmpdir || die Unable to create tmpdir.
- trap 'rm -rf $mplayer_tmpdir' EXIT
- 
-@@ -665,6 +665,8 @@ EOF
- _gl_wayland=yes
- libs_mplayer=$libs_mplayer -lGL -lEGL
- test $_gl_wayland = yes  res_comment=$res_comment wayland
-+  else
-+_gl_wayland=no
-   fi
-   if test $_x11 = yes  test $_gl = yes  pkg_config_add egl; then
-

Re: Update: multimedia/mpv 0.8.3

[Henrik Friedrichsen]

Works well here.

Update: multimedia/mpv 0.8.3

[Dmitrij D. Czarkoff]

Hi!

Below is an update for multimedia/mpv.  Comments?  OKs?

-- 
Dmitrij D. Czarkoff

Index: Makefile
===
RCS file: /var/cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile17 Mar 2015 09:00:56 -  1.7
+++ Makefile23 Mar 2015 22:34:17 -
@@ -5,7 +5,7 @@
 ONLY_FOR_ARCHS =   amd64
 
 COMMENT =  movie player based on MPlayer/mplayer2
-V =0.8.2
+V =0.8.3
 DISTNAME = mpv-${V}
 
 GH_ACCOUNT=mpv-player
Index: distinfo
===
RCS file: /var/cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo17 Mar 2015 09:00:56 -  1.3
+++ distinfo23 Mar 2015 22:35:35 -
@@ -1,2 +1,2 @@
-SHA256 (mpv-0.8.2.tar.gz) = pWWTS/ZoskqUbxkvBpgWZEFb2ZH9IERUuFu495eAdKc=
-SIZE (mpv-0.8.2.tar.gz) = 2663666
+SHA256 (mpv-0.8.3.tar.gz) = CRA4yAKGaEjjZH8qUCFfpk6tDcNvkRRFfbizU1KGic8=
+SIZE (mpv-0.8.3.tar.gz) = 2664730

Re: UPDATE: multimedia/mpv to 0.8.2

[Dimitris Papastamos]

On Mon, Mar 16, 2015 at 08:51:02PM +0100, Henrik Friedrichsen wrote:
 Hey Dmitrij and ports@,
 attached is a patch that updates mpv to 0.8.2.
 Tested it and it seems to play my files just fine.
 
 Comments? OK?
 
 henrik

Seems to work well for me too.

UPDATE: multimedia/mpv to 0.8.2

[Henrik Friedrichsen]

Hey Dmitrij and ports@,
attached is a patch that updates mpv to 0.8.2.
Tested it and it seems to play my files just fine.

Comments? OK?

henrik
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile17 Feb 2015 01:27:11 -  1.6
+++ Makefile16 Mar 2015 19:47:15 -
@@ -5,9 +5,8 @@
 ONLY_FOR_ARCHS =   amd64
 
 COMMENT =  movie player based on MPlayer/mplayer2
-V =0.7.3
+V =0.8.2
 DISTNAME = mpv-${V}
-REVISION = 0
 
 GH_ACCOUNT=mpv-player
 GH_PROJECT=mpv
@@ -26,7 +25,8 @@ PERMIT_PACKAGE_FTP =  Yes
 WANTLIB += EGL GL X11 Xext Xinerama Xrandr Xss Xv ass avcodec
 WANTLIB += avdevice avfilter avformat avresample avutil c cdio
 WANTLIB += cdio_cdda cdio_paranoia dvdnav dvdread jpeg lcms2
-WANTLIB += m postproc pthread smbclient sndio swscale z ${MODLUA_WANTLIB}
+WANTLIB += m postproc pthread smbclient sndio swresample swscale z
+WANTLIB += ${MODLUA_WANTLIB}
 
 MODULES =  converters/libiconv \
lang/lua \
@@ -66,7 +66,6 @@ CONFIGURE_ARGS += --confdir=${SYSCONFDIR
--disable-optimization \
--disable-openal \
--disable-pulse \
-   --disable-portaudio \
--disable-rsound
 
 # pkg-config says smbclient's version is 0
Index: distinfo
===
RCS file: /cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo13 Feb 2015 13:49:45 -  1.2
+++ distinfo16 Mar 2015 19:47:15 -
@@ -1,2 +1,2 @@
-SHA256 (mpv-0.7.3.tar.gz) = iNzcRCZKjpubc6ldAxN9UQca6owmnMGRRhCb+PkX6LE=
-SIZE (mpv-0.7.3.tar.gz) = 2672554
+SHA256 (mpv-0.8.2.tar.gz) = pWWTS/ZoskqUbxkvBpgWZEFb2ZH9IERUuFu495eAdKc=
+SIZE (mpv-0.8.2.tar.gz) = 2663666
Index: patches/patch-DOCS_man_mpv_rst
===
RCS file: /cvs/ports/multimedia/mpv/patches/patch-DOCS_man_mpv_rst,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-DOCS_man_mpv_rst
--- patches/patch-DOCS_man_mpv_rst  17 Feb 2015 01:27:11 -  1.1
+++ patches/patch-DOCS_man_mpv_rst  16 Mar 2015 19:47:15 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-DOCS_man_mpv_rst,v 1.1 2015/02/17 01:27:11 brad Exp $
 DOCS/man/mpv.rst.orig  Fri Feb 13 22:10:04 2015
-+++ DOCS/man/mpv.rst   Fri Feb 13 22:10:15 2015
-@@ -847,7 +847,7 @@ Play a multi-angle DVD:
+--- DOCS/man/mpv.rst.orig  Thu Feb 26 19:13:34 2015
 DOCS/man/mpv.rst   Mon Mar 16 20:10:57 2015
+@@ -849,7 +849,7 @@ Play a multi-angle DVD:
  ``mpv dvd://1 --dvd-angle=2``
  
  Play from a different DVD device:
Index: patches/patch-DOCS_man_options_rst
===
RCS file: /cvs/ports/multimedia/mpv/patches/patch-DOCS_man_options_rst,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-DOCS_man_options_rst
--- patches/patch-DOCS_man_options_rst  17 Feb 2015 01:27:11 -  1.1
+++ patches/patch-DOCS_man_options_rst  16 Mar 2015 19:47:15 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-DOCS_man_options_rst,v 1.1 2015/02/17 01:27:11 brad Exp $
 DOCS/man/options.rst.orig  Fri Feb 13 22:05:13 2015
-+++ DOCS/man/options.rst   Fri Feb 13 22:05:39 2015
-@@ -1786,10 +1786,10 @@ Disc Devices
+--- DOCS/man/options.rst.orig  Thu Feb 26 19:13:34 2015
 DOCS/man/options.rst   Mon Mar 16 20:10:57 2015
+@@ -1854,10 +1854,10 @@ Disc Devices
  
  
  ``--cdrom-device=path``
Index: patches/patch-old-configure
===
RCS file: /cvs/ports/multimedia/mpv/patches/patch-old-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-old-configure
--- patches/patch-old-configure 17 Feb 2015 01:27:11 -  1.2
+++ patches/patch-old-configure 16 Mar 2015 19:47:15 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-old-configure,v 1.2 2015/02/17 01:27:11 brad Exp $
 old-configure.orig Mon Jan 26 20:23:08 2015
-+++ old-configure  Fri Feb 13 21:55:41 2015
-@@ -191,7 +191,7 @@ options_state_machine() {
+--- old-configure.orig Thu Feb 26 19:13:34 2015
 old-configure  Mon Mar 16 20:10:57 2015
+@@ -190,7 +190,7 @@ options_state_machine() {
  opt_yes_no _libavresample libavresample (preferred over libswresample)
  opt_yes_no _libswresample libswresample
  opt_yes_no _cacaCACA  video output
@@ -10,7 +10,7 @@ $OpenBSD: patch-old-configure,v 1.2 2015
  opt_yes_no _xv  Xv video output
  opt_yes_no _vdpau   VDPAU acceleration
  opt_yes_no _vaapi   VAAPI acceleration
-@@ -328,7 +328,7 @@ test -z $_bindir   _bindir=$_prefix/bin
+@@ -326,7 +326,7 @@ test -z $_bindir   _bindir=$_prefix/bin
  test -z 

Re: Update: multimedia/mpv 0.7.2 = 0.7.3

[Dmitrij D. Czarkoff]

Stuart Henderson said:
 Seems fairly safe and the ebml/lzo fixes look worth having. I'll wait a
 little while for more test reports before committing but I'm OK with this.

Apparently we are out of test reports as it seems.

-- 
Dmitrij D. Czarkoff

Re: Update: multimedia/mpv 0.7.2 = 0.7.3

[Dimitris Papastamos]

On Mon, Feb 09, 2015 at 12:49:57AM +, Stuart Henderson wrote:
 On 2015/02/08 23:13, Dmitrij D. Czarkoff wrote:
  Hi!
  
  Here is a straight-forward update for multimedia/mpv.  Changes appear to
  be insignificant, so it may be safely delayed until 5.7 release
  management work is done.
  
  I'm using it now on amd64.

Seems to work on amd64.

 guenther, this program seems to reliably trigger the weird unkillable process
 thing when it's ^Z'd that I hit with icinga2. Version in packages does too for
 me. pkg_add mpv, mpv $somefile.mp4, ^Z while it's playing. My kernel isn't
 super-new (somewhere around Feb 1st), heading to bed now and I'm not around
 tomorrow otherwise I'd test with a new kernel too, but might be worth a play
 with.

I also have this problem.  I have rebuilt from source on the 8th of
Feb.  See below for my dmesg.

OpenBSD 5.7-beta (GENERIC.MP) #25: Sun Feb  8 16:33:56 GMT 2015
r...@darkstar.2f30.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 8451125248 (8059MB)
avail mem = 828480 (7841MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.6 @ 0xdae9c000 (63 entries)
bios0: vendor LENOVO version 83ET76WW (1.46 ) date 07/05/2013
bios0: LENOVO 4236MBG
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP SLIC SSDT SSDT SSDT HPET APIC MCFG ECDT ASF! TCPA SSDT 
SSDT DMAR UEFI UEFI UEFI
acpi0: wakeup devices LID_(S3) SLPB(S3) IGBE(S4) EXP4(S4) EHC1(S3) EHC2(S3) 
HDEF(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpihpet0 at acpi0: 14318179 Hz
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz, 797.55 MHz
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
cpu0: apic clock running at 99MHz
cpu0: mwait min=64, max=64, C-substates=0.2.1.1.2, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz, 797.41 MHz
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC
cpu1: 256KB 64b/line 8-way L2 cache
cpu1: smt 1, core 0, package 0
cpu2 at mainbus0: apid 2 (application processor)
cpu2: Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz, 797.41 MHz
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC
cpu2: 256KB 64b/line 8-way L2 cache
cpu2: smt 0, core 1, package 0
cpu3 at mainbus0: apid 3 (application processor)
cpu3: Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz, 797.41 MHz
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC
cpu3: 256KB 64b/line 8-way L2 cache
cpu3: smt 1, core 1, package 0
ioapic0 at mainbus0: apid 2 pa 0xfec0, version 20, 24 pins
acpimcfg0 at acpi0 addr 0xf800, bus 0-63
acpiec0 at acpi0
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (PEG_)
acpiprt2 at acpi0: bus 2 (EXP1)
acpiprt3 at acpi0: bus 3 (EXP2)
acpiprt4 at acpi0: bus -1 (EXP4)
acpiprt5 at acpi0: bus 13 (EXP5)
acpicpu0 at acpi0: C3, C2, C1, PSS
acpicpu1 at acpi0: C3, C2, C1, PSS
acpicpu2 at acpi0: C3, C2, C1, PSS
acpicpu3 at acpi0: C3, C2, C1, PSS
acpipwrres0 at acpi0: PUBS, resource for EHC1, EHC2
acpitz0 at acpi0: critical temperature is 98 degC
acpibtn0 at acpi0: LID_
acpibtn1 at acpi0: SLPB
acpibat0 at acpi0: BAT0 model 45N1173 serial 26283 type LION oem SANYO
acpibat1 at acpi0: BAT1 not present
acpiac0 at acpi0: AC unit offline
acpithinkpad0 at acpi0
cpu0: Enhanced SpeedStep 797 MHz: speeds: 2601, 2600, 2400, 2200, 2000, 1800, 
1600, 1400, 1200, 1000, 800 MHz
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 Intel Core 2G Host rev 0x09
vga1 at pci0 dev 2 function 0 Intel HD Graphics 3000 rev 0x09
intagp at vga1 not configured
inteldrm0 at vga1
drm0 at inteldrm0
drm: Memory usable by graphics device = 2048M
inteldrm0: 1600x900
wsdisplay0 at vga1 mux 1: console (std, vt100 emulation)
wsdisplay0: screen 1-5 added (std, vt100 emulation)
Intel 6 Series MEI rev 0x04 at pci0 dev 22 function 0 not configured
puc0 at pci0 dev 22 function 3 Intel 6 Series KT rev 0x04: ports: 1 com
com4 at puc0 port 0 

Re: Update: multimedia/mpv 0.7.2 = 0.7.3

[Dmitrij D. Czarkoff]

Dimitris Papastamos said:
  guenther, this program seems to reliably trigger the weird unkillable 
  process
  thing when it's ^Z'd that I hit with icinga2. Version in packages does too 
  for
  me. pkg_add mpv, mpv $somefile.mp4, ^Z while it's playing. My kernel isn't
  super-new (somewhere around Feb 1st), heading to bed now and I'm not around
  tomorrow otherwise I'd test with a new kernel too, but might be worth a play
  with.
 
 I also have this problem.  I have rebuilt from source on the 8th of
 Feb.  See below for my dmesg.

FWIW I have the same issue with latest snapshot (just updated).

-- 
Dmitrij D. Czarkoff

Update: multimedia/mpv 0.7.2 = 0.7.3

[Dmitrij D. Czarkoff]

Hi!

Here is a straight-forward update for multimedia/mpv.  Changes appear to
be insignificant, so it may be safely delayed until 5.7 release
management work is done.

I'm using it now on amd64.

-- 
Dmitrij D. Czarkoff

Index: Makefile
===
RCS file: /var/cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile12 Jan 2015 06:31:04 -  1.4
+++ Makefile7 Feb 2015 08:40:22 -
@@ -5,9 +5,8 @@
 ONLY_FOR_ARCHS =   amd64
 
 COMMENT =  movie player based on MPlayer/mplayer2
-V =0.7.2
+V =0.7.3
 DISTNAME = mpv-${V}
-REVISION = 1
 
 GH_ACCOUNT=mpv-player
 GH_PROJECT=mpv
Index: distinfo
===
RCS file: /var/cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo11 Jan 2015 08:21:39 -  1.1.1.1
+++ distinfo7 Feb 2015 08:39:58 -
@@ -1,2 +1,2 @@
-SHA256 (mpv-0.7.2.tar.gz) = fQg7kkgkWrT+8OXceTLCMW4uetHtbFfg+vC7Xqjm2o8=
-SIZE (mpv-0.7.2.tar.gz) = 2658772
+SHA256 (mpv-0.7.3.tar.gz) = iNzcRCZKjpubc6ldAxN9UQca6owmnMGRRhCb+PkX6LE=
+SIZE (mpv-0.7.3.tar.gz) = 2672554

Re: Update: multimedia/mpv 0.7.2 = 0.7.3

[Anthony J. Bentley]

Stuart Henderson writes:
 On 2015/02/08 23:13, Dmitrij D. Czarkoff wrote:
  Hi!
  
  Here is a straight-forward update for multimedia/mpv.  Changes appear to
  be insignificant, so it may be safely delayed until 5.7 release
  management work is done.
  
  I'm using it now on amd64.
 
 Seems fairly safe and the ebml/lzo fixes look worth having. I'll wait a
 little while for more test reports before committing but I'm OK with this.

ok bentley@

Re: Update: multimedia/mpv 0.7.2 = 0.7.3

[Stuart Henderson]

On 2015/02/08 23:13, Dmitrij D. Czarkoff wrote:
 Hi!
 
 Here is a straight-forward update for multimedia/mpv.  Changes appear to
 be insignificant, so it may be safely delayed until 5.7 release
 management work is done.
 
 I'm using it now on amd64.

Seems fairly safe and the ebml/lzo fixes look worth having. I'll wait a
little while for more test reports before committing but I'm OK with this.

guenther, this program seems to reliably trigger the weird unkillable process
thing when it's ^Z'd that I hit with icinga2. Version in packages does too for
me. pkg_add mpv, mpv $somefile.mp4, ^Z while it's playing. My kernel isn't
super-new (somewhere around Feb 1st), heading to bed now and I'm not around
tomorrow otherwise I'd test with a new kernel too, but might be worth a play
with.