[SCM] bs1770gain/master: Added 10-unsigned-char-archs.diff to fix build problem when char is unsigned (Closes: #789248).

pere at users.alioth.debian.org pere at users.alioth.debian.org
Sat Jun 20 21:31:05 UTC 2015


The following commit has been merged in the master branch:
commit 52567bc8d942e3c7a374200be0285911ebfedb97
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Jun 20 21:27:40 2015 +0000

    Added 10-unsigned-char-archs.diff to fix build problem when char is unsigned (Closes: #789248).

diff --git a/debian/patches/10-unsigned-char-archs.diff b/debian/patches/10-unsigned-char-archs.diff
new file mode 100644
index 0000000..033cdd0
--- /dev/null
+++ b/debian/patches/10-unsigned-char-archs.diff
@@ -0,0 +1,29 @@
+Description: Fix build problem on archs with signed char
+ The return type of getc() is int to be able to return both characters
+ and EOF (-1).  The test in the code is always false when the return is
+ stored in a char when char is unsigned.  This fixes build problem on
+ arm* and many other architectures.
+Author: Petter Reinholdtsen <pere at debian.org>
+Bug-Debian: https://bugs.debian.org/789248
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <pere at debian.org>
+Last-Update: 2015-06-20
+
+--- bs1770gain-0.4.3.orig/libffsox-2/ffsox_csv2avdict.c
++++ bs1770gain-0.4.3/libffsox-2/ffsox_csv2avdict.c
+@@ -255,11 +255,14 @@ static int priv_get_utf8(priv_t *b)
+   static unsigned short mask[] = {192, 224, 240}; 
+ 
+   char *wp=b->ch;
++  int firstbyte;
+   size_t n; 
+ 
+   // read first byte into buffer
+-  if (EOF==(*wp=getc(b->f)))
++  firstbyte = getc(b->f);
++  if (EOF==firstbyte)
+     goto error;
++  *wp = (char)firstbyte;
+ 
+   // check how many more bytes need to be read for character
+   n = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 44556cb..3b86c0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 #10-autotools.diff
 #20-disable-dynload.diff
 #30-link-math-lib.diff
+10-unsigned-char-archs.diff

-- 
bs1770gain packaging



More information about the pkg-multimedia-commits mailing list