Hello community, here is the log from the commit of package hydrogen for openSUSE:Factory checked in at 2020-11-17 21:26:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hydrogen (Old) and /work/SRC/openSUSE:Factory/.hydrogen.new.24930 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hydrogen" Tue Nov 17 21:26:06 2020 rev:41 rq:848907 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/hydrogen/hydrogen.changes 2020-07-03 00:04:02.706404323 +0200 +++ /work/SRC/openSUSE:Factory/.hydrogen.new.24930/hydrogen.changes 2020-11-17 21:26:09.677429936 +0100 @@ -1,0 +2,31 @@ +Sun Nov 15 11:46:57 UTC 2020 - [email protected] + +- Update to version 1.0.1 + * Fixed compilation with libtar + * Fixed jack transport tempo drift when using non-integer bpm values + * Disabled "development mode" warning + * Fix crash on saving ladspa settings + * Added manual + tutorial files to Windows and OS X Installers + +- Update to version 1.0.0 + * QT5 support + * MIDI feedback + * OSC support (incl. feedback) + * Playback track + * Menu redesign + * Note probability property + * Velocity automation + * Full screen mode + * New default kit: GMRockKit + +- Add fix-obsolete-appdata.patch +- Add fix-version-soversion.patch (replaces hydrogen-0.9.6-lib64.patch) +- Remove hydrogen-no-current-time.patch (__DATE__ and __TIME__ + are considered by SOURCE_DATE_EPOCH and the compiler) +- Remove hydrogen-fix-qt5.15.patch (fixed upstream) +- Remove hydrogen-gcc47.patch (obsolete) +- Remove hydrogen-0.9.6-lib64.patch (obsolete) +- h2cli.1 is now created during %install +- Clean up spec file + +------------------------------------------------------------------- Old: ---- COPYING _service _servicedata h2cli.1 hydrogen-0.9.6-lib64.patch hydrogen-0.99+git20200527.tar.xz hydrogen-fix-qt5.15.patch hydrogen-gcc47.patch hydrogen-no-current-time.patch New: ---- fix-obsolete-appdata.patch fix-version-soversion.patch hydrogen-1.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hydrogen.spec ++++++ --- /var/tmp/diff_new_pack.tAKazL/_old 2020-11-17 21:26:10.613430865 +0100 +++ /var/tmp/diff_new_pack.tAKazL/_new 2020-11-17 21:26:10.617430869 +0100 @@ -17,69 +17,68 @@ %define soversion 1 -%define soage 0 -%define sorevision 0 -%define tarvers 1.0.0 -# WARNING: ATM librubberband2 support is experimental currently it is recommended that you disable -# this config option to ensure backwards compatibility with songs created under 0.9.5 which use -# rubberband. Use the rubberband -cli package instead. -%define librubberband 0 +%bcond_with lash +# The use of librubberband2 is marked as experimental. +# Because the current implementation produce wrong timing! +# So long this bug isn't solved, please disable this option. +# If rubberband-cli is installed, the hydrogen rubberband-function +# will work properly as expected. +%bcond_with librubberband + Name: hydrogen -Version: 0.99+git20200527 +Version: 1.0.1 Release: 0 Summary: A Real-Time Drum Machine and Sequencer -# NOTE: Don't forget to update the libsuffix macro. License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Midi URL: http://www.hydrogen-music.org/ -# https://github.com/hydrogen-music/%%{name}/archive/%%{tarvers}-beta2.tar.gz -Source0: %{name}-%{version}.tar.xz -Source1: h2cli.1 -Source2: COPYING -# Remove current date and time from sources. -Patch1: hydrogen-no-current-time.patch -# libhydrogencore has no soname and installs in _libexecdir -Patch2: hydrogen-0.9.6-lib64.patch -# PATCH-FIX-UPSTREAM hydrogen-gcc47.patch [email protected] -- Fix build with gcc 4.7. -Patch3: hydrogen-gcc47.patch -Patch4: hydrogen-fix-qt5.15.patch +Source0: https://github.com/hydrogen-music/hydrogen/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: fix-version-soversion.patch +Patch1: fix-obsolete-appdata.patch BuildRequires: cmake -BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: gcc-c++ BuildRequires: help2man BuildRequires: hicolor-icon-theme BuildRequires: ladspa BuildRequires: ladspa-devel +BuildRequires: libtar-devel BuildRequires: pkgconfig +BuildRequires: portmidi-devel BuildRequires: update-desktop-files -BuildRequires: util-linux +BuildRequires: cmake(Qt5Concurrent) +BuildRequires: cmake(Qt5Core) >= 5.6 +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5OpenGL) +BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Test) -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Core) >= 5.6 -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5OpenGL) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: pkgconfig(Qt5XmlPatterns) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5X11Extras) +BuildRequires: cmake(Qt5Xml) +BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(flac) -BuildRequires: pkgconfig(flac++) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libarchive) +BuildRequires: pkgconfig(liblo) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(lrdf) BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(raptor2) BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(zlib) -#pkgconfig(ladspa-1.13) -%if 0%{?librubberband} == 1 +%if 0%{?suse_version} <= 1500 +BuildRequires: gcc9 +BuildRequires: gcc9-c++ +%else +BuildRequires: gcc-c++ +%endif +%if %{with lash} +BuildRequires: pkgconfig(lash-1.0) +%endif +%if %{with librubberband} BuildRequires: pkgconfig(rubberband) %else BuildRequires: rubberband-cli @@ -115,106 +114,70 @@ %package -n libhydrogen-core-devel Summary: Development files and headers for libhydrogen-core Group: Development/Libraries/C and C++ -Requires: libhydrogen-core%{soversion} = %{version}-%{release} +Requires: libhydrogen-core%{soversion} = %{version} %description -n libhydrogen-core-devel These are the headers needed to develop apps that link with libhydrogen-core. %prep -%setup -q - -%autopatch -p1 - -# copy licence with correct fsf address -install -m 0644 %{SOURCE2} ./ +%autosetup -p1 %build -%cmake \ - -DWANT_SHARED:BOOL=on \ - -DWANT_LIBARCHIVE:BOOL=on \ - -DWANT_LRDF:BOOL=off \ - -DLADSPA_INCLUDE_DIR:PATH=%{_includedir} \ - -DLADSPA_LIBRARIES:PATH=%{_libdir}/ladspa \ - -DCMAKE_CURRENT_LIBRARY_DIR:PATH="%{_lib}" \ - -Dcoreversion:STRING=%{soversion} \ - -Dsoage:STRING=%{soage} \ - -Dsorevision:STRING=%{sorevision} - -# For some reason cmake won't produce a correct soname with only the version so this is a hack to fix it. -pushd src/core/CMakeFiles/hydrogen-core.dir && \ -cat link.txt|sed 's/-soname,libhydrogen-core.so.%{tarvers}/-soname,libhydrogen-core.so.%{soversion}/'>\ -link.txt~;mv link.txt~ link.txt +export LADSPA_PATH=%{_libdir}/ladspa -cat relink.txt|sed 's/-soname,libhydrogen-core.so.%{tarvers}/-soname,libhydrogen-core.so.%{soversion}/'>\ -relink.txt~;mv relink.txt~ relink.txt - -popd +%cmake \ +%if 0%{?suse_version} <= 1500 + -DCMAKE_C_COMPILER=gcc-9 \ + -DCMAKE_CXX_COMPILER=g++-9 \ +%endif +%if %{with lash} + -DWANT_LASH:BOOL=ON \ +%endif + -DWANT_LIBARCHIVE:BOOL=ON \ + -DWANT_LRDF:BOOL=ON \ + -DWANT_PORTAUDIO:BOOL=ON \ + -DWANT_PORTMIDI:BOOL=ON \ +%if %{with librubberband} + -DWANT_RUBBERBAND:BOOL=ON \ +%endif + -DWANT_SHARED:BOOL=ON -make %{?_smp_mflags} +%cmake_build %install - -%cmake_install VERBOSE_MAKEFILE=1 -mkdir -p %{buildroot}%{_libdir} && cp -v build/src/core/libhydrogen-core.so.%{tarvers} %{buildroot}%{_libdir}/ -# libhydrogen-core's internal SONAME = libhydrogen-core.so.0 so we provide a link. -pushd %{buildroot}%{_libdir} && ln -s libhydrogen-core.so.%{tarvers} libhydrogen-core.so.%{soversion} -ln -s libhydrogen-core.so.%{tarvers} libhydrogen-core.so -popd +%cmake_install # Install the h2cli man page created by help2man -mkdir -p %{buildroot}%{_mandir}/man1 -install -pm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/ +install -d -m 0755 %{buildroot}%{_mandir}/man1 +LD_LIBRARY_PATH=%{buildroot}%{_libdir} \ + help2man -N -o %{buildroot}%{_mandir}/man1/h2cli.1 %{buildroot}%{_bindir}/h2cli -# temporary link i18n files from usr/share/hydrogen/data/i18n to _datadir/locale for find_lang to find. -ln -s %{_datadir}/hydrogen/data/i18n %{buildroot}%{_datadir}/locale -%find_lang %{name} %{name}.lang --without-kde --with-qt --all-name --without-mo -rm -rf %{buildroot}%{_datadir}/locale -cat %{name}.lang - -# Set executable bit on scripts in buildroot/_datadir/name/data/i18n -for i in $(find %{buildroot}%{_datadir}/hydrogen/data/i18n -type f -perm 0644 -print0|xargs -0r grep -l '#!'); \ -do chmod 0755 ${i}; done -rm -f %{buildroot}%{_datadir}/hydrogen/data/i18n/stats.py +%suse_update_desktop_file -i org.hydrogenmusic.Hydrogen AudioVideo Sequencer %fdupes -s %{buildroot}%{_datadir} -# Make icon avalable for desktop file -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ \ -&& pushd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ -ln -s ../../../../%{name}/data/img/gray/h2-icon.svg h2-icon.svg -#usr/share/hydrogen/data/img/gray/h2-icon.svg -popd && %suse_update_desktop_file -i org.hydrogenmusic.Hydrogen AudioVideo Sequencer - -%post -%desktop_database_post - -%postun -%desktop_database_postun +%find_lang %{name} --with-qt %files -f %{name}.lang -%{_bindir}/* -%doc AUTHORS ChangeLog README.txt %license COPYING -%dir %{_datadir}/%{name}/* -%dir %{_datadir}/%{name} -%dir %{_datadir}/appdata -%{_mandir}/man1/hydrogen.1%{ext_man} -%{_mandir}/man1/h2cli.1%{ext_man} -%{_datadir}/%{name}/data/* -%{_datadir}/appdata/org.hydrogenmusic.Hydrogen.appdata.xml +%doc AUTHORS ChangeLog README.txt +%{_bindir}/* +%{_datadir}/%{name} %{_datadir}/applications/org.hydrogenmusic.Hydrogen.desktop %{_datadir}/icons/hicolor/scalable/apps/*.svg +%{_datadir}/metainfo/org.hydrogenmusic.Hydrogen.appdata.xml +%{_mandir}/man1/h2cli.1%{?ext_man} +%{_mandir}/man1/hydrogen.1%{?ext_man} %post -n libhydrogen-core%{soversion} -p /sbin/ldconfig %postun -n libhydrogen-core%{soversion} -p /sbin/ldconfig %files -n libhydrogen-core%{soversion} -%{_libdir}/libhydrogen-core.so.%{soversion}* +%{_libdir}/libhydrogen-core.so.* %files -n libhydrogen-core-devel -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/* +%{_includedir}/%{name} %{_libdir}/libhydrogen-core.so %changelog ++++++ fix-obsolete-appdata.patch ++++++ --- a/CMakeLists.txt 2020-09-01 00:04:40.000000000 +0200 +++ b/CMakeLists.txt 2020-11-15 10:56:57.712801770 +0100 @@ -386,7 +386,7 @@ ELSE() INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE) ENDIF() IF(NOT MINGW AND NOT APPLE) - INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") + INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg") INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") ++++++ fix-version-soversion.patch ++++++ diff -ruNp a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt --- a/src/cli/CMakeLists.txt 2020-11-15 10:37:03.118744237 +0100 +++ b/src/cli/CMakeLists.txt 2020-11-15 10:39:45.716304655 +0100 @@ -13,12 +13,12 @@ ADD_EXECUTABLE(h2cli WIN32 MACOSX_BUNDLE SET_PROPERTY(TARGET h2cli PROPERTY CXX_STANDARD 14) TARGET_LINK_LIBRARIES(h2cli - hydrogen-core-${VERSION} + hydrogen-core Qt5::Widgets ${LASH_LIBRARIES} ${OSC_LIBRARIES} ) -ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION}) +ADD_DEPENDENCIES(h2cli hydrogen-core) INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) diff -ruNp a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt --- a/src/core/CMakeLists.txt 2020-11-15 10:37:20.174488458 +0100 +++ b/src/core/CMakeLists.txt 2020-11-15 10:41:05.147112335 +0100 @@ -5,7 +5,7 @@ FILE(GLOB_RECURSE hydrogen_INCLUDES incl FILE(GLOB_RECURSE hydrogen_SOURCES src/*.cpp src/*.cc src/*.c) LIST(APPEND hydrogen_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h) -ADD_LIBRARY( hydrogen-core-${VERSION} ${H2CORE_LIBRARY_TYPE} ${hydrogen_SOURCES}) +ADD_LIBRARY( hydrogen-core ${H2CORE_LIBRARY_TYPE} ${hydrogen_SOURCES}) INCLUDE_DIRECTORIES( include ${CMAKE_SOURCE_DIR}/include # regular headers ${CMAKE_CURRENT_BINARY_DIR}/include # generated config.h @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( include ${RUBBERBAND_INCLUDE_DIRS} ) -TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION} +TARGET_LINK_LIBRARIES(hydrogen-core ${LIBTAR_LIBRARIES} ${LIBARCHIVE_LIBRARIES} ${LIBSNDFILE_LIBRARIES} @@ -48,16 +48,17 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE ${OSC_LIBRARIES} ) -TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION} +TARGET_LINK_LIBRARIES(hydrogen-core Qt5::Core Qt5::Xml Qt5::XmlPatterns ) -#SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER "${hydrogen_INCLUDES}" ) -SET_PROPERTY(TARGET hydrogen-core-${VERSION} PROPERTY CXX_STANDARD 14) +#SET_TARGET_PROPERTIES(hydrogen-core PROPERTIES PUBLIC_HEADER "${hydrogen_INCLUDES}" ) +#SET_PROPERTY(TARGET hydrogen-core PROPERTY CXX_STANDARD 14) +set_target_properties(hydrogen-core PROPERTIES VERSION ${VERSION} SOVERSION ${VERSION_MAJOR} CXX_STANDARD 14) -INSTALL(TARGETS hydrogen-core-${VERSION} +INSTALL(TARGETS hydrogen-core LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" # do not copy directory hierarchy diff -ruNp a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt --- a/src/gui/CMakeLists.txt 2020-11-15 10:36:46.978986286 +0100 +++ b/src/gui/CMakeLists.txt 2020-11-15 10:41:35.950649943 +0100 @@ -58,9 +58,9 @@ if(APPLE) endif() TARGET_LINK_LIBRARIES(hydrogen - hydrogen-core-${VERSION} + hydrogen-core Qt5::Widgets ) -ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION}) +ADD_DEPENDENCIES(hydrogen hydrogen-core) INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) diff -ruNp a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt --- a/src/player/CMakeLists.txt 2020-11-15 10:36:54.742869851 +0100 +++ b/src/player/CMakeLists.txt 2020-11-15 10:41:51.658414153 +0100 @@ -11,10 +11,10 @@ ADD_EXECUTABLE(h2player WIN32 MACOSX_BUN SET_PROPERTY(TARGET h2player PROPERTY CXX_STANDARD 14) TARGET_LINK_LIBRARIES(h2player - hydrogen-core-${VERSION} + hydrogen-core Qt5::Widgets ) -ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION}) +ADD_DEPENDENCIES(h2player hydrogen-core) INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) diff -ruNp a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt --- a/src/tests/CMakeLists.txt 2020-11-15 10:37:11.334621029 +0100 +++ b/src/tests/CMakeLists.txt 2020-11-15 10:42:10.274134708 +0100 @@ -14,10 +14,10 @@ add_executable(tests ${TESTS_SRCS}) SET_PROPERTY(TARGET tests PROPERTY CXX_STANDARD 14) target_link_libraries(tests - hydrogen-core-${VERSION} + hydrogen-core ${CPPUNIT_LIBRARIES} Qt5::Core Qt5::Test ) -add_dependencies(tests hydrogen-core-${VERSION}) +add_dependencies(tests hydrogen-core) _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
