[SCM] juce/master: use system libraries

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7a679a6f1f851bdacb851a8c508747108bc1227d
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Jan 21 16:38:05 2016 +0100

    use system libraries

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index db0641c..6db4f1e 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -28,6 +28,25 @@ SOURCES=juce_audio_basics.cpp \
 
 VPATH=$(MODULES_PATH)/juce_audio_basics:$(MODULES_PATH)/juce_audio_devices:$(MODULES_PATH)/juce_audio_formats:$(MODULES_PATH)/juce_audio_processors:$(MODULES_PATH)/juce_audio_utils:$(MODULES_PATH)/juce_box2d:$(MODULES_PATH)/juce_core:$(MODULES_PATH)/juce_cryptography:$(MODULES_PATH)/juce_data_structures:$(MODULES_PATH)/juce_events:$(MODULES_PATH)/juce_graphics:$(MODULES_PATH)/juce_gui_basics:$(MODULES_PATH)/juce_gui_extra:$(MODULES_PATH)/juce_osc:$(MODULES_PATH)/juce_opengl:$(MODULES_PATH)/juce_video
 
+
+FLAC_CFLAGS  := -DJUCE_INCLUDE_FLAC_CODE=0 $(shell pkg-config --cflags flac)
+FLAC_LDFLAGS := $(shell pkg-config --libs flac)
+
+JPEG_CFLAGS  := -DJUCE_INCLUDE_JPEGLIB_CODE=0 $(shell pkg-config --cflags libjpeg)
+JPEG_LDFLAGS := $(shell pkg-config --libs libjpeg)
+
+PNG_CFLAGS  := -DJUCE_INCLUDE_PNGLIB_CODE=0 -DPNG_SKIP_SETJMP_CHECK $(shell pkg-config --cflags libpng)
+PNG_LDFLAGS := $(shell pkg-config --libs libpng)
+
+VORBIS_CFLAGS  := -DJUCE_INCLUDE_OGGVORBIS_CODE=0 $(shell pkg-config --cflags vorbis)
+VORBIS_LDFLAGS := $(shell pkg-config --libs vorbis)
+
+ZLIB_CFLAGS  := -DJUCE_INCLUDE_ZLIB_CODE=0 $(shell pkg-config --cflags zlib)
+ZLIB_LDFLAGS := $(shell pkg-config --libs zlib)
+
+FREETYPE_CFLAGS  := $(shell pkg-config --cflags freetype2)
+FREETYPE_LDFLAGS := $(shell pkg-config --libs freetype2)
+
 BINDIR := build
 LIBDIR := build
 OBJDIR := build/intermediate/Release
@@ -57,6 +76,14 @@ JUCE_CFLAGS += $(JUCE_CPPFLAGS) \
 	-O3 \
 	-fPIC \
 	-fpermissive
+JUCE_CFLAGS+= \
+	$(FLAC_CFLAGS) \
+	$(JPEG_CFLAGS) \
+	$(PNG_CFLAGS) \
+	$(VORBIS_CFLAGS) \
+	$(ZLIB_CFLAGS) \
+	$(FREETYPE_CFLAGS) \
+	$(empty)
 JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11
 JUCE_LDFLAGS += $(TARGET_ARCH) \
 	-rdynamic \
@@ -64,6 +91,14 @@ JUCE_LDFLAGS += $(TARGET_ARCH) \
 	-fPIC \
 	$(empty)
 #JUCE_LDFLAGS += -fvisibility=hidden
+JUCE_LDFLAGS+= \
+	$(FLAC_LDFLAGS) \
+	$(JPEG_LDFLAGS) \
+	$(PNG_LDFLAGS) \
+	$(VORBIS_LDFLAGS) \
+	$(ZLIB_LDFLAGS) \
+	$(FREETYPE_LDFLAGS) \
+	$(empty)
 JUCE_LDFLAGS += \
 	-L$(BINDIR) \
 	-L$(LIBDIR) \

-- 
juce packaging