pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib Remove a trailing colon from an as...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bdb98b141e50
branches:  trunk
changeset: 610415:bdb98b141e50
user:      apb <apb%pkgsrc.org@localhost>
date:      Tue Oct 23 19:57:33 2012 +0000

description:
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:

 multimedia/xine-lib/distinfo                            |  4 ++--
 multimedia/xine-lib/patches/patch-src-post-planar-eq2.c |  9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r 5750b109a214 -r bdb98b141e50 multimedia/xine-lib/distinfo
--- a/multimedia/xine-lib/distinfo      Tue Oct 23 19:50:50 2012 +0000
+++ b/multimedia/xine-lib/distinfo      Tue Oct 23 19:57:33 2012 +0000
@@ -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-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 -r 5750b109a214 -r bdb98b141e50 multimedia/xine-lib/patches/patch-src-post-planar-eq2.c
--- a/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c   Tue Oct 23 19:50:50 2012 +0000
+++ b/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c   Tue Oct 23 19:57:33 2012 +0000
@@ -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 @@
 
 --- 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 @@
 +      "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 @@
        : "%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 )



Home | Main Index | Thread Index | Old Index