[arch-commits] Commit in libffado/trunk (PKGBUILD libffado-gcc7.patch)

[Antonio Rojas]

    Date: Wednesday, June 14, 2017 @ 19:54:04
  Author: arojas
Revision: 236846

libconfig 1.6 rebuild

Added:
  libffado/trunk/libffado-gcc7.patch
Modified:
  libffado/trunk/PKGBUILD

---------------------+
 PKGBUILD            |    8 +++++---
 libffado-gcc7.patch |   20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-14 19:53:45 UTC (rev 236845)
+++ PKGBUILD	2017-06-14 19:54:04 UTC (rev 236846)
@@ -5,7 +5,7 @@
 
 pkgname=libffado
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Driver for FireWire audio devices"
 arch=('i686' 'x86_64')
 url="http://www.ffado.org/"
@@ -21,13 +21,14 @@
         'libxml++3.patch'
         'gcc-warnings.patch'
         'cpuinfo-parsing.patch'
-        'gcc6.patch')
+        'gcc6.patch' 'libffado-gcc7.patch')
 md5sums=('8f452977267200cfaf9b8e16ba3c92df'
          '223f7a10dd208f30ead7ec0c3c84473f'
          '4203ef91ace1639516408461d03e39f1'
          '6d353c935007b048b36af7a2bcd9e433'
          '71532069197df12783d389c7a21382ba'
-         '8a02cc31fa9c538d84b263eb9de063b3')
+         '8a02cc31fa9c538d84b263eb9de063b3'
+         '781ea47512cef122f72d4b38ad121bcd')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -38,6 +39,7 @@
   patch -Np3 -i "$srcdir/gcc-warnings.patch"
   patch -Np1 -i "$srcdir/cpuinfo-parsing.patch"
   patch -Np1 -i "$srcdir/gcc6.patch"
+  patch -Np1 -i "$srcdir/libffado-gcc7.patch" # Fedora
 }
 
 build() {

Added: libffado-gcc7.patch
===================================================================
--- libffado-gcc7.patch	                        (rev 0)
+++ libffado-gcc7.patch	2017-06-14 19:54:04 UTC (rev 236846)
@@ -0,0 +1,20 @@
+--- libffado-2.3.0/src/libieee1394/configrom.cpp.derefptr	2017-02-16 12:03:33.894937836 +0000
++++ libffado-2.3.0/src/libieee1394/configrom.cpp	2017-02-16 12:03:44.000947451 +0000
+@@ -176,7 +176,7 @@
+                 ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_vendorNameKv ),
+                 len );
+ 
+-    while ((buf + len - 1) == '\0') {
++    while (*(buf + len - 1) == '\0') {
+             len--;
+         }
+         // \todo XXX seems a bit strage to do this but the nodemgr.c code does
+@@ -195,7 +195,7 @@
+         memcpy( buf,
+                 ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_modelNameKv ),
+                 len );
+-    while ((buf + len - 1) == '\0') {
++    while (*(buf + len - 1) == '\0') {
+             len--;
+         }
+         // \todo XXX for edirol fa-66 it seems somehow broken. see above