diff --git a/CMakeLists.txt b/CMakeLists.txt index 77de349..ee2ad53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,4 +8,3 @@ PROJECT( pianobooster ) ADD_SUBDIRECTORY(src build) -#ADD_SUBDIRECTORY(translations build/translations) diff --git a/pkgs/arch/PKGBUILD b/pkgs/arch/PKGBUILD index 2b53bf1..f187461 100644 --- a/pkgs/arch/PKGBUILD +++ b/pkgs/arch/PKGBUILD @@ -1,3 +1,5 @@ +build_with_cmake="0" + pkgdesc='A MIDI file player that teaches you how to play the piano' pkgname='pianobooster' pkgver=0.7.0 @@ -14,6 +16,8 @@ md5sums=('SKIP') build () { cd "${pkgname}-${pkgver}" +if [ "$build_with_cmake" = "1" ] +then cmake . \ -DUSE_SYSTEM_FONT=ON \ -DINSTALL_ALL_LANGS=ON \ @@ -23,10 +27,26 @@ build () { -DWITH_FLUIDSYNTH=ON \ -DUSE_FLUIDSYNTH=ON \ -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" +else + qmake-qt5 \ + USE_SYSTEM_FONT=ON \ + NO_DOCS=ON \ + INSTALL_ALL_LANGS=ON \ + USE_SYSTEM_RTMIDI=ON \ + WITH_MAN=ON \ + WITH_TIMIDITY=ON \ + WITH_FLUIDSYNTH=ON \ + USE_FLUIDSYNTH=ON make +fi } package () { cd "${pkgname}-${pkgver}" - make install -C build + if [ "$build_with_cmake" = "1" ] + then + make install -C build + else + make install INSTALL_ROOT=${pkgdir} + fi } diff --git a/pkgs/deb/pianobooster.dsc b/pkgs/deb/pianobooster.dsc index 19c0cd3..4525bbe 100644 --- a/pkgs/deb/pianobooster.dsc +++ b/pkgs/deb/pianobooster.dsc @@ -21,4 +21,4 @@ Build-Depends: Package-List: pianobooster deb games optional arch=any Files: - 24892795dc5b5506bbd710f559da1d24 8477967 pianobooster-0.7.0.tar.gz + 7e32ca7fc4eb65ac39a5bc5d95cd5709 8511345 pianobooster-0.7.0.tar.gz diff --git a/pkgs/rpm/pianobooster.spec b/pkgs/rpm/pianobooster.spec index 46b6fef..4aebb98 100644 --- a/pkgs/rpm/pianobooster.spec +++ b/pkgs/rpm/pianobooster.spec @@ -1,3 +1,9 @@ +%define build_with_cmake 1 + +%if 0%{?suse_version} +%define qmake_qt5 qmake-qt5 +%endif + Name: pianobooster Version: 0.7.0 Release: %mkrel 1 @@ -20,7 +26,9 @@ License: GPL-3.0-or-later Url: https://github.com/captnfab/PianoBooster Source0: %{name}-%{version}.tar.gz +%if %{build_with_cmake} BuildRequires: cmake +%endif BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(ftgl) @@ -81,7 +89,12 @@ is really recommended. %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/games/%{name} +%dir %{_datadir}/games/%{name} +%dir %{_datadir}/games/%{name}/music +%dir %{_datadir}/games/%{name}/translations +%{_datadir}/games/%{name}/music/*.zip +%{_datadir}/games/%{name}/translations/*.qm +%{_datadir}/games/%{name}/translations/*.json %{_mandir}/man6/%{name}.6* #---------------------------------------------------------------------------- @@ -158,6 +171,7 @@ even without a plugged-in MIDI keyboard. %autosetup -p1 -n %{name}-%{version} %build +%if %{build_with_cmake} %cmake \ -DUSE_SYSTEM_FONT=ON \ -DNO_DOCS=ON \ @@ -167,7 +181,22 @@ even without a plugged-in MIDI keyboard. -DWITH_TIMIDITY=ON \ -DWITH_FLUIDSYNTH=ON \ -DUSE_FLUIDSYNTH=ON +%else +%qmake_qt5 \ + USE_SYSTEM_FONT=ON \ + NO_DOCS=ON \ + INSTALL_ALL_LANGS=ON \ + USE_SYSTEM_RTMIDI=ON \ + WITH_MAN=ON \ + WITH_TIMIDITY=ON \ + WITH_FLUIDSYNTH=ON \ + USE_FLUIDSYNTH=ON +%endif %make_build %install +%if %{build_with_cmake} %make_install -C build +%else +%make_install INSTALL_ROOT=%{buildroot} +%endif