summaryrefslogtreecommitdiff
path: root/multimedia/mpv/patches
diff options
context:
space:
mode:
authoradam <adam>2015-05-24 08:03:05 +0000
committeradam <adam>2015-05-24 08:03:05 +0000
commit853a8341a0c49ec5cf8281027bffdb208b764e3d (patch)
tree0be2a2527e1b3a417ba00c007f9fb827eb4cea36 /multimedia/mpv/patches
parenta884b7c4f8ec95d3f019399e2f1c6d4fca7ea24b (diff)
downloadpkgsrc-853a8341a0c49ec5cf8281027bffdb208b764e3d.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/mpv/patches')
-rw-r--r--multimedia/mpv/patches/patch-audio_chmap.c24
1 files changed, 24 insertions, 0 deletions
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