[SCM] giada/master: Dropped references to JUCE

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Tue May 17 13:56:40 UTC 2016


The following commit has been merged in the master branch:
commit 48d68df0365b64c1d896e691c9c674030d088215
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue May 17 15:46:41 2016 +0200

    Dropped references to JUCE
    
    when building without VST support (as in Debian)

diff --git a/debian/patches/drop_juce.patch b/debian/patches/drop_juce.patch
new file mode 100644
index 0000000..4ff0e57
--- /dev/null
+++ b/debian/patches/drop_juce.patch
@@ -0,0 +1,42 @@
+Description: only use JUCE if VST is enabled
+ drop all references to JUCE is VST is disabled.
+Author: Debian
+Forwarded: http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2016-May/051554.html
+Last-Update: 2016-05-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- giada.orig/Makefile.am
++++ giada/Makefile.am
+@@ -229,7 +229,10 @@
+ src/core/dataStorageIni.cpp  \
+ src/core/dataStorageJson.cpp \
+ src/utils/utils.cpp          \
+-src/utils/log.cpp            \
++src/utils/log.cpp
++
++if WITH_VST
++giada_tests_SOURCES +=        \
+ src/deps/juce/juce_audio_basics/juce_audio_basics.cpp         \
+ src/deps/juce/juce_audio_processors/juce_audio_processors.cpp \
+ src/deps/juce/juce_core/juce_core.cpp                         \
+@@ -238,6 +241,7 @@
+ src/deps/juce/juce_graphics/juce_graphics.cpp                 \
+ src/deps/juce/juce_gui_basics/juce_gui_basics.cpp             \
+ src/deps/juce/juce_gui_extra/juce_gui_extra.cpp
++endif
+ 
+ giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
+   -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse -lrtmidi \
+@@ -245,8 +249,11 @@
+ 
+ giada_tests_CXXFLAGS = -std=c++11
+ 
+-giada_tests_CPPFLAGS = -I./src/deps/juce -I./src/deps/vst -I/usr/include \
++giada_tests_CPPFLAGS =
++if WITH_VST
++giada_tests_CPPFLAGS += -I./src/deps/juce -I./src/deps/vst -I/usr/include \
+                        -I/usr/include/freetype2
++endif
+ 
+ # make rename ------------------------------------------------------------------
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..eec7100 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+drop_juce.patch

-- 
giada packaging



More information about the pkg-multimedia-commits mailing list