File 0001-Use-system-flac-vorbis-ogg.patch of Package carla
From 125f16f4861ec6df1709b03c5cc44b80677bbef7 Mon Sep 17 00:00:00 2001 From: Mia Herkt <mia@0x0.st> Date: Sat, 7 Jan 2023 13:31:11 +0100 Subject: [PATCH 1/3] Use system flac/vorbis/ogg --- source/Makefile.mk | 8 ++++++++ source/backend/Makefile | 2 ++ source/backend/utils/Makefile | 2 ++ source/bridges-plugin/Makefile | 5 +++++ source/bridges-ui/Makefile | 10 +++++----- source/plugin/Makefile | 3 +++ 6 files changed, 25 insertions(+), 5 deletions(-) Index: b/source/Makefile.mk =================================================================== --- a/source/Makefile.mk 2024-09-21 23:56:30.000000000 +0200 +++ b/source/Makefile.mk 2024-12-01 17:46:10.094204091 +0200 @@ -224,6 +224,14 @@ else ifeq ($(HAVE_SDL1),true) BASE_FLAGS += -DHAVE_SDL -DHAVE_SDL1 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_SNDFILE),true) BASE_FLAGS += -DHAVE_SNDFILE endif Index: b/source/backend/Makefile =================================================================== --- a/source/backend/Makefile 2024-09-21 23:56:30.000000000 +0200 +++ b/source/backend/Makefile 2024-12-01 17:46:10.094204091 +0200 @@ -86,6 +86,8 @@ STANDALONE_LINK_FLAGS += $(MAGIC_LIBS) STANDALONE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) STANDALONE_LINK_FLAGS += $(SDL_LIBS) STANDALONE_LINK_FLAGS += $(X11_LIBS) +STANDALONE_LINK_FLAGS += $(FLAC_LIBS) +STANDALONE_LINK_FLAGS += $(VORBIS_LIBS) ifeq ($(USING_JUCE),true) STANDALONE_LINK_FLAGS += $(JUCE_AUDIO_BASICS_LIBS) Index: b/source/backend/utils/Makefile =================================================================== --- a/source/backend/utils/Makefile 2024-09-21 23:56:30.000000000 +0200 +++ b/source/backend/utils/Makefile 2024-12-01 17:46:10.094204091 +0200 @@ -48,6 +48,8 @@ LINK_FLAGS += $(JACKBRIDGE_LIBS) LINK_FLAGS += $(LILV_LIBS) LINK_FLAGS += $(WATER_LIBS) LINK_FLAGS += $(YSFX_GRAPHICS_LIBS) +LINK_FLAGS += $(FLAC_LIBS) +LINK_FLAGS += $(VORBIS_LIBS) ifeq ($(HAVE_X11),true) LINK_FLAGS += $(X11_LIBS) Index: b/source/bridges-plugin/Makefile =================================================================== --- a/source/bridges-plugin/Makefile 2024-09-21 23:56:30.000000000 +0200 +++ b/source/bridges-plugin/Makefile 2024-12-01 17:46:10.094204091 +0200 @@ -180,6 +180,11 @@ NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) NATIVE_BUILD_FLAGS += $(MAGIC_FLAGS) NATIVE_LINK_FLAGS += $(MAGIC_LIBS) +NATIVE_BUILD_FLAGS += $(FLAC_FLAGS) +NATIVE_LINK_FLAGS += $(FLAC_LIBS) +NATIVE_BUILD_FLAGS += $(VORBIS_FLAGS) +NATIVE_LINK_FLAGS += $(VORBIS_LIBS) + LIBS_native += $(MODULEDIR)/audio_decoder.a LIBS_native += $(MODULEDIR)/native-plugins.a LIBS_native += $(MODULEDIR)/sfzero.a Index: b/source/bridges-ui/Makefile =================================================================== --- a/source/bridges-ui/Makefile 2024-09-21 23:56:30.000000000 +0200 +++ b/source/bridges-ui/Makefile 2024-12-01 17:46:10.094204091 +0200 @@ -36,19 +36,19 @@ endif # --------------------------------------------------------------------------------------------------------------------- BUILD_GTK2_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_GTK2 $(X11_FLAGS) -LINK_GTK2_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) +LINK_GTK2_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) $(FLAC_LIBS) $(VORBIS_LIBS) BUILD_GTK3_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_GTK3 $(X11_FLAGS) -LINK_GTK3_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) +LINK_GTK3_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) $(FLAC_LIBS) $(VORBIS_LIBS) BUILD_QT4_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_QT4 $(shell pkg-config --cflags QtCore QtGui) $(X11_FLAGS) -I$(OBJDIR) -I$(CWD)/theme -Wno-unused-variable -LINK_QT4_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui) $(X11_LIBS) $(LIBDL_LIBS) +LINK_QT4_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui) $(X11_LIBS) $(LIBDL_LIBS) $(FLAC_LIBS) $(VORBIS_LIBS) 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) $(LIBDL_LIBS) +LINK_QT5_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) $(LIBDL_LIBS) $(FLAC_LIBS) $(VORBIS_LIBS) BUILD_X11_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_X11 $(X11_FLAGS) -LINK_X11_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) +LINK_X11_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) $(FLAC_LIBS) $(VORBIS_LIBS) BUILD_COCOA_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_COCOA -ObjC++ LINK_COCOA_FLAGS = $(LINK_FLAGS) -framework Cocoa $(LIBDL_LIBS) Index: b/source/plugin/Makefile =================================================================== --- a/source/plugin/Makefile 2024-09-21 23:56:30.000000000 +0200 +++ b/source/plugin/Makefile 2024-12-01 17:46:10.098203915 +0200 @@ -127,6 +127,9 @@ endif LINK_FLAGS += $(YSFX_GRAPHICS_LIBS) +LINK_FLAGS += $(FLAC_LIBS) +LINK_FLAGS += $(VORBIS_LIBS) + ifeq ($(MACOS),true) SYMBOLS_NATIVE = -Wl,-exported_symbol,_carla_get_native_rack_plugin SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_plugin
