Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package drumstick for openSUSE:Factory
checked in at 2022-08-19 17:56:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/drumstick (Old)
and /work/SRC/openSUSE:Factory/.drumstick.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drumstick"
Fri Aug 19 17:56:10 2022 rev:18 rq:998017 version:2.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/drumstick/drumstick.changes 2022-08-12
16:07:17.287586280 +0200
+++ /work/SRC/openSUSE:Factory/.drumstick.new.2083/drumstick.changes
2022-08-19 17:58:59.924417286 +0200
@@ -1,0 +2,7 @@
+Thu Aug 18 11:26:40 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 2.7.1
+ * Improved the sonivox detection when building drumstick
+ * Fixed underlinking in some RT backends
+
+-------------------------------------------------------------------
Old:
----
drumstick-2.7.0.tar.bz2
New:
----
drumstick-2.7.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ drumstick.spec ++++++
--- /var/tmp/diff_new_pack.woOD4s/_old 2022-08-19 17:59:00.280418032 +0200
+++ /var/tmp/diff_new_pack.woOD4s/_new 2022-08-19 17:59:00.284418040 +0200
@@ -1,7 +1,7 @@
#
# spec file for package drumstick
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2005-2010 Pedro Lopez-Cabanillas <p...@users.sourceforge.net>
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: drumstick
-Version: 2.7.0
+Version: 2.7.1
Release: 0
Summary: MIDI Sequencer C++ Library Bindings
License: GPL-2.0-or-later AND GPL-3.0-or-later
@@ -41,6 +41,7 @@
BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(Qt5UiPlugin)
BuildRequires: cmake(Qt5Widgets)
+BuildRequires: cmake(sonivox)
BuildRequires: pkgconfig(alsa)
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
BuildRequires: pkgconfig(fluidsynth)
@@ -144,7 +145,7 @@
This package contains the developer's documentation of the drumstick libraries.
%prep
-%setup -q
+%autosetup -p1
# Update obsolete config file
doxygen -u Doxyfile.in
@@ -156,25 +157,25 @@
%cmake_build
-make %{?_smp_mflags} doxygen
+%make_build doxygen
%install
%cmake_install
+
%suse_update_desktop_file -n net.sourceforge.drumstick-drumgrid Midi
%suse_update_desktop_file -n net.sourceforge.drumstick-guiplayer Midi
%suse_update_desktop_file -n net.sourceforge.drumstick-vpiano Midi
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
-%post -n libdrumstick-file2 -p /sbin/ldconfig
-%postun -n libdrumstick-file2 -p /sbin/ldconfig
%post -n libdrumstick-alsa2 -p /sbin/ldconfig
-%postun -n libdrumstick-alsa2 -p /sbin/ldconfig
+%post -n libdrumstick-file2 -p /sbin/ldconfig
%post -n libdrumstick-rt2 -p /sbin/ldconfig
-%postun -n libdrumstick-rt2 -p /sbin/ldconfig
%post -n libdrumstick-widgets2 -p /sbin/ldconfig
+%postun -n libdrumstick-alsa2 -p /sbin/ldconfig
+%postun -n libdrumstick-file2 -p /sbin/ldconfig
+%postun -n libdrumstick-rt2 -p /sbin/ldconfig
%postun -n libdrumstick-widgets2 -p /sbin/ldconfig
%files
++++++ drumstick-2.7.0.tar.bz2 -> drumstick-2.7.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/drumstick-2.7.0/CMakeLists.txt
new/drumstick-2.7.1/CMakeLists.txt
--- old/drumstick-2.7.0/CMakeLists.txt 2022-07-31 13:46:05.933458907 +0200
+++ new/drumstick-2.7.1/CMakeLists.txt 2022-08-14 12:57:49.251771218 +0200
@@ -15,10 +15,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
cmake_minimum_required(VERSION 3.14)
-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment
version")
project( Drumstick
- VERSION 2.7.0
+ VERSION 2.7.1
LANGUAGES CXX
DESCRIPTION "MIDI C++ Libraries for Qt"
HOMEPAGE_URL "https://sourceforge.net/p/drumstick/";
@@ -29,7 +28,7 @@
include(CTest)
include(GNUInstallDirs)
-set(RELEASE_DATE "Jul 31, 2022")
+set(RELEASE_DATE "August 14, 2022")
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
@@ -47,13 +46,14 @@
endif()
#[==[
+compiler and linker extra checks:
if(UNIX AND NOT APPLE)
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic")
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}
-Wl,--as-needed")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
-Wl,--as-needed -Wl,--no-undefined")
+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}
-Wl,--as-needed -Wl,-z,defs")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed
-Wl,-z,defs")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
-Wl,--as-needed -Wl,--no-undefined -Wl,-z,defs")
endif()
endif()
]==]
@@ -96,7 +96,7 @@
option(BUILD_FILE "Build the libdrumstick-file library" ON)
option(BUILD_RT "Build the libdrumstick-rt library" ON)
option(BUILD_WIDGETS "Build the libdrumstick-widgets library" ON)
-option(STATIC_DRUMSTICK "Build static libraries instead of dynamic" OFF)
+option(STATIC_DRUMSTICK "Build and link static libraries instead of shared"
OFF)
option(USE_DBUS "Include DBus support (required for RealtimeKit)"
${_DBUS_INIT})
option(USE_PULSEAUDIO "Build Sonivox RT backend (if PulseAudio is available)"
${_PULSE_INIT})
option(USE_FLUIDSYNTH "Build FluidSynth RT backend (if available)" ON)
@@ -125,6 +125,12 @@
set(CMAKE_FRAMEWORK ${BUILD_FRAMEWORKS})
endif()
+if (UNIX AND NOT APPLE)
+ if ((USE_PULSEAUDIO AND NOT USE_SONIVOX) OR (USE_SONIVOX AND NOT
USE_PULSEAUDIO))
+ message(FATAL_ERROR "Wrong combination of USE_SONIVOX and
USE_PULSEAUDIO options")
+ endif()
+endif()
+
if (USE_QT)
if (NOT (USE_QT EQUAL 5 OR USE_QT EQUAL 6))
message(FATAL_ERROR "Wrong Qt major version. Only 5 and 6 are valid
options")
@@ -164,7 +170,7 @@
if(Qt${QT_VERSION_MAJOR}Network_FOUND)
message(STATUS "Found QtNetwork version =
${Qt${QT_VERSION_MAJOR}Network_VERSION}")
else()
- message(STATUS "Warning: QtNetwork library not available. Network RT
backend won't be built.")
+ message(FATAL_ERROR "QtNetwork library not available. Network RT
backend can't be built.")
endif()
endif()
@@ -176,36 +182,34 @@
endif()
# ALSA Sequencer is only available on Linux
-if(${CMAKE_SYSTEM} MATCHES "Linux")
+if (BUILD_ALSA AND (${CMAKE_SYSTEM} MATCHES "Linux"))
pkg_check_modules(ALSA REQUIRED IMPORTED_TARGET alsa>=1.0.0)
if(ALSA_FOUND)
message(STATUS "Found ALSA version = ${ALSA_VERSION}")
+ else()
+ message(FATAL_ERROR "library libdrumstick-alsa requested, but ALSA
Sequencer was not found")
endif()
endif()
-if (BUILD_ALSA AND NOT ALSA_FOUND)
- message(FATAL_ERROR "library libdrumstick-alsa requested, but ALSA
Sequencer was not found")
-endif()
-
if(BUILD_RT AND PKG_CONFIG_FOUND AND UNIX AND NOT APPLE)
if (USE_PULSEAUDIO)
pkg_check_modules(PULSE QUIET IMPORTED_TARGET libpulse-simple)
- endif()
- if(PULSE_FOUND)
- message(STATUS "Found PulseAudio version = ${PULSE_VERSION}")
- else()
- message(STATUS "Warning: PulseAudio library not available. Sonivox RT
backend won't be built.")
+ if(PULSE_FOUND)
+ message(STATUS "Found PulseAudio version = ${PULSE_VERSION}")
+ else()
+ message(FATAL_ERROR "PulseAudio library not available. Sonivox RT
backend can't be built.")
+ endif()
endif()
endif()
if (BUILD_RT AND PKG_CONFIG_FOUND)
if (USE_FLUIDSYNTH)
pkg_check_modules(FLUIDSYNTH QUIET IMPORTED_TARGET fluidsynth>=1.1.1)
- endif()
- if(FLUIDSYNTH_FOUND)
- message(STATUS "Found FluidSynth version = ${FLUIDSYNTH_VERSION}")
- else()
- message(STATUS "Warning: FluidSynth library not available. FluidSynth
RT backend won't be built.")
+ if(FLUIDSYNTH_FOUND)
+ message(STATUS "Found FluidSynth version = ${FLUIDSYNTH_VERSION}")
+ else()
+ message(FATAL_ERROR "FluidSynth library not available. FluidSynth
RT backend can't be built.")
+ endif()
endif()
endif()
@@ -214,7 +218,7 @@
if(sonivox_FOUND)
message(STATUS "Found Sonivox version = ${sonivox_VERSION}")
else()
- message(STATUS "Warning: Sonivox library not available. EasSynth RT
backend won't be built.")
+ message(FATAL_ERROR "Sonivox library not available. SonivoxEas Synth
RT backend can't be built.")
endif()
endif()
@@ -226,7 +230,7 @@
endif()
# CMAKE_SYSTEM_PROCESSOR is broken on Windows with MSVC
-# cmake bug https://gitlab.kitware.com/cmake/cmake/-/issues/15170 still open
in 2022/04
+# cmake bug https://gitlab.kitware.com/cmake/cmake/-/issues/15170 still open
in 2022/08
if (MSVC)
string(TOLOWER ${MSVC_CXX_ARCHITECTURE_ID} CMAKE_SYSTEM_PROCESSOR)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/drumstick-2.7.0/ChangeLog
new/drumstick-2.7.1/ChangeLog
--- old/drumstick-2.7.0/ChangeLog 2022-07-31 13:46:05.937458916 +0200
+++ new/drumstick-2.7.1/ChangeLog 2022-08-14 12:57:49.255771227 +0200
@@ -1,3 +1,13 @@
+2022-08-14
+ * Release 2.7.1
+
+2022-08-13
+ * Fix for ticket #45: sonivox library dependency is optional, and easily
forgotten
+ * Fixed underlinking in some RT backends
+
+2022-07-31
+ * Release 2.7.0
+
2022-07-28
* ticket #44: removed sonivox library sources from the source tree
* new option USE_SONIVOX to let the user decide to build the sonivox
backend or not
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/drumstick-2.7.0/install.md
new/drumstick-2.7.1/install.md
--- old/drumstick-2.7.0/install.md 2022-07-31 13:46:05.937458916 +0200
+++ new/drumstick-2.7.1/install.md 2022-08-14 12:57:49.255771227 +0200
@@ -37,8 +37,8 @@
* macOS: CoreMIDI
* Windows: WinMM
* Unix: OSS
- * Synthesizers (output backends): SonivoxEAS, FluidSynth, Apple DLS Synth
- * All: Network - ipMIDI (IPv4, IPv6)
+ * Synthesizers (output backends): Sonivox, FluidSynth, Apple DLS Synth
+ * All: Network - ipMIDI (IPv4, IPv6): QtNetwork
* shared-mime-info 0.30
See http://freedesktop.org/wiki/Software/shared-mime-info
The utility "update-mime-database" must be executed after installing the
library "drumstick-file" and the "drumstick.xml" file. This is automatically
done by the cmake build system unless you defined DESTDIR. In this case, your
package manager should perform it as a post-install step.
@@ -136,12 +136,14 @@
-DUSE_NETWORK=YES|ON|1
Build the ipMIDI Network RT backend (default)
+Triggers a fatal error at configuration time if libQtNetwork is not available.
-DUSE_NETWORK=NO|OFF|0
Don't build the ipMIDI Network RT backend
-DUSE_PULSEAUDIO=YES|ON|1
Build the SonivoxEAS RT output backend (default)
+Triggers a fatal error at configuration time if libpulse-simple is not
available.
-DUSE_PULSEAUDIO=NO|OFF|0
Don't build the SonivoxEAS RT output backend
@@ -150,6 +152,7 @@
-DUSE_FLUIDSYNTH=YES|ON|1
Build the FluidSynth RT output backend (default)
+Triggers a fatal error at configuration time if libfluidsynth is not available.
-DUSE_FLUIDSYNTH=NO|OFF|0
Don't build the FluidSynth RT output backend
@@ -158,3 +161,10 @@
Choose which Qt major version (5 or 6) to prefer. By default (if not set) uses
whatever is found.
notes: Qt6 support is still experimental.
When using Qt6, the Core5Compat additional library is required for
Drumstick::File
+
+-DUSE_SONIVOX=YES|ON|1
+Build Sonivox RT backend (default)
+Triggers a fatal error at configuration time if libsonivox is not available.
+
+-DUSE_SONIVOX==NO|OFF|0
+Don't build SonivoxEAS RT output backend
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drumstick-2.7.0/library/rt-backends/alsa-in/CMakeLists.txt
new/drumstick-2.7.1/library/rt-backends/alsa-in/CMakeLists.txt
--- old/drumstick-2.7.0/library/rt-backends/alsa-in/CMakeLists.txt
2022-07-31 13:46:05.885458794 +0200
+++ new/drumstick-2.7.1/library/rt-backends/alsa-in/CMakeLists.txt
2022-08-14 12:57:49.207771125 +0200
@@ -51,6 +51,7 @@
target_link_libraries(drumstick-rt-alsa-in PRIVATE
Qt${QT_VERSION_MAJOR}::Core
Drumstick::ALSA
+ Drumstick::RT
)
set_target_properties(drumstick-rt-alsa-in PROPERTIES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drumstick-2.7.0/library/rt-backends/alsa-out/CMakeLists.txt
new/drumstick-2.7.1/library/rt-backends/alsa-out/CMakeLists.txt
--- old/drumstick-2.7.0/library/rt-backends/alsa-out/CMakeLists.txt
2022-07-31 13:46:05.889458802 +0200
+++ new/drumstick-2.7.1/library/rt-backends/alsa-out/CMakeLists.txt
2022-08-14 12:57:49.211771133 +0200
@@ -52,6 +52,7 @@
target_link_libraries(drumstick-rt-alsa-out PRIVATE
Qt${QT_VERSION_MAJOR}::Core
Drumstick::ALSA
+ Drumstick::RT
)
set_target_properties(drumstick-rt-alsa-out PROPERTIES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drumstick-2.7.0/library/rt-backends/eassynth/CMakeLists.txt
new/drumstick-2.7.1/library/rt-backends/eassynth/CMakeLists.txt
--- old/drumstick-2.7.0/library/rt-backends/eassynth/CMakeLists.txt
2022-07-31 13:46:05.885458794 +0200
+++ new/drumstick-2.7.1/library/rt-backends/eassynth/CMakeLists.txt
2022-08-14 12:57:49.207771125 +0200
@@ -34,6 +34,7 @@
Qt${QT_VERSION_MAJOR}::Core
PkgConfig::PULSE
sonivox::sonivox
+ Drumstick::RT
)
target_include_directories(drumstick-rt-eassynth PRIVATE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drumstick-2.7.0/library/rt-backends/oss-in/CMakeLists.txt
new/drumstick-2.7.1/library/rt-backends/oss-in/CMakeLists.txt
--- old/drumstick-2.7.0/library/rt-backends/oss-in/CMakeLists.txt
2022-07-31 13:46:05.893458813 +0200
+++ new/drumstick-2.7.1/library/rt-backends/oss-in/CMakeLists.txt
2022-08-14 12:57:49.211771133 +0200
@@ -59,6 +59,7 @@
target_link_libraries(drumstick-rt-oss-in PRIVATE
Qt${QT_VERSION_MAJOR}::Core
+ Drumstick::RT
)
set_target_properties(drumstick-rt-oss-in PROPERTIES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drumstick-2.7.0/library/rt-backends/oss-out/CMakeLists.txt
new/drumstick-2.7.1/library/rt-backends/oss-out/CMakeLists.txt
--- old/drumstick-2.7.0/library/rt-backends/oss-out/CMakeLists.txt
2022-07-31 13:46:05.893458813 +0200
+++ new/drumstick-2.7.1/library/rt-backends/oss-out/CMakeLists.txt
2022-08-14 12:57:49.215771141 +0200
@@ -54,6 +54,7 @@
target_link_libraries(drumstick-rt-oss-out PRIVATE
Qt${QT_VERSION_MAJOR}::Core
+ Drumstick::RT
)
set_target_properties(drumstick-rt-oss-out PROPERTIES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drumstick-2.7.0/utils/drumgrid/drumstick-drumgrid.metainfo.xml
new/drumstick-2.7.1/utils/drumgrid/drumstick-drumgrid.metainfo.xml
--- old/drumstick-2.7.0/utils/drumgrid/drumstick-drumgrid.metainfo.xml
2022-07-31 13:46:05.913458860 +0200
+++ new/drumstick-2.7.1/utils/drumgrid/drumstick-drumgrid.metainfo.xml
2022-08-14 12:57:49.231771176 +0200
@@ -25,6 +25,9 @@
</screenshots>
<releases>
+ <release version="2.7.1" date="2022-08-14" />
+ <release version="2.7.0" date="2022-07-31" />
+ <release version="2.6.1" date="2022-05-20" />
<release version="2.6.0" date="2022-04-04" />
<release version="2.5.1" date="2022-02-07" />
</releases>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drumstick-2.7.0/utils/guiplayer/drumstick-guiplayer.metainfo.xml
new/drumstick-2.7.1/utils/guiplayer/drumstick-guiplayer.metainfo.xml
--- old/drumstick-2.7.0/utils/guiplayer/drumstick-guiplayer.metainfo.xml
2022-07-31 13:46:05.913458860 +0200
+++ new/drumstick-2.7.1/utils/guiplayer/drumstick-guiplayer.metainfo.xml
2022-08-14 12:57:49.231771176 +0200
@@ -25,6 +25,9 @@
</screenshots>
<releases>
+ <release version="2.7.1" date="2022-08-14" />
+ <release version="2.7.0" date="2022-07-31" />
+ <release version="2.6.1" date="2022-05-20" />
<release version="2.6.0" date="2022-04-04" />
<release version="2.5.1" date="2022-02-07" />
</releases>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/drumstick-2.7.0/utils/vpiano/drumstick-vpiano.metainfo.xml
new/drumstick-2.7.1/utils/vpiano/drumstick-vpiano.metainfo.xml
--- old/drumstick-2.7.0/utils/vpiano/drumstick-vpiano.metainfo.xml
2022-07-31 13:46:05.913458860 +0200
+++ new/drumstick-2.7.1/utils/vpiano/drumstick-vpiano.metainfo.xml
2022-08-14 12:57:49.231771176 +0200
@@ -25,6 +25,9 @@
</screenshots>
<releases>
+ <release version="2.7.1" date="2022-08-14" />
+ <release version="2.7.0" date="2022-07-31" />
+ <release version="2.6.1" date="2022-05-20" />
<release version="2.6.0" date="2022-04-04" />
<release version="2.5.1" date="2022-02-07" />
</releases>
