[SCM] juce/master: Also force disable pnglib

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Thu Nov 9 13:06:39 UTC 2017


The following commit has been merged in the master branch:
commit 8e6b693818b63aa050dec7efd433bb96d5e50be6
Author: IOhannes m zmölnig <zmoelnig at umlautS.umlaeute.mur.at>
Date:   Wed Nov 8 23:12:43 2017 +0100

    Also force disable pnglib

diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch
index a4c7e0d..62c21ba 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,21 @@
+@@ -65,6 +65,26 @@
  
  #include "system/juce_TargetPlatform.h"
  
@@ -28,13 +28,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +# 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 +139,7 @@
+@@ -124,7 +144,7 @@
      specify the path where your zlib headers live.
  */
  #ifndef JUCE_INCLUDE_ZLIB_CODE

-- 
juce packaging



More information about the pkg-multimedia-commits mailing list