diff options
author | jperkin <jperkin@pkgsrc.org> | 2014-06-27 12:17:22 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2014-06-27 12:17:22 +0000 |
commit | 553fcd11657752943c2b3f2179caa0ffa5be1f65 (patch) | |
tree | 26d1908a6bd2225b77051cd97a47c90ed6a093e9 /multimedia/xine-lib | |
parent | c8b8dc815c5096f98858a368ef6ca8f85927cc2a (diff) | |
download | pkgsrc-553fcd11657752943c2b3f2179caa0ffa5be1f65.tar.gz |
Disable MMX sections on SunOS.
Diffstat (limited to 'multimedia/xine-lib')
-rw-r--r-- | multimedia/xine-lib/Makefile | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/distinfo | 6 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-src-post-planar-eq.c | 24 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-src-post-planar-noise.c | 44 |
4 files changed, 68 insertions, 10 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index ea31e3102e6..9729a21369b 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.127 2014/05/29 23:37:02 wiz Exp $ +# $NetBSD: Makefile,v 1.128 2014/06/27 12:17:22 jperkin Exp $ .include "Makefile.common" @@ -40,7 +40,7 @@ PLIST.oss= yes .endif .endif -CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 +CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE LDFLAGS.SunOS+= -lresolv # flac is supported internally; don't know what the plugin is good for diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index db7e3b425c0..cd2f928d111 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.95 2014/05/19 12:43:33 wiz Exp $ +$NetBSD: distinfo,v 1.96 2014/06/27 12:17:22 jperkin Exp $ SHA1 (xine-lib-1.2.5.tar.xz) = c7ef38fa8ee301e44ba28d6549220546d02d053d RMD160 (xine-lib-1.2.5.tar.xz) = bb9c3a06666f454e8dfda85471eb6605e2dcb685 @@ -24,10 +24,10 @@ SHA1 (patch-src-post-mosaico-mosaico.c) = 04f21603055b1e8e7490ba5d6e006ca5a9b683 SHA1 (patch-src-post-mosaico-switch.c) = ff46e13acfbcaf0167943b536b12cb95ec7591d4 SHA1 (patch-src-post-planar-boxblur.c) = 191ce5819fce39a247adaefe07e3302870c3d1c3 SHA1 (patch-src-post-planar-denoise3d.c) = e140ff0b7867fd850099ff073f67201b4649dcad -SHA1 (patch-src-post-planar-eq.c) = c6239b3b2bdc7e1108e735caa677170b1ea015e9 +SHA1 (patch-src-post-planar-eq.c) = 2c81fdb839456affa6882577479cea7934121619 SHA1 (patch-src-post-planar-eq2.c) = d55acfe532088394c18f6a4be97f98d5c7fd3267 SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067 -SHA1 (patch-src-post-planar-noise.c) = 4184e5d93187e547f24da7a50f935db9c61dc8f4 +SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5 SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d SHA1 (patch-src_audio__out_Makefile.am) = 6c5ef1716e5874de0b43b794e2e4b86da922f029 diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-eq.c b/multimedia/xine-lib/patches/patch-src-post-planar-eq.c index 486fdfd6376..536e6545f70 100644 --- a/multimedia/xine-lib/patches/patch-src-post-planar-eq.c +++ b/multimedia/xine-lib/patches/patch-src-post-planar-eq.c @@ -1,9 +1,20 @@ -$NetBSD: patch-src-post-planar-eq.c,v 1.2 2014/05/18 15:38:18 wiz Exp $ +$NetBSD: patch-src-post-planar-eq.c,v 1.3 2014/06/27 12:17:22 jperkin Exp $ https://bugs.xine-project.org/show_bug.cgi?id=524 ---- src/post/planar/eq.c.orig 2011-08-30 13:13:46.000000000 +0000 +Disable MMX sections on SunOS. + +--- src/post/planar/eq.c.orig 2013-09-18 10:04:54.000000000 +0000 +++ src/post/planar/eq.c +@@ -31,7 +31,7 @@ + #include <pthread.h> + + +-#if defined(ARCH_X86) || defined(ARCH_X86_64) ++#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined(__sun) + static void process_MMX(unsigned char *dest, int dstride, unsigned char *src, int sstride, + int w, int h, int brightness, int contrast) + { @@ -138,9 +138,11 @@ typedef struct eq_parameters_s { * description of params struct */ @@ -18,3 +29,12 @@ https://bugs.xine-project.org/show_bug.cgi?id=524 "contrast" ) END_PARAM_DESCR( param_descr ) +@@ -259,7 +261,7 @@ static post_plugin_t *eq_open_plugin(pos + } + + process = process_C; +-#if defined(ARCH_X86) || defined(ARCH_X86_64) ++#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined(__sun) + if( xine_mm_accel() & MM_ACCEL_X86_MMX ) + process = process_MMX; + #endif diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-noise.c b/multimedia/xine-lib/patches/patch-src-post-planar-noise.c index adc12e9a653..1cef6707514 100644 --- a/multimedia/xine-lib/patches/patch-src-post-planar-noise.c +++ b/multimedia/xine-lib/patches/patch-src-post-planar-noise.c @@ -1,10 +1,30 @@ -$NetBSD: patch-src-post-planar-noise.c,v 1.2 2014/05/18 15:38:18 wiz Exp $ +$NetBSD: patch-src-post-planar-noise.c,v 1.3 2014/06/27 12:17:22 jperkin Exp $ https://bugs.xine-project.org/show_bug.cgi?id=524 ---- src/post/planar/noise.c.orig 2011-08-30 13:13:53.000000000 +0000 +Disable MMX sections on SunOS. + +--- src/post/planar/noise.c.orig 2013-09-18 10:04:54.000000000 +0000 +++ src/post/planar/noise.c -@@ -329,15 +329,20 @@ static char *enum_quality[] = {"fixed", +@@ -155,7 +155,7 @@ static inline void lineNoise_C(uint8_t * + } + } + +-#ifdef ARCH_X86 ++#if defined(ARCH_X86) && !defined(__sun) + static inline void lineNoise_MMX(uint8_t *dst, uint8_t *src, int8_t *noise, int len, int shift){ + intarch_t mmx_len= len&(~7); + noise+=shift; +@@ -224,7 +224,7 @@ static inline void lineNoiseAvg_C(uint8_ + } + } + +-#ifdef ARCH_X86 ++#if defined(ARCH_X86) && !defined(__sun) + + static inline void lineNoiseAvg_MMX(uint8_t *dst, uint8_t *src, int len, int8_t **shift){ + intarch_t mmx_len= len&(~7); +@@ -333,15 +333,20 @@ static const char *const enum_quality[] * description of params struct */ START_PARAM_DESCR( noise_parameters_t ) @@ -30,3 +50,21 @@ https://bugs.xine-project.org/show_bug.cgi?id=524 "Mix random noise with a (semi)regular pattern" ) END_PARAM_DESCR( param_descr ) +@@ -460,7 +465,7 @@ void *noise_init_plugin(xine_t *xine, vo + class->description = N_("Adds noise"); + class->dispose = default_post_class_dispose; + +-#ifdef ARCH_X86 ++#if defined(ARCH_X86) && !defined(__sun) + if (xine_mm_accel() & MM_ACCEL_X86_MMX) { + lineNoise = lineNoise_MMX; + lineNoiseAvg = lineNoiseAvg_MMX; +@@ -579,7 +584,7 @@ static int noise_draw(vo_frame_t *frame, + frame->width * 2, frame->height, &this->params[0]); + } + +-#ifdef ARCH_X86 ++#if defined(ARCH_X86) && !defined(__sun) + if (xine_mm_accel() & MM_ACCEL_X86_MMX) + asm volatile ("emms\n\t"); + if (xine_mm_accel() & MM_ACCEL_X86_MMXEXT) |