File carla-systemlibs.patch of Package carla

Overview Repositories Revisions Requests Users Attributes Meta

File carla-systemlibs.patch of Package carla (Revision c305462919b6d738fe1e559b93b192b7)

Currently displaying revision c305462919b6d738fe1e559b93b192b7 , Show latest

--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -335,6 +335,14 @@ endif
 LINUXSAMPLER_LIBS += $(shell pkg-config --libs linuxsampler)
 endif
 
+FLAC_FLAGS  = $(shell pkg-config --cflags flac)
+FLAC_LIBS   = $(shell pkg-config --libs flac)
+BASE_FLAGS += $(FLAC_FLAGS)
+
+VORBIS_FLAGS  = $(shell pkg-config --cflags vorbis vorbisfile vorbisenc ogg)
+VORBIS_LIBS   = $(shell pkg-config --libs   vorbis vorbisfile vorbisenc ogg)
+BASE_FLAGS += $(VORBIS_FLAGS)
+
 ifeq ($(HAVE_PROJECTM),true)
 PROJECTM_FLAGS = $(shell pkg-config --cflags libprojectM)
 PROJECTM_LIBS  = $(shell pkg-config --libs libprojectM)
--- a/source/backend/Makefile
+++ b/source/backend/Makefile
@@ -107,6 +107,9 @@ ifeq ($(HAVE_LINUXSAMPLER),true)
 STANDALONE_LINK_FLAGS += $(LINUXSAMPLER_LIBS)
 endif
 
+STANDALONE_LINK_FLAGS += $(FLAC_LIBS)
+STANDALONE_LINK_FLAGS += $(VORBIS_LIBS)
+
 ifeq ($(HAVE_X11),true)
 STANDALONE_LINK_FLAGS += $(X11_LIBS)
 endif
@@ -115,6 +118,8 @@ UTILS_LINK_FLAGS  = $(JUCE_AUDIO_BASICS_
 UTILS_LINK_FLAGS += $(JUCE_AUDIO_FORMATS_LIBS)
 UTILS_LINK_FLAGS += $(JUCE_CORE_LIBS)
 UTILS_LINK_FLAGS += $(LILV_LIBS)
+UTILS_LINK_FLAGS += $(FLAC_LIBS)
+UTILS_LINK_FLAGS += $(VORBIS_LIBS)
 
 ifeq ($(HAVE_X11),true)
 UTILS_LINK_FLAGS += $(X11_LIBS)
--- a/source/bridges-plugin/Makefile
+++ b/source/bridges-plugin/Makefile
@@ -144,6 +144,11 @@ NATIVE_BUILD_FLAGS += $(LINUXSAMPLER_FLA
 NATIVE_LINK_FLAGS  += $(LINUXSAMPLER_LIBS)
 endif
 
+NATIVE_BUILD_FLAGS += $(FLAC_FLAGS)
+NATIVE_BUILD_FLAGS += $(VORBIS_FLAGS)
+NATIVE_LINK_FLAGS  += $(FLAC_LIBS)
+NATIVE_LINK_FLAGS  += $(VORBIS_LIBS)
+
 LIBS_native        += $(MODULEDIR)/juce_audio_formats.a
 NATIVE_LINK_FLAGS  += $(JUCE_AUDIO_FORMATS_LIBS)
 
--- a/source/bridges-ui/Makefile
+++ b/source/bridges-ui/Makefile
@@ -41,10 +41,10 @@ BUILD_QT4_FLAGS     = $(BUILD_CXX_FLAGS)
 LINK_QT4_FLAGS      = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui) -ldl
 
 BUILD_QT5_FLAGS     = $(BUILD_CXX_FLAGS) -DBRIDGE_QT5 $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets) -I$(OBJDIR) -I$(CWD)/theme
-LINK_QT5_FLAGS      = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) -ldl
+LINK_QT5_FLAGS      = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) -ldl $(FLAC_LIBS) $(VORBIS_LIBS)
 
 BUILD_X11_FLAGS     = $(BUILD_CXX_FLAGS) -DBRIDGE_X11 $(X11_FLAGS)
-LINK_X11_FLAGS      = $(LINK_FLAGS) $(X11_LIBS) -ldl
+LINK_X11_FLAGS      = $(LINK_FLAGS) $(X11_LIBS) -ldl $(FLAC_LIBS) $(VORBIS_LIBS)
 
 BUILD_COCOA_FLAGS   = $(BUILD_CXX_FLAGS) -DBRIDGE_COCOA -ObjC++
 LINK_COCOA_FLAGS    = $(LINK_FLAGS) -framework Cocoa -framework IOKit -framework QuartzCore -ldl
@@ -54,8 +54,11 @@ LINK_WINDOWS_FLAGS  = $(LINK_FLAGS) -sta
 
 ifeq ($(LINUX),true)
 ifeq ($(HAVE_X11),true)
+LINK_GTK2_FLAGS += $(FLAC_LIBS) $(VORBIS_LIBS)
 LINK_GTK2_FLAGS += -lX11
+LINK_GTK3_FLAGS += $(FLAC_LIBS) $(VORBIS_LIBS)
 LINK_GTK3_FLAGS += -lX11
+LINK_QT4_FLAGS  += $(FLAC_LIBS) $(VORBIS_LIBS)
 LINK_QT4_FLAGS  += -lX11
 endif
 endif
--- a/source/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp
+++ b/source/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp
@@ -86,6 +86,7 @@ namespace juce
 
 namespace FlacNamespace
 {
+#if 0
 #if JUCE_INCLUDE_FLAC_CODE || ! defined (JUCE_INCLUDE_FLAC_CODE)
 
  #undef VERSION
@@ -153,6 +154,9 @@ namespace FlacNamespace
  #if JUCE_CLANG
   #pragma clang diagnostic pop
  #endif
+#else
+#include <FLAC/all.h>
+#endif
 }
 
 #undef max
--- a/source/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp
+++ b/source/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp
@@ -30,6 +30,7 @@
 
 namespace OggVorbisNamespace
 {
+#if 0
 #if JUCE_INCLUDE_OGGVORBIS_CODE || ! defined (JUCE_INCLUDE_OGGVORBIS_CODE)
  #if JUCE_MSVC
   #pragma warning (push)
@@ -81,6 +82,11 @@ namespace OggVorbisNamespace
 #else
  #include <vorbis/vorbisenc.h>
  #include <vorbis/codec.h>
+ #include <vorbis/vorbisfile.h>
+#endif
+#else
+ #include <vorbis/vorbisenc.h>
+ #include <vorbis/codec.h>
  #include <vorbis/vorbisfile.h>
 #endif
 }
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -91,6 +91,8 @@ endif
 ifeq ($(HAVE_LINUXSAMPLER),true)
 LINK_FLAGS += $(LINUXSAMPLER_LIBS)
 endif
+LINK_FLAGS += $(FLAC_LIBS)
+LINK_FLAGS += $(VORBIS_LIBS)
 
 ifeq ($(HAVE_X11),true)
 LINK_FLAGS += $(X11_LIBS)

Places

File carla-systemlibs.patch of Package carla (Revision c305462919b6d738fe1e559b93b192b7)

Places