From: IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>
Date: Tue, 19 Dec 2017 10:31:11 +0000 (+0100)
Subject: force JUCE_INCLUDE_FLAC_CODE and JUCE_INCLUDE_OGGVORBIS_CODE to 0
X-Git-Tag: archive/raspbian/5.4.5_ds0-1+rpi1~1^2~126
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=24791e49b13b6faa09bc92deb3f153446cdc0953;p=juce.git

force JUCE_INCLUDE_FLAC_CODE and JUCE_INCLUDE_OGGVORBIS_CODE to 0

since we don't include them in juce-modules-source

LP: #1720634
---

diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch
index 62c21baa..70fb0795 100644
--- a/debian/patches/debian_fixed-defines.patch
+++ b/debian/patches/debian_fixed-defines.patch
@@ -12,7 +12,7 @@ Last-Update: 2016-04-07
 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
-@@ -65,6 +65,26 @@
+@@ -65,6 +65,36 @@
  
  #include "system/juce_TargetPlatform.h"
  
@@ -24,6 +24,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +#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
@@ -39,7 +49,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  //==============================================================================
  /** Config: JUCE_FORCE_DEBUG
  
-@@ -124,7 +144,7 @@
+@@ -124,7 +154,7 @@
      specify the path where your zlib headers live.
  */
  #ifndef JUCE_INCLUDE_ZLIB_CODE