diff options
| author | nat <nat> | 2017-03-11 00:46:47 +0000 |
|---|---|---|
| committer | nat <nat> | 2017-03-11 00:46:47 +0000 |
| commit | b459556d62604babf5e394b674f18997ee48f7c8 (patch) | |
| tree | 05b8b4de110111c79cf145bb9e5e00e8221d4180 /multimedia | |
| parent | a32df60756f50e8e21aac60cf61490a6f0b4cf9d (diff) | |
| download | pkgsrc-b459556d62604babf5e394b674f18997ee48f7c8.tar.gz | |
Use correct option for libass.
Patch for waftools check custom.py no longer needed as
raspberrypi-userland >= 20170109 contains pkgconfig files.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mpv/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mpv/options.mk | 8 | ||||
| -rw-r--r-- | multimedia/mpv/patches/patch-waftools_checks_custom.py | 16 |
3 files changed, 5 insertions, 22 deletions
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index e1689d22ab3..b532b758dd9 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -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 diff --git a/multimedia/mpv/options.mk b/multimedia/mpv/options.mk index 4e5deff2cc5..0ed86f67235 100644 --- a/multimedia/mpv/options.mk +++ b/multimedia/mpv/options.mk @@ -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 diff --git a/multimedia/mpv/patches/patch-waftools_checks_custom.py b/multimedia/mpv/patches/patch-waftools_checks_custom.py deleted file mode 100644 index aa7d5abf9b3..00000000000 --- a/multimedia/mpv/patches/patch-waftools_checks_custom.py +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-waftools_checks_custom.py,v 1.1 2017/03/10 15:55:33 nat Exp $ - -Pkgconfig descriptions are not available for rpi_userland on NetBSD. - ---- waftools/checks/custom.py.orig 2017-03-10 15:24:39.000000000 +0000 -+++ waftools/checks/custom.py -@@ -142,9 +142,6 @@ def check_rpi(ctx, dependency_identifier - prev_pkg_path])) - - checks = [ -- check_pkg_config('bcm_host', uselib_store='bcm_host'), -- check_pkg_config('egl'), -- check_pkg_config('glesv2'), - check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']), - # We still need all OpenGL symbols, because the vo_opengl code is - # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. |