Date: Thursday, August 4, 2016 @ 08:08:13 Author: jgc Revision: 273014
upgpkg: libsidplay 1.36.59-8 Add fix for gcc6 Added: libsidplay/trunk/g++-6_build.patch Modified: libsidplay/trunk/PKGBUILD -------------------+ PKGBUILD | 24 +++++++++++++++--------- g++-6_build.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-08-04 08:08:13 UTC (rev 273013) +++ PKGBUILD 2016-08-04 08:08:13 UTC (rev 273014) @@ -1,29 +1,35 @@ # $Id$ -# Maintainer: +# Maintainer: Jan de Groot <[email protected]> # Contributor: Kritoke <[email protected]> pkgname=libsidplay pkgver=1.36.59 -pkgrel=7 +pkgrel=8 pkgdesc="A library for playing SID music files." arch=('i686' 'x86_64') url="http://critical.ch/distfiles/"; license=('GPL') -source=(http://critical.ch/distfiles/${pkgname}-${pkgver}.tgz libsidplay-1.36.59-gcc43.patch) -md5sums=('37c51ba4bd57164b1b0bb7b43b9adece' 'c24d7bca2639f4fee03c40c7dcaadfee') +depends=('gcc-libs') +source=(http://critical.ch/distfiles/${pkgname}-${pkgver}.tgz + libsidplay-1.36.59-gcc43.patch + g++-6_build.patch) +sha256sums=('3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024' + '68476bfee9a378b045c81eb0f6d9aee7341610fe6b22047d67ce859a7a3b5053' + '6612b8c684bfd80d88431d3aa7f5a3fc911528f25f67ab530f78a7592cc11e23') prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i $srcdir/libsidplay-1.36.59-gcc43.patch + cd ${pkgname}-${pkgver} + patch -Np1 -i ../libsidplay-1.36.59-gcc43.patch + patch -Np1 -i ../g++-6_build.patch } build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } Added: g++-6_build.patch =================================================================== --- g++-6_build.patch (rev 0) +++ g++-6_build.patch 2016-08-04 08:08:13 UTC (rev 273014) @@ -0,0 +1,28 @@ +Description: use unsigned char to keep int value + Use unsigned char to keep all bits of int values in the array. +Author: Laszlo Boszormenyi (GCS) <[email protected]> +Bug-Debian: https://bugs.debian.org/811762 +Last-Update: 2016-07-16 + +--- + +--- libsidplay-1.36.59.orig/src/samples.cpp ++++ libsidplay-1.36.59/src/samples.cpp +@@ -75,7 +75,7 @@ struct sampleChannel + sampleChannel ch4, ch5; + + +-const sbyte galwayNoiseTab1[16] = ++const ubyte galwayNoiseTab1[16] = + { + 0x80,0x91,0xa2,0xb3,0xc4,0xd5,0xe6,0xf7, + 0x08,0x19,0x2a,0x3b,0x4c,0x5d,0x6e,0x7f +@@ -84,7 +84,7 @@ const sbyte galwayNoiseTab1[16] = + ubyte galwayNoiseVolTab[16]; + sbyte galwayNoiseSamTab[16]; + +-const sbyte sampleConvertTab[16] = ++const ubyte sampleConvertTab[16] = + { + // 0x81,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff, + // 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x7f
