summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authoradam <adam>2015-05-24 08:03:05 +0000
committeradam <adam>2015-05-24 08:03:05 +0000
commit2b03c2ffa9c9d9a9a58779d7450c61ed6c7538ae (patch)
tree0be2a2527e1b3a417ba00c007f9fb827eb4cea36 /multimedia
parent8f09b48718b107737a965645f203941e693d70d8 (diff)
downloadpkgsrc-2b03c2ffa9c9d9a9a58779d7450c61ed6c7538ae.tar.gz
Changes 0.9.2:
The Lua check now also checks for lua52.pc, as used by Arch Linux testing. (X11) vo_opengl's icc-profile-auto now queries the current ICC profile relative to the center of the window. ao_coreaudio, ao_alsa now support adding dummy padding channels for better compatibility with hardware decoders that only support specific channel counts (e.g. 5.1 now should work on a decoder that only accepts 7.1). Channel fallback (in case the audio device doesn't natively support a given channel layout) has been improved. vf_vapoursynth now rejects unaligned video instead of outputting corrupted video. mpv now tries to autoload .sup subtitles as well.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mpv/Makefile5
-rw-r--r--multimedia/mpv/distinfo9
-rw-r--r--multimedia/mpv/patches/patch-audio_chmap.c24
3 files changed, 31 insertions, 7 deletions
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 0f84ee41d75..e1cbd602d50 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2015/04/30 15:10:17 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/05/24 08:03:05 adam Exp $
-DISTNAME= mpv-0.9.0
+DISTNAME= mpv-0.9.2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -15,7 +15,6 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
BUILD_DEPENDS+= waf>=1.8.4:../../devel/waf
PYTHON_FOR_BUILD_ONLY= yes
-PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-docutils
USE_TOOLS+= perl pkg-config
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index 551b19ede8e..5b23446b548 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2015/04/30 15:10:17 wiz Exp $
+$NetBSD: distinfo,v 1.14 2015/05/24 08:03:05 adam Exp $
-SHA1 (mpv-0.9.0.tar.gz) = 8960058bfd61941967fdea168de412c15d57d257
-RMD160 (mpv-0.9.0.tar.gz) = 40f0e10412c30250eab76f60e85eb19cd5404903
-Size (mpv-0.9.0.tar.gz) = 2697623 bytes
+SHA1 (mpv-0.9.2.tar.gz) = e5b59d62dee13f8f5cf3974f9c46b7afeb02b740
+RMD160 (mpv-0.9.2.tar.gz) = bcb626d91875a240a9cfa440c917fc96bed25b7d
+Size (mpv-0.9.2.tar.gz) = 2701306 bytes
+SHA1 (patch-audio_chmap.c) = 796442d644fd4b6d0313779f3c6dbbbe598f8ec1
diff --git a/multimedia/mpv/patches/patch-audio_chmap.c b/multimedia/mpv/patches/patch-audio_chmap.c
new file mode 100644
index 00000000000..f47cef43fa7
--- /dev/null
+++ b/multimedia/mpv/patches/patch-audio_chmap.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-audio_chmap.c,v 1.1 2015/05/24 08:03:05 adam Exp $
+
+Avoid conflict with system popcount64().
+
+--- audio/chmap.c.orig 2015-05-24 07:59:39.000000000 +0000
++++ audio/chmap.c
+@@ -395,7 +395,7 @@ void mp_chmap_get_reorder(int src[MP_NUM
+ assert(src[n] < 0 || (to->speaker[n] == from->speaker[src[n]]));
+ }
+
+-static int popcount64(uint64_t bits)
++static int mypopcount64(uint64_t bits)
+ {
+ int r = 0;
+ for (int n = 0; n < 64; n++)
+@@ -408,7 +408,7 @@ int mp_chmap_diffn(const struct mp_chmap
+ {
+ uint64_t a_mask = mp_chmap_to_lavc_unchecked(a);
+ uint64_t b_mask = mp_chmap_to_lavc_unchecked(b);
+- return popcount64((a_mask ^ b_mask) & a_mask);
++ return mypopcount64((a_mask ^ b_mask) & a_mask);
+ }
+
+ // Returns something like "fl-fr-fc". If there's a standard layout in lavc