[packages/hydrogen] - updated to 1.2.3

qboosh qboosh at pld-linux.org
Thu Sep 26 18:21:05 CEST 2024


commit b43a5d721932226f52878420f9e3114d4cc965c7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 26 18:24:03 2024 +0200

    - updated to 1.2.3

 hydrogen.spec | 223 +++++++++++++++++++++++++---------------------------------
 mandir.patch  |  12 ----
 2 files changed, 97 insertions(+), 138 deletions(-)
---
diff --git a/hydrogen.spec b/hydrogen.spec
index 1809e12..d9cb073 100644
--- a/hydrogen.spec
+++ b/hydrogen.spec
@@ -1,67 +1,66 @@
-#
-# TODO:
-#	- fix localized manuals build
+# TODO: documentation? (submodule: https://github.com/hydrogen-music/documentation)
 #
 # Conditional build:
-%bcond_without	tests		# build with tests
-
+%bcond_with	rubberband	# RubberBand support (unadvised as of 1.2.3)
+%bcond_without	tests		# test suite
 
-%define beta	beta1
-%define rel	1
 Summary:	Pattern based drum machine
 Summary(pl.UTF-8):	Automat perkusyjny
 Name:		hydrogen
-Version:	1.0.0
-Release:	0.%{beta}.%{rel}
-License:	GPL v2, zlib (TinyXML Library)
+Version:	1.2.3
+Release:	1
+License:	GPL v2+
 Group:		X11/Applications/Sound
-Source0:	http://downloads.sourceforge.net/hydrogen/%{name}-%{version}-%{beta}.tar.gz
-# Source0-md5:	788540070d1874473fd1019e9de73f4b
-Patch0:		mandir.patch
-URL:		http://www.hydrogen-music.org/
-# BuildRequires:	portaudio-devel < 19
-BuildRequires:	Qt5Network-devel
-BuildRequires:	Qt5Gui-devel
-BuildRequires:	Qt5Core-devel
-BuildRequires:	Qt5Widgets-devel
-BuildRequires:	Qt5Xml-devel
-BuildRequires:	Qt5XmlPatterns-devel
+Source0:	https://downloads.sourceforge.net/hydrogen/%{name}-%{version}.tar.gz
+# Source0-md5:	6fb1fab7ecbad534b1fb6087edcf0beb
+URL:		http://hydrogen-music.org/
+BuildRequires:	Qt5Core-devel >= 5
+BuildRequires:	Qt5Gui-devel >= 5
+BuildRequires:	Qt5Network-devel >= 5
+BuildRequires:	Qt5Svg-devel >= 5
+BuildRequires:	Qt5Test-devel >= 5
+BuildRequires:	Qt5Widgets-devel >= 5
+BuildRequires:	Qt5Xml-devel >= 5
+BuildRequires:	Qt5XmlPatterns-devel >= 5
 BuildRequires:	alsa-lib-devel >= 1.0.0
-BuildRequires:	cmake >= 2.8.11
+BuildRequires:	cmake >= 3.8
 %{?with_tests:BuildRequires:	cppunit-devel}
 BuildRequires:	jack-audio-connection-kit-devel >= 0.103.0
 BuildRequires:	ladspa-devel
 BuildRequires:	lash-devel >= 0.5.0
+# or libtar-devel, but libarchive is preferred
 BuildRequires:	libarchive-devel
 BuildRequires:	liblo-devel
 BuildRequires:	liblrdf-devel
 BuildRequires:	libsndfile-devel >= 1.0.18
 BuildRequires:	pkgconfig
+BuildRequires:	portaudio-devel >= 19
 BuildRequires:	portmidi-devel
 BuildRequires:	pulseaudio-devel
-BuildRequires:	rubberband-devel
-BuildRequires:	qt5-build
-BuildRequires:	qt5-linguist
-# for translated manuals
-#BuildRequires:	gnome-doc-utils
-#BuildRequires:	kde4-poxml
-#BuildRequires:	libxml2-progs
-#BuildRequires:	xmlto
-Obsoletes:	hydrogen-doc
+%{?with_rubberband:BuildRequires:	rubberband-devel}
+BuildRequires:	qt5-build >= 5
+BuildRequires:	qt5-linguist >= 5
+BuildRequires:	rpmbuild(macros) >= 1.605
+BuildRequires:	zlib-devel
+%if %{with tests} && %(grep '^/dev/shm' /proc/mounts ; echo $?)
+# tests fail without /dev/shm
+BuildRequires:	mounted(/dev/shm)
+%endif
+Obsoletes:	hydrogen-doc < 1
 # drumkits can be installed from the application
-Obsoletes:	hydrogen-drumkits
-Obsoletes:	hydrogen-drumkits-3355606
-Obsoletes:	hydrogen-drumkits-DrumkitPack1
-Obsoletes:	hydrogen-drumkits-DrumkitPack2
-Obsoletes:	hydrogen-drumkits-EasternHop-1
-Obsoletes:	hydrogen-drumkits-Electric-Empire-Kit
-Obsoletes:	hydrogen-drumkits-ErnysPercussion
-Obsoletes:	hydrogen-drumkits-HardElectro1
-Obsoletes:	hydrogen-drumkits-Millo-Drums_v.1
-Obsoletes:	hydrogen-drumkits-Millo-MultiLayered2
-Obsoletes:	hydrogen-drumkits-TD-7
-Obsoletes:	hydrogen-drumkits-UltraAcousticKit
-Obsoletes:	hydrogen-drumkits-Yamaha-Vintage-Kit
+Obsoletes:	hydrogen-drumkits < 1.0-5
+Obsoletes:	hydrogen-drumkits-3355606 < 1.0-5
+Obsoletes:	hydrogen-drumkits-DrumkitPack1 < 1.0-5
+Obsoletes:	hydrogen-drumkits-DrumkitPack2 < 1.0-5
+Obsoletes:	hydrogen-drumkits-EasternHop-1 < 1.0-5
+Obsoletes:	hydrogen-drumkits-Electric-Empire-Kit < 1.0-5
+Obsoletes:	hydrogen-drumkits-ErnysPercussion < 1.0-5
+Obsoletes:	hydrogen-drumkits-HardElectro1 < 1.0-5
+Obsoletes:	hydrogen-drumkits-Millo-Drums_v.1 < 1.0-5
+Obsoletes:	hydrogen-drumkits-Millo-MultiLayered2 < 1.0-5
+Obsoletes:	hydrogen-drumkits-TD-7 < 1.0-5
+Obsoletes:	hydrogen-drumkits-UltraAcousticKit < 1.0-5
+Obsoletes:	hydrogen-drumkits-Yamaha-Vintage-Kit < 1.0-5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -75,28 +74,27 @@ GNU/Linuksa. Celem programu jest umożliwienie w prosty i szybki sposób
 tworzenia paternów rytmicznych.
 
 %prep
-%setup -q -n %{name}-%{version}-%{beta}
-%patch0 -p1
+%setup -q
 
 %build
 mkdir build
 cd build
 %cmake .. \
-	-DWANT_DEBUG=%{debug} \
-	-DWANT_JACK=1 \
-	-DWANT_ALSA=1 \
-	-DWANT_LIBARCHIVE=1 \
-	-DWANT_RUBBERBAND=1 \
-	-DWANT_OSS=0 \
-	-DWANT_PORTAUDIO=0 \
-	-DWANT_PORTMIDI=1 \
-	-DWANT_LASH=1 \
-	-DWANT_LRDF=1 \
-	-DWANT_COREAUDIO=0 \
-	-DWANT_COREMIDI=0 \
-	-DWANT_LADSPA=1 \
 	-DLADSPA_INCLUDE_DIR=/usr/include \
-	-DLADSPA_LIBRARIES=%{_libdir}/ladspa
+	-DLADSPA_LIBRARIES=%{_libdir}/ladspa \
+	-DWANT_ALSA=ON \
+	-DWANT_COREAUDIO=OFF \
+	-DWANT_COREMIDI=OFF \
+	-DWANT_DEBUG=%{debug} \
+	-DWANT_JACK=ON \
+	-DWANT_LADSPA=ON \
+	-DWANT_LASH=ON \
+	-DWANT_LIBARCHIVE=ON \
+	-DWANT_LRDF=ON \
+	-DWANT_OSS=ON \
+	-DWANT_PORTAUDIO=ON \
+	-DWANT_PORTMIDI=ON \
+	%{?with_rubberband:-DWANT_RUBBERBAND=ON}
 
 %{__make}
 cd ..
@@ -113,88 +111,61 @@ install -d $RPM_BUILD_ROOT%{_pixmapsdir}
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -p $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/img/gray/h2-icon.svg $RPM_BUILD_ROOT%{_pixmapsdir}/h2-icon.svg
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/hydrogen
 
-rm -rf $RPM_BUILD_ROOT%{_includedir}/hydrogen
-rm -rf $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/i18n/{stats.py,updateTranslations.sh}
-
-# clean up documentation
-rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README.md,TODO}
-rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,po,pot}
-rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/img/*.h2song
-rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/i18n/*.ts
-
-%post	-p /sbin/ldconfig
+# unify
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/i18n/hydrogen_{hu_HU,hu}.qm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README.txt
-%attr(755,root,root) %{_bindir}/*
-%doc data/doc/README.md
+%doc AUTHORS ChangeLog README.md
+%attr(755,root,root) %{_bindir}/h2cli
+%attr(755,root,root) %{_bindir}/h2player
+%attr(755,root,root) %{_bindir}/hydrogen
 %attr(755,root,root) %{_libdir}/libhydrogen-core-%{version}.so
-
 %dir %{_datadir}/hydrogen
 %dir %{_datadir}/hydrogen/data
-%dir %{_datadir}/hydrogen/data/demo_songs
-%dir %{_datadir}/hydrogen/data/i18n
-
 %{_datadir}/hydrogen/data/*.conf
-%{_datadir}/hydrogen/data/*.h2song
 %{_datadir}/hydrogen/data/*.wav
 %{_datadir}/hydrogen/data/drumkits
 %{_datadir}/hydrogen/data/img
+%{_datadir}/hydrogen/data/new_tutorial
+%{_datadir}/hydrogen/data/themes
 %{_datadir}/hydrogen/data/xsd
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.svg
+%{_datadir}/metainfo/org.hydrogenmusic.Hydrogen.metainfo.xml
+%{_desktopdir}/org.hydrogenmusic.Hydrogen.desktop
+%{_iconsdir}/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg
+%{_mandir}/man1/hydrogen.1*
 
 # demo songs
-%{_datadir}/hydrogen/data/demo_songs/*.h2song
+%{_datadir}/hydrogen/data/demo_songs
 
 # translations
-%lang(ca) %{_datadir}/hydrogen/data/i18n/%{name}.ca.qm
-%lang(cs) %{_datadir}/hydrogen/data/i18n/%{name}.cs.qm
-%lang(de) %{_datadir}/hydrogen/data/i18n/%{name}.de.qm
-%lang(el) %{_datadir}/hydrogen/data/i18n/%{name}.el.qm
-%lang(es) %{_datadir}/hydrogen/data/i18n/%{name}.es.qm
-%lang(fr) %{_datadir}/hydrogen/data/i18n/%{name}.fr.qm
-%lang(gl) %{_datadir}/hydrogen/data/i18n/%{name}.gl.qm
-%lang(hu) %{_datadir}/hydrogen/data/i18n/%{name}.hu_HU.qm
-%lang(hr) %{_datadir}/hydrogen/data/i18n/%{name}.hr.qm
-%lang(it) %{_datadir}/hydrogen/data/i18n/%{name}.it.qm
-%lang(ja) %{_datadir}/hydrogen/data/i18n/%{name}.ja.qm
-%lang(nl) %{_datadir}/hydrogen/data/i18n/%{name}.nl.qm
-%lang(pl) %{_datadir}/hydrogen/data/i18n/%{name}.pl.qm
-%lang(pt_BR) %{_datadir}/hydrogen/data/i18n/%{name}.pt_BR.qm
-%lang(ru) %{_datadir}/hydrogen/data/i18n/%{name}.ru.qm
-%lang(sr) %{_datadir}/hydrogen/data/i18n/%{name}.sr.qm
-%lang(sv) %{_datadir}/hydrogen/data/i18n/%{name}.sv.qm
-%lang(uk) %{_datadir}/hydrogen/data/i18n/%{name}.uk.qm
-
-%{_mandir}/man1/hydrogen.1*
-%{_datadir}/appdata/*.xml
-
-%dir %{_datadir}/hydrogen/data/doc
-%dir %{_datadir}/hydrogen/data/doc/img
-
-%{_datadir}/hydrogen/data/doc/MidiInstrumentMapping.ods
-
-# images
-%lang(nl) %{_datadir}/hydrogen/data/doc/img/nl
-%{_datadir}/hydrogen/data/doc/img/*.png
-%{_datadir}/hydrogen/data/doc/img_tutorial
-
-# multilang manual & tutorial
-#%lang(ca) %{_datadir}/hydrogen/data/doc/manual_ca.html
-#%lang(es) %{_datadir}/hydrogen/data/doc/manual_es.html
-#%lang(fr) %{_datadir}/hydrogen/data/doc/manual_fr.html
-#%lang(it) %{_datadir}/hydrogen/data/doc/manual_it.html
-#%lang(nl) %{_datadir}/hydrogen/data/doc/manual_nl.html
-%{_datadir}/hydrogen/data/doc/manual.html
-%{_datadir}/hydrogen/data/doc/manual_en.html
-
-%dir %{_datadir}/hydrogen/data/new_tutorial
-%{_datadir}/hydrogen/data/new_tutorial/img_tutorial
-%{_datadir}/hydrogen/data/new_tutorial/tutorial_en.html
+%dir %{_datadir}/hydrogen/data/i18n
+%lang(ca) %{_datadir}/hydrogen/data/i18n/%{name}_ca.qm
+%lang(cs) %{_datadir}/hydrogen/data/i18n/%{name}_cs.qm
+%lang(de) %{_datadir}/hydrogen/data/i18n/%{name}_de.qm
+%lang(el) %{_datadir}/hydrogen/data/i18n/%{name}_el.qm
+%lang(en) %{_datadir}/hydrogen/data/i18n/%{name}_en.qm
+%lang(en) %{_datadir}/hydrogen/data/i18n/%{name}_en_GB.qm
+%lang(es) %{_datadir}/hydrogen/data/i18n/%{name}_es.qm
+%lang(fr) %{_datadir}/hydrogen/data/i18n/%{name}_fr.qm
+%lang(gl) %{_datadir}/hydrogen/data/i18n/%{name}_gl.qm
+%lang(hr) %{_datadir}/hydrogen/data/i18n/%{name}_hr.qm
+%lang(hu) %{_datadir}/hydrogen/data/i18n/%{name}_hu.qm
+%lang(it) %{_datadir}/hydrogen/data/i18n/%{name}_it.qm
+%lang(ja) %{_datadir}/hydrogen/data/i18n/%{name}_ja.qm
+%lang(nl) %{_datadir}/hydrogen/data/i18n/%{name}_nl.qm
+%lang(pl) %{_datadir}/hydrogen/data/i18n/%{name}_pl.qm
+%lang(pt_BR) %{_datadir}/hydrogen/data/i18n/%{name}_pt_BR.qm
+%lang(ru) %{_datadir}/hydrogen/data/i18n/%{name}_ru.qm
+%lang(sr) %{_datadir}/hydrogen/data/i18n/%{name}_sr.qm
+%lang(sv) %{_datadir}/hydrogen/data/i18n/%{name}_sv.qm
+%lang(uk) %{_datadir}/hydrogen/data/i18n/%{name}_uk.qm
+%lang(zh_CN) %{_datadir}/hydrogen/data/i18n/%{name}_zh_CN.qm
diff --git a/mandir.patch b/mandir.patch
deleted file mode 100644
index 2e07ffe..0000000
--- a/mandir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur hydrogen-1.0.0-beta1.orig/CMakeLists.txt hydrogen-1.0.0-beta1/CMakeLists.txt
---- hydrogen-1.0.0-beta1.orig/CMakeLists.txt	2018-03-18 12:50:43.000000000 +0100
-+++ hydrogen-1.0.0-beta1/CMakeLists.txt	2019-04-18 09:12:23.000000000 +0200
-@@ -361,7 +361,7 @@
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
- ENDIF()
- 
- #
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hydrogen.git/commitdiff/b43a5d721932226f52878420f9e3114d4cc965c7



More information about the pld-cvs-commit mailing list