summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2016-03-05 08:52:23 +0000
committerryoon <ryoon@pkgsrc.org>2016-03-05 08:52:23 +0000
commit135519782a987ef2e7e897e1b3d4c13fe33b17aa (patch)
treee3b48b04eda5973bf0d94ed9416e2ad360ffc694 /multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h
parentbbde267b847ee1a1b0f84152afd2a553740764ab (diff)
downloadpkgsrc-135519782a987ef2e7e897e1b3d4c13fe33b17aa.tar.gz
Import ffmpeg3-3.0 as multimedia/ffmpeg3.
FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library. This package contains major version 3.
Diffstat (limited to 'multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h')
-rw-r--r--multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h b/multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h
new file mode 100644
index 00000000000..1f723d7907e
--- /dev/null
+++ b/multimedia/ffmpeg3/patches/patch-libavutil_x86_asm.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-libavutil_x86_asm.h,v 1.1 2016/03/05 08:52:23 ryoon Exp $
+
+avoid SunOS regset.h definition for REG_SP
+
+--- libavutil/x86/asm.h.orig 2016-01-15 16:58:37.000000000 +0000
++++ libavutil/x86/asm.h
+@@ -27,6 +27,11 @@
+ typedef struct xmm_reg { uint64_t a, b; } xmm_reg;
+ typedef struct ymm_reg { uint64_t a, b, c, d; } ymm_reg;
+
++/* avoid SunOS regset.h definition for REG_SP */
++#if defined (__sun) && defined (REG_SP)
++#undef REG_SP
++#endif
++
+ #if ARCH_X86_64
+ # define OPSIZE "q"
+ # define REG_a "rax"