From 320dc4833f3ad0d48e6cbd4cbde986f6bd03238b Mon Sep 17 00:00:00 2001 From: Brendan Jones Date: Oct 30 2015 04:59:19 +0000 Subject: Update to 0.7.1 --- diff --git a/.gitignore b/.gitignore index fe59262..8d45018 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /qtractor-0.6.4.tar.gz /qtractor-0.6.6.tar.gz /qtractor-0.6.7.tar.gz +/qtractor-0.7.1.tar.gz diff --git a/qtractor-libmad-factorout-makefile.patch b/qtractor-libmad-factorout-makefile.patch index 7c6c0ac..7a4ded5 100644 --- a/qtractor-libmad-factorout-makefile.patch +++ b/qtractor-libmad-factorout-makefile.patch @@ -1,13 +1,69 @@ -diff -Nurp qtractor-0.6.2.orig/Makefile.in qtractor-0.6.2.mod/Makefile.in ---- qtractor-0.6.2.orig/Makefile.in 2014-07-08 12:03:50.335212022 +0200 -+++ qtractor-0.6.2.mod/Makefile.in 2014-07-08 12:47:51.071198268 +0200 -@@ -313,26 +313,40 @@ export mandir = @mandir@ - translations_dir = $(datadir)/$(name)/translations +--- Makefile.in.orig 2015-10-27 08:10:35.299485834 +0100 ++++ Makefile.in 2015-10-27 08:11:39.837524577 +0100 +@@ -17,7 +23,6 @@ headers = \ + src/qtractorAudioEngine.h \ + src/qtractorAudioFile.h \ + src/qtractorAudioListView.h \ +- src/qtractorAudioMadFile.h \ + src/qtractorAudioMeter.h \ + src/qtractorAudioMonitor.h \ + src/qtractorAudioPeak.h \ +@@ -136,7 +147,6 @@ sources = \ + src/qtractorAudioEngine.cpp \ + src/qtractorAudioFile.cpp \ + src/qtractorAudioListView.cpp \ +- src/qtractorAudioMadFile.cpp \ + src/qtractorAudioMeter.cpp \ + src/qtractorAudioMonitor.cpp \ + src/qtractorAudioPeak.cpp \ +@@ -239,6 +249,9 @@ sources = \ + src/qtractorTimeScaleForm.cpp \ + src/qtractorTrackForm.cpp ++mad_sources = \ ++ src/qtractorAudioMadFile.cpp \ ++ + forms = \ + src/qtractorBusForm.ui \ + src/qtractorClipForm.ui \ +--- Makefile.in.orig 2015-10-27 08:10:35.299485834 +0100 ++++ Makefile.in 2015-10-27 08:11:39.837524577 +0100 +@@ -1,8 +1,14 @@ + prefix = @ac_prefix@ ++have_libmad = @ac_have_libmad@ --all: $(target) -+all: $(target) $(mad_target) + name = qtractor + target = src/$(name) ++ifeq ($(have_libmad), 1) ++ mad_target = lib$(name)_mad.so ++ mad_install_target = install_mad ++ mad_clean_target = clean_mad ++endif + + headers = \ + src/config.h \ +@@ -130,6 +136,11 @@ headers = \ + src/qtractorTimeScaleForm.h \ + src/qtractorTrackForm.h + ++mad_headers = \ ++ src/config.h \ ++ src/qtractorAudioMadFile.h \ ++ src/qtractorAudioFile.h ++ + sources = \ + src/qtractor.cpp \ + src/qtractorActionControl.cpp \ +--- Makefile.in.orig 2015-10-27 08:01:07.844730303 +0100 ++++ Makefile.in 2015-10-27 08:07:50.275500773 +0100 +@@ -309,26 +322,40 @@ export LUPDATE = @ac_lupdate@ + export LRELEASE = @ac_lrelease@ + + +-all: $(target) +- ++all: $(target) $(mad_target) $(target): $(name).mak $(resources) ${forms} $(sources) $(headers) @$(MAKE) -f $(name).mak @@ -15,24 +71,25 @@ diff -Nurp qtractor-0.6.2.orig/Makefile.in qtractor-0.6.2.mod/Makefile.in +$(mad_target): $(name)_mad.mak $(mad_sources) $(mad_headers) + @$(MAKE) -f $(name)_mad.mak + -+ $(name).mak: $(name).pro - @$(qmake) -o $(name).mak $(name).pro + @$(QMAKE) -o $(name).mak $(name).pro +$(name)_mad.mak: $(name)_mad.pro + @$(qmake) -o $(name)_mad.mak $(name)_mad.pro ++ translations_lupdate: $(name).pro - @$(lupdate) -verbose $(name).pro + @$(LUPDATE) -verbose $(name).pro +mad_plugin: $(mad_target) + translations_lrelease: translations_lupdate $(translations_targets) + +$(translation_targets): $(name).pro + @$(lupdate) -verbose $(name).pro - ++ %.qm: %.ts - @$(lrelease) -verbose $< -qm $@ + @$(LRELEASE) -verbose $< -qm $@ install: $(target) translations_lrelease $(name).1 @@ -43,7 +100,7 @@ diff -Nurp qtractor-0.6.2.orig/Makefile.in qtractor-0.6.2.mod/Makefile.in @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install @install -d -v -m 0755 $(DESTDIR)$(translations_dir) @install -d -v -m 0755 $(DESTDIR)$(mandir)/man1 -@@ -346,7 +360,11 @@ uninstall: $(DESTDIR)$(prefix)/bin/$(nam +@@ -342,7 +369,11 @@ uninstall: $(DESTDIR)$(prefix)/bin/$(nam @rm -vf $(DESTDIR)$(mandir)/man1/$(name).* @@ -53,6 +110,6 @@ diff -Nurp qtractor-0.6.2.orig/Makefile.in qtractor-0.6.2.mod/Makefile.in + @rm -f $(mad_target) $(name)_mad.mak + +clean: $(name).mak $(clean_mad) - @$(MAKE) -f $(name).mak clean + @$(MAKE) -f $(name).mak distclean @rm -f $(target) $(target).mak $(name).mak @rm -rf *.cache *.log *.status $(translations_targets) diff --git a/qtractor-libmad-factorout.patch b/qtractor-libmad-factorout.patch index 36447e1..9a76512 100644 --- a/qtractor-libmad-factorout.patch +++ b/qtractor-libmad-factorout.patch @@ -35,65 +35,6 @@ diff -rupN qtractor-0.5.5.old/configure.ac qtractor-0.5.5/configure.ac echo echo "Now type 'make', followed by 'make install' as root." echo -diff -rupN qtractor-0.5.5.old/Makefile.in qtractor-0.5.5/Makefile.in ---- qtractor-0.5.5.old/Makefile.in 2012-05-25 12:55:11.000000000 -0400 -+++ qtractor-0.5.5/Makefile.in 2012-06-24 04:39:18.798372418 -0400 -@@ -2,10 +2,16 @@ prefix = @ac_prefix@ - qmake = @ac_qmake@ - lupdate = @ac_lupdate@ - lrelease = @ac_lrelease@ -+have_libmad = @ac_have_libmad@ - - name = qtractor - - target = src/$(name) -+ifeq ($(have_libmad), 1) -+ mad_target = lib$(name)_mad.so -+ mad_install_target = install_mad -+ mad_clean_target = clean_mad -+endif - - headers = \ - src/config.h \ -@@ -17,7 +23,6 @@ headers = \ - src/qtractorAudioEngine.h \ - src/qtractorAudioFile.h \ - src/qtractorAudioListView.h \ -- src/qtractorAudioMadFile.h \ - src/qtractorAudioMeter.h \ - src/qtractorAudioMonitor.h \ - src/qtractorAudioPeak.h \ -@@ -128,6 +133,12 @@ headers = \ - src/qtractorTimeScaleForm.h \ - src/qtractorTrackForm.h - -+mad_headers = \ -+ src/config.h \ -+ src/qtractorAudioMadFile.h \ -+ src/qtractorAudioFile.h -+ -+ - sources = \ - src/qtractor.cpp \ - src/qtractorAudioBuffer.cpp \ -@@ -136,7 +147,6 @@ sources = \ - src/qtractorAudioEngine.cpp \ - src/qtractorAudioFile.cpp \ - src/qtractorAudioListView.cpp \ -- src/qtractorAudioMadFile.cpp \ - src/qtractorAudioMeter.cpp \ - src/qtractorAudioMonitor.cpp \ - src/qtractorAudioPeak.cpp \ -@@ -239,6 +249,9 @@ sources = \ - src/qtractorTimeScaleForm.cpp \ - src/qtractorTrackForm.cpp - -+mad_sources = \ -+ src/qtractorAudioMadFile.cpp \ -+ - forms = \ - src/qtractorBusForm.ui \ - src/qtractorClipForm.ui \ diff -rupN qtractor-0.5.5.old/qtractor_mad.pro qtractor-0.5.5/qtractor_mad.pro --- qtractor-0.5.5.old/qtractor_mad.pro 1969-12-31 19:00:00.000000000 -0500 +++ qtractor-0.5.5/qtractor_mad.pro 2012-06-24 04:27:11.320512459 -0400 @@ -310,18 +251,6 @@ diff -rupN qtractor-0.5.5.old/src/qtractorMainForm.cpp qtractor-0.5.5/src/qtract #include "qtractorMidiEngine.h" #include "qtractorSessionDocument.h" -@@ -4801,9 +4802,9 @@ void qtractorMainForm::helpAbout (void) - - list << tr("Ogg Vorbis (libvorbis) file support disabled."); - #endif --#ifndef CONFIG_LIBMAD -+if (!madPluginExists()) { - list << tr("MPEG-1 Audio Layer 3 (libmad) file support disabled."); --#endif -+} - #ifndef CONFIG_LIBSAMPLERATE - list << tr("Sample-rate conversion (libsamplerate) disabled."); - #endif 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 @@ -367,3 +296,18 @@ diff -Nurp qtractor-0.6.6/src/src.pro qtractor-0.6.6.mod/src/src.pro qtractorAudioMeter.cpp \ qtractorAudioMonitor.cpp \ qtractorAudioPeak.cpp \ +--- qtractor-0.7.1/src/qtractorMainForm.cpp.orig 2015-10-27 08:27:32.804564716 +0100 ++++ qtractor-0.7.1/src/qtractorMainForm.cpp 2015-10-27 08:29:14.758466424 +0100 +@@ -5348,9 +5348,9 @@ void qtractorMainForm::helpAbout (void) + #ifndef CONFIG_LIBVORBIS + list << tr("Ogg Vorbis (libvorbis) file support disabled."); + #endif +-#ifndef CONFIG_LIBMAD +- list << tr("MPEG-1 Audio Layer 3 (libmad) file support disabled."); +-#endif ++ if (!madPluginExists()) { ++ list << tr("MPEG-1 Audio Layer 3 (libmad) file support disabled."); ++ } + #ifndef CONFIG_LIBSAMPLERATE + list << tr("Sample-rate conversion (libsamplerate) disabled."); + #endif diff --git a/qtractor.spec b/qtractor.spec index 3548745..ecd7bbd 100644 --- a/qtractor.spec +++ b/qtractor.spec @@ -10,7 +10,7 @@ Summary: Audio/MIDI multi-track sequencer Name: qtractor -Version: 0.6.7 +Version: 0.7.1 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -49,7 +49,7 @@ dedicated to the personal home-studio. %prep %setup -q -n %{name}-%{version} %patch1 -p1 -b .mad-factorout -%patch2 -p1 -b .mad-makefile +%patch2 -p0 -b .mad-makefile %patch3 -p1 -b .second # Fix odd permissions @@ -103,6 +103,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/appdata/%{name}.appdata.xml %changelog +* Tue Oct 27 2015 Brendan Jones 0.7.1-1 +- Update to 0.7.1 + * Mon Jun 29 2015 Brendan Jones 0.6.7-1 - Update to 0.6.7 diff --git a/sources b/sources index 147d0a2..ad70e55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -787757fba50723dcbadf230b78458820 qtractor-0.6.7.tar.gz +7d4afb517423bc32969daa83dfd58482 qtractor-0.7.1.tar.gz