[SCM] juce/master: dos2unix
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Thu Jan 21 16:34:05 UTC 2016
The following commit has been merged in the master branch:
commit 7e9afbab5ef0dc902e17c95f3de3d1d4b64173ac
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Thu Jan 21 16:11:30 2016 +0100
dos2unix
diff --git a/debian/libbuilder/AppConfig.h b/debian/libbuilder/AppConfig.h
index 20dc531..b8d3f8c 100644
--- a/debian/libbuilder/AppConfig.h
+++ b/debian/libbuilder/AppConfig.h
@@ -1,199 +1,199 @@
-#ifndef __JUCE_APPCONFIG_DEBIAN_
-#define __JUCE_APPCONFIG_DEBIAN__
-
-//==============================================================================
-// [BEGIN_USER_CODE_SECTION]
-
-// (You can add your own code in this section, and the Introjucer will not overwrite it)
-
-// [END_USER_CODE_SECTION]
-
-//==============================================================================
-#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1
-#define JUCE_MODULE_AVAILABLE_juce_audio_devices 1
-#define JUCE_MODULE_AVAILABLE_juce_audio_formats 1
-#define JUCE_MODULE_AVAILABLE_juce_audio_processors 1
-#define JUCE_MODULE_AVAILABLE_juce_audio_utils 1
-#define JUCE_MODULE_AVAILABLE_juce_box2d 1
-#define JUCE_MODULE_AVAILABLE_juce_core 1
-#define JUCE_MODULE_AVAILABLE_juce_cryptography 1
-#define JUCE_MODULE_AVAILABLE_juce_data_structures 1
-#define JUCE_MODULE_AVAILABLE_juce_events 1
-#define JUCE_MODULE_AVAILABLE_juce_graphics 1
-#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1
-#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1
-#define JUCE_MODULE_AVAILABLE_juce_opengl 1
-#define JUCE_MODULE_AVAILABLE_juce_osc 1
-#define JUCE_MODULE_AVAILABLE_juce_video 1
-
-//==============================================================================
-#ifndef JUCE_STANDALONE_APPLICATION
- #define JUCE_STANDALONE_APPLICATION 0
-#endif
-
-//==============================================================================
-// juce_audio_devices flags:
-
-#ifndef JUCE_ASIO
- #define JUCE_ASIO 0
-#endif
-
-#ifndef JUCE_WASAPI
- #define JUCE_WASAPI 0
-#endif
-
-#ifndef JUCE_WASAPI_EXCLUSIVE
- #define JUCE_WASAPI_EXCLUSIVE 0
-#endif
-
-#ifndef JUCE_DIRECTSOUND
- #define JUCE_DIRECTSOUND 0
-#endif
-
-#ifndef JUCE_ALSA
- #define JUCE_ALSA 1
-#endif
-
-#ifndef JUCE_JACK
- #define JUCE_JACK 1
-#endif
-
-#ifndef JUCE_USE_ANDROID_OPENSLES
- #define JUCE_USE_ANDROID_OPENSLES 0
-#endif
-
-#ifndef JUCE_USE_CDREADER
- //#define JUCE_USE_CDREADER
-#endif
-
-#ifndef JUCE_USE_CDBURNER
- //#define JUCE_USE_CDBURNER
-#endif
-
-//==============================================================================
-// juce_audio_formats flags:
-
-#ifndef JUCE_USE_FLAC
- #define JUCE_USE_FLAC 1
-#endif
-
-#ifndef JUCE_USE_OGGVORBIS
- #define JUCE_USE_OGGVORBIS 1
-#endif
-
-#ifndef JUCE_USE_MP3AUDIOFORMAT
- #define JUCE_USE_MP3AUDIOFORMAT 0
-#endif
-
-#ifndef JUCE_USE_LAME_AUDIO_FORMAT
- #define JUCE_USE_LAME_AUDIO_FORMAT 1
-#endif
-
-#ifndef JUCE_USE_WINDOWS_MEDIA_FORMAT
- #define JUCE_USE_WINDOWS_MEDIA_FORMAT 0
-#endif
-
-//==============================================================================
-// juce_audio_processors flags:
-
-#ifndef JUCE_PLUGINHOST_VST
- #define JUCE_PLUGINHOST_VST 0
-#endif
-
-#ifndef JUCE_PLUGINHOST_VST3
- #define JUCE_PLUGINHOST_VST3 0
-#endif
-
-#ifndef JUCE_PLUGINHOST_AU
- #define JUCE_PLUGINHOST_AU 0
-#endif
-
-//==============================================================================
-// juce_core flags:
-
-#ifndef JUCE_FORCE_DEBUG
- //#define JUCE_FORCE_DEBUG
-#endif
-
-#ifndef JUCE_LOG_ASSERTIONS
- #define JUCE_LOG_ASSERTIONS 1
-#endif
-
-#ifndef JUCE_CHECK_MEMORY_LEAKS
- #define JUCE_CHECK_MEMORY_LEAKS 1
-#endif
-
-#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
- #define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 1
-#endif
-
-#ifndef JUCE_INCLUDE_ZLIB_CODE
- #define JUCE_INCLUDE_ZLIB_CODE 0
-#endif
-
-#ifndef JUCE_USE_CURL
- #define JUCE_USE_CURL 1
-#endif
-
-//==============================================================================
-// juce_graphics flags:
-
-#ifndef JUCE_USE_COREIMAGE_LOADER
- #define JUCE_USE_COREIMAGE_LOADER 0
-#endif
-
-#ifndef JUCE_USE_DIRECTWRITE
- #define JUCE_USE_DIRECTWRITE 0
-#endif
-
-//==============================================================================
-// juce_gui_basics flags:
-
-#ifndef JUCE_ENABLE_REPAINT_DEBUGGING
- #define JUCE_ENABLE_REPAINT_DEBUGGING 0
-#endif
-
-#ifndef JUCE_USE_XSHM
- #define JUCE_USE_XSHM 1
-#endif
-
-#ifndef JUCE_USE_XRENDER
- #define JUCE_USE_XRENDER 1
-#endif
-
-#ifndef JUCE_USE_XCURSOR
- #define JUCE_USE_XCURSOR 1
-#endif
-
-//==============================================================================
-// juce_gui_extra flags:
-
-#ifndef JUCE_WEB_BROWSER
- #define JUCE_WEB_BROWSER 1
-#endif
-
-#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR
- #define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 1
-#endif
-
-//==============================================================================
-// juce_video flags:
-
-#ifndef JUCE_DIRECTSHOW
- #define JUCE_DIRECTSHOW 0
-#endif
-
-#ifndef JUCE_MEDIAFOUNDATION
- #define JUCE_MEDIAFOUNDATION 0
-#endif
-
-#ifndef JUCE_QUICKTIME
- #define JUCE_QUICKTIME 0
-#endif
-
-#ifndef JUCE_USE_CAMERA
- //#define JUCE_USE_CAMERA
-#endif
-
-
-#endif // __JUCE_APPCONFIG_DEBIAN__
+#ifndef __JUCE_APPCONFIG_DEBIAN_
+#define __JUCE_APPCONFIG_DEBIAN__
+
+//==============================================================================
+// [BEGIN_USER_CODE_SECTION]
+
+// (You can add your own code in this section, and the Introjucer will not overwrite it)
+
+// [END_USER_CODE_SECTION]
+
+//==============================================================================
+#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1
+#define JUCE_MODULE_AVAILABLE_juce_audio_devices 1
+#define JUCE_MODULE_AVAILABLE_juce_audio_formats 1
+#define JUCE_MODULE_AVAILABLE_juce_audio_processors 1
+#define JUCE_MODULE_AVAILABLE_juce_audio_utils 1
+#define JUCE_MODULE_AVAILABLE_juce_box2d 1
+#define JUCE_MODULE_AVAILABLE_juce_core 1
+#define JUCE_MODULE_AVAILABLE_juce_cryptography 1
+#define JUCE_MODULE_AVAILABLE_juce_data_structures 1
+#define JUCE_MODULE_AVAILABLE_juce_events 1
+#define JUCE_MODULE_AVAILABLE_juce_graphics 1
+#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1
+#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1
+#define JUCE_MODULE_AVAILABLE_juce_opengl 1
+#define JUCE_MODULE_AVAILABLE_juce_osc 1
+#define JUCE_MODULE_AVAILABLE_juce_video 1
+
+//==============================================================================
+#ifndef JUCE_STANDALONE_APPLICATION
+ #define JUCE_STANDALONE_APPLICATION 0
+#endif
+
+//==============================================================================
+// juce_audio_devices flags:
+
+#ifndef JUCE_ASIO
+ #define JUCE_ASIO 0
+#endif
+
+#ifndef JUCE_WASAPI
+ #define JUCE_WASAPI 0
+#endif
+
+#ifndef JUCE_WASAPI_EXCLUSIVE
+ #define JUCE_WASAPI_EXCLUSIVE 0
+#endif
+
+#ifndef JUCE_DIRECTSOUND
+ #define JUCE_DIRECTSOUND 0
+#endif
+
+#ifndef JUCE_ALSA
+ #define JUCE_ALSA 1
+#endif
+
+#ifndef JUCE_JACK
+ #define JUCE_JACK 1
+#endif
+
+#ifndef JUCE_USE_ANDROID_OPENSLES
+ #define JUCE_USE_ANDROID_OPENSLES 0
+#endif
+
+#ifndef JUCE_USE_CDREADER
+ //#define JUCE_USE_CDREADER
+#endif
+
+#ifndef JUCE_USE_CDBURNER
+ //#define JUCE_USE_CDBURNER
+#endif
+
+//==============================================================================
+// juce_audio_formats flags:
+
+#ifndef JUCE_USE_FLAC
+ #define JUCE_USE_FLAC 1
+#endif
+
+#ifndef JUCE_USE_OGGVORBIS
+ #define JUCE_USE_OGGVORBIS 1
+#endif
+
+#ifndef JUCE_USE_MP3AUDIOFORMAT
+ #define JUCE_USE_MP3AUDIOFORMAT 0
+#endif
+
+#ifndef JUCE_USE_LAME_AUDIO_FORMAT
+ #define JUCE_USE_LAME_AUDIO_FORMAT 1
+#endif
+
+#ifndef JUCE_USE_WINDOWS_MEDIA_FORMAT
+ #define JUCE_USE_WINDOWS_MEDIA_FORMAT 0
+#endif
+
+//==============================================================================
+// juce_audio_processors flags:
+
+#ifndef JUCE_PLUGINHOST_VST
+ #define JUCE_PLUGINHOST_VST 0
+#endif
+
+#ifndef JUCE_PLUGINHOST_VST3
+ #define JUCE_PLUGINHOST_VST3 0
+#endif
+
+#ifndef JUCE_PLUGINHOST_AU
+ #define JUCE_PLUGINHOST_AU 0
+#endif
+
+//==============================================================================
+// juce_core flags:
+
+#ifndef JUCE_FORCE_DEBUG
+ //#define JUCE_FORCE_DEBUG
+#endif
+
+#ifndef JUCE_LOG_ASSERTIONS
+ #define JUCE_LOG_ASSERTIONS 1
+#endif
+
+#ifndef JUCE_CHECK_MEMORY_LEAKS
+ #define JUCE_CHECK_MEMORY_LEAKS 1
+#endif
+
+#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+ #define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 1
+#endif
+
+#ifndef JUCE_INCLUDE_ZLIB_CODE
+ #define JUCE_INCLUDE_ZLIB_CODE 0
+#endif
+
+#ifndef JUCE_USE_CURL
+ #define JUCE_USE_CURL 1
+#endif
+
+//==============================================================================
+// juce_graphics flags:
+
+#ifndef JUCE_USE_COREIMAGE_LOADER
+ #define JUCE_USE_COREIMAGE_LOADER 0
+#endif
+
+#ifndef JUCE_USE_DIRECTWRITE
+ #define JUCE_USE_DIRECTWRITE 0
+#endif
+
+//==============================================================================
+// juce_gui_basics flags:
+
+#ifndef JUCE_ENABLE_REPAINT_DEBUGGING
+ #define JUCE_ENABLE_REPAINT_DEBUGGING 0
+#endif
+
+#ifndef JUCE_USE_XSHM
+ #define JUCE_USE_XSHM 1
+#endif
+
+#ifndef JUCE_USE_XRENDER
+ #define JUCE_USE_XRENDER 1
+#endif
+
+#ifndef JUCE_USE_XCURSOR
+ #define JUCE_USE_XCURSOR 1
+#endif
+
+//==============================================================================
+// juce_gui_extra flags:
+
+#ifndef JUCE_WEB_BROWSER
+ #define JUCE_WEB_BROWSER 1
+#endif
+
+#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR
+ #define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 1
+#endif
+
+//==============================================================================
+// juce_video flags:
+
+#ifndef JUCE_DIRECTSHOW
+ #define JUCE_DIRECTSHOW 0
+#endif
+
+#ifndef JUCE_MEDIAFOUNDATION
+ #define JUCE_MEDIAFOUNDATION 0
+#endif
+
+#ifndef JUCE_QUICKTIME
+ #define JUCE_QUICKTIME 0
+#endif
+
+#ifndef JUCE_USE_CAMERA
+ //#define JUCE_USE_CAMERA
+#endif
+
+
+#endif // __JUCE_APPCONFIG_DEBIAN__
diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index 8970791..46a17f2 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -1,106 +1,106 @@
-# Automatically generated makefile, created by the Introjucer
-# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!
-
-# (this disables dependency generation if multiple architectures are set)
-DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
-
-empty=
-
-MODULES_PATH=../../modules
-
-SOURCES=juce_audio_basics.cpp \
- juce_audio_devices.cpp \
- juce_audio_formats.cpp \
- juce_audio_processors.cpp \
- juce_audio_utils.cpp \
- juce_box2d.cpp \
- juce_core.cpp \
- juce_cryptography.cpp \
- juce_data_structures.cpp \
- juce_events.cpp \
- juce_graphics.cpp \
- juce_gui_basics.cpp \
- juce_gui_extra.cpp \
- juce_opengl.cpp \
- juce_osc.cpp \
- juce_video.cpp \
- $(empty)
-
-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
-
-BINDIR := build
-LIBDIR := build
-OBJDIR := build/intermediate/Release
-OUTDIR := build
-
-ifeq ($(TARGET_ARCH),)
- TARGET_ARCH := -march=native
-endif
-
-CPPFLAGS := $(DEPFLAGS) \
- -D "LINUX=1" \
- -D "NDEBUG=1" \
- -D "DEBUG=0" \
- -D "JUCE_DLL_BUILD=1" \
- $(empty)
-#CPPFLAGS := $(CPPFLAGS) \
-# -D "JUCER_LINUX_MAKE_6D53C8B4=1" \
-# -D "JUCE_APP_VERSION=1.0.0" \
-# -D "JUCE_APP_VERSION_HEX=0x10000" \
-# $(empty)
-CPPFLAGS := $(CPPFLAGS) \
- -I /usr/include \
- -I /usr/include/freetype2 \
- -I . \
- $(empty)
-CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -fPIC \
- -fpermissive
-CXXFLAGS += $(CFLAGS) -std=c++11
-LDFLAGS += $(TARGET_ARCH) \
- -rdynamic \
- -shared \
- -fPIC \
- $(empty)
-#LDFLAGS += -fvisibility=hidden
-LDFLAGS += \
- -L$(BINDIR) \
- -L$(LIBDIR) \
- -L/usr/X11R6/lib/ \
- -lGL \
- -lX11 \
- -lXext \
- -lXinerama \
- -lasound \
- -ldl \
- -lfreetype \
- -lpthread \
- -lcurl \
- -lrt \
- $(empty)
-
-TARGET := libjuce.so
-BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
-CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
-
-OBJECTS=$(SOURCES:%.cpp=$(OBJDIR)/%.o)
-
-.PHONY: clean
-
-$(OUTDIR)/$(TARGET): $(OBJECTS) $(RESOURCES)
- @echo Linking juce_dll
- - at mkdir -p $(BINDIR)
- - at mkdir -p $(LIBDIR)
- - at mkdir -p $(OUTDIR)
- $(BLDCMD)
-
-$(OBJDIR):
- mkdir -p "$@"
-
-$(OBJDIR)/%.o: %.cpp $(OBJDIR)
- $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-clean:
- @echo Cleaning juce_dll
- $(CLEANCMD)
-
--include $(OBJECTS:%.o=%.d)
+# Automatically generated makefile, created by the Introjucer
+# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!
+
+# (this disables dependency generation if multiple architectures are set)
+DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
+
+empty=
+
+MODULES_PATH=../../modules
+
+SOURCES=juce_audio_basics.cpp \
+ juce_audio_devices.cpp \
+ juce_audio_formats.cpp \
+ juce_audio_processors.cpp \
+ juce_audio_utils.cpp \
+ juce_box2d.cpp \
+ juce_core.cpp \
+ juce_cryptography.cpp \
+ juce_data_structures.cpp \
+ juce_events.cpp \
+ juce_graphics.cpp \
+ juce_gui_basics.cpp \
+ juce_gui_extra.cpp \
+ juce_opengl.cpp \
+ juce_osc.cpp \
+ juce_video.cpp \
+ $(empty)
+
+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
+
+BINDIR := build
+LIBDIR := build
+OBJDIR := build/intermediate/Release
+OUTDIR := build
+
+ifeq ($(TARGET_ARCH),)
+ TARGET_ARCH := -march=native
+endif
+
+CPPFLAGS := $(DEPFLAGS) \
+ -D "LINUX=1" \
+ -D "NDEBUG=1" \
+ -D "DEBUG=0" \
+ -D "JUCE_DLL_BUILD=1" \
+ $(empty)
+#CPPFLAGS := $(CPPFLAGS) \
+# -D "JUCER_LINUX_MAKE_6D53C8B4=1" \
+# -D "JUCE_APP_VERSION=1.0.0" \
+# -D "JUCE_APP_VERSION_HEX=0x10000" \
+# $(empty)
+CPPFLAGS := $(CPPFLAGS) \
+ -I /usr/include \
+ -I /usr/include/freetype2 \
+ -I . \
+ $(empty)
+CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -fPIC \
+ -fpermissive
+CXXFLAGS += $(CFLAGS) -std=c++11
+LDFLAGS += $(TARGET_ARCH) \
+ -rdynamic \
+ -shared \
+ -fPIC \
+ $(empty)
+#LDFLAGS += -fvisibility=hidden
+LDFLAGS += \
+ -L$(BINDIR) \
+ -L$(LIBDIR) \
+ -L/usr/X11R6/lib/ \
+ -lGL \
+ -lX11 \
+ -lXext \
+ -lXinerama \
+ -lasound \
+ -ldl \
+ -lfreetype \
+ -lpthread \
+ -lcurl \
+ -lrt \
+ $(empty)
+
+TARGET := libjuce.so
+BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
+CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
+
+OBJECTS=$(SOURCES:%.cpp=$(OBJDIR)/%.o)
+
+.PHONY: clean
+
+$(OUTDIR)/$(TARGET): $(OBJECTS) $(RESOURCES)
+ @echo Linking juce_dll
+ - at mkdir -p $(BINDIR)
+ - at mkdir -p $(LIBDIR)
+ - at mkdir -p $(OUTDIR)
+ $(BLDCMD)
+
+$(OBJDIR):
+ mkdir -p "$@"
+
+$(OBJDIR)/%.o: %.cpp $(OBJDIR)
+ $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+clean:
+ @echo Cleaning juce_dll
+ $(CLEANCMD)
+
+-include $(OBJECTS:%.o=%.d)
--
juce packaging
More information about the pkg-multimedia-commits
mailing list