Update to 0.9.13

3 files changed, 22 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b8a48deeab3..f8d42a0c337e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Feb 23 12:05:53 UTC 2016
+# Sat Mar 12 09:32:56 UTC 2016
 pkgbase = mpd-dsd
 	pkgdesc = Flexible, powerful, server-side application for playing music with DSD patches and Sox enabled
-	pkgver = 0.19.12
-	pkgrel = 2
+	pkgver = 0.19.13
+	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.12.tar.xz
-	source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.12.tar.xz.sig
+	source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.13.tar.xz
+	source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.13.tar.xz.sig
 	source = tmpfiles.d
 	source = conf
-	source = 0001-Add-native-DSD-support-to-MPD-0.19.12.patch
+	source = 0001-Add-native-DSD-support-to-MPD-0.19.13.patch
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
diff --git a/0001-Add-native-DSD-support-to-MPD-0.19.12.patch b/0001-Add-native-DSD-support-to-MPD-0.19.13.patch
index d9cbcd5ea9a8..0ecdf1c2b6ab 100644
--- a/0001-Add-native-DSD-support-to-MPD-0.19.12.patch
+++ b/0001-Add-native-DSD-support-to-MPD-0.19.13.patch
@@ -1,17 +1,12 @@
-From 23a6dbb62a0347a5791335bb195baedd94045923 Mon Sep 17 00:00:00 2001
+From 57c9e313694e518302a2e54cde6183ee30099e90 Mon Sep 17 00:00:00 2001
 From: Jurgen Kramer <gtmkramer@xs4all.nl>
-Date: Mon, 11 Jan 2016 12:21:06 +0100
-Subject: [PATCH] Add native DSD support to MPD 0.19 using DSD_U8 and
- DSD_U32_BE sample formats.
-
-See https://github.com/lintweaker/xmos-native-dsd for more info.
-
-Jurgen Kramer
+Date: Tue, 8 Mar 2016 18:10:36 +0100
+Subject: [PATCH] Update MPD native DSD patch to MPD 0.19.13
 
 Signed-off-by: Jurgen Kramer <gtmkramer@xs4all.nl>
 ---
  Makefile.am                             |  5 ++-
- README-DSD                              | 52 +++++++++++++++++++++++
+ README-DSD                              | 51 ++++++++++++++++++++++
  configure.ac                            |  2 +-
  src/AudioFormat.cxx                     |  4 +-
  src/AudioFormat.hxx                     | 18 +++++++-
@@ -28,7 +23,7 @@ Signed-off-by: Jurgen Kramer <gtmkramer@xs4all.nl>
  src/pcm/PcmFormat.cxx                   | 10 ++++-
  src/pcm/PcmMix.cxx                      |  6 ++-
  src/pcm/Volume.cxx                      |  6 ++-
- 18 files changed, 330 insertions(+), 21 deletions(-)
+ 18 files changed, 329 insertions(+), 21 deletions(-)
  create mode 100644 README-DSD
  create mode 100644 src/pcm/PcmDsdNative.cxx
  create mode 100644 src/pcm/PcmDsdNative.hxx
@@ -58,10 +53,10 @@ index 307fcba..e905003 100644
  
 diff --git a/README-DSD b/README-DSD
 new file mode 100644
-index 0000000..d896020
+index 0000000..d859472
 --- /dev/null
 +++ b/README-DSD
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,51 @@
 +[31-jan-15]
 +This version of MPD 0.19 has been enhancend with DSD native playback options.
 +DSD output using DoP is mutually exclusive with native DSD playback. 
@@ -75,9 +70,8 @@ index 0000000..d896020
 +
 +dop	"no"
 +
-+Native DSD playback requires ALSA driver and ALSA library support. The ALSA
-+library needs patching (ALSA lib <= 1.0.28). A version with the needed DSD_U32_BE sample
-+format is not released yet. See: https://github.com/lintweaker/xmos-native-dsd
++Native DSD playback requires ALSA driver (i.e. linux kernel) and ALSA library
++support (ALSA lib >= 1.0.28). See: https://github.com/lintweaker/xmos-native-dsd
 +
 +Add the following configuration to the appropriate audio_output section(s) of your mpd configuration file (e.g.
 +/etc/mpd.conf):
@@ -115,14 +109,14 @@ index 0000000..d896020
 +
 +
 diff --git a/configure.ac b/configure.ac
-index 107b45a..c7079c2 100644
+index 39f2aaf..63e0bc8 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1,6 +1,6 @@
  AC_PREREQ(2.60)
  
--AC_INIT(mpd, 0.19.12, musicpd-dev-team@lists.sourceforge.net)
-+AC_INIT(mpd, 0.19.12-dsd, gtmkramer@xs4all.nl)
+-AC_INIT(mpd, 0.19.13, musicpd-dev-team@lists.sourceforge.net)
++AC_INIT(mpd, 0.19.13-dsd, gtmkramer@xs4all.nl)
  
  VERSION_MAJOR=0
  VERSION_MINOR=19
@@ -789,4 +783,3 @@ index b12d8fd..ec718be 100644
  	}
 -- 
 2.5.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 4e3279852c10..3e971f447dce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd-dsd
-pkgver=0.19.12
-pkgrel=2
+pkgver=0.19.13
+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.12.patch')
+        '0001-Add-native-DSD-support-to-MPD-0.19.13.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.12.patch"
+  patch -Np1 -i "../0001-Add-native-DSD-support-to-MPD-0.19.13.patch"
 }
 
 build() {