Fix the package

3 files changed, 55 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6cf9b906d539..6f268412f69d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Sun Oct 16 09:29:10 UTC 2016
 pkgbase = dsf2flac-svn
 	pkgdesc = A file conversion tool for translating dsf and dff dsd audio files into flac pcm audio files.
 	pkgver = 53
@@ -12,8 +14,10 @@ pkgbase = dsf2flac-svn
 	depends = boost-libs
 	depends = flac
 	depends = id3lib
-	source = dsf2flac::svn+http://dsf2flac.googlecode.com/svn/trunk/
-	sha512sums = SKIP
+	source = dsf2flac.zip::https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/dsf2flac/source-archive.zip
+	source = fix-build.patch
+	sha512sums = cd6c49e3a3f61202f0a8309bef55973aad77f8da4f85a8cf39fae9e450422dfc17cc85db8aa5fb43ac4b0405169ae5e1c0ae2db8a0601dc0513d44c86820cdd4
+	sha512sums = 50bbc642225fca1080eee2b5978049057891cec7e2a414081bb9081a3b044b301f9f96fa2ed00e9e200e40b66e8ebf3ea4bece68c8ba83b9809b0fbdf1486e3a
 
 pkgname = dsf2flac-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index 1d4c0ae6cbde..d43850287863 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,16 +8,15 @@ arch=('i686' 'x86_64')
 url="https://code.google.com/p/dsf2flac"
 license=('GPL3')
 depends=('boost-libs' 'flac' 'id3lib')
-makedepends=('boost' 'cmake' 'subversion')
-source=('dsf2flac::svn+http://dsf2flac.googlecode.com/svn/trunk/')
-sha512sums=('SKIP')
-
-pkgver() {
-  svnversion dsf2flac
-}
+makedepends=('boost' 'cmake')
+source=('dsf2flac.zip::https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/dsf2flac/source-archive.zip'
+        'fix-build.patch')
+sha512sums=('cd6c49e3a3f61202f0a8309bef55973aad77f8da4f85a8cf39fae9e450422dfc17cc85db8aa5fb43ac4b0405169ae5e1c0ae2db8a0601dc0513d44c86820cdd4'
+            '50bbc642225fca1080eee2b5978049057891cec7e2a414081bb9081a3b044b301f9f96fa2ed00e9e200e40b66e8ebf3ea4bece68c8ba83b9809b0fbdf1486e3a')
 
 prepare() {
-  cd dsf2flac
+  cd dsf2flac/trunk
+  patch -p1 < "$srcdir"/fix-build.patch
   perl -ne 'print unless /-static/' -i CMakeLists.txt
 }
 
@@ -26,7 +25,7 @@ build() {
   mkdir build
   cd build
 
-  cmake -DCMAKE_BUILD_TYPE=Release "$srcdir"/dsf2flac
+  cmake -DCMAKE_BUILD_TYPE=Release "$srcdir"/dsf2flac/trunk
   make
 }
 
diff --git a/fix-build.patch b/fix-build.patch
new file mode 100644
index 000000000000..067f064698ba
--- /dev/null
+++ b/fix-build.patch
@@ -0,0 +1,41 @@
+diff a/src/dop_packer.cpp b/src/dop_packer.cpp
+--- a/src/dop_packer.cpp
++++ b/src/dop_packer.cpp
+@@ -99,14 +99,14 @@ unsigned char reverse(unsigned char x)
+ 
+ void DopPacker::pack_buffer(dsf2flac_int32 *buffer, dsf2flac_uint32 bufferLen) {
+ 	// check the buffer seems sensible
+-	div_t d = div(bufferLen,reader->getNumChannels());
++	ldiv_t d = div(dsf2flac_int64(bufferLen),reader->getNumChannels());
+ 	if (d.rem) {
+ 		fputs("Buffer length is not a multiple of getNumChannels()",stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	// get the sample buffer
+ 	boost::circular_buffer<dsf2flac_uint8>* buff = reader->getBuffer();
+-	for (int i=0; i<d.quot ; i++) {
++	for (dsf2flac_int64 i=0; i<d.quot ; i++) {
+ 
+ 		dsf2flac_int32 packed_sample;
+ 		dsf2flac_uint8 byte1;
+diff a/src/dsd_decimator.cpp b/src/dsd_decimator.cpp
+--- a/src/dsd_decimator.cpp
++++ b/src/dsd_decimator.cpp
+@@ -179,7 +179,7 @@ template <typename sampleType> void DsdDecimator::getSamplesInternal(
+ 		bool roundToInt)
+ {
+ 	// check the buffer seems sensible
+-	div_t d = div(bufferLen,getNumChannels());
++	ldiv_t d = div(dsf2flac_int64(bufferLen),getNumChannels());
+ 	if (d.rem) {
+ 		fputs("Buffer length is not a multiple of getNumChannels()",stderr);
+ 		exit(EXIT_FAILURE);
+@@ -188,7 +188,7 @@ template <typename sampleType> void DsdDecimator::getSamplesInternal(
+ 	bool clip = clipAmplitude > 0;
+ 	// get the sample buffer
+ 	boost::circular_buffer<dsf2flac_uint8>* buff = reader->getBuffer();
+-	for (int i=0; i<d.quot ; i++) {
++	for (dsf2flac_int64 i=0; i<d.quot ; i++) {
+ 		// filter each chan in turn
+ 		for (dsf2flac_uint32 c=0; c<getNumChannels(); c++) {
+ 			calc_type sum = 0.0;