From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- media-sound/hydrogen/Manifest | 3 +- .../files/hydrogen-9999-gnuinstalldirs.patch | 120 +++++++++++++++++++++ media-sound/hydrogen/hydrogen-9999.ebuild | 15 ++- 3 files changed, 132 insertions(+), 6 deletions(-) create mode 100644 media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch (limited to 'media-sound/hydrogen') diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index a6081666cbc1..f443b583cd37 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1,5 +1,6 @@ AUX hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch 4495 BLAKE2B 8342dd95dc1cd5ad89948d417c440e791e30c62e365fe9d1d3f8d7c5fa40180475d93a27958e64d4b587846067a4266f87a21d76e0b6ea57acde9154fb5d2e4c SHA512 cb7b068bd0690630ac49060aa8cbe2b3f250f6670ccd3035ad0b412df248c21753ea094dc67d5e3ceb80343b066b833cf3377b2c166e58119de1c112c5bb4c42 +AUX hydrogen-9999-gnuinstalldirs.patch 5411 BLAKE2B 74cc202dbab0243e14ce489a5c2db4385bf6eaee363b38ed151684a2829d4794ccc70c18fe55cd2cdd7043c61025d62f39469023441071be8c64c6fc31e18742 SHA512 231c4af81c1ca5bb5ec0d3aadccee16b653e0ec79ac4129d9178da6c4e509f2e3655ab0c9f77c2835b599f15197626f77cb12edae3ef455e8233042381026425 DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47 EBUILD hydrogen-1.0.0_pre20180301-r1.ebuild 1937 BLAKE2B 1338ca9bed21852edf5219f68a1584b4d2ac7ae46fc63f47ae209f261aeba6c69990a773974e5d7eceb7baf34461aa272bb11837b7b9d642b6972104b8f17bbf SHA512 4c5411a87f399211430ad30c94d933494b919bf0ac62e23bda32aadd7af7988c11f1bb924b5cd3ece46a61b743ff6aa65786eab91e319174560b1129a54312cc -EBUILD hydrogen-9999.ebuild 1849 BLAKE2B 7c8e0555d88dcd682ef01503f0f80a04851f9515eb411949078cab0f3194ae032fade26cd1dfac870c06ea9fb2fc96c76f9a882cec9c5d51252a8f9f9c1f2ea2 SHA512 aacae6cc35be6f45302b40dde8d997424617ead7681956db9659408aa79d103a980bd376893f72b1305e66c88b2e5e8b3847733f3b31cb17ba58f84da04a6ca7 +EBUILD hydrogen-9999.ebuild 1927 BLAKE2B 8db5844843c51df98d882e0dc3c91aabcfdda4b8afd24a2249bf1145833135b4d4d5bff4eab32dcd25b92473bf01f4dde46f49b615c5b1f9cbe3ea6dfbcf72f1 SHA512 c2b6a5f120e5d1fcc9ec8e333718e333719ef88065403bab15cf72ba3540b1077004ea4766ae05cc1a545692f21bbcc92a7ba073fdff47975e32bc10ed14c4d2 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch new file mode 100644 index 000000000000..14babedefa5c --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch @@ -0,0 +1,120 @@ +From 64e251765e58b6948953f0bbc2aac05042daaa55 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 | 19 ++++++++----------- + 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(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b18508a8..76305ea7 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") + + # +@@ -144,21 +146,16 @@ IF(APPLE) + #Without setting this, installation would go into /usr/local, which does not exist per default + SET(CMAKE_INSTALL_PREFIX "/usr" ) + ELSE(APPLE) +- SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" ) ++ SET(OSS_LIB_PATHS "${CMAKE_INSTALL_FULL_LIBDIR}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" ) + ENDIF(APPLE) + + + #Installation paths + # TODO remove data from path +-SET(H2_SYS_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen") ++SET(H2_SYS_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen") + # TODO remove data from path, could be .config/hydrogen + SET(H2_USR_PATH ".hydrogen") + +-#Changing this to user writable location will allow successful, non-root, deployment (e.g: make install). +-IF(NOT MINGW AND NOT APPLE) +- SET(H2_UNIX_ICON_PATH "/usr/share/pixmaps" CACHE STRING "Freedesktop default icon path.") +-ENDIF() +- + SET(MAX_INSTRUMENTS 1000 CACHE STRING "Maximum number of instruments") + SET(MAX_COMPONENTS 32 CACHE STRING "Maximum number of components") + SET(MAX_NOTES 192 CACHE STRING "Maximum number of notes") +@@ -366,10 +363,10 @@ 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/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 "${H2_UNIX_ICON_PATH}") +- 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_DATAROOTDIR}/appdata") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_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_MANDIR}/man1") + ENDIF() + + # +diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt +index f6cd04eb..7725dc83 100644 +--- 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 +index db1333da..0ab61d96 100644 +--- 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_INCLUDEDIR}/hydrogen" ) + ENDIF() +diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt +index 4030dc9a..2aeb17c2 100644 +--- a/src/gui/CMakeLists.txt ++++ b/src/gui/CMakeLists.txt +@@ -51,4 +51,4 @@ TARGET_LINK_LIBRARIES(hydrogen + ) + 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 +index 72c270f3..836fc5b4 100644 +--- 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.19.1 + diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild index c5712d4665c7..2d92d83a64cb 100644 --- a/media-sound/hydrogen/hydrogen-9999.ebuild +++ b/media-sound/hydrogen/hydrogen-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,12 +12,11 @@ EGIT_REPO_URI="https://github.com/${PN}-music/${PN}" LICENSE="GPL-2 ZLIB" SLOT="0" KEYWORDS="" -IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio" +IUSE="alsa +archive doc 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 @@ -37,11 +36,12 @@ RDEPEND=" " DEPEND="${RDEPEND} virtual/pkgconfig + doc? ( app-doc/doxygen ) " DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) -PATCHES=( "${FILESDIR}/${PN}-1.0.0_pre20180301-gnuinstalldirs.patch" ) +PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" ) src_configure() { local mycmakeargs=( @@ -65,9 +65,14 @@ src_configure() { cmake-utils_src_configure } +src_compile() { + cmake-utils_src_compile + use doc && cmake-utils_src_compile doc +} + src_install() { + use doc && local HTML_DOCS=( ${BUILD_DIR}/docs/html/. ) cmake-utils_src_install - dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html } pkg_postinst() { -- cgit v1.2.3