diff options
| author | jperkin <jperkin> | 2014-06-27 12:56:16 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-06-27 12:56:16 +0000 |
| commit | ad621fe7babd581235f9eaec45b95003d5001969 (patch) | |
| tree | 672f6aba5d62cd4145978b3cad4decafa39619ec /multimedia | |
| parent | 38157376fbb23589c6bb88951b2494dc7ad8a020 (diff) | |
| download | pkgsrc-ad621fe7babd581235f9eaec45b95003d5001969.tar.gz | |
Explicitly disable HAVE_7REGS on SunOS, it enables certain optimisations
which do not compile.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mplayer-share/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_x86__cpu.h | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 766caa51f48..75819ea0b44 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.83 2014/06/24 12:03:42 wiz Exp $ +$NetBSD: distinfo,v 1.84 2014/06/27 12:56:16 jperkin Exp $ SHA1 (mplayer/MPlayer-1.1.1.tar.xz) = ba2f3bd1442d04b17b0143680850273d928689c1 RMD160 (mplayer/MPlayer-1.1.1.tar.xz) = 745b3fdf684ba7614dbec2a7143188b7c9cca3a1 @@ -6,6 +6,7 @@ Size (mplayer/MPlayer-1.1.1.tar.xz) = 11202492 bytes SHA1 (patch-aa) = da461823d0731624de964323ab630f6e295be7b7 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4 +SHA1 (patch-ffmpeg_libavutil_x86__cpu.h) = ea2c6e179840c7746930848b751b6fd1dcd67e90 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 SHA1 (patch-libmpdemux_demux__gif.c) = 4efec4ea1fe395e24760530e532d3251c64a8fb8 SHA1 (patch-libvo_vo__corevideo.h) = 2d0b1702363227363343a29060a7b027ce96b5bb diff --git a/multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_x86__cpu.h b/multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_x86__cpu.h new file mode 100644 index 00000000000..df9f342d66d --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_x86__cpu.h @@ -0,0 +1,18 @@ +$NetBSD: patch-ffmpeg_libavutil_x86__cpu.h,v 1.1 2014/06/27 12:56:16 jperkin Exp $ + +Disable certain optimisations on SunOS. + +--- ffmpeg/libavutil/x86_cpu.h.orig 2013-05-05 18:11:42.000000000 +0000 ++++ ffmpeg/libavutil/x86_cpu.h +@@ -68,7 +68,11 @@ typedef int32_t x86_reg; + typedef int x86_reg; + #endif + ++#ifdef __sun ++#define HAVE_7REGS 0 ++#else + #define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) ++#endif + #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) + + #if ARCH_X86_64 && defined(PIC) |