CVS commit: pkgsrc/multimedia/mpv

["Nathanial Sloss" <nat%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nat
Date:           Sat Mar 11 00:46:47 UTC 2017

Modified Files:
        pkgsrc/multimedia/mpv: distinfo options.mk
Removed Files:
        pkgsrc/multimedia/mpv/patches: patch-waftools_checks_custom.py

Log Message:
Use correct option for libass.
Patch for waftools check custom.py no longer needed as
 raspberrypi-userland >= 20170109 contains pkgconfig files.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/multimedia/mpv/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/mpv/options.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/multimedia/mpv/patches/patch-waftools_checks_custom.py

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/distinfo
diff -u pkgsrc/multimedia/mpv/distinfo:1.32 pkgsrc/multimedia/mpv/distinfo:1.33
--- pkgsrc/multimedia/mpv/distinfo:1.32 Fri Mar 10 15:55:33 2017
+++ pkgsrc/multimedia/mpv/distinfo      Sat Mar 11 00:46:47 2017
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.32 2017/03/10 15:55:33 nat Exp $
+$NetBSD: distinfo,v 1.33 2017/03/11 00:46:47 nat Exp $
 
 SHA1 (mpv-0.24.0.tar.gz) = ade12ce6a626fdba5cbdb41444805f1ed3dfcb36
 RMD160 (mpv-0.24.0.tar.gz) = 436b62cfd50594e5dd3782cc9eae8f9bf9364501
 SHA512 (mpv-0.24.0.tar.gz) = c1d988ccf9e22765822b9ce75c04f155df4fc4bd4c2aa164903eee8947c36f659116c2ab96668a4af31c4f5aeecbf20ce21191c48456d74e138db617a1e34d96
 Size (mpv-0.24.0.tar.gz) = 2835920 bytes
 SHA1 (patch-player_main.c) = 842432e448526a9d170e7efd2b01276e36072e16
-SHA1 (patch-waftools_checks_custom.py) = 4bfc74fa6b2c80bef3f540ad8287eb26cb39c6ad

Index: pkgsrc/multimedia/mpv/options.mk
diff -u pkgsrc/multimedia/mpv/options.mk:1.7 pkgsrc/multimedia/mpv/options.mk:1.8
--- pkgsrc/multimedia/mpv/options.mk:1.7        Fri Mar 10 15:55:33 2017
+++ pkgsrc/multimedia/mpv/options.mk    Sat Mar 11 00:46:47 2017
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.7 2017/03/10 15:55:33 nat Exp $
+# $NetBSD: options.mk,v 1.8 2017/03/11 00:46:47 nat Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mpv
-PKG_SUPPORTED_OPTIONS= caca lua pulseaudio sdl v4l2 sdl2 rpi libass
+PKG_SUPPORTED_OPTIONS= caca lua pulseaudio sdl v4l2 sdl2 rpi ass
 PKG_SUGGESTED_OPTIONS= lua
 
 .include "../../mk/bsd.options.mk"
@@ -62,7 +62,7 @@ WAF_CONFIGURE_ARGS+=  --disable-sdl1
 ###
 ### libASS support
 ###
-.if !empty(PKG_OPTIONS:Mlibass)
+.if !empty(PKG_OPTIONS:Mass)
 WAF_CONFIGURE_ARGS+=   --enable-libass
 .else
 WAF_CONFIGURE_ARGS+=   --disable-libass
@@ -81,7 +81,7 @@ WAF_CONFIGURE_ARGS+=  --disable-libv4l2
 ### Raspberry Pi support
 ###
 .if !empty(PKG_OPTIONS:Mrpi)
-.include "../../misc/raspberrypi-userland/buildlink3.mk"
+BUILD_DEPENDS+=        raspberrypi-userland>=20170109:../../misc/raspberrypi-userland
 CFLAGS+="-L${PREFIX}/lib"
 SUBST_CLASSES+=                vc
 SUBST_STAGE.vc=                pre-configure