Hello community, here is the log from the commit of package buzztrax for openSUSE:Leap:15.2 checked in at 2020-02-19 18:42:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/buzztrax (Old) and /work/SRC/openSUSE:Leap:15.2/.buzztrax.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "buzztrax" Wed Feb 19 18:42:50 2020 rev:18 rq:772276 version:0.10.2+git20191209 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/buzztrax/buzztrax.changes 2020-01-15 14:49:07.965368125 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.buzztrax.new.26092/buzztrax.changes 2020-02-19 18:42:51.526368814 +0100 @@ -1,0 +2,92 @@ +Mon Dec 23 10:46:09 UTC 2019 - Dave Plater <[email protected]> + +- Removed conditional for 0001-Fix-build-with-fluidsynth-2.x.patch + buzztrax now builds with fluidsynth one and two with the patch. + +------------------------------------------------------------------- +Thu Dec 19 12:06:53 UTC 2019 - Dave Plater <[email protected]> + +- Update to git snapshot 0.10.2+git20191209 +- Add patch from debian 0001-Fix-build-with-fluidsynth-2.x.patch +- Upstream changes: + *More synth pannning. Add more module ideas. + +------------------------------------------------------------------- +Tue Nov 26 09:21:42 UTC 2019 - Dave Plater <[email protected]> + +- Update to git snapshot version 0.10.2+git20191028 includes + Bernard's reproducible build: Use NEWS date instead of build date +- Upstream changes: + *core:fix format strings in logger + *tests:add init handling to fuzzer and update docs + *tests:add a fuzzer for reading song files + *test:make the test helper builable with older gtk versions + *tests:remove unused code + *Use NEWS date instead of build date + *test:set a GdkDevice in the synthetic events to silence a warning + *tests:swap out the screenshoting code. + *tests:use top_abs_* more often + *tests:update location of valgrind suppressions + *tests:extract local var for readability + *tests:more debugging for the flaky screenshotting + *tests:fix action signal emission. + *tests:test the analyzer dialog for the master + *sink-bin:guard some properties with a class check + *tests:fix bad property in handwritten song + *tests:move the call to get the window size out of the ifdef + *icons:add the apps dir + *tests:disable the cairo hack + *help:only copy the images + *tests:add ref_sink() before releasing to fix a warning. + *edit/tools:extract some common code into a help and add tests + *tests:add a workaround for snapshotting images + *help:fix typo in path for image generation target + *tests:udpate new manual doc path for tests + *help:fix make check target + +------------------------------------------------------------------- +Sun Aug 11 08:14:05 UTC 2019 - Dave Plater <[email protected]> + +- Update to git snapshot version 0.10.2+git20190809 which no longer + uses rarian-scrollkeeper but uses yelp instead for help file + generation. +- This fixes boo#1141385. +- Removed the following incorporated patches: + buzztrax-appdata.patch, buzztrax-build.patch, + buzztrax-gcc7fix.patch, buzztrax-misleading-indentation.patch + and buzztrax-newfix.patch. +- Added -Wno-error=format for the i586 build. + +------------------------------------------------------------------- +Wed Jul 10 12:25:54 UTC 2019 - Dave Plater <[email protected]> + +- Use %license + +------------------------------------------------------------------- +Thu Apr 4 20:58:43 UTC 2019 - [email protected] + +- Use gcc8 in SLE_12 + +------------------------------------------------------------------- +Fri Jan 18 10:57:59 UTC 2019 - [email protected] + +- Removed fluidsynth from the build until it catches up with + version 2.x.x + +------------------------------------------------------------------- +Wed Jul 4 22:17:58 UTC 2018 - [email protected] + +- Drop pkgconfig(gconf-2.0) BuildRequires and the macro + gconf_schemas_requires: No longer needed, nor used. + +------------------------------------------------------------------- +Mon Jun 18 10:22:38 UTC 2018 - [email protected] + +- Fix Factory/Tumbleweed build failure with buzztrax-newfix.patch. + +------------------------------------------------------------------- +Mon Jun 11 11:38:06 UTC 2018 - [email protected] + +- Fix gcc8 build failure with -Wno-error=restrict. + +------------------------------------------------------------------- Old: ---- buzztrax-0.10.2.tar.gz buzztrax-appdata.patch buzztrax-build.patch buzztrax-gcc7fix.patch buzztrax-misleading-indentation.patch New: ---- 0001-Fix-build-with-fluidsynth-2.x.patch buzztrax-0.10.2+git20191209.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ buzztrax.spec ++++++ --- /var/tmp/diff_new_pack.0nHOOt/_old 2020-02-19 18:42:52.050369912 +0100 +++ /var/tmp/diff_new_pack.0nHOOt/_new 2020-02-19 18:42:52.054369921 +0100 @@ -1,7 +1,7 @@ # # spec file for package buzztrax # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,10 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define rev 1f57d1b6ff55dd3d574f92039bb06a768d613d67 +%define relver 0.11.0 + %define gir gobject-introspection-1.0 %define gstreamer_pluginsdir %(pkg-config --variable=pluginsdir gstreamer-1.0) %define girdir %{_datadir}/gir-1.0 @@ -28,22 +31,17 @@ %define glib_version 2.32.0 %define gst_version 1.2.0 Name: buzztrax -Version: 0.10.2 +Version: 0.10.2+git20191209 Release: 0 Summary: A music studio inspired by Buzz -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Utilities Url: http://buzztrax.org -Source0: http://files.buzztrax.org/releases/%{name}-%{version}.tar.gz +Source0: https://github.com/Buzztrax/buzztrax/archive//%{rev}.tar.gz#/%{name}-%{version}.tar.gz +#http://files.buzztrax.org/releases/%%{name}-%%{version}.tar.gz Source1: autogen.sh Source2: COPYING-DOCS -# Combined patch of cherry picked build fixes applies after 0.10.2 -Patch0: buzztrax-build.patch -Patch1: buzztrax-appdata.patch -# PATCH-FIX gcc6 error misleading-indentation with patch from git. -Patch2: buzztrax-misleading-indentation.patch -# PATCH-FIX-UPSTREAM buzztrax-gcc7fix.patch [email protected] -- fix gcc 7 duplicate constant errors -Patch3: buzztrax-gcc7fix.patch +Patch0: 0001-Fix-build-with-fluidsynth-2.x.patch BuildRequires: automake >= 1.13 BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -53,14 +51,14 @@ BuildRequires: intltool BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: scrollkeeper BuildRequires: shared-mime-info +BuildRequires: yelp-devel +BuildRequires: yelp-tools BuildRequires: pkgconfig(%{gir}) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(fluidsynth) -BuildRequires: pkgconfig(gconf-2.0) >= 2.2.0 BuildRequires: pkgconfig(gdk-x11-3.0) BuildRequires: pkgconfig(gio-2.0) >= %{glib_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib_version} @@ -79,12 +77,13 @@ BuildRequires: pkgconfig(pango) Requires: %{name}-plugins = %{version} Requires: gstreamer-1_0-plugins-buzztrax = %{version} +Requires: yelp +Recommends: gstreamer-plugins-good-jack # We provide appdata(buzztrax-edit.appdata.xml) to prevent installation system error see: # boo#961304 which is marked duplicate of boo#952304 #Provides: appdata(buzztrax-edit.appdata.xml) Provides: buzztard = %{version} Obsoletes: buzztard < %{version} -%{gconf_schemas_requires} %description buzztrax aims to be a music studio that allows one to compose @@ -194,6 +193,10 @@ Summary: Buzztrax plugins Group: Productivity/Multimedia/Other Requires: buzztrax = %{version} +Requires: libbml%{bml_soname} = %{version} +Requires: libbuzztrax-core%{core_soname} = %{version} +Requires: libbuzztrax-gst%{gst_soname} = %{version} +Requires: libbuzztrax-ic%{ic_soname} = %{version} %description plugins This package contains buzztrax plugins @@ -201,37 +204,41 @@ %lang_package %prep -%setup -q -%patch0 -%patch1 -%patch2 -%patch3 +%setup -q -n %{name}-%{rev} + +%autopatch -p1 # Rpmlint complains that COPYING-DOCS is outdated cp -v %{SOURCE2} . cp -v %{SOURCE1} . +if ! `test -a AUTHORS`; then +touch AUTHORS +fi %build -%if 1 == 0 -%define gcc_version 7 -export CC=gcc-7 -export CPP=cpp-7 -export CXX=g++-7 -%endif +test -x "$(type -p gcc-8)" && export CC="$_" +test -x "$(type -p g++-8)" && export CXX="$_" export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" -%if 0%{?gcc_version} >= 7 -export CFLAGS="$CFLAGS -Wno-error=format-truncation= -Wno-error=format-overflow= -Wno-error=incompatible-pointer-types" +export CFLAGS="$CFLAGS -Wno-error=format-truncation= -Wno-error=format-overflow= -Wno-error=incompatible-pointer-types -Wno-error=restrict" +%ifarch i586 +export CFLAGS="$CFLAGS -Wno-error=format" %endif +export CXXFLAGS="$CFLAGS" /bin/sh ./autogen.sh --noconfigure %configure --disable-static \ --disable-schemas-compile \ + --disable-update-mime \ + --disable-update-desktop \ + --disable-update-icon-cache \ --disable-silent-rules \ --enable-deprecated \ --enable-debug \ --disable-rpath \ --with-pic \ --enable-man \ - --disable-dllwrapper + --disable-dllwrapper \ + --enable-gtk-doc +cp -v docs/version.entities docs/help/bt-edit/C/ make %{?_smp_mflags} @@ -239,14 +246,14 @@ %make_install find %{buildroot} -type f -name "*.la" -delete -print echo %{buildroot} -%find_lang %{name}-%{version} +%find_lang %{name}-%{relver} mv %{buildroot}%{_datadir}/applications/buzztrax-edit.desktop %{buildroot}%{_datadir}/applications/buzztrax.desktop #%%find_gconf_schemas # ensure the icons in hicolor are the REAL files. fdupes links them the 'wrong way around' for xdg-app and appstream-builder for icon in 48x48/apps/buzztrax.png scalable/apps/buzztrax.svg; do ln -sf %{_datadir}/icons/hicolor/${icon} %{buildroot}%{_datadir}/icons/gnome/${icon} done -%fdupes -s %{buildroot} +%fdupes -s %{buildroot}/%{_datadir}/ # WARNING: this creates baselibs.conf printf 'libbuzztrax-ic%{ic_soname}\n libbuzztrax-core%{core_soname}\n @@ -256,17 +263,6 @@ typelib-1_0-BuzztraxCore-1_1\n \t+^%{typelibdir}/BuzztraxCore-%{girsoname}.typelib$\n' > %{_sourcedir}/baselibs.conf -# Anything that doesn't work goes here -%if 1 == 0 -%pre -f %{name}.schemas_pre - -%posttrans -f %{name}.schemas_posttrans - -f %{name}.schemas_list - -%preun -f %{name}.schemas_preun - -%endif - %post %glib2_gsettings_schema_post %icon_theme_cache_post @@ -307,7 +303,8 @@ %files %defattr(0644,root,root,0755) -%doc AUTHORS COPYING COPYING-DOCS NEWS README.md TODO +%doc AUTHORS NEWS README.md TODO +%license COPYING COPYING-DOCS %attr(0755,root,root) %{_bindir}/* %dir %{_datadir}/buzztrax %{_datadir}/buzztrax/ @@ -315,11 +312,8 @@ %{_datadir}/appdata/buzztrax.appdata.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/gnome -%dir %{_datadir}/omf -%dir %{_datadir}/omf/buzztrax-edit -%doc %{_datadir}/omf/buzztrax-edit/ -%dir %{_datadir}/gnome/ -%doc %{_datadir}/gnome/help/ +%{_datadir}/help/C +%{_mandir}/man1/* %dir %{_datadir}/gtk-doc/html/buzztrax-cmd %dir %{_datadir}/gtk-doc/html/buzztrax-edit %{_datadir}/gtk-doc/html/buzztrax-cmd/ @@ -405,7 +399,7 @@ %dir %{_libdir}/buzztrax-songio %{_libdir}/buzztrax-songio/*.so -%files lang -f buzztrax-%{version}.lang +%files lang -f %{name}-%{relver}.lang %defattr (-, root, root) %changelog ++++++ 0001-Fix-build-with-fluidsynth-2.x.patch ++++++ >From 38b421440c55d5d8ba74be99c37cf117cad01541 Mon Sep 17 00:00:00 2001 From: Peter Michael Green <[email protected]> Date: Thu, 19 Dec 2019 01:38:18 +0000 Subject: [PATCH] Fix build with fluidsynth 2.x --- src/gst/fluidsynth/fluidsynth.c | 42 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/gst/fluidsynth/fluidsynth.c b/src/gst/fluidsynth/fluidsynth.c index 0d954f8e..4a091146 100644 --- a/src/gst/fluidsynth/fluidsynth.c +++ b/src/gst/fluidsynth/fluidsynth.c @@ -132,25 +132,41 @@ G_DEFINE_TYPE (GstBtFluidSynth, gstbt_fluid_synth, GSTBT_TYPE_AUDIO_SYNTH); //-- fluid_synth log handler static void +#if FLUIDSYNTH_VERSION_MAJOR < 2 gstbt_fluid_synth_error_log_function (int level, char *message, void *data) +#else +gstbt_fluid_synth_error_log_function (int level, const char *message, void *data) +#endif { GST_ERROR ("%s", message); } static void +#if FLUIDSYNTH_VERSION_MAJOR < 2 gstbt_fluid_synth_warning_log_function (int level, char *message, void *data) +#else +gstbt_fluid_synth_warning_log_function (int level, const char *message, void *data) +#endif { GST_WARNING ("%s", message); } static void +#if FLUIDSYNTH_VERSION_MAJOR < 2 gstbt_fluid_synth_info_log_function (int level, char *message, void *data) +#else +gstbt_fluid_synth_info_log_function (int level, const char *message, void *data) +#endif { GST_INFO ("%s", message); } static void +#if FLUIDSYNTH_VERSION_MAJOR < 2 gstbt_fluid_synth_debug_log_function (int level, char *message, void *data) +#else +gstbt_fluid_synth_debug_log_function (int level, const char *message, void *data) +#endif { GST_DEBUG ("%s", message); } @@ -212,7 +228,11 @@ typedef struct /* for counting the number of FluidSynth settings properties */ static void +#if FLUIDSYNTH_VERSION_MAJOR < 2 settings_foreach_count (void *data, char *name, int type) +#else +settings_foreach_count (void *data, const char *name, int type) +#endif { int *count = (int *) data; *count = *count + 1; @@ -220,7 +240,11 @@ settings_foreach_count (void *data, char *name, int type) /* add each FluidSynth setting as a GObject property */ static void +#if FLUIDSYNTH_VERSION_MAJOR < 2 settings_foreach_func (void *data, char *name, int type) +#else +settings_foreach_func (void *data, const char *name, int type) +#endif { ForeachBag *bag = (ForeachBag *) data; GParamSpec *spec; @@ -231,18 +255,30 @@ settings_foreach_func (void *data, char *name, int type) switch (type) { case FLUID_NUM_TYPE: fluid_settings_getnum_range (bag->settings, name, &dmin, &dmax); +#if FLUIDSYNTH_VERSION_MAJOR < 2 ddef = fluid_settings_getnum_default (bag->settings, name); +#else + if (fluid_settings_getnum_default (bag->settings, name, &ddef) != FLUID_OK) ddef = 0; +#endif spec = g_param_spec_double (name, name, name, dmin, dmax, ddef, G_PARAM_READWRITE); break; case FLUID_INT_TYPE: fluid_settings_getint_range (bag->settings, name, &imin, &imax); +#if FLUIDSYNTH_VERSION_MAJOR < 2 idef = fluid_settings_getint_default (bag->settings, name); +#else + if (fluid_settings_getint_default (bag->settings, name, &idef) != FLUID_OK) idef = 0; +#endif spec = g_param_spec_int (name, name, name, imin, imax, idef, G_PARAM_READWRITE); break; case FLUID_STR_TYPE: +#if FLUIDSYNTH_VERSION_MAJOR < 2 defstr = fluid_settings_getstr_default (bag->settings, name); +#else + if (fluid_settings_getstr_default (bag->settings, name,&defstr) != FLUID_OK) defstr = 0; +#endif spec = g_param_spec_string (name, name, name, defstr, G_PARAM_READWRITE); break; case FLUID_SET_TYPE: @@ -724,7 +760,11 @@ gstbt_fluid_synth_init (GstBtFluidSynth * src) new_fluid_midi_router (src->settings, fluid_synth_handle_midi_event, src->fluid); if (src->midi_router) { +#if FLUIDSYNTH_VERSION_MAJOR < 2 src->cmd_handler = new_fluid_cmd_handler (src->fluid); +#else + src->cmd_handler = new_fluid_cmd_handler (src->fluid,NULL); +#endif if (src->cmd_handler) { src->midi = new_fluid_midi_driver (src->settings, fluid_midi_router_handle_midi_event, (void *) (src->midi_router)); @@ -886,7 +926,7 @@ gstbt_fluid_synth_class_init (GstBtFluidSynthClass * klass) g_param_spec_enum ("chorus-waveform", "Chorus waveform", "Chorus waveform type", CHORUS_WAVEFORM_TYPE, - FLUID_CHORUS_DEFAULT_TYPE, + FLUID_CHORUS_MOD_SINE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); gst_element_class_set_static_metadata (element_class, -- 2.16.4
