Tue Oct 23 19:57:33 2012 UTC ()
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.


(apb)
diff -r1.88 -r1.89 pkgsrc/multimedia/xine-lib/distinfo
diff -r1.2 -r1.3 pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c
cvs diff -r1.88 -r1.89 pkgsrc/multimedia/xine-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/distinfo 2012/09/27 10:28:14 1.88
+++ pkgsrc/multimedia/xine-lib/distinfo 2012/10/23 19:57:33 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.88 2012/09/27 10:28:14 apb Exp $ 1$NetBSD: distinfo,v 1.89 2012/10/23 19:57:33 apb Exp $
2 2
3SHA1 (xine-lib-1.2.2.tar.xz) = a349cbb0b72256bb262377796a022dcf63829b4c 3SHA1 (xine-lib-1.2.2.tar.xz) = a349cbb0b72256bb262377796a022dcf63829b4c
4RMD160 (xine-lib-1.2.2.tar.xz) = 3f11df3fa8a8946bdcc9cdecd6952dc76b834d14 4RMD160 (xine-lib-1.2.2.tar.xz) = 3f11df3fa8a8946bdcc9cdecd6952dc76b834d14
5Size (xine-lib-1.2.2.tar.xz) = 4857248 bytes 5Size (xine-lib-1.2.2.tar.xz) = 4857248 bytes
6SHA1 (patch-Makefile.am) = ab2bdb97834ea3ebf161e2c716f0dcb6eb147c1e 6SHA1 (patch-Makefile.am) = ab2bdb97834ea3ebf161e2c716f0dcb6eb147c1e
7SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 7SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
8SHA1 (patch-ag) = 00009002714ed26fa646eed326e2b0a5e2265572 8SHA1 (patch-ag) = 00009002714ed26fa646eed326e2b0a5e2265572
9SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b 9SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
10SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508 10SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
11SHA1 (patch-ap) = d48fa83879895d4b1f56bfbcbe31087dd57d8a82 11SHA1 (patch-ap) = d48fa83879895d4b1f56bfbcbe31087dd57d8a82
12SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 12SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
13SHA1 (patch-at) = 15a810379ccb345aeeb374b0148096684f5f179b 13SHA1 (patch-at) = 15a810379ccb345aeeb374b0148096684f5f179b
14SHA1 (patch-av) = 12b8957279b977db3bba2c1adae40217a1661072 14SHA1 (patch-av) = 12b8957279b977db3bba2c1adae40217a1661072
@@ -22,24 +22,24 @@ SHA1 (patch-src-post-audio-stretch.c) =  @@ -22,24 +22,24 @@ SHA1 (patch-src-post-audio-stretch.c) =
22SHA1 (patch-src-post-audio-upmix.c) = ab01e157b42b8dd99622a17b5a8ecdb464ee694e 22SHA1 (patch-src-post-audio-upmix.c) = ab01e157b42b8dd99622a17b5a8ecdb464ee694e
23SHA1 (patch-src-post-audio-upmix_mono.c) = 182a73985d6158c5ab2409bc372b302d3385320e 23SHA1 (patch-src-post-audio-upmix_mono.c) = 182a73985d6158c5ab2409bc372b302d3385320e
24SHA1 (patch-src-post-audio-volnorm.c) = 49d9bd437d240ddf2a14275d518469313cb29a0c 24SHA1 (patch-src-post-audio-volnorm.c) = 49d9bd437d240ddf2a14275d518469313cb29a0c
25SHA1 (patch-src-post-deinterlace-plugins-greedy2frame.c) = 85acf40662602c41e1f475b010534aefbb466a4b 25SHA1 (patch-src-post-deinterlace-plugins-greedy2frame.c) = 85acf40662602c41e1f475b010534aefbb466a4b
26SHA1 (patch-src-post-deinterlace-plugins-greedy2frame_template.c) = 8cb62659326648cb54fa0219cd12fd02c53d047d 26SHA1 (patch-src-post-deinterlace-plugins-greedy2frame_template.c) = 8cb62659326648cb54fa0219cd12fd02c53d047d
27SHA1 (patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c) = af9a57b0c5e496836c145d6888ea3149bf501c2f 27SHA1 (patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c) = af9a57b0c5e496836c145d6888ea3149bf501c2f
28SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 132554aa9bdc43fbe9e7dc42fee5916cb60be806 28SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 132554aa9bdc43fbe9e7dc42fee5916cb60be806
29SHA1 (patch-src-post-goom-mmx.h) = 09b82b9e1fae57afb385daa1cd3bb265fd680a1d 29SHA1 (patch-src-post-goom-mmx.h) = 09b82b9e1fae57afb385daa1cd3bb265fd680a1d
30SHA1 (patch-src-post-mosaico-mosaico.c) = f26e6ccc60c78a499d2bd0fd8f3d4c2f4efffde8 30SHA1 (patch-src-post-mosaico-mosaico.c) = f26e6ccc60c78a499d2bd0fd8f3d4c2f4efffde8
31SHA1 (patch-src-post-mosaico-switch.c) = 11dd1ec387c298693fc82feba1f16a316648e580 31SHA1 (patch-src-post-mosaico-switch.c) = 11dd1ec387c298693fc82feba1f16a316648e580
32SHA1 (patch-src-post-planar-boxblur.c) = 1bcaec011aaf581394ad42c9ff324ec0a3d28ecb 32SHA1 (patch-src-post-planar-boxblur.c) = 1bcaec011aaf581394ad42c9ff324ec0a3d28ecb
33SHA1 (patch-src-post-planar-denoise3d.c) = 05059a1864278f749a5796661075db522c2e202c 33SHA1 (patch-src-post-planar-denoise3d.c) = 05059a1864278f749a5796661075db522c2e202c
34SHA1 (patch-src-post-planar-eq.c) = 85f6f72bc5fbc52f0ae48751b20fb100d5d6f27b 34SHA1 (patch-src-post-planar-eq.c) = 85f6f72bc5fbc52f0ae48751b20fb100d5d6f27b
35SHA1 (patch-src-post-planar-eq2.c) = 2230c493fb6e586d13d4c7c0660113eb22a6bf3b 35SHA1 (patch-src-post-planar-eq2.c) = 61209f05e7c4e3f6e3ab6d71cd062186738aa976
36SHA1 (patch-src-post-planar-expand.c) = 7c532feeae4078f40d6f9a28dfa207e5cbee60a1 36SHA1 (patch-src-post-planar-expand.c) = 7c532feeae4078f40d6f9a28dfa207e5cbee60a1
37SHA1 (patch-src-post-planar-noise.c) = b3baf82e150ca9a27e73753398c18839066748f1 37SHA1 (patch-src-post-planar-noise.c) = b3baf82e150ca9a27e73753398c18839066748f1
38SHA1 (patch-src-post-planar-pp.c) = 147dc05a09ff851af99c488112c6a77926ae5afb 38SHA1 (patch-src-post-planar-pp.c) = 147dc05a09ff851af99c488112c6a77926ae5afb
39SHA1 (patch-src-post-planar-unsharp.c) = 964ec33c8c3cfcc8783b5fae1093c8fba76ff2a9 39SHA1 (patch-src-post-planar-unsharp.c) = 964ec33c8c3cfcc8783b5fae1093c8fba76ff2a9
40SHA1 (patch-src-xine-engine-post.h) = 3b96d1279bbec48b2f3df50a576bfa8ec25f796f 40SHA1 (patch-src-xine-engine-post.h) = 3b96d1279bbec48b2f3df50a576bfa8ec25f796f
41SHA1 (patch-src_audio__out_Makefile.am) = 5f8ba2ce81a63cb195407c3ce6649007ce15408f 41SHA1 (patch-src_audio__out_Makefile.am) = 5f8ba2ce81a63cb195407c3ce6649007ce15408f
42SHA1 (patch-src_libw32dll_wine_Makefile.am) = 17c717c84531780dc06c3cd5db8f879a560aeb3a 42SHA1 (patch-src_libw32dll_wine_Makefile.am) = 17c717c84531780dc06c3cd5db8f879a560aeb3a
43SHA1 (patch-src_libw32dll_wine_registry.c) = f34685be27dc9ec098f80e78cd24f3e92f12367a 43SHA1 (patch-src_libw32dll_wine_registry.c) = f34685be27dc9ec098f80e78cd24f3e92f12367a
44SHA1 (patch-src_post_goom_convolve_fx.c) = 61ab87d03780f057ba6e8e7f2097e57bac9bfa49 44SHA1 (patch-src_post_goom_convolve_fx.c) = 61ab87d03780f057ba6e8e7f2097e57bac9bfa49
45SHA1 (patch-src_xine-engine_Makefile.am) = 24efec8a881ca068b18e6370e9b02a6f6bc5c3d9 45SHA1 (patch-src_xine-engine_Makefile.am) = 24efec8a881ca068b18e6370e9b02a6f6bc5c3d9
cvs diff -r1.2 -r1.3 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 2012/09/27 10:28:14 1.2
+++ pkgsrc/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c 2012/10/23 19:57:33 1.3
@@ -1,52 +1,51 @@ @@ -1,52 +1,51 @@
1$NetBSD: patch-src-post-planar-eq2.c,v 1.2 2012/09/27 10:28:14 apb Exp $ 1$NetBSD: patch-src-post-planar-eq2.c,v 1.3 2012/10/23 19:57:33 apb Exp $
2 2
3In affine_1d_MMX(), move the initialisation of %mm3 and %mm4 registers 3In affine_1d_MMX(), move the initialisation of %mm3 and %mm4 registers
4into a separate asm statement, to give the compiler more freedom 4into a separate asm statement, to give the compiler more freedom
5for register allocation. Fixes a problem with gcc-4.5.4 on NetBSD/i386 5for register allocation. Fixes a problem with gcc-4.5.4 on NetBSD/i386
6in which gcc complained: 6in which gcc complained:
7 7
8eq2.c: In function 'affine_1d_MMX': 8eq2.c: In function 'affine_1d_MMX':
9eq2.c:128:5: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' 9eq2.c:128:5: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
10eq2.c:128:5: error: 'asm' operand has impossible constraints 10eq2.c:128:5: error: 'asm' operand has impossible constraints
11 11
12--- src/post/planar/eq2.c.orig 2012-02-05 19:17:02.000000000 +0000 12--- src/post/planar/eq2.c.orig 2012-02-05 19:17:02.000000000 +0000
13+++ src/post/planar/eq2.c 13+++ src/post/planar/eq2.c
14@@ -126,8 +126,13 @@ void affine_1d_MMX (eq2_param_t *par, un 14@@ -126,8 +126,12 @@ void affine_1d_MMX (eq2_param_t *par, un
15  15
16 while (h-- > 0) { 16 while (h-- > 0) {
17 asm volatile ( 17 asm volatile (
18- "movq (%5), %%mm3 \n\t" 18- "movq (%5), %%mm3 \n\t"
19- "movq (%6), %%mm4 \n\t" 19- "movq (%6), %%mm4 \n\t"
20+ "movq (%0), %%mm3 \n\t" 20+ "movq (%0), %%mm3 \n\t"
21+ "movq (%1), %%mm4 \n\t" 21+ "movq (%1), %%mm4 \n\t"
22+ : 22+ :
23+ : "r" (brvec), "r" (contvec) 23+ : "r" (brvec), "r" (contvec)
24+ : 
25+ ); 24+ );
26+ asm volatile ( 25+ asm volatile (
27 "pxor %%mm0, %%mm0 \n\t" 26 "pxor %%mm0, %%mm0 \n\t"
28 "movl %4, %%eax\n\t" 27 "movl %4, %%eax\n\t"
29 ASMALIGN(4) 28 ASMALIGN(4)
30@@ -149,7 +154,7 @@ void affine_1d_MMX (eq2_param_t *par, un 29@@ -149,7 +153,7 @@ void affine_1d_MMX (eq2_param_t *par, un
31 "decl %%eax \n\t" 30 "decl %%eax \n\t"
32 "jnz 1b \n\t" 31 "jnz 1b \n\t"
33 : "=r" (src), "=r" (dst) 32 : "=r" (src), "=r" (dst)
34- : "0" (src), "1" (dst), "r" (w >> 3), "r" (brvec), "r" (contvec) 33- : "0" (src), "1" (dst), "r" (w >> 3), "r" (brvec), "r" (contvec)
35+ : "0" (src), "1" (dst), "r" (w >> 3) 34+ : "0" (src), "1" (dst), "r" (w >> 3)
36 : "%eax" 35 : "%eax"
37 ); 36 );
38  37
39@@ -288,19 +293,26 @@ typedef struct eq2_parameters_s { 38@@ -288,19 +292,26 @@ typedef struct eq2_parameters_s {
40 * description of params struct 39 * description of params struct
41 */ 40 */
42 START_PARAM_DESCR( eq2_parameters_t ) 41 START_PARAM_DESCR( eq2_parameters_t )
43-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, gamma, NULL, 0, 5, 0, 42-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, gamma, NULL, 0, 5, 0,
44+PARAM_ITEM( eq2_parameters_t,  43+PARAM_ITEM( eq2_parameters_t,
45+ POST_PARAM_TYPE_DOUBLE, gamma, NULL, 0, 5, 0, 44+ POST_PARAM_TYPE_DOUBLE, gamma, NULL, 0, 5, 0,
46 "gamma" ) 45 "gamma" )
47-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, brightness, NULL, -1, 1, 0, 46-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, brightness, NULL, -1, 1, 0,
48+PARAM_ITEM( eq2_parameters_t,  47+PARAM_ITEM( eq2_parameters_t,
49+ POST_PARAM_TYPE_DOUBLE, brightness, NULL, -1, 1, 0, 48+ POST_PARAM_TYPE_DOUBLE, brightness, NULL, -1, 1, 0,
50 "brightness" ) 49 "brightness" )
51-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, contrast, NULL, 0, 2, 0, 50-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, contrast, NULL, 0, 2, 0,
52+PARAM_ITEM( eq2_parameters_t,  51+PARAM_ITEM( eq2_parameters_t,