From 0131fcdf86190b31364d10b2d759f0792fad852a Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Apr 06 2014 14:57:29 +0000
Subject: New upstream release 1.2.0


- Drop our patches (merged upstream)

---

diff --git a/.gitignore b/.gitignore
index b2e17ce..71f5144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /sidplayfp-1.0.1.tar.gz
 /sidplayfp-1.0.3.tar.gz
 /sidplayfp-1.1.0.tar.gz
+/sidplayfp-1.2.0.tar.gz
diff --git a/sidplayfp-1.1.0-pulse-build.patch b/sidplayfp-1.1.0-pulse-build.patch
deleted file mode 100644
index 0a263da..0000000
--- a/sidplayfp-1.1.0-pulse-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -up sidplayfp-1.1.0/src/audio/pulse/audiodrv.cpp~ sidplayfp-1.1.0/src/audio/pulse/audiodrv.cpp
---- sidplayfp-1.1.0/src/audio/pulse/audiodrv.cpp~	2013-09-16 22:02:15.000000000 +0200
-+++ sidplayfp-1.1.0/src/audio/pulse/audiodrv.cpp	2013-09-30 11:04:15.394740091 +0200
-@@ -24,6 +24,7 @@
- #ifdef HAVE_PULSE
- 
- #include <new>
-+#include <pulse/error.h>
- 
- Audio_Pulse::Audio_Pulse() :
-     AudioBase("PULSE")
-@@ -52,7 +53,7 @@ bool Audio_Pulse::open(AudioConfig &cfg)
-     pacfg.format = PA_SAMPLE_S16NE;
- 
-     // Set sample precision and type of encoding.
--    int error;
-+    int err;
-     _audioHandle = pa_simple_new(
-         NULL,
-         "sidplayfp",
-@@ -62,13 +63,13 @@ bool Audio_Pulse::open(AudioConfig &cfg)
-         &pacfg,
-         NULL,
-         NULL,
--        &error
-+        &err
-     );
- 
-     try
-     {
-         if (! _audioHandle) {
--            throw error(pa_strerror(error));
-+            throw error(pa_strerror(err));
-         }
- 
-         cfg.bufSize = 4096;
-@@ -123,10 +124,10 @@ bool Audio_Pulse::write()
-         return false;
-     }
- 
--    int error;
--    if (pa_simple_write(_audioHandle, _sampleBuffer, _settings.bufSize * 2, &error) < 0)
-+    int err;
-+    if (pa_simple_write(_audioHandle, _sampleBuffer, _settings.bufSize * 2, &err) < 0)
-     {
--        setError(pa_strerror(error));
-+        setError(pa_strerror(err));
-         // FIXME should we return false here?
-     }
-     return true;
diff --git a/sidplayfp.spec b/sidplayfp.spec
index b74e223..955e437 100644
--- a/sidplayfp.spec
+++ b/sidplayfp.spec
@@ -1,11 +1,10 @@
 Name:           sidplayfp
-Version:        1.1.0
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        SID chip music module player
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/sidplay-residfp/
 Source0:        http://downloads.sourceforge.net/sidplay-residfp/%{name}-%{version}.tar.gz
-Patch0:         sidplayfp-1.1.0-pulse-build.patch
 BuildRequires:  libsidplayfp-devel alsa-lib-devel pulseaudio-libs-devel
 %if 0%{?fedora} >= 19
 # Obsolete old sidplay2 based sidplay (sidplayfp is a continuation of sidplay2)
@@ -20,7 +19,6 @@ and compatibles.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -41,6 +39,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Apr  6 2014 Hans de Goede <hdegoede@redhat.com> - 1.2.0-1
+- New upstream release 1.2.0
+- Drop our patches (merged upstream)
+
 * Mon Sep 30 2013 Hans de Goede <hdegoede@redhat.com> - 1.1.0-1
 - New upstream release 1.1.0
 - Drop our patches (merged upstream)
diff --git a/sources b/sources
index 028b231..d6fa182 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-492719e658efe7f71deb71743c2413de  sidplayfp-1.1.0.tar.gz
+3ca21da495abb7ccb7ca78b17dbc2189  sidplayfp-1.2.0.tar.gz