[SCM] gwc/master: Added patch to build with clang.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Sun Aug 10 14:45:35 UTC 2014


The following commit has been merged in the master branch:
commit c8738bb7ddc5e0000e974801f3ddf8e6aeae0f5b
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Aug 10 16:45:04 2014 +0200

    Added patch to build with clang.

diff --git a/debian/patches/0002-fix-function-declaration.patch b/debian/patches/0002-fix-function-declaration.patch
new file mode 100644
index 0000000..a5b6d44
--- /dev/null
+++ b/debian/patches/0002-fix-function-declaration.patch
@@ -0,0 +1,55 @@
+Subject: Fix build with clang
+ Thanks to Arthur Marble <arthur at info9.net>
+Reviewed-by: Jaromír Mikeš <mira.mikes at seznam.cz>
+Last-Update: 2014-08-10
+Forwarded: no
+
+Index: gwc/gwc.c
+===================================================================
+--- gwc.orig/gwc.c
++++ gwc/gwc.c
+@@ -2657,28 +2657,28 @@ long time_to_sample(char *time, struct s
+     return position;
+ }
+ 
++long batch_atol(char *time)
++{
++	if( strcmp(time,"end") == 0 )
++		return prefs.n_samples;
++	else
++		return atol(time);
++}
++
++long batch_time_to_sample(char *time, struct sound_prefs *p)
++{
++	if( strcmp(time,"end") == 0 )
++		return p->n_samples;
++	else
++		return time_to_sample(time, p);
++}
++
+ /* bj Sep 2003 re-write batch declick, add batch denoise, batch truncate */
+ void batch(int argc, char **argv)
+ {
+ #define BYTIME 0
+ #define BYSAMPLE 1
+ 
+-	long batch_atol(char *time)
+-	{
+-		if( strcmp(time,"end") == 0 )
+-			return prefs.n_samples;
+-		else
+-			return atol(time);
+-	}
+-
+-	long batch_time_to_sample(char *time, struct sound_prefs *p)
+-	{
+-		if( strcmp(time,"end") == 0 )
+-			return p->n_samples;
+-		else
+-			return time_to_sample(time, p);	
+-	}
+-
+     int type = BYTIME ; 
+ 
+     batch_mode = 1 ;
diff --git a/debian/patches/series b/debian/patches/series
index b5c7eee..d89c5a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-buildsystem.patch
+0002-fix-function-declaration.patch
+0003-fix_typos.patch

-- 
gwc packaging



More information about the pkg-multimedia-commits mailing list