Hello community, here is the log from the commit of package carla for openSUSE:Factory checked in at 2017-11-21 15:33:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/carla (Old) and /work/SRC/openSUSE:Factory/.carla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "carla" Tue Nov 21 15:33:45 2017 rev:9 rq:543936 version:1.9.7+git20171111.5b97ec1e Changes: -------- --- /work/SRC/openSUSE:Factory/carla/carla.changes 2017-11-17 12:44:50.746695526 +0100 +++ /work/SRC/openSUSE:Factory/.carla.new/carla.changes 2017-11-21 15:33:53.249915293 +0100 @@ -1,0 +2,12 @@ +Mon Nov 20 15:09:15 UTC 2017 - edog...@aon.at + +- added carla.libjack-soversion.patch (removes soversion from private libjack.so.0) +- removed unneeded explicit BuildRequires: jack-devel, +------------------------------------------------------------------- +Wed Nov 15 11:20:41 UTC 2017 - edog...@aon.at + +- Update to version 1.9.7+git20171111.5b97ec1e + * removed carla-buildcompare.patch, not needed anymore + * updated carla-systemlibs.patch so it applies to current source + +------------------------------------------------------------------- Old: ---- carla-1.9.7+git20170124.9ff1711b.tar.xz carla-buildcompare.patch New: ---- carla-1.9.7+git20171111.5b97ec1e.tar.xz carla.libjack-soversion.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ carla.spec ++++++ --- /var/tmp/diff_new_pack.in1awb/_old 2017-11-21 15:33:54.497870069 +0100 +++ /var/tmp/diff_new_pack.in1awb/_new 2017-11-21 15:33:54.501869924 +0100 @@ -23,7 +23,7 @@ %bcond_without rdflib %endif Name: carla -Version: 1.9.7+git20170124.9ff1711b +Version: 1.9.7+git20171111.5b97ec1e Release: 0 Summary: An audio plugin host License: GPL-2.0+ @@ -31,8 +31,8 @@ ExclusiveArch: x86_64 Url: http://kxstudio.sourceforge.net/cadence Source: %{name}-%{version}.tar.xz -Patch1: carla-buildcompare.patch -Patch2: carla-systemlibs.patch +Patch1: carla-systemlibs.patch +Patch2: carla.libjack-soversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel ++++++ _service ++++++ --- /var/tmp/diff_new_pack.in1awb/_old 2017-11-21 15:33:54.537868620 +0100 +++ /var/tmp/diff_new_pack.in1awb/_new 2017-11-21 15:33:54.537868620 +0100 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="filename">carla</param> <param name="versionformat">1.9.7+git%cd.%h</param> - <param name="revision">hotfix-1.9.7</param> + <param name="revision">master</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.in1awb/_old 2017-11-21 15:33:54.557867895 +0100 +++ /var/tmp/diff_new_pack.in1awb/_new 2017-11-21 15:33:54.557867895 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/falkTX/Carla.git</param> - <param name="changesrevision">9ff1711b8fdf0acb4608498463ed4608889ead1e</param> + <param name="changesrevision">5b97ec1e00fda8ec9442da18878b10de47ffd726</param> </service> -</servicedata> \ No newline at end of file +</servicedata> ++++++ carla-1.9.7+git20170124.9ff1711b.tar.xz -> carla-1.9.7+git20171111.5b97ec1e.tar.xz ++++++ /work/SRC/openSUSE:Factory/carla/carla-1.9.7+git20170124.9ff1711b.tar.xz /work/SRC/openSUSE:Factory/.carla.new/carla-1.9.7+git20171111.5b97ec1e.tar.xz differ: char 25, line 1 ++++++ carla-systemlibs.patch ++++++ --- /var/tmp/diff_new_pack.in1awb/_old 2017-11-21 15:33:54.581867025 +0100 +++ /var/tmp/diff_new_pack.in1awb/_new 2017-11-21 15:33:54.581867025 +0100 @@ -1,57 +1,38 @@ ---- 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) +diff -up carla-1.9.7+git20171111.5b97ec1e/source/backend/Makefile.orig carla-1.9.7+git20171111.5b97ec1e/source/backend/Makefile +--- carla-1.9.7+git20171111.5b97ec1e/source/backend/Makefile.orig 2017-11-11 19:38:28.000000000 +0100 ++++ carla-1.9.7+git20171111.5b97ec1e/source/backend/Makefile 2017-11-16 12:29:29.530325818 +0100 +@@ -63,8 +63,13 @@ STANDALONE_LINK_FLAGS += $(FLUIDSYNTH_LI STANDALONE_LINK_FLAGS += $(LINUXSAMPLER_LIBS) - endif + STANDALONE_LINK_FLAGS += $(X11_LIBS) +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 += $(WATER_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 +diff -up carla-1.9.7+git20171111.5b97ec1e/source/bridges-plugin/Makefile.orig carla-1.9.7+git20171111.5b97ec1e/source/bridges-plugin/Makefile +--- carla-1.9.7+git20171111.5b97ec1e/source/bridges-plugin/Makefile.orig 2017-11-11 19:38:28.000000000 +0100 ++++ carla-1.9.7+git20171111.5b97ec1e/source/bridges-plugin/Makefile 2017-11-16 12:32:23.886167734 +0100 +@@ -94,6 +94,11 @@ NATIVE_LINK_FLAGS += $(LINUXSAMPLER_LIB + NATIVE_LINK_FLAGS += $(FFMPEG_LIBS) + NATIVE_LINK_FLAGS += $(SNDFILE_LIBS) +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) + LIBS_native += $(MODULEDIR)/audio_decoder.a + LIBS_native += $(MODULEDIR)/native-plugins.base.a ---- a/source/bridges-ui/Makefile -+++ b/source/bridges-ui/Makefile +diff -up carla-1.9.7+git20171111.5b97ec1e/source/bridges-ui/Makefile.orig carla-1.9.7+git20171111.5b97ec1e/source/bridges-ui/Makefile +--- carla-1.9.7+git20171111.5b97ec1e/source/bridges-ui/Makefile.orig 2017-11-11 19:38:28.000000000 +0100 ++++ carla-1.9.7+git20171111.5b97ec1e/source/bridges-ui/Makefile 2017-11-16 12:37:12.317906867 +0100 @@ -41,10 +41,10 @@ BUILD_QT4_FLAGS = $(BUILD_CXX_FLAGS) LINK_QT4_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui) -ldl @@ -77,56 +58,34 @@ 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) +diff -up carla-1.9.7+git20171111.5b97ec1e/source/Makefile.mk.orig carla-1.9.7+git20171111.5b97ec1e/source/Makefile.mk +--- carla-1.9.7+git20171111.5b97ec1e/source/Makefile.mk.orig 2017-11-11 19:38:28.000000000 +0100 ++++ carla-1.9.7+git20171111.5b97ec1e/source/Makefile.mk 2017-11-16 12:51:31.169134413 +0100 +@@ -346,6 +346,14 @@ LINUXSAMPLER_LIBS += -lws2_32 + endif 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) + SNDFILE_FLAGS = $(shell pkg-config --cflags sndfile) + SNDFILE_LIBS = $(shell pkg-config --libs sndfile) +diff -up carla-1.9.7+git20171111.5b97ec1e/source/plugin/Makefile.orig carla-1.9.7+git20171111.5b97ec1e/source/plugin/Makefile +--- carla-1.9.7+git20171111.5b97ec1e/source/plugin/Makefile.orig 2017-11-11 19:38:28.000000000 +0100 ++++ carla-1.9.7+git20171111.5b97ec1e/source/plugin/Makefile 2017-11-16 12:49:04.341266050 +0100 +@@ -81,6 +81,9 @@ LINK_FLAGS += $(LINUXSAMPLER_LIBS) + LINK_FLAGS += $(MAGIC_LIBS) + LINK_FLAGS += $(X11_LIBS) + +LINK_FLAGS += $(FLAC_LIBS) +LINK_FLAGS += $(VORBIS_LIBS) ++ + # ---------------------------------------------------------------------------------------------------------------------------- - ifeq ($(HAVE_X11),true) - LINK_FLAGS += $(X11_LIBS) + TARGETS = \ ++++++ carla.libjack-soversion.patch ++++++ diff -up carla-1.9.7+git20171111.5b97ec1e/Makefile.orig carla-1.9.7+git20171111.5b97ec1e/Makefile --- carla-1.9.7+git20171111.5b97ec1e/Makefile.orig 2017-11-20 15:29:23.000000000 +0100 +++ carla-1.9.7+git20171111.5b97ec1e/Makefile 2017-11-20 15:29:49.135744165 +0100 @@ -417,7 +417,7 @@ endif ifeq ($(LINUX),true) # Install libjack install -m 755 \ - bin/jack/libjack.so.0 \ + bin/jack/libjack.so \ $(DESTDIR)$(LIBDIR)/carla/jack endif diff -up carla-1.9.7+git20171111.5b97ec1e/source/libjack/Makefile.orig carla-1.9.7+git20171111.5b97ec1e/source/libjack/Makefile --- carla-1.9.7+git20171111.5b97ec1e/source/libjack/Makefile.orig 2017-11-11 19:38:28.000000000 +0100 +++ carla-1.9.7+git20171111.5b97ec1e/source/libjack/Makefile 2017-11-20 14:51:13.605673128 +0100 @@ -48,7 +48,7 @@ OBJS = \ $(OBJDIR)/libjack_time.cpp.o \ $(OBJDIR)/libjack_transport.cpp.o \ $(OBJDIR)/ringbuffer.c.o -TARGET = $(BINDIR)/jack/libjack.so.0 +TARGET = $(BINDIR)/jack/libjack.so endif # ---------------------------------------------------------------------------------------------------------------------- @@ -67,7 +67,7 @@ debug: $(TARGET): $(OBJS) -@mkdir -p $(BINDIR)/jack - @echo "Linking libjack.so.0" + @echo "Linking libjack.so" @$(CXX) $^ $(SHARED) $(LINK_FLAGS) $(LIBJACK_LIBS) -o $@ # ----------------------------------------------------------------------------------------------------------------------
