From 342c44e9545350abc429cbd44185d4012afbab6a Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 13 Mar 2018 20:14:49 +0100 Subject: media-sound/hydrogen: Fix cmake-patch Thanks-to: PhobosK Closes: https://bugs.gentoo.org/650430 Package-Manager: Portage-2.3.24, Repoman-2.3.6 --- ...hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch | 101 +++++++++++++++++++++ .../hydrogen/files/hydrogen-gnuinstalldirs.patch | 101 --------------------- .../hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild | 82 +++++++++++++++++ .../hydrogen/hydrogen-1.0.0_pre20180301.ebuild | 82 ----------------- media-sound/hydrogen/hydrogen-9999.ebuild | 2 +- 5 files changed, 184 insertions(+), 184 deletions(-) create mode 100644 media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch delete mode 100644 media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch create mode 100644 media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild delete mode 100644 media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild (limited to 'media-sound') diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch new file mode 100644 index 000000000000..59a5486e2cad --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch @@ -0,0 +1,101 @@ +From 11c72da8b2bf96f650ca6e1e38af0819c4f49c45 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 1 Jan 2018 11:52:18 +0100 +Subject: [PATCH] Use GNUInstallDirs + +Fixes multiarch and deprecated man dir location. +--- + CMakeLists.txt | 14 ++++++++------ + src/cli/CMakeLists.txt | 2 +- + src/core/CMakeLists.txt | 6 +++--- + src/gui/CMakeLists.txt | 2 +- + src/player/CMakeLists.txt | 2 +- + 5 files changed, 14 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96dbf47a..2caab298 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,6 +30,8 @@ ELSE() + SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}") + ENDIF(VERSION_SUFFIX) + ++include(GNUInstallDirs) ++ + SET(LIBSNDFILE_VERSION_PREV "1.0.17") + + # +@@ -150,7 +152,7 @@ ELSE(MINGW) + + #Installation paths + # TODO remove data from path +-SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data") ++SET(SYS_DATA_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen/data") + # TODO remove data from path, could be .config/hydrogen + SET(USR_DATA_PATH ".hydrogen/data") + +@@ -358,10 +360,10 @@ ELSE() + INSTALL(DIRECTORY data DESTINATION ${SYS_DATA_PATH}/.. PATTERN ".git" EXCLUDE) + ENDIF() + IF(NOT MINGW AND NOT APPLE) +- 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.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") + ENDIF() + + # +diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt +--- a/src/cli/CMakeLists.txt ++++ b/src/cli/CMakeLists.txt +@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli + + ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION}) + +-INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin ) ++INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION} + #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER "${hydrogen_INCLUDES}" ) + + INSTALL(TARGETS hydrogen-core-${VERSION} +- LIBRARY DESTINATION "lib${LIB_SUFFIX}" +- ARCHIVE DESTINATION "lib${LIB_SUFFIX}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + # do not copy directory hierarchy + #PUBLIC_HEADER DESTINATION include/hydrogen + ) + + IF(NOT APPLE AND NOT WIN32) + INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE) +- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" ) ++ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) + ENDIF() +diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt +--- a/src/gui/CMakeLists.txt ++++ b/src/gui/CMakeLists.txt +@@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(hydrogen + qt5_use_modules(hydrogen Widgets) + ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION}) + +-INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin ) ++INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt +--- a/src/player/CMakeLists.txt ++++ b/src/player/CMakeLists.txt +@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player + + ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION}) + +-INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin ) ++INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) +-- +2.15.1 + diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch deleted file mode 100644 index e0100eedf7cc..000000000000 --- a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 11c72da8b2bf96f650ca6e1e38af0819c4f49c45 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 1 Jan 2018 11:52:18 +0100 -Subject: [PATCH] Use GNUInstallDirs - -Fixes multiarch and deprecated man dir location. ---- - CMakeLists.txt | 14 ++++++++------ - src/cli/CMakeLists.txt | 2 +- - src/core/CMakeLists.txt | 6 +++--- - src/gui/CMakeLists.txt | 2 +- - src/player/CMakeLists.txt | 2 +- - 5 files changed, 14 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96dbf47a..2caab298 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,6 +30,8 @@ ELSE() - SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}") - ENDIF(VERSION_SUFFIX) - -+include(GNUInstallDirs) -+ - SET(LIBSNDFILE_VERSION_PREV "1.0.17") - - # -@@ -150,7 +152,7 @@ ELSE(MINGW) - - #Installation paths - # TODO remove data from path --SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data") -+SET(SYS_DATA_PATH "${CMAKE_FULL_INSTALL_DATAROOTDIR}/hydrogen/data") - # TODO remove data from path, could be .config/hydrogen - SET(USR_DATA_PATH ".hydrogen/data") - -@@ -358,10 +360,10 @@ ELSE() - INSTALL(DIRECTORY data DESTINATION ${SYS_DATA_PATH}/.. PATTERN ".git" EXCLUDE) - ENDIF() - IF(NOT MINGW AND NOT APPLE) -- 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.appdata.xml DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/appdata") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/applications") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/pixmaps") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_FULL_INSTALL_MANDIR}/man1") - ENDIF() - - # -diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt ---- a/src/cli/CMakeLists.txt -+++ b/src/cli/CMakeLists.txt -@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli - - ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION}) - --INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin ) -+INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION} - #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER "${hydrogen_INCLUDES}" ) - - INSTALL(TARGETS hydrogen-core-${VERSION} -- LIBRARY DESTINATION "lib${LIB_SUFFIX}" -- ARCHIVE DESTINATION "lib${LIB_SUFFIX}" -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - # do not copy directory hierarchy - #PUBLIC_HEADER DESTINATION include/hydrogen - ) - - IF(NOT APPLE AND NOT WIN32) - INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE) -- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" ) -+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_FULL_INSTALL_INCLUDEDIR}/hydrogen" ) - ENDIF() -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(hydrogen - qt5_use_modules(hydrogen Widgets) - ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION}) - --INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin ) -+INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt ---- a/src/player/CMakeLists.txt -+++ b/src/player/CMakeLists.txt -@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player - - ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION}) - --INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin ) -+INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}) --- -2.15.1 - diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild new file mode 100644 index 000000000000..61d6269e79d3 --- /dev/null +++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +COMMIT=1a477ffe380f153c5d9fb3495d9874df7f75334f +inherit cmake-utils vcs-snapshot xdg-utils + +DESCRIPTION="Advanced drum machine" +HOMEPAGE="http://www.hydrogen-music.org/" +SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio" + +REQUIRED_USE="lash? ( alsa )" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + >=media-libs/libsndfile-1.0.18 + alsa? ( media-libs/alsa-lib ) + archive? ( app-arch/libarchive ) + !archive? ( >=dev-libs/libtar-1.2.11-r3 ) + jack? ( virtual/jack ) + ladspa? ( media-libs/liblrdf ) + lash? ( media-sound/lash ) + osc? ( media-libs/liblo ) + portaudio? ( media-libs/portaudio ) + portmidi? ( media-libs/portmidi ) + pulseaudio? ( media-sound/pulseaudio ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) + +PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" ) + +src_configure() { + local mycmakeargs=( + -DWANT_ALSA=$(usex alsa) + -DWANT_CPPUNIT=OFF + -DWANT_DEBUG=OFF + -DWANT_JACK=$(usex jack) + -DWANT_JACKSESSION=$(usex jack) + -DWANT_LADSPA=$(usex ladspa) + -DWANT_LASH=$(usex lash) + -DWANT_LIBARCHIVE=$(usex archive) + -DWANT_LRDF=$(usex ladspa) + -DWANT_OSC=$(usex osc) + -DWANT_OSS=$(usex oss) + -DWANT_PORTAUDIO=$(usex portaudio) + -DWANT_PORTMIDI=$(usex portmidi) + -DWANT_PULSEAUDIO=$(usex pulseaudio) + -DWANT_RUBBERBAND=OFF + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html +} + +pkg_postinst() { + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild deleted file mode 100644 index c54815796c43..000000000000 --- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT=1a477ffe380f153c5d9fb3495d9874df7f75334f -inherit cmake-utils vcs-snapshot xdg-utils - -DESCRIPTION="Advanced drum machine" -HOMEPAGE="http://www.hydrogen-music.org/" -SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio" - -REQUIRED_USE="lash? ( alsa )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - >=media-libs/libsndfile-1.0.18 - alsa? ( media-libs/alsa-lib ) - archive? ( app-arch/libarchive ) - !archive? ( >=dev-libs/libtar-1.2.11-r3 ) - jack? ( virtual/jack ) - ladspa? ( media-libs/liblrdf ) - lash? ( media-sound/lash ) - osc? ( media-libs/liblo ) - portaudio? ( media-libs/portaudio ) - portmidi? ( media-libs/portmidi ) - pulseaudio? ( media-sound/pulseaudio ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) - -PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" ) - -src_configure() { - local mycmakeargs=( - -DWANT_ALSA=$(usex alsa) - -DWANT_CPPUNIT=OFF - -DWANT_DEBUG=OFF - -DWANT_JACK=$(usex jack) - -DWANT_JACKSESSION=$(usex jack) - -DWANT_LADSPA=$(usex ladspa) - -DWANT_LASH=$(usex lash) - -DWANT_LIBARCHIVE=$(usex archive) - -DWANT_LRDF=$(usex ladspa) - -DWANT_OSC=$(usex osc) - -DWANT_OSS=$(usex oss) - -DWANT_PORTAUDIO=$(usex portaudio) - -DWANT_PORTMIDI=$(usex portmidi) - -DWANT_PULSEAUDIO=$(usex pulseaudio) - -DWANT_RUBBERBAND=OFF - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild index 3d14fb4a6533..c5712d4665c7 100644 --- a/media-sound/hydrogen/hydrogen-9999.ebuild +++ b/media-sound/hydrogen/hydrogen-9999.ebuild @@ -41,7 +41,7 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) -PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.0.0_pre20180301-gnuinstalldirs.patch" ) src_configure() { local mycmakeargs=( -- cgit v1.2.3-65-gdbad