[SCM] juce/master: Refreshed patches.
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Fri Nov 4 22:12:04 UTC 2016
The following commit has been merged in the master branch:
commit 23580a8f85e52bb5706556acb38285db5354e8f8
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Fri Nov 4 20:55:53 2016 +0100
Refreshed patches.
diff --git a/debian/patches/debian_make-projucer.patch b/debian/patches/debian_make-projucer.patch
index fe6d919..9c05ad3 100644
--- a/debian/patches/debian_make-projucer.patch
+++ b/debian/patches/debian_make-projucer.patch
@@ -23,8 +23,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ TARGET_ARCH :=
endif
-- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.4 -DJUCE_APP_VERSION_HEX=0x40204 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules
-+ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.4 -DJUCE_APP_VERSION_HEX=0x40204 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS)
+- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules
++ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS)
JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11
JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11
- JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt
@@ -40,8 +40,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ TARGET_ARCH :=
endif
-- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.4 -DJUCE_APP_VERSION_HEX=0x40204 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules
-+ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.4 -DJUCE_APP_VERSION_HEX=0x40204 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS)
+- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules
++ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS)
JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11
JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11
- JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt
@@ -49,7 +49,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
TARGET := Projucer
BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
-@@ -105,13 +107,6 @@
+@@ -106,13 +108,6 @@
$(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o \
$(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \
$(JUCE_OBJDIR)/BinaryData_ce4232d4.o \
@@ -63,7 +63,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
.PHONY: clean
-@@ -120,7 +115,7 @@
+@@ -121,7 +116,7 @@
- at mkdir -p $(JUCE_BINDIR)
- at mkdir -p $(JUCE_LIBDIR)
- at mkdir -p $(JUCE_OUTDIR)
@@ -72,7 +72,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
-@@ -128,285 +123,285 @@
+@@ -129,290 +124,290 @@
clean:
@echo Cleaning Projucer
@@ -108,6 +108,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
+ $(JUCE_OBJDIR)/jucer_DownloadCompileEngineThread_8a38703f.o: ../../Source/Application/jucer_DownloadCompileEngineThread.cpp
+ - at mkdir -p $(JUCE_OBJDIR)
+ @echo "Compiling jucer_DownloadCompileEngineThread.cpp"
+- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
+
$(JUCE_OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o: ../../Source/Application/jucer_GlobalPreferences.cpp
- at mkdir -p $(JUCE_OBJDIR)
@echo "Compiling jucer_GlobalPreferences.cpp"
--
juce packaging
More information about the pkg-multimedia-commits
mailing list