From 6efc34a80fddd92128ed6ce0c2da2c025e85a12e Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Sun, 11 Feb 2018 00:00:00 +0100 Subject: [PATCH] clamp a few defines to fixed values on Debian we only ever allow using the system provided libraries (zlib, flac, oggvorbis,...) Origin: Debian Forwarded: not-needed Gbp-Pq: Name debian_fixed-defines.patch --- .../utility/juce_CheckSettingMacros.h | 25 +++++++++++++++ modules/juce_core/juce_core.h | 32 ++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h index 43808746..2a26fee7 100644 --- a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +++ b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h @@ -23,6 +23,30 @@ ============================================================================== */ +/* Debian specific overrides */ +#if JucePlugin_Build_LV2 && ! defined (JucePlugin_LV2URI) +# warning JUCE/Debian using default LV2URI +# define JucePlugin_LV2URI JucePlugin_Name +#endif + +#if JucePlugin_Build_AU +# warning JUCE/Debian disabled AU support +# undef JucePlugin_Build_AU +# define JucePlugin_Build_AU 0 +#endif + +#if JucePlugin_Build_RTAS +# warning JUCE/Debian disabled RTAS support +# undef JucePlugin_Build_RTAS +# define JucePlugin_Build_RTAS 0 +#endif + +#if JucePlugin_Build_AAX +# warning JUCE/Debian disabled AAX support +# undef JucePlugin_Build_AAX +# define JucePlugin_Build_AAX 0 +#endif + // The following checks should cause a compile error if you've forgotten to // define all your plugin settings properly.. @@ -38,6 +62,7 @@ #endif #define JUCE_CHECKSETTINGMACROS_H + #ifndef JucePlugin_IsSynth #error "You need to define the JucePlugin_IsSynth value!" #endif diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h index 4f6b2838..3c58e560 100644 --- a/modules/juce_core/juce_core.h +++ b/modules/juce_core/juce_core.h @@ -65,6 +65,36 @@ #include "system/juce_TargetPlatform.h" +/** Debian specific constants + - Debian, we don't use embedded libraries +*/ +#ifdef JUCE_INCLUDE_ZLIB_CODE +# undef JUCE_INCLUDE_ZLIB_CODE +#endif +#define JUCE_INCLUDE_ZLIB_CODE 0 + +#ifdef JUCE_INCLUDE_FLAC_CODE +# undef JUCE_INCLUDE_FLAC_CODE +#endif +#define JUCE_INCLUDE_FLAC_CODE 0 + +#ifdef JUCE_INCLUDE_OGGVORBIS_CODE +# undef JUCE_INCLUDE_OGGVORBIS_CODE +#endif +#define JUCE_INCLUDE_OGGVORBIS_CODE 0 + +#ifdef JUCE_INCLUDE_JPEGLIB_CODE +# undef JUCE_INCLUDE_JPEGLIB_CODE +#endif +#define JUCE_INCLUDE_JPEGLIB_CODE 0 + +#ifdef JUCE_INCLUDE_PNGLIB_CODE +# undef JUCE_INCLUDE_PNGLIB_CODE +#endif +#define JUCE_INCLUDE_PNGLIB_CODE 0 +/** Debian specifics END +*/ + //============================================================================== /** Config: JUCE_FORCE_DEBUG @@ -124,7 +154,7 @@ specify the path where your zlib headers live. */ #ifndef JUCE_INCLUDE_ZLIB_CODE - #define JUCE_INCLUDE_ZLIB_CODE 1 + #define JUCE_INCLUDE_ZLIB_CODE 0 #endif #ifndef JUCE_ZLIB_INCLUDE_PATH -- 2.30.2