[arch-commits] Commit in libsidplay/repos (10 files)
Jan de Groot
jgc at archlinux.org
Thu Aug 4 08:08:19 UTC 2016
Date: Thursday, August 4, 2016 @ 08:08:19
Author: jgc
Revision: 273015
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libsidplay/repos/extra-i686/PKGBUILD
(from rev 273014, libsidplay/trunk/PKGBUILD)
libsidplay/repos/extra-i686/g++-6_build.patch
(from rev 273014, libsidplay/trunk/g++-6_build.patch)
libsidplay/repos/extra-i686/libsidplay-1.36.59-gcc43.patch
(from rev 273014, libsidplay/trunk/libsidplay-1.36.59-gcc43.patch)
libsidplay/repos/extra-x86_64/PKGBUILD
(from rev 273014, libsidplay/trunk/PKGBUILD)
libsidplay/repos/extra-x86_64/g++-6_build.patch
(from rev 273014, libsidplay/trunk/g++-6_build.patch)
libsidplay/repos/extra-x86_64/libsidplay-1.36.59-gcc43.patch
(from rev 273014, libsidplay/trunk/libsidplay-1.36.59-gcc43.patch)
Deleted:
libsidplay/repos/extra-i686/PKGBUILD
libsidplay/repos/extra-i686/libsidplay-1.36.59-gcc43.patch
libsidplay/repos/extra-x86_64/PKGBUILD
libsidplay/repos/extra-x86_64/libsidplay-1.36.59-gcc43.patch
---------------------------------------------+
/PKGBUILD | 70 ++++++++++++++++++++++
/libsidplay-1.36.59-gcc43.patch | 80 ++++++++++++++++++++++++++
extra-i686/PKGBUILD | 29 ---------
extra-i686/g++-6_build.patch | 28 +++++++++
extra-i686/libsidplay-1.36.59-gcc43.patch | 40 -------------
extra-x86_64/PKGBUILD | 29 ---------
extra-x86_64/g++-6_build.patch | 28 +++++++++
extra-x86_64/libsidplay-1.36.59-gcc43.patch | 40 -------------
8 files changed, 206 insertions(+), 138 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-08-04 08:08:13 UTC (rev 273014)
+++ extra-i686/PKGBUILD 2016-08-04 08:08:19 UTC (rev 273015)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Kritoke <kritoke at gamebox.net>
-
-pkgname=libsidplay
-pkgver=1.36.59
-pkgrel=7
-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')
-
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i $srcdir/libsidplay-1.36.59-gcc43.patch
-}
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
-}
Copied: libsidplay/repos/extra-i686/PKGBUILD (from rev 273014, libsidplay/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-08-04 08:08:19 UTC (rev 273015)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Kritoke <kritoke at gamebox.net>
+
+pkgname=libsidplay
+pkgver=1.36.59
+pkgrel=8
+pkgdesc="A library for playing SID music files."
+arch=('i686' 'x86_64')
+url="http://critical.ch/distfiles/"
+license=('GPL')
+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 ${pkgname}-${pkgver}
+ patch -Np1 -i ../libsidplay-1.36.59-gcc43.patch
+ patch -Np1 -i ../g++-6_build.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Copied: libsidplay/repos/extra-i686/g++-6_build.patch (from rev 273014, libsidplay/trunk/g++-6_build.patch)
===================================================================
--- extra-i686/g++-6_build.patch (rev 0)
+++ extra-i686/g++-6_build.patch 2016-08-04 08:08:19 UTC (rev 273015)
@@ -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) <gcs at debian.org>
+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
Deleted: extra-i686/libsidplay-1.36.59-gcc43.patch
===================================================================
--- extra-i686/libsidplay-1.36.59-gcc43.patch 2016-08-04 08:08:13 UTC (rev 273014)
+++ extra-i686/libsidplay-1.36.59-gcc43.patch 2016-08-04 08:08:19 UTC (rev 273015)
@@ -1,40 +0,0 @@
-diff --git a/src/sidtune.cpp b/src/sidtune.cpp
-index 4d1d33b..6fbae80 100644
---- a/src/sidtune.cpp
-+++ b/src/sidtune.cpp
-@@ -306,11 +306,7 @@ udword sidTune::loadFile(const char* fileName, ubyte** bufferRef)
- return 0;
- }
- // Open binary input file stream at end of file.
--#if defined(SID_HAVE_IOS_BIN)
-- ifstream myIn( fileName, ios::in|ios::bin|ios::ate );
--#else
- ifstream myIn( fileName, ios::in|ios::binary|ios::ate );
--#endif
- // As a replacement for !is_open(), bad() and the NOT-operator
- // don't seem to work on all systems.
- #if defined(SID_DONT_HAVE_IS_OPEN)
-@@ -972,11 +968,7 @@ bool sidTune::saveC64dataFile( const char* fileName, bool overWriteFlag )
- }
- // Open binary output file stream.
- else
--#if defined(SID_HAVE_IOS_BIN)
-- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
--#else
- fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
--#endif
- if ( !fMyOut )
- {
- info.statusString = text_cantCreateFile;
-@@ -1061,11 +1053,7 @@ bool sidTune::savePSIDfile( const char* fileName, bool overWriteFlag )
- }
- // Open binary output file stream.
- else
--#if defined(SID_HAVE_IOS_BIN)
-- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
--#else
- fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
--#endif
- if ( !fMyOut )
- {
- info.statusString = text_cantCreateFile;
Copied: libsidplay/repos/extra-i686/libsidplay-1.36.59-gcc43.patch (from rev 273014, libsidplay/trunk/libsidplay-1.36.59-gcc43.patch)
===================================================================
--- extra-i686/libsidplay-1.36.59-gcc43.patch (rev 0)
+++ extra-i686/libsidplay-1.36.59-gcc43.patch 2016-08-04 08:08:19 UTC (rev 273015)
@@ -0,0 +1,40 @@
+diff --git a/src/sidtune.cpp b/src/sidtune.cpp
+index 4d1d33b..6fbae80 100644
+--- a/src/sidtune.cpp
++++ b/src/sidtune.cpp
+@@ -306,11 +306,7 @@ udword sidTune::loadFile(const char* fileName, ubyte** bufferRef)
+ return 0;
+ }
+ // Open binary input file stream at end of file.
+-#if defined(SID_HAVE_IOS_BIN)
+- ifstream myIn( fileName, ios::in|ios::bin|ios::ate );
+-#else
+ ifstream myIn( fileName, ios::in|ios::binary|ios::ate );
+-#endif
+ // As a replacement for !is_open(), bad() and the NOT-operator
+ // don't seem to work on all systems.
+ #if defined(SID_DONT_HAVE_IS_OPEN)
+@@ -972,11 +968,7 @@ bool sidTune::saveC64dataFile( const char* fileName, bool overWriteFlag )
+ }
+ // Open binary output file stream.
+ else
+-#if defined(SID_HAVE_IOS_BIN)
+- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
+-#else
+ fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
+-#endif
+ if ( !fMyOut )
+ {
+ info.statusString = text_cantCreateFile;
+@@ -1061,11 +1053,7 @@ bool sidTune::savePSIDfile( const char* fileName, bool overWriteFlag )
+ }
+ // Open binary output file stream.
+ else
+-#if defined(SID_HAVE_IOS_BIN)
+- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
+-#else
+ fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
+-#endif
+ if ( !fMyOut )
+ {
+ info.statusString = text_cantCreateFile;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-08-04 08:08:13 UTC (rev 273014)
+++ extra-x86_64/PKGBUILD 2016-08-04 08:08:19 UTC (rev 273015)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Kritoke <kritoke at gamebox.net>
-
-pkgname=libsidplay
-pkgver=1.36.59
-pkgrel=7
-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')
-
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i $srcdir/libsidplay-1.36.59-gcc43.patch
-}
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
-}
Copied: libsidplay/repos/extra-x86_64/PKGBUILD (from rev 273014, libsidplay/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-08-04 08:08:19 UTC (rev 273015)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Kritoke <kritoke at gamebox.net>
+
+pkgname=libsidplay
+pkgver=1.36.59
+pkgrel=8
+pkgdesc="A library for playing SID music files."
+arch=('i686' 'x86_64')
+url="http://critical.ch/distfiles/"
+license=('GPL')
+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 ${pkgname}-${pkgver}
+ patch -Np1 -i ../libsidplay-1.36.59-gcc43.patch
+ patch -Np1 -i ../g++-6_build.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Copied: libsidplay/repos/extra-x86_64/g++-6_build.patch (from rev 273014, libsidplay/trunk/g++-6_build.patch)
===================================================================
--- extra-x86_64/g++-6_build.patch (rev 0)
+++ extra-x86_64/g++-6_build.patch 2016-08-04 08:08:19 UTC (rev 273015)
@@ -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) <gcs at debian.org>
+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
Deleted: extra-x86_64/libsidplay-1.36.59-gcc43.patch
===================================================================
--- extra-x86_64/libsidplay-1.36.59-gcc43.patch 2016-08-04 08:08:13 UTC (rev 273014)
+++ extra-x86_64/libsidplay-1.36.59-gcc43.patch 2016-08-04 08:08:19 UTC (rev 273015)
@@ -1,40 +0,0 @@
-diff --git a/src/sidtune.cpp b/src/sidtune.cpp
-index 4d1d33b..6fbae80 100644
---- a/src/sidtune.cpp
-+++ b/src/sidtune.cpp
-@@ -306,11 +306,7 @@ udword sidTune::loadFile(const char* fileName, ubyte** bufferRef)
- return 0;
- }
- // Open binary input file stream at end of file.
--#if defined(SID_HAVE_IOS_BIN)
-- ifstream myIn( fileName, ios::in|ios::bin|ios::ate );
--#else
- ifstream myIn( fileName, ios::in|ios::binary|ios::ate );
--#endif
- // As a replacement for !is_open(), bad() and the NOT-operator
- // don't seem to work on all systems.
- #if defined(SID_DONT_HAVE_IS_OPEN)
-@@ -972,11 +968,7 @@ bool sidTune::saveC64dataFile( const char* fileName, bool overWriteFlag )
- }
- // Open binary output file stream.
- else
--#if defined(SID_HAVE_IOS_BIN)
-- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
--#else
- fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
--#endif
- if ( !fMyOut )
- {
- info.statusString = text_cantCreateFile;
-@@ -1061,11 +1053,7 @@ bool sidTune::savePSIDfile( const char* fileName, bool overWriteFlag )
- }
- // Open binary output file stream.
- else
--#if defined(SID_HAVE_IOS_BIN)
-- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
--#else
- fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
--#endif
- if ( !fMyOut )
- {
- info.statusString = text_cantCreateFile;
Copied: libsidplay/repos/extra-x86_64/libsidplay-1.36.59-gcc43.patch (from rev 273014, libsidplay/trunk/libsidplay-1.36.59-gcc43.patch)
===================================================================
--- extra-x86_64/libsidplay-1.36.59-gcc43.patch (rev 0)
+++ extra-x86_64/libsidplay-1.36.59-gcc43.patch 2016-08-04 08:08:19 UTC (rev 273015)
@@ -0,0 +1,40 @@
+diff --git a/src/sidtune.cpp b/src/sidtune.cpp
+index 4d1d33b..6fbae80 100644
+--- a/src/sidtune.cpp
++++ b/src/sidtune.cpp
+@@ -306,11 +306,7 @@ udword sidTune::loadFile(const char* fileName, ubyte** bufferRef)
+ return 0;
+ }
+ // Open binary input file stream at end of file.
+-#if defined(SID_HAVE_IOS_BIN)
+- ifstream myIn( fileName, ios::in|ios::bin|ios::ate );
+-#else
+ ifstream myIn( fileName, ios::in|ios::binary|ios::ate );
+-#endif
+ // As a replacement for !is_open(), bad() and the NOT-operator
+ // don't seem to work on all systems.
+ #if defined(SID_DONT_HAVE_IS_OPEN)
+@@ -972,11 +968,7 @@ bool sidTune::saveC64dataFile( const char* fileName, bool overWriteFlag )
+ }
+ // Open binary output file stream.
+ else
+-#if defined(SID_HAVE_IOS_BIN)
+- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
+-#else
+ fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
+-#endif
+ if ( !fMyOut )
+ {
+ info.statusString = text_cantCreateFile;
+@@ -1061,11 +1053,7 @@ bool sidTune::savePSIDfile( const char* fileName, bool overWriteFlag )
+ }
+ // Open binary output file stream.
+ else
+-#if defined(SID_HAVE_IOS_BIN)
+- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
+-#else
+ fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
+-#endif
+ if ( !fMyOut )
+ {
+ info.statusString = text_cantCreateFile;
More information about the arch-commits
mailing list