[SCM] juce/master: clamp some defines to fixed values

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed Feb 10 20:53:49 UTC 2016


The following commit has been merged in the master branch:
commit 6df00a327efa5bb7415b995a4474ed505f190166
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Feb 10 21:51:16 2016 +0100

    clamp some defines to fixed values

diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch
new file mode 100644
index 0000000..974b919
--- /dev/null
+++ b/debian/patches/debian_fixed-defines.patch
@@ -0,0 +1,45 @@
+Description: clamp a few defines to fixed values
+ upstream allows to make Debug and Release builds; and Release builds with some
+ debugging options on.
+ our libjuce.so doesn't support so many configurations, so we disable a few.
+Author: IOhannes m zmölnig
+Origin: Debian
+Forwarded: not-needed
+Last-Update: 2016-02-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- juce.orig/modules/juce_core/juce_core.h
++++ juce/modules/juce_core/juce_core.h
+@@ -61,6 +61,32 @@
+ #include "system/juce_TargetPlatform.h"
+ 
+ //=============================================================================
++/** Debian specific constants
++Debian's libjuce.so only allows to either create
++- a proper Release build
++OR
++- a proper Debug build.
++*/
++#ifdef JUCE_FORCE_DEBUG
++# undef JUCE_FORCE_DEBUG
++#endif
++
++#ifdef JUCE_LOG_ASSERTIONS
++# undef JUCE_LOG_ASSERTIONS
++#endif
++#define JUCE_LOG_ASSERTIONS JUCE_DEBUG
++
++#ifdef JUCE_CHECK_MEMORY_LEAKS
++# undef JUCE_CHECK_MEMORY_LEAKS
++#endif
++#define JUCE_CHECK_MEMORY_LEAKS JUCE_DEBUG
++/** Debian specifics END
++*/
++
++
++
++
++//=============================================================================
+ /** Config: JUCE_FORCE_DEBUG
+ 
+     Normally, JUCE_DEBUG is set to 1 or 0 based on compiler and project settings,
diff --git a/debian/patches/series b/debian/patches/series
index 6c8ce45..9721dbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ no-ztypes.patch
 introjucer-makegenerator.patch
 reproducible-date.patch
 debian_apply-reproducible-date.patch
+debian_fixed-defines.patch
 debian_introjucer-modulepath.patch
 debian_make-introjucer.patch
 debian_do-not-track.patch

-- 
juce packaging



More information about the pkg-multimedia-commits mailing list