Update to 0.19.17

3 files changed, 22 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5faa18b26e21..7a0087386e70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Mar 31 07:52:18 UTC 2016
+# Tue Aug 16 14:38:24 UTC 2016
 pkgbase = mpd-dsd
 	pkgdesc = Flexible, powerful, server-side application for playing music with DSD patches and Sox enabled
-	pkgver = 0.19.14
-	pkgrel = 2
+	pkgver = 0.19.17
+	pkgrel = 1
 	url = https://github.com/lintweaker/mpd-dsd-019
 	install = install
 	arch = i686
@@ -37,11 +37,11 @@ pkgbase = mpd-dsd
 	optdepends = sox-dsd-git
 	conflicts = mpd
 	backup = etc/mpd.conf
-	source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.14.tar.xz
-	source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.14.tar.xz.sig
+	source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.17.tar.xz
+	source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.17.tar.xz.sig
 	source = tmpfiles.d
 	source = conf
-	source = 0001-Add-native-DSD-support-to-MPD-0.19.14.patch
+	source = 0001-This-patch-extends-native-DSD-support-for-MPD-0.19.1.patch
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
diff --git a/0001-Add-native-DSD-support-to-MPD-0.19.14.patch b/0001-This-patch-extends-native-DSD-support-for-MPD-0.19.1.patch
index f701d1ec9976..4ef9cdfceb85 100644
--- a/0001-Add-native-DSD-support-to-MPD-0.19.14.patch
+++ b/0001-This-patch-extends-native-DSD-support-for-MPD-0.19.1.patch
@@ -1,8 +1,7 @@
-From 38940248d7b759a122204d47783a9c46de8324bf Mon Sep 17 00:00:00 2001
+From 9eee6e511a4b875069b6a7c42cd68ccc6a982311 Mon Sep 17 00:00:00 2001
 From: Jurgen Kramer <gtmkramer@xs4all.nl>
-Date: Sat, 19 Mar 2016 13:47:15 +0100
-Subject: [PATCH] This patch extends native DSD support for MPD 0.19.14 and
- contains a workaround for hangs at the end of certain DSD DFF files.
+Date: Sun, 31 Jul 2016 10:30:30 +0200
+Subject: [PATCH] This patch extends native DSD support for MPD 0.19.17
 
 Signed-off-by: Jurgen Kramer <gtmkramer@xs4all.nl>
 ---
@@ -31,10 +30,10 @@ Signed-off-by: Jurgen Kramer <gtmkramer@xs4all.nl>
  create mode 100644 src/pcm/PcmDsdNative.hxx
 
 diff --git a/Makefile.am b/Makefile.am
-index 307fcba..e905003 100644
+index 7cd68f8..a57cbaa 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -495,7 +495,8 @@ PCM_LIBS = \
+@@ -496,7 +496,8 @@ PCM_LIBS = \
  if ENABLE_DSD
  libpcm_a_SOURCES += \
  	src/pcm/PcmDsd.cxx src/pcm/PcmDsd.hxx \
@@ -44,7 +43,7 @@ index 307fcba..e905003 100644
  endif
  
  if HAVE_LIBSAMPLERATE
-@@ -2093,7 +2094,7 @@ endif
+@@ -2094,7 +2095,7 @@ endif
  #
  
  man_MANS = doc/mpd.1 doc/mpd.conf.5
@@ -111,14 +110,14 @@ index 0000000..d859472
 +
 +
 diff --git a/configure.ac b/configure.ac
-index 66621e6..96d7d28 100644
+index b5d59c2..5d5c9c3 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1,6 +1,6 @@
  AC_PREREQ(2.60)
  
--AC_INIT(mpd, 0.19.14, musicpd-dev-team@lists.sourceforge.net)
-+AC_INIT(mpd, 0.19.14-dsd, gtmkramer@xs4all.nl)
+-AC_INIT(mpd, 0.19.17, musicpd-dev-team@lists.sourceforge.net)
++AC_INIT(mpd, 0.19.17-dsd, gtmkramer@xs4all.nl)
  
  VERSION_MAJOR=0
  VERSION_MINOR=19
@@ -778,7 +777,7 @@ index d21b5f0..c72afdb 100644
  		return false;
  
 diff --git a/src/pcm/Volume.cxx b/src/pcm/Volume.cxx
-index b12d8fd..ec718be 100644
+index 6d28a9b..341b665 100644
 --- a/src/pcm/Volume.cxx
 +++ b/src/pcm/Volume.cxx
 @@ -1,5 +1,5 @@
@@ -788,7 +787,7 @@ index b12d8fd..ec718be 100644
   * http://www.musicpd.org
   *
   * This program is free software; you can redistribute it and/or modify
-@@ -116,6 +116,8 @@ PcmVolume::Open(SampleFormat _format, Error &error)
+@@ -118,6 +118,8 @@ PcmVolume::Open(SampleFormat _format, Error &error)
  		break;
  
  	case SampleFormat::DSD:
@@ -807,4 +806,4 @@ index b12d8fd..ec718be 100644
  		return src;
  	}
 -- 
-2.5.0
+2.5.5
diff --git a/PKGBUILD b/PKGBUILD
index 8ea478d0013b..e1ef7ce5ea9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd-dsd
-pkgver=0.19.14
-pkgrel=2
+pkgver=0.19.17
+pkgrel=1
 pkgdesc='Flexible, powerful, server-side application for playing music with DSD patches and Sox enabled'
 url='https://github.com/lintweaker/mpd-dsd-019'
 license=('GPL')
@@ -23,7 +23,7 @@ validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
 source=("http://www.musicpd.org/download/mpd/${pkgver%.*}/mpd-${pkgver}.tar.xz"{,.sig}
         'tmpfiles.d'
         'conf'
-        '0001-Add-native-DSD-support-to-MPD-0.19.14.patch')
+        '0001-This-patch-extends-native-DSD-support-for-MPD-0.19.1.patch')
 sha1sums=('SKIP'
           'SKIP'
           'SKIP'
@@ -35,7 +35,7 @@ install=install
 
 prepare() {
 cd "${srcdir}/mpd-${pkgver}"
-  patch -Np1 -i "../0001-Add-native-DSD-support-to-MPD-0.19.14.patch"
+  patch -Np1 -i "../0001-This-patch-extends-native-DSD-support-for-MPD-0.19.1.patch"
 }
 
 build() {