bsjones pushed to qtractor (f21). "Update to 0.6.6"

Wed Apr 29 18:50:20 UTC 2015

>From 5332bb2545f53f3c1577e9d60c42b6645c6fb6de Mon Sep 17 00:00:00 2001
From: Brendan Jones <brendan.jones.it at gmail.com>
Date: Wed, 29 Apr 2015 20:47:53 +0200
Subject: Update to 0.6.6

diff --git a/.gitignore b/.gitignore
index b6cd752..d9e263e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /qtractor-0.6.2.tar.gz
 /qtractor-0.6.3.tar.gz
 /qtractor-0.6.4.tar.gz
+/qtractor-0.6.6.tar.gz
diff --git a/qtractor-0.6.5.tar.gz b/qtractor-0.6.5.tar.gz
deleted file mode 100644
index a9812a4..0000000
Binary files a/qtractor-0.6.5.tar.gz and /dev/null differ
diff --git a/qtractor-libmad-factorout.patch b/qtractor-libmad-factorout.patch
index 6237db2..36447e1 100644
--- a/qtractor-libmad-factorout.patch
+++ b/qtractor-libmad-factorout.patch
@@ -1,29 +1,6 @@
 diff -rupN qtractor-0.5.5.old/configure.ac qtractor-0.5.5/configure.ac
 --- qtractor-0.5.5.old/configure.ac	2012-06-15 06:12:54.000000000 -0400
 +++ qtractor-0.5.5/configure.ac	2012-06-24 04:26:35.076671263 -0400
-@@ -14,6 +14,22 @@ fi
- AC_SUBST(ac_prefix)
- AC_DEFINE_UNQUOTED(CONFIG_PREFIX, ["$ac_prefix"], [Default installation prefix.])
- 
-+# Set default installation libdir and plugindir.
-+if test "x$exec_prefix" = "xNONE"; then
-+    exec_prefix="${ac_prefix}"
-+fi
-+
-+ac_libdir=$libdir
-+if test "x$ac_libdir" = "xNONE"; then
-+    ac_libdir=$ac_default_libdir
-+fi
-+# We want to make sure that this expands out. Otherwise we have bash variables
-+# such as ${exec_prefix} inside config.h:
-+eval ac_libdir="\"$ac_libdir\""
-+AC_SUBST(ac_libdir)
-+AC_DEFINE_UNQUOTED(CONFIG_LIBDIR, ["$ac_libdir"], [Default installation libdir.])
-+AC_DEFINE_UNQUOTED(CONFIG_PLUGINDIR, ["$ac_libdir/qtractor"], [Default plugin installation dir.])
-+
- # Enable debugging argument option.
- AC_ARG_ENABLE(debug,
-   AC_HELP_STRING([--enable-debug], [enable debugging (default=no)]),
 @@ -550,12 +566,14 @@ if test "x$ac_libmad" = "xyes"; then
     AC_CHECK_LIB(mad, main, [ac_libmad="yes"], [ac_libmad="no"])
     if test "x$ac_libmad" = "xyes"; then
@@ -133,16 +110,6 @@ diff -rupN qtractor-0.5.5.old/qtractor_mad.pro qtractor-0.5.5/qtractor_mad.pro
 diff -rupN qtractor-0.5.5.old/src/config.h.in qtractor-0.5.5/src/config.h.in
 --- qtractor-0.5.5.old/src/config.h.in	2012-06-15 06:13:53.000000000 -0400
 +++ qtractor-0.5.5/src/config.h.in	2012-06-24 04:04:30.131475190 -0400
-@@ -21,6 +21,9 @@
- /* Define if LADSPA header is available. */
- #undef CONFIG_LADSPA
- 
-+/* Default installation libdir. */
-+#undef CONFIG_LIBDIR
-+
- /* Define if liblilv is available. */
- #undef CONFIG_LIBLILV
- 
 @@ -84,6 +87,9 @@
  /* Define if NSM support is available. */
  #undef CONFIG_NSM
@@ -355,21 +322,36 @@ diff -rupN qtractor-0.5.5.old/src/qtractorMainForm.cpp qtractor-0.5.5/src/qtract
  #ifndef CONFIG_LIBSAMPLERATE
  	list << tr("Sample-rate conversion (libsamplerate) disabled.");
  #endif
-diff -rupN qtractor-0.5.5.old/src/src.pri.in qtractor-0.5.5/src/src.pri.in
---- qtractor-0.5.5.old/src/src.pri.in	2010-09-25 18:08:05.000000000 -0400
-+++ qtractor-0.5.5/src/src.pri.in	2012-06-24 04:26:15.516757012 -0400
-@@ -1,6 +1,7 @@
- # qtractor.pri
- #
- PREFIX  = @ac_prefix@
-+LIBDIR = @ac_libdir@
- CONFIG += @ac_debug@
- INCLUDEPATH += @ac_incpath@
- LIBS += @ac_libs@
-diff -rupN qtractor-0.5.5.old/src/src.pro qtractor-0.5.5/src/src.pro
---- qtractor-0.5.5.old/src/src.pro	2012-05-25 12:55:11.000000000 -0400
-+++ qtractor-0.5.5/src/src.pro	2012-06-24 04:04:30.143475138 -0400
-@@ -19,7 +19,6 @@ HEADERS += config.h \
+diff -Nurp qtractor-0.6.6/configure.ac qtractor-0.6.6.mod/configure.ac
+--- qtractor-0.6.6/configure.ac	2015-04-29 07:17:24.800743638 +0200
++++ qtractor-0.6.6.mod/configure.ac	2015-04-29 07:19:34.351744874 +0200
+@@ -22,6 +22,22 @@ eval ac_libdir=$libdir
+ AC_SUBST(ac_libdir)
+ AC_DEFINE_UNQUOTED(CONFIG_LIBDIR, ["$ac_libdir"], [Default library path.])
+ 
++# Set default installation libdir and plugindir.
++if test "x$exec_prefix" = "xNONE"; then
++    exec_prefix="${ac_prefix}"
++fi
++
++ac_libdir=$libdir
++if test "x$ac_libdir" = "xNONE"; then
++    ac_libdir=$ac_default_libdir
++fi
++# We want to make sure that this expands out. Otherwise we have bash variables
++# such as ${exec_prefix} inside config.h:
++eval ac_libdir="\"$ac_libdir\""
++AC_SUBST(ac_libdir)
++AC_DEFINE_UNQUOTED(CONFIG_LIBDIR, ["$ac_libdir"], [Default installation libdir.])
++AC_DEFINE_UNQUOTED(CONFIG_PLUGINDIR, ["$ac_libdir/qtractor"], [Default plugin installation dir.])
++
+ # Enable debugging argument option.
+ AC_ARG_ENABLE(debug,
+   AC_HELP_STRING([--enable-debug], [enable debugging (default=no)]),
+diff -Nurp qtractor-0.6.6/src/src.pro qtractor-0.6.6.mod/src/src.pro
+--- qtractor-0.6.6/src/src.pro	2015-03-29 16:54:06.966664956 +0200
++++ qtractor-0.6.6.mod/src/src.pro	2015-04-29 07:21:36.791746043 +0200
+@@ -18,7 +18,6 @@ HEADERS += config.h \
  	qtractorAudioEngine.h \
  	qtractorAudioFile.h \
  	qtractorAudioListView.h \
@@ -377,7 +359,7 @@ diff -rupN qtractor-0.5.5.old/src/src.pro qtractor-0.5.5/src/src.pro
  	qtractorAudioMeter.h \
  	qtractorAudioMonitor.h \
  	qtractorAudioPeak.h \
-@@ -141,7 +140,6 @@ SOURCES += \
+@@ -143,7 +142,6 @@ SOURCES += \
  	qtractorAudioEngine.cpp \
  	qtractorAudioFile.cpp \
  	qtractorAudioListView.cpp \
diff --git a/qtractor.spec b/qtractor.spec
index 983c4e4..55bc677 100644
--- a/qtractor.spec
+++ b/qtractor.spec
@@ -10,7 +10,7 @@
 
 Summary:       Audio/MIDI multi-track sequencer
 Name:          qtractor
-Version:       0.6.5
+Version:       0.6.6
 Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
@@ -100,8 +100,12 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/mime/packages/%{name}.xml
 %{_bindir}/%{name}
 %{_datadir}/man/man1/%{name}*
+%{_datadir}/appdata/%{name}.appdata.xml
 
 %changelog
+* Wed Apr 01 2015 Brendan Jones <brendan.jones.it at gmail.com> 0.6.6-1
+- Update to 0.6.6
+
 * Tue Feb 03 2015 Brendan Jones <brendan.jones.it at gmail.com> 0.6.5-1
 - Update to 0.6.5
 
diff --git a/sources b/sources
index 189fcb2..dd931f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-810ec8b8d80cf76be6347c271f28a6cc  qtractor-0.6.5.tar.gz
+f3cf65a15c851b74f8b19e6ad5f22c5c  qtractor-0.6.6.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qtractor.git/commit/?h=f21&id=5332bb2545f53f3c1577e9d60c42b6645c6fb6de
