[qtractor] Update to 0.6.4

[Brendan Jones]

commit 1dd403ceda8f43bd4dddef915d771402b827bbb7
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Tue Nov 25 07:24:37 2014 +0100

    Update to 0.6.4

 .gitignore                                         |    1 +
 ...condary.patch => qtractor-0.6.4-secondary.patch |   13 +++++--------
 qtractor-libmad-factorout.patch                    |    4 ++--
 qtractor.spec                                      |   14 +++++++++-----
 sources                                            |    2 +-
 5 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ce7d6ab..b6cd752 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /qtractor-0.6.1.tar.gz
 /qtractor-0.6.2.tar.gz
 /qtractor-0.6.3.tar.gz
+/qtractor-0.6.4.tar.gz
diff --git a/qtractor-0.5.12-secondary.patch b/qtractor-0.6.4-secondary.patch
similarity index 71%
rename from qtractor-0.5.12-secondary.patch
rename to qtractor-0.6.4-secondary.patch
index 155d98e..6d6cc33 100644
--- a/qtractor-0.5.12-secondary.patch
+++ b/qtractor-0.6.4-secondary.patch
@@ -1,11 +1,9 @@
-diff -up qtractor-0.5.12/src/qtractorAtomic.h.secondary qtractor-0.5.12/src/qtractorAtomic.h
---- qtractor-0.5.12/src/qtractorAtomic.h.secondary	2014-03-13 20:20:56.000000000 +0100
-+++ qtractor-0.5.12/src/qtractorAtomic.h	2014-03-13 21:45:47.000000000 +0100
-@@ -33,6 +33,27 @@
+--- qtractor-0.6.4/src/qtractorAtomic.h.orig	2014-11-25 06:56:42.653344147 +0100
++++ qtractor-0.6.4/src/qtractorAtomic.h	2014-11-25 06:57:15.025344456 +0100
+@@ -33,6 +33,26 @@
  extern "C" {
  #endif
  
-+
 +#if defined(HAVE_QATOMIC_H)
 +
 +typedef QAtomicInt qtractorAtomic;
@@ -29,11 +27,10 @@ diff -up qtractor-0.5.12/src/qtractorAtomic.h.secondary qtractor-0.5.12/src/qtra
  #if defined(__GNUC__)
  
  #if defined(powerpc) || defined(__ppc__)
-@@ -106,27 +127,6 @@ static inline int ATOMIC_CAS1 (
- #   error "qtractorAtomic.h: unsupported target compiler processor (WIN32)."
+@@ -107,26 +127,6 @@ static inline int ATOMIC_CAS1 (
  #endif
  
--
+ 
 -#if defined(HAVE_QATOMIC_H)
 -
 -typedef QAtomicInt qtractorAtomic;
diff --git a/qtractor-libmad-factorout.patch b/qtractor-libmad-factorout.patch
index 231e666..6237db2 100644
--- a/qtractor-libmad-factorout.patch
+++ b/qtractor-libmad-factorout.patch
@@ -40,8 +40,8 @@ diff -rupN qtractor-0.5.5.old/configure.ac qtractor-0.5.5/configure.ac
  
  # Check for optional libsamplerate library.
  if test "x$ac_libsamplerate" = "xyes"; then
-@@ -716,6 +734,9 @@ if test "x$ac_jack_latency" = "xyes"; th
-    fi
+@@ -776,6 +776,9 @@ else
+    AC_MSG_WARN([*** JACK metadata support will be disabled.])
  fi
  
 +# To dlopen plugins
diff --git a/qtractor.spec b/qtractor.spec
index 4665ba8..4a0c187 100644
--- a/qtractor.spec
+++ b/qtractor.spec
@@ -10,7 +10,7 @@
 
 Summary:       Audio/MIDI multi-track sequencer
 Name:          qtractor
-Version:       0.6.3
+Version:       0.6.4
 Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
@@ -18,7 +18,7 @@ URL:           http://qtractor.sourceforge.net/
 Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:        qtractor-libmad-factorout.patch
 Patch2:        qtractor-libmad-factorout-makefile.patch
-Patch3:        qtractor-0.5.12-secondary.patch
+Patch3:        qtractor-0.6.4-secondary.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
@@ -48,9 +48,9 @@ dedicated to the personal home-studio.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch1 -p1 -b .mad-factorout
+%patch2 -p1 -b .mad-makefile
+%patch3 -p1 -b .second
 
 # Fix odd permissions
 chmod -x src/qtractorMmcEvent.*
@@ -102,6 +102,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/man/man1/%{name}*
 
 %changelog
+* Tue Nov 25 2014 Brendan Jones <brendan.jones.it at gmail.com> 0.6.4-1
+- Update to 0.6.4
+- Refactor secondary patch
+
 * Thu Sep 25 2014 Brendan Jones <brendan.jones.it at gmail.com> 0.6.3-1
 - Update to 0.6.3
 
diff --git a/sources b/sources
index 3be48ce..cc45382 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-caf1b4ddd924ac81b58bfd11ecd1e805  qtractor-0.6.3.tar.gz
+37396d7dae7a5d6348d481d2d77a88cb  qtractor-0.6.4.tar.gz