From: IOhannes m zmölnig Date: Sat, 10 Feb 2018 23:00:00 +0000 (+0100) Subject: clamp a few defines to fixed values X-Git-Tag: archive/raspbian/7.0.2_ds0-2+rpi1^2~9 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ed12f4715d92807144c1da9f8fd1aee921c80219;p=juce.git 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 --- 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 1aafb16f..40a2c977 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