CVS commit: pkgsrc/multimedia/mpv

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 11 08:52:23 UTC 2023

Modified Files:
        pkgsrc/multimedia/mpv: Makefile options.mk

Log Message:
mpv: Wayland support is too fast-moving in this package.

It tries to use defines that are only available in very recent
Linux kernels which also results in maintenance burden for those of
us concerned with porting the code to NetBSD.

Use the SDL2 video backend for Wayland support.


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/multimedia/mpv/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/mpv/Makefile
diff -u pkgsrc/multimedia/mpv/Makefile:1.156 pkgsrc/multimedia/mpv/Makefile:1.157
--- pkgsrc/multimedia/mpv/Makefile:1.156        Tue Jul 18 18:34:31 2023
+++ pkgsrc/multimedia/mpv/Makefile      Fri Aug 11 08:52:23 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.156 2023/07/18 18:34:31 nia Exp $
+# $NetBSD: Makefile,v 1.157 2023/08/11 08:52:23 nia Exp $
 
 DISTNAME=      mpv-0.35.1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -27,6 +27,9 @@ WAF_CONFIGURE_ARGS+=  --sysconfdir=${PKG_
 WAF_CONFIGURE_ARGS+=   --enable-dvdnav
 WAF_CONFIGURE_ARGS+=   --enable-libmpv-shared
 
+# Support Wayland via SDL2, wayland support in mpv is too fast-moving.
+WAF_CONFIGURE_ARGS+=   --disable-wayland
+
 PYTHON_FOR_BUILD_ONLY=         yes
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 

Index: pkgsrc/multimedia/mpv/options.mk
diff -u pkgsrc/multimedia/mpv/options.mk:1.32 pkgsrc/multimedia/mpv/options.mk:1.33
--- pkgsrc/multimedia/mpv/options.mk:1.32       Tue Jun  6 12:42:02 2023
+++ pkgsrc/multimedia/mpv/options.mk    Fri Aug 11 08:52:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.32 2023/06/06 12:42:02 riastradh Exp $
+# $NetBSD: options.mk,v 1.33 2023/08/11 08:52:23 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mpv
 
@@ -42,11 +42,6 @@ PKG_SUPPORTED_OPTIONS+=              vdpau
 PKG_SUGGESTED_OPTIONS+=                vdpau
 .endif
 
-.if ${OPSYS} == "Linux"
-PKG_SUPPORTED_OPTIONS+=                wayland
-PKG_SUGGESTED_OPTIONS+=                wayland
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -181,18 +176,6 @@ SUBST_SED.vc+=             -e 's;opt/vc;${PREFIX};g
 .endif
 
 ###
-### Wayland support (video output)
-###
-.if !empty(PKG_OPTIONS:Mwayland)
-WAF_CONFIGURE_ARGS+=   --enable-wayland
-.include "../../devel/wayland/buildlink3.mk"
-.include "../../devel/wayland-protocols/buildlink3.mk"
-.include "../../x11/libxkbcommon/buildlink3.mk"
-.else
-WAF_CONFIGURE_ARGS+=   --disable-wayland
-.endif
-
-###
 ### X11 support (video output)
 ###
 .if !empty(PKG_OPTIONS:Mx11)