[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: 000fd2c16ef1c7c0cabe77ada00bbb5b454e0578 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Nov 14 10:24:39 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Nov 14 10:24:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000fd2c1 media-sound/hydrogen: updated live ebuild patches + scrubbed patches Signed-off-by: Miroslav Šulc gentoo.org> .../files/hydrogen-1.2.1-gnuinstalldirs.patch | 4 .../hydrogen/files/hydrogen-1.2.2-cflags.patch | 2 -- .../hydrogen/files/hydrogen-1.3.0-cflags.patch | 11 ++ .../files/hydrogen-1.3.0-gnuinstalldirs.patch | 25 ++ media-sound/hydrogen/hydrogen-.ebuild | 4 ++-- 5 files changed, 38 insertions(+), 8 deletions(-) diff --git a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch index d7b6105a42ff..61f94d84bfc7 100644 --- a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch +++ b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc368f7..b764d7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -418,10 +418,10 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/data/doc/CMakeLists.txt) @@ -16,8 +14,6 @@ index dc368f7..b764d7c 100644 ENDIF() # -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index e96d7ed..79b74e0 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -77,5 +77,5 @@ ENDIF() diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch index f244b4edcc08..13bd531df885 100644 --- a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch +++ b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fe4013..180aa2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,7 +141,7 @@ ENDIF() diff --git a/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch new file mode 100644 index ..f08f1af10ddd --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -173,7 +173,7 @@ endif() + if(WANT_DEBUG) + set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O0") + else() +- set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O3 -ffast-math") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + endif() + + if(WANT_APPIMAGE) diff --git a/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch new file mode 100644 index ..c716ca75ac9e --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch @@ -0,0 +1,25 @@ +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -478,10 +478,10 @@ else() + endif() + install(DIRECTORY data DESTINATION ${H2_DATA_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE) + if(NOT MINGW AND NOT APPLE) +- install(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.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}/linux/org.hydrogenmusic.Hydrogen.metainfo.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") ++ install(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_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") ++ install(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") + endif() + + # +--- a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +@@ -77,5 +77,5 @@ endif() + + if(NOT APPLE AND NOT WIN32) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/core DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE) +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" ) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) + endif() diff --git a/media-sound/hydrogen/hydrogen-.ebuild b/media-sound/hydrogen/hydrogen-.ebuild index 28fdaf94ba63..440fe2ae3992 100644 --- a/media-sound/hydrogen/hydrogen-.ebuild +++ b/media-sound/hydrogen/hydrogen-.ebuild @@ -59,8 +59,8 @@ RDEPEND="${CDEPEND}" DOCS=( AUTHORS ChangeLog DEVELOPERS.md README.md )
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: 63f4e354d90c8691375cd14b209de603073ac82c Author: Miroslav Šulc gentoo org> AuthorDate: Sun Oct 15 07:58:02 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Oct 15 07:58:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f4e354 media-sound/hydrogen: dropped obsolete 1.2.1-r1 Bug: https://bugs.gentoo.org/915712 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/hydrogen/Manifest | 1 - .../files/hydrogen-1.1.0-gnuinstalldirs.patch | 29 --- media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild | 98 -- 3 files changed, 128 deletions(-) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index 0f072277bdd9..f67eb3c86039 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1,2 +1 @@ -DIST hydrogen-1.2.1.tar.gz 12920203 BLAKE2B 3ddc92fdab9a07c26aa1d00239a23dd7aeb2014cf5e71023ef3ccfee880fb9a568cad6de94c9cdaf2037bab5dbe500cfbaaac14c02a608f002866927cb75dc61 SHA512 aa6faadaf43da1ab6f514223bf7c8b526daac8dcd17916a0fdea098d6f80a33170ca3aaa210e2aedea7546221fb2aacaabf365d1457b5a25fb81f51780405ff2 DIST hydrogen-1.2.2.tar.gz 12948890 BLAKE2B 30d8624078a29a0514aee01d56865e5923f755de02acfddde45a26d6ffbd68cf3c8c774827fe4538b7d03faefaabb9ddcfd9a28bb404c535ad7f6734eb5b1aff SHA512 bd6b102b14d30a8e2f4ea7e405199bb34f9b7691b57c3f9f3096c9e30c25c158e3bfd40bcfdd2d449bc153b7d3d9717df401f1e7a086e33dc953247870f1dee0 diff --git a/media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch deleted file mode 100644 index ef70497abf72.. --- a/media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04aa6380..e979783e 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -362,10 +362,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/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") -- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_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") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") - ENDIF() - - # -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index cfdc72a7..b7b0dbcb 100644 a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION} - - IF(NOT APPLE AND NOT WIN32) - INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/core DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE) --INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" ) -+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) - ENDIF() diff --git a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild deleted file mode 100644 index 1b24ce7d4622.. --- a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -DESCRIPTION="Advanced drum machine" -HOMEPAGE="http://hydrogen-music.org/; - -if [[ ${PV} == ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}-music/${PN}; -else - MY_PV=${PV/_/-} - SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ppc ppc64 x86" - S="${WORKDIR}"/${PN}-${MY_PV} -fi - -LICENSE="GPL-2 ZLIB" -SLOT="0" -IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio" - -REQUIRED_USE="lash? ( alsa )" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -CDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 -
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: ccd8a47995573f318c40991d2ade851a012ed702 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Aug 9 16:53:29 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Aug 9 16:53:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd8a479 media-sound/hydrogen: updated patch in the live ebuild Closes: https://bugs.gentoo.org/911490 Signed-off-by: Miroslav Šulc gentoo.org> .../files/hydrogen-1.2.1-gnuinstalldirs.patch | 29 ++ media-sound/hydrogen/hydrogen-.ebuild | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch new file mode 100644 index ..d7b6105a42ff --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dc368f7..b764d7c 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -418,10 +418,10 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/data/doc/CMakeLists.txt) + ENDIF() + INSTALL(DIRECTORY data DESTINATION ${H2_DATA_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE) + IF(NOT MINGW AND NOT APPLE) +- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.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}/linux/org.hydrogenmusic.Hydrogen.metainfo.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_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") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") + ENDIF() + + # +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index e96d7ed..79b74e0 100644 +--- a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +@@ -77,5 +77,5 @@ ENDIF() + + IF(NOT APPLE AND NOT WIN32) + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/core DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE) +-INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" ) ++INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) + ENDIF() diff --git a/media-sound/hydrogen/hydrogen-.ebuild b/media-sound/hydrogen/hydrogen-.ebuild index cd84978b5281..951d4fb7a1fc 100644 --- a/media-sound/hydrogen/hydrogen-.ebuild +++ b/media-sound/hydrogen/hydrogen-.ebuild @@ -59,7 +59,7 @@ RDEPEND="${CDEPEND}" DOCS=( AUTHORS ChangeLog DEVELOPERS README.md ) PATCHES=( - "${FILESDIR}/${PN}-1.1.0-gnuinstalldirs.patch" + "${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: 8f3ce8690d846c6da5d9a17a898fc083bfafb8a6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 18 12:11:05 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 18 15:49:54 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f3ce869 media-sound/hydrogen: drop 1.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/hydrogen/Manifest | 1 - .../files/hydrogen-1.0.0-gnuinstalldirs.patch | 29 --- media-sound/hydrogen/hydrogen-1.0.2.ebuild | 95 -- 3 files changed, 125 deletions(-) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index d3456f839b5d..054fe7a8b71f 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1,2 +1 @@ -DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9 DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089 SHA512 c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37 diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch deleted file mode 100644 index 9b8429753072.. --- a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04aa6380..e979783e 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -362,10 +362,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/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") -- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_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") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") - ENDIF() - - # -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index cfdc72a7..b7b0dbcb 100644 a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION} - - 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_INCLUDEDIR}/hydrogen" ) -+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) - ENDIF() diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild b/media-sound/hydrogen/hydrogen-1.0.2.ebuild deleted file mode 100644 index 5b62655b32e1.. --- a/media-sound/hydrogen/hydrogen-1.0.2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Advanced drum machine" -HOMEPAGE="http://www.hydrogen-music.org/; - -if [[ ${PV} == ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}-music/${PN}; -else - MY_PV=${PV/_/-} - SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ppc ppc64 x86" - S="${WORKDIR}"/${PN}-${MY_PV} -fi - -LICENSE="GPL-2 ZLIB" -SLOT="0" -IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio" - -REQUIRED_USE="lash? ( alsa )" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -CDEPEND=" - 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? (
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: 30c121c1dd2b0d8c27ab8e940f115fa1ca977789 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Oct 24 07:04:07 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Oct 24 07:05:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c121c1 Revert "media-sound/hydrogen: removed obsolete 1.0.2" This reverts commit ba9cfda89c0cd5aaf5a2727d9118363935c2bdb4. Bug: https://bugs.gentoo.org/819453 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/hydrogen/Manifest | 1 + .../files/hydrogen-1.0.0-gnuinstalldirs.patch | 29 +++ media-sound/hydrogen/hydrogen-1.0.2.ebuild | 95 ++ 3 files changed, 125 insertions(+) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index 3130780c76c..bf9badcec01 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1 +1,2 @@ +DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9 DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19 SHA512 116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8 diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch new file mode 100644 index 000..9b842975307 --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04aa6380..e979783e 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -362,10 +362,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/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") +- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_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") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") + ENDIF() + + # +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index cfdc72a7..b7b0dbcb 100644 +--- a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION} + + 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_INCLUDEDIR}/hydrogen" ) ++INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) + ENDIF() diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild b/media-sound/hydrogen/hydrogen-1.0.2.ebuild new file mode 100644 index 000..5b62655b32e --- /dev/null +++ b/media-sound/hydrogen/hydrogen-1.0.2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg + +DESCRIPTION="Advanced drum machine" +HOMEPAGE="http://www.hydrogen-music.org/; + +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}-music/${PN}; +else + MY_PV=${PV/_/-} + SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ppc ppc64 x86" + S="${WORKDIR}"/${PN}-${MY_PV} +fi + +LICENSE="GPL-2 ZLIB" +SLOT="0" +IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio" + +REQUIRED_USE="lash? ( alsa )" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" +CDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: ba9cfda89c0cd5aaf5a2727d9118363935c2bdb4 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Oct 17 06:17:11 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Oct 17 06:17:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9cfda8 media-sound/hydrogen: removed obsolete 1.0.2 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/hydrogen/Manifest | 1 - .../files/hydrogen-1.0.0-gnuinstalldirs.patch | 29 --- media-sound/hydrogen/hydrogen-1.0.2.ebuild | 95 -- 3 files changed, 125 deletions(-) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index bf9badcec01..3130780c76c 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1,2 +1 @@ -DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9 DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19 SHA512 116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8 diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch deleted file mode 100644 index 9b842975307..000 --- a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04aa6380..e979783e 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -362,10 +362,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/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") -- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_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") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") - ENDIF() - - # -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index cfdc72a7..b7b0dbcb 100644 a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION} - - 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_INCLUDEDIR}/hydrogen" ) -+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) - ENDIF() diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild b/media-sound/hydrogen/hydrogen-1.0.2.ebuild deleted file mode 100644 index 5b62655b32e..000 --- a/media-sound/hydrogen/hydrogen-1.0.2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Advanced drum machine" -HOMEPAGE="http://www.hydrogen-music.org/; - -if [[ ${PV} == ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}-music/${PN}; -else - MY_PV=${PV/_/-} - SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ppc ppc64 x86" - S="${WORKDIR}"/${PN}-${MY_PV} -fi - -LICENSE="GPL-2 ZLIB" -SLOT="0" -IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio" - -REQUIRED_USE="lash? ( alsa )" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -CDEPEND=" - 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
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: a3d4c8ffc70b4e1b7a7d8d76e5ac32f506f95c92 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Sep 7 18:49:38 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Sep 7 18:49:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d4c8ff media-sound/hydrogen: bump to 1.1.0 + updated live upstream dropped support for jack session Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/hydrogen/Manifest | 1 + ...n--gnuinstalldirs.patch => hydrogen-1.1.0-gnuinstalldirs.patch} | 0 media-sound/hydrogen/{hydrogen-.ebuild => hydrogen-1.1.0.ebuild} | 1 - media-sound/hydrogen/hydrogen-.ebuild | 3 +-- 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index fff259c6586..bf9badcec01 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1 +1,2 @@ DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9 +DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19 SHA512 116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8 diff --git a/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch similarity index 100% rename from media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch rename to media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch diff --git a/media-sound/hydrogen/hydrogen-.ebuild b/media-sound/hydrogen/hydrogen-1.1.0.ebuild similarity index 98% copy from media-sound/hydrogen/hydrogen-.ebuild copy to media-sound/hydrogen/hydrogen-1.1.0.ebuild index 8a3c0ad28c9..85706a8f385 100644 --- a/media-sound/hydrogen/hydrogen-.ebuild +++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild @@ -70,7 +70,6 @@ src_configure() { -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) diff --git a/media-sound/hydrogen/hydrogen-.ebuild b/media-sound/hydrogen/hydrogen-.ebuild index 8a3c0ad28c9..6d861d99ffa 100644 --- a/media-sound/hydrogen/hydrogen-.ebuild +++ b/media-sound/hydrogen/hydrogen-.ebuild @@ -57,7 +57,7 @@ RDEPEND="${CDEPEND}" DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) PATCHES=( - "${FILESDIR}/${P}-gnuinstalldirs.patch" + "${FILESDIR}/${PN}-1.1.0-gnuinstalldirs.patch" ) src_prepare() { @@ -70,7 +70,6 @@ src_configure() { -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)
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: 668ed76cb709dda92f1005ebd3ece95ca8e8ae27 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jul 19 08:56:05 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jul 19 08:56:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=668ed76c media-sound/hydrogen: fixed metainfo installation path Closes: https://bugs.gentoo.org/733090 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch | 2 +- .../{hydrogen-1.0.0_rc1.ebuild => hydrogen-1.0.0_rc1-r1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch index a137dc580b8..4c6512760b8 100644 --- a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch +++ b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch @@ -8,7 +8,7 @@ index 20368f1..b72a272 100644 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.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") + INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_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") diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild similarity index 100% rename from media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild rename to media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: dc1a726a1432df849c3ebe11be7db54099d74f5d Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jul 19 08:47:20 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jul 19 08:47:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc1a726a media-sound/hydrogen: removed obsolete 1.0.0_beta2 Closes: https://bugs.gentoo.org/726510 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/hydrogen/Manifest | 1 - .../hydrogen-1.0.0_beta2-gnuinstalldirs.patch | 30 --- media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild | 92 -- 3 files changed, 123 deletions(-) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index d46e36b2dbb..5b7804a6568 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1,2 +1 @@ -DIST hydrogen-1.0.0_beta2.tar.gz 11375652 BLAKE2B 9eaf07d69060e74478dd130722450264a463135dbfb05486ec853c684f09fcbae2537e3a7b032ed831e7103ccba3a3ba7c6866d2fde241464ab11465f8ad9ea9 SHA512 8712996adbc820909d1d38ff7d45a2a49ec64c15135d5a99b08b93ebd5a0c05139ce78a317c274059a538eb68031f0f42bb9d22988312c2b9f60fa53c539a242 DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8 SHA512 1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch deleted file mode 100644 index 6238c47504b..000 --- a/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5d9e146..986e435 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -362,10 +362,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/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") -- 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/org.hydrogenmusic.Hydrogen.svg") -- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_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_FULL_MANDIR}/man1") - ENDIF() - - # -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index cfdc72a..b7b0dbc 100644 a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION} - - 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_INCLUDEDIR}/hydrogen" ) -+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) - ENDIF() diff --git a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild deleted file mode 100644 index b86b1ac0cdd..000 --- a/media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Advanced drum machine" -HOMEPAGE="http://www.hydrogen-music.org/; - -if [[ ${PV} == ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}-music/${PN}; - KEYWORDS="amd64 ppc ppc64 x86" -else - MY_PV=${PV/_/-} - SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ppc ppc64 x86" - S="${WORKDIR}"/${PN}-${MY_PV} -fi - -LICENSE="GPL-2 ZLIB" -SLOT="0" -IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio" - -REQUIRED_USE="lash? ( alsa )" -
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: 7490e42dd8acbb71fb69d2713c214cbf16a6ae77 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Mar 23 15:14:24 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Mar 23 15:14:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7490e42d media-sound/hydrogen: bump to 1.0.0_beta2 1) fixed ebuild name from 1.0.0_pre20180301-r1 to 1.0.0_beta1_pre20180301-r1 2) synced live ebuild Package-Manager: Portage-2.3.95, Repoman-2.3.21 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/hydrogen/Manifest | 3 ++- ...n-1.0.0_beta1_pre20180301-gnuinstalldirs.patch} | 0 .../hydrogen-1.0.0_beta2-gnuinstalldirs.patch | 30 ++ ... => hydrogen-1.0.0_beta1_pre20180301-r1.ebuild} | 2 +- ...gen-.ebuild => hydrogen-1.0.0_beta2.ebuild} | 23 ++--- media-sound/hydrogen/hydrogen-.ebuild | 23 ++--- 6 files changed, 71 insertions(+), 10 deletions(-) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index 785fee5f214..3c42f5cef06 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1 +1,2 @@ -DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47 +DIST hydrogen-1.0.0_beta1_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47 +DIST hydrogen-1.0.0_beta2.tar.gz 11375853 BLAKE2B a7b5e8f0fa675a9869d84cad922f8d9119c88983e80c278dced2d03140619f4d8f70eb132319fd75be0a130cbd65a247dc4a8176a09b4c0a678d0f02385aa5aa SHA512 e87b57fb52a1ff00ef0d011321ad721902df5d1d31f3136d702498b9b5b3580cc7df43c0d7f4cecf55fd96957caf9c44a400eddb3bef07d7fe2cfda85ca1e00e diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch similarity index 100% rename from media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch rename to media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch new file mode 100644 index 000..6238c47504b --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5d9e146..986e435 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -362,10 +362,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/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") +- 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/org.hydrogenmusic.Hydrogen.svg") +- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_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_FULL_MANDIR}/man1") + ENDIF() + + # +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index cfdc72a..b7b0dbc 100644 +--- a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION} + + 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_INCLUDEDIR}/hydrogen" ) ++INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) + ENDIF() diff
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: 42ca400fd2cd38d214a3a849857f579af3edc5ec Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jun 16 16:35:48 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jun 16 16:35:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ca400f media-sound/hydrogen-: removed gnuinstalldirs patch it has been applied by upstream Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Miroslav Šulc gentoo.org> .../files/hydrogen--gnuinstalldirs.patch | 120 - media-sound/hydrogen/hydrogen-.ebuild | 2 - 2 files changed, 122 deletions(-) diff --git a/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch deleted file mode 100644 index 14babedefa5..000 --- a/media-sound/hydrogen/files/hydrogen--gnuinstalldirs.patch +++ /dev/null @@ -1,120 +0,0 @@ -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}"
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: 342c44e9545350abc429cbd44185d4012afbab6a Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 13 19:14:49 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 13 19:17:16 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342c44e9 media-sound/hydrogen: Fix cmake-patch Thanks-to: PhobosK fastmail.fm> Closes: https://bugs.gentoo.org/650430 Package-Manager: Portage-2.3.24, Repoman-2.3.6 ...patch => hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch} | 12 ++-- ...e20180301.ebuild => hydrogen-1.0.0_pre20180301-r1.ebuild} | 2 +- media-sound/hydrogen/hydrogen-.ebuild| 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch similarity index 92% rename from media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch rename to media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch index e0100eedf7c..59a5486e2ca 100644 --- a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch +++ b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch @@ -30,7 +30,7 @@ index 96dbf47a..2caab298 100644 #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") ++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") @@ -42,10 +42,10 @@ index 96dbf47a..2caab298 100644 - 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") ++ 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() # @@ -76,7 +76,7 @@ diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt 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" ) ++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 diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild similarity index 97% rename from media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild rename to media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild index c54815796c4..61d6269e79d 100644 --- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild +++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild @@ -42,7 +42,7 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) -PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" ) +PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" ) src_configure() { local mycmakeargs=( diff --git a/media-sound/hydrogen/hydrogen-.ebuild b/media-sound/hydrogen/hydrogen-.ebuild index 3d14fb4a653..c5712d4665c 100644 --- a/media-sound/hydrogen/hydrogen-.ebuild +++ b/media-sound/hydrogen/hydrogen-.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=(
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: 47ebefac39bde969dd959d74604fe09c729d64d2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 6 17:57:17 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 6 18:05:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ebefac media-sound/hydrogen: Add 1.0.0_pre20180301 Qt5-based snapshot Bug: https://bugs.gentoo.org/570814 Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-sound/hydrogen/Manifest | 1 + .../hydrogen/files/hydrogen-gnuinstalldirs.patch | 25 ++- .../hydrogen/hydrogen-1.0.0_pre20180301.ebuild | 82 ++ 3 files changed, 90 insertions(+), 18 deletions(-) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index 513f3ca3192..d6bf321efed 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1 +1,2 @@ DIST hydrogen-0.9.5.tar.gz 5239702 BLAKE2B 5fb1e7561b65587a6a4b8e642a4e0262cf8521a6847f04e57d4f99af2ef38fecb05f779cd5b0c25d487360db6455b0912729e7deac0d9959e8c32938a44b1adb SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97 +DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47 diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch index d42b3971d45..e0100eedf7c 100644 --- a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch +++ b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch @@ -25,19 +25,12 @@ index 96dbf47a..2caab298 100644 SET(LIBSNDFILE_VERSION_PREV "1.0.17") # -@@ -146,13 +148,13 @@ ELSE(MINGW) - #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_LIBDIR}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" ) - ENDIF(APPLE) - ENDIF(MINGW) +@@ -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_DATAROOTDIR}/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") @@ -49,15 +42,14 @@ index 96dbf47a..2caab298 100644 - 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_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_DATAROOTDIR}/pixmaps") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/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 -index f6cd04eb..7725dc83 100644 --- a/src/cli/CMakeLists.txt +++ b/src/cli/CMakeLists.txt @@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli @@ -67,7 +59,6 @@ index f6cd04eb..7725dc83 100644 -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} @@ -85,10 +76,9 @@ index db1333da..0ab61d96 100644 IF(NOT APPLE AND NOT WIN32) INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h"
[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/
commit: 63720d87d47cb9c54dee9e64d7bd754c23b1c080 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 1 10:37:11 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 1 11:12:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63720d87 media-sound/hydrogen: Add Qt5-based live version Thanks-to: Samuel Bauer bitmessage.ch> Bug: https://bugs.gentoo.org/570814 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../hydrogen/files/hydrogen-gnuinstalldirs.patch | 112 + media-sound/hydrogen/hydrogen-.ebuild | 81 +++ media-sound/hydrogen/metadata.xml | 21 ++-- 3 files changed, 204 insertions(+), 10 deletions(-) diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch new file mode 100644 index 000..d42b3971d45 --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch @@ -0,0 +1,112 @@ +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") + + # +@@ -146,13 +148,13 @@ ELSE(MINGW) + #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_LIBDIR}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" ) + ENDIF(APPLE) + ENDIF(MINGW) + + #Installation paths + # TODO remove data from path +-SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data") ++SET(SYS_DATA_PATH "${CMAKE_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_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_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