diff options
author | apb <apb@pkgsrc.org> | 2012-10-23 19:57:33 +0000 |
---|---|---|
committer | apb <apb@pkgsrc.org> | 2012-10-23 19:57:33 +0000 |
commit | ee7215b2e5ad6cce13f32863aa5c01727bb4ce4b (patch) | |
tree | ce6caf25aa458b365ae112cbfb3e07ff978c7f47 /multimedia/xine-lib | |
parent | c4f95ab71a8e776eb3384df9e8b9ddfa4e2a89c8 (diff) | |
download | pkgsrc-ee7215b2e5ad6cce13f32863aa5c01727bb4ce4b.tar.gz |
Remove a trailing colon from an asm statement that was introduced in
revision 1.2 of patches/patch-src-post-planar-eq2.c. Apparently, some
versions of gcc don't like an empty clobber list in an asm statement.
This should fix PR 47035 from David Shao.
Diffstat (limited to 'multimedia/xine-lib')
-rw-r--r-- | multimedia/xine-lib/distinfo | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-src-post-planar-eq2.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 92a42bb5b91..0a89c7cb75c 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.88 2012/09/27 10:28:14 apb Exp $ +$NetBSD: distinfo,v 1.89 2012/10/23 19:57:33 apb Exp $ SHA1 (xine-lib-1.2.2.tar.xz) = a349cbb0b72256bb262377796a022dcf63829b4c RMD160 (xine-lib-1.2.2.tar.xz) = 3f11df3fa8a8946bdcc9cdecd6952dc76b834d14 @@ -32,7 +32,7 @@ SHA1 (patch-src-post-mosaico-switch.c) = 11dd1ec387c298693fc82feba1f16a316648e58 SHA1 (patch-src-post-planar-boxblur.c) = 1bcaec011aaf581394ad42c9ff324ec0a3d28ecb SHA1 (patch-src-post-planar-denoise3d.c) = 05059a1864278f749a5796661075db522c2e202c SHA1 (patch-src-post-planar-eq.c) = 85f6f72bc5fbc52f0ae48751b20fb100d5d6f27b -SHA1 (patch-src-post-planar-eq2.c) = 2230c493fb6e586d13d4c7c0660113eb22a6bf3b +SHA1 (patch-src-post-planar-eq2.c) = 61209f05e7c4e3f6e3ab6d71cd062186738aa976 SHA1 (patch-src-post-planar-expand.c) = 7c532feeae4078f40d6f9a28dfa207e5cbee60a1 SHA1 (patch-src-post-planar-noise.c) = b3baf82e150ca9a27e73753398c18839066748f1 SHA1 (patch-src-post-planar-pp.c) = 147dc05a09ff851af99c488112c6a77926ae5afb diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c b/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c index 5294baa8b22..f5a8c60963b 100644 --- a/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c +++ b/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c @@ -1,4 +1,4 @@ -$NetBSD: patch-src-post-planar-eq2.c,v 1.2 2012/09/27 10:28:14 apb Exp $ +$NetBSD: patch-src-post-planar-eq2.c,v 1.3 2012/10/23 19:57:33 apb Exp $ In affine_1d_MMX(), move the initialisation of %mm3 and %mm4 registers into a separate asm statement, to give the compiler more freedom @@ -11,7 +11,7 @@ eq2.c:128:5: error: 'asm' operand has impossible constraints --- src/post/planar/eq2.c.orig 2012-02-05 19:17:02.000000000 +0000 +++ src/post/planar/eq2.c -@@ -126,8 +126,13 @@ void affine_1d_MMX (eq2_param_t *par, un +@@ -126,8 +126,12 @@ void affine_1d_MMX (eq2_param_t *par, un while (h-- > 0) { asm volatile ( @@ -21,13 +21,12 @@ eq2.c:128:5: error: 'asm' operand has impossible constraints + "movq (%1), %%mm4 \n\t" + : + : "r" (brvec), "r" (contvec) -+ : + ); + asm volatile ( "pxor %%mm0, %%mm0 \n\t" "movl %4, %%eax\n\t" ASMALIGN(4) -@@ -149,7 +154,7 @@ void affine_1d_MMX (eq2_param_t *par, un +@@ -149,7 +153,7 @@ void affine_1d_MMX (eq2_param_t *par, un "decl %%eax \n\t" "jnz 1b \n\t" : "=r" (src), "=r" (dst) @@ -36,7 +35,7 @@ eq2.c:128:5: error: 'asm' operand has impossible constraints : "%eax" ); -@@ -288,19 +293,26 @@ typedef struct eq2_parameters_s { +@@ -288,19 +292,26 @@ typedef struct eq2_parameters_s { * description of params struct */ START_PARAM_DESCR( eq2_parameters_t ) |