Wed Feb 4 20:50:17 2015 UTC ()
Older GCC releases don't like to use to pointers to fulfill the "g"
constraint, so use "r".


(joerg)
diff -r1.100 -r1.101 pkgsrc/multimedia/xine-lib/distinfo
diff -r1.7 -r1.8 pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c
cvs diff -r1.100 -r1.101 pkgsrc/multimedia/xine-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/distinfo 2015/01/09 22:59:43 1.100
+++ pkgsrc/multimedia/xine-lib/distinfo 2015/02/04 20:50:16 1.101
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.100 2015/01/09 22:59:43 wiz Exp $ 1$NetBSD: distinfo,v 1.101 2015/02/04 20:50:16 joerg Exp $
2 2
3SHA1 (xine-lib-1.2.6.tar.xz) = ac929eef2b7bf5c27699bbed612b953a01fccba5 3SHA1 (xine-lib-1.2.6.tar.xz) = ac929eef2b7bf5c27699bbed612b953a01fccba5
4RMD160 (xine-lib-1.2.6.tar.xz) = 05edcd9a36e93d2fc9d1bf13cae3b32d4bd996da 4RMD160 (xine-lib-1.2.6.tar.xz) = 05edcd9a36e93d2fc9d1bf13cae3b32d4bd996da
5Size (xine-lib-1.2.6.tar.xz) = 5020964 bytes 5Size (xine-lib-1.2.6.tar.xz) = 5020964 bytes
6SHA1 (patch-ag) = 108a626575cf4c9d964822cc879cf6868e0bbe24 6SHA1 (patch-ag) = 108a626575cf4c9d964822cc879cf6868e0bbe24
7SHA1 (patch-cb) = 708ee946dd1708a40baef5ac193a46dc22bff8b5 7SHA1 (patch-cb) = 708ee946dd1708a40baef5ac193a46dc22bff8b5
8SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c 8SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
9SHA1 (patch-include_xine_post.h) = 30629bff9486bf6b7ca889189cfad406eb242674 9SHA1 (patch-include_xine_post.h) = 30629bff9486bf6b7ca889189cfad406eb242674
10SHA1 (patch-src-post-audio-stretch.c) = 6f950bcd47fdf68b691744dc105f59f821748ce1 10SHA1 (patch-src-post-audio-stretch.c) = 6f950bcd47fdf68b691744dc105f59f821748ce1
11SHA1 (patch-src-post-audio-upmix.c) = 70ca6babfa9a7add0ac70a6024fcff429e1bc49d 11SHA1 (patch-src-post-audio-upmix.c) = 70ca6babfa9a7add0ac70a6024fcff429e1bc49d
12SHA1 (patch-src-post-audio-upmix_mono.c) = 2c70ded10118cbeed5be3c948886f7311ddb7bbd 12SHA1 (patch-src-post-audio-upmix_mono.c) = 2c70ded10118cbeed5be3c948886f7311ddb7bbd
13SHA1 (patch-src-post-audio-volnorm.c) = b110542ae4c21762cf369a4cf2b6c66343c3b761 13SHA1 (patch-src-post-audio-volnorm.c) = b110542ae4c21762cf369a4cf2b6c66343c3b761
14SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 536365d479b5cd0354365a53db4f19f8404788ac 14SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 536365d479b5cd0354365a53db4f19f8404788ac
15SHA1 (patch-src-post-mosaico-mosaico.c) = 04f21603055b1e8e7490ba5d6e006ca5a9b683a3 15SHA1 (patch-src-post-mosaico-mosaico.c) = 04f21603055b1e8e7490ba5d6e006ca5a9b683a3
16SHA1 (patch-src-post-mosaico-switch.c) = ff46e13acfbcaf0167943b536b12cb95ec7591d4 16SHA1 (patch-src-post-mosaico-switch.c) = ff46e13acfbcaf0167943b536b12cb95ec7591d4
17SHA1 (patch-src-post-planar-boxblur.c) = 191ce5819fce39a247adaefe07e3302870c3d1c3 17SHA1 (patch-src-post-planar-boxblur.c) = 191ce5819fce39a247adaefe07e3302870c3d1c3
18SHA1 (patch-src-post-planar-denoise3d.c) = e140ff0b7867fd850099ff073f67201b4649dcad 18SHA1 (patch-src-post-planar-denoise3d.c) = e140ff0b7867fd850099ff073f67201b4649dcad
19SHA1 (patch-src-post-planar-eq.c) = 2c81fdb839456affa6882577479cea7934121619 19SHA1 (patch-src-post-planar-eq.c) = 2c81fdb839456affa6882577479cea7934121619
20SHA1 (patch-src-post-planar-eq2.c) = 8b90439bcfacc0b260ad0f4d0a85b70de16b7c06 20SHA1 (patch-src-post-planar-eq2.c) = 3a99bf71d43d17628fd21a261974e7a854eb70aa
21SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067 21SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067
22SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5 22SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5
23SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d 23SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
24SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d 24SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
25SHA1 (patch-src_xine-engine_Makefile.am) = e44ca141304e102faa40763ef083e8c1f60089e7 25SHA1 (patch-src_xine-engine_Makefile.am) = e44ca141304e102faa40763ef083e8c1f60089e7
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c 2015/01/09 22:59:43 1.7
+++ pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c 2015/02/04 20:50:16 1.8
@@ -1,35 +1,29 @@ @@ -1,35 +1,29 @@
1$NetBSD: patch-src-post-planar-eq2.c,v 1.7 2015/01/09 22:59:43 wiz Exp $ 1$NetBSD: patch-src-post-planar-eq2.c,v 1.8 2015/02/04 20:50:16 joerg Exp $
2 2
3First chunk: 3First chunk:
4https://bugs.xine-project.org/show_bug.cgi?id=556 4https://bugs.xine-project.org/show_bug.cgi?id=556
5 5
6Rest: 6Rest:
7https://bugs.xine-project.org/show_bug.cgi?id=524 7https://bugs.xine-project.org/show_bug.cgi?id=524
8 8
9--- src/post/planar/eq2.c.orig 2014-06-09 16:08:42.000000000 +0000 9--- src/post/planar/eq2.c.orig 2014-06-09 16:08:42.000000000 +0000
10+++ src/post/planar/eq2.c 10+++ src/post/planar/eq2.c
11@@ -125,11 +125,11 @@ void affine_1d_MMX (eq2_param_t *par, un 11@@ -129,7 +129,7 @@ void affine_1d_MMX (eq2_param_t *par, un
12 dstep = dstride - w; 12 "movq (%1), %%mm4 \n\t"
13  
14 asm volatile ( 
15- "movq (%0), %%mm3 \n\t" 
16- "movq (%1), %%mm4 \n\t" 
17+ "movq %0, %%mm3 \n\t" 
18+ "movq %1, %%mm4 \n\t" 
19 "pxor %%mm0, %%mm0 \n\t" 13 "pxor %%mm0, %%mm0 \n\t"
20 : 14 :
21- : "g" (brvec), "g" (contvec) 15- : "g" (brvec), "g" (contvec)
22+ : "m" (brvec), "m" (contvec) 16+ : "r" (brvec), "r" (contvec)
23 ); 17 );
24  18
25 while (h-- > 0) { 19 while (h-- > 0) {
26@@ -293,19 +293,26 @@ typedef struct eq2_parameters_s { 20@@ -293,19 +293,26 @@ typedef struct eq2_parameters_s {
27 * description of params struct 21 * description of params struct
28 */ 22 */
29 START_PARAM_DESCR( eq2_parameters_t ) 23 START_PARAM_DESCR( eq2_parameters_t )
30-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, gamma, NULL, 0, 5, 0, 24-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, gamma, NULL, 0, 5, 0,
31+PARAM_ITEM( eq2_parameters_t,  25+PARAM_ITEM( eq2_parameters_t,
32+ POST_PARAM_TYPE_DOUBLE, gamma, NULL, 0, 5, 0, 26+ POST_PARAM_TYPE_DOUBLE, gamma, NULL, 0, 5, 0,
33 "gamma" ) 27 "gamma" )
34-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, brightness, NULL, -1, 1, 0, 28-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, brightness, NULL, -1, 1, 0,
35+PARAM_ITEM( eq2_parameters_t,  29+PARAM_ITEM( eq2_parameters_t,