Hello community, here is the log from the commit of package carla for openSUSE:Factory checked in at 2017-08-13 14:58:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/carla (Old) and /work/SRC/openSUSE:Factory/.carla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "carla" Sun Aug 13 14:58:26 2017 rev:5 rq:515896 version:1.9.7+git20170124.9ff1711b Changes: -------- --- /work/SRC/openSUSE:Factory/carla/carla.changes 2017-04-06 11:02:20.981891901 +0200 +++ /work/SRC/openSUSE:Factory/.carla.new/carla.changes 2017-08-13 14:58:30.338553259 +0200 @@ -1,0 +2,18 @@ +Thu Aug 10 09:42:41 UTC 2017 - [email protected] + +- Wipe __DATE__/__TIME with carla-buildcompare.patch +- Fix build with carla-gcc7.patch +- Use system flac/vorbis/ogg with carla-systemlibs.patch +- ExclusiveArch x86_64 until i386 is fixed + +------------------------------------------------------------------- +Fri Jul 7 01:30:11 UTC 2017 - [email protected] + +- Add missing runtime dependency on PyQt4 + +------------------------------------------------------------------- +Fri Jun 16 06:40:18 UTC 2017 - [email protected] + +- Remove override of pyuic4 + +------------------------------------------------------------------- New: ---- carla-buildcompare.patch carla-gcc7.patch carla-systemlibs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ carla.spec ++++++ --- /var/tmp/diff_new_pack.is6PGq/_old 2017-08-13 14:58:31.966324819 +0200 +++ /var/tmp/diff_new_pack.is6PGq/_new 2017-08-13 14:58:31.998320329 +0200 @@ -28,23 +28,30 @@ Summary: An audio plugin host License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities -ExclusiveArch: %ix86 x86_64 +ExclusiveArch: x86_64 Url: http://kxstudio.sourceforge.net/cadence Source: %{name}-%{version}.tar.xz +Patch0: carla-gcc7.patch +Patch1: carla-buildcompare.patch +Patch2: carla-systemlibs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel BuildRequires: file-devel BuildRequires: python-qt4-devel +BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(vorbisenc) %if %{defined fedora} BuildRequires: pulseaudio-libs-devel BuildRequires: python3-PyQt4-devel +Requires: python3-PyQt4 BuildRequires: qt5-qtbase-devel %else BuildRequires: libpulse-devel BuildRequires: libqt5-qtbase-devel BuildRequires: python3-qt4-devel +Requires: python3-qt4 %endif %if 0%{?suse_version} @@ -100,17 +107,16 @@ %prep %setup -q -sed -i -e "s/__DATE__/\"openSUSE\"/" -e "s/__TIME__/\"BuildService\"/" source/native-plugins/zynaddsubfx/main.cpp -sed -i -e "s/__DATE__/\"openSUSE\"/" source/modules/juce_core/time/juce_Time.cpp +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build +rm -rfv source/modules/juce_audio_formats/codecs/flac +rm -rfv source/modules/juce_audio_formats/codecs/oggvorbis export CXXFLAGS="%{optflags}" export CFLAGS="%{optflags}" -%if 0%{?suse_version} -sed -i 's:pyuic4:py3uic4:' Makefile -sed -i 's:wildcard /:wildcard $(DESTDIR)/:' Makefile -%endif make \ %ifnarch %ix86 x86_64 BASE_OPTS= \ @@ -119,18 +125,11 @@ features # bulding with high -j numbers often results in build failures, thus we're disabling _smp_flags for now -%if 0%{?suse_version} > 1310 -# make %{?_smp_mflags} --trace make \ %ifnarch %ix86 x86_64 BASE_OPTS= \ %endif --trace -%else -# Old make -# make %{?_smp_mflags} -make -%endif %install make install DESTDIR=%{buildroot} PREFIX="%{_prefix}" LIBDIR="%{_libdir}" ++++++ carla-buildcompare.patch ++++++ --- a/source/modules/juce_core/time/juce_Time.cpp +++ b/source/modules/juce_core/time/juce_Time.cpp @@ -602,10 +602,10 @@ Time Time::getCompilationDate() { StringArray dateTokens, timeTokens; - dateTokens.addTokens (__DATE__, true); + dateTokens.addTokens ("Apr 01 1970", true); dateTokens.removeEmptyStrings (true); - timeTokens.addTokens (__TIME__, ":", StringRef()); + timeTokens.addTokens ("01:23:45", ":", StringRef()); return Time (dateTokens[2].getIntValue(), getMonthNumberForCompileDate (dateTokens[0]), --- a/source/native-plugins/zynaddsubfx/main.cpp +++ b/source/native-plugins/zynaddsubfx/main.cpp @@ -211,7 +211,6 @@ int main(int argc, char *argv[]) cerr << " Copyright (c) 2009-2016 Mark McCurry [active maintainer]" << endl; - cerr << "Compiled: " << __DATE__ << " " << __TIME__ << endl; cerr << "This program is free software (GNU GPL v2 or later) and \n"; cerr << "it comes with ABSOLUTELY NO WARRANTY.\n" << endl; if(argc == 1) ++++++ carla-gcc7.patch ++++++ diff --git a/source/backend/engine/CarlaEngineBridge.cpp b/source/backend/engine/CarlaEngineBridge.cpp index 3d3b0da4..a7dd6dc5 100644 --- a/source/backend/engine/CarlaEngineBridge.cpp +++ b/source/backend/engine/CarlaEngineBridge.cpp @@ -999,7 +999,7 @@ public: } break; case kPluginBridgeNonRtClientPingOnOff: { - const uint32_t onOff(fShmNonRtClientControl.readBool()); + const bool onOff(fShmNonRtClientControl.readBool()); fLastPingTime = onOff ? Time::currentTimeMillis() : -1; } break; @@ -1049,7 +1049,7 @@ public: case kPluginBridgeNonRtClientSetParameterMidiChannel: { const uint32_t index(fShmNonRtClientControl.readUInt()); - const uint8_t channel(fShmNonRtClientControl.readByte()); + const uint8_t channel = fShmNonRtClientControl.readByte(); if (plugin != nullptr && plugin->isEnabled()) plugin->setParameterMidiChannel(index, channel, false, false); ++++++ carla-systemlibs.patch ++++++ --- 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)
