* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2017-09-26 18:11 Andreas Hüttel
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Hüttel @ 2017-09-26 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 2753ebbdac800866fed8a2c7bf8a9da7eba9b151
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 18:10:25 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 18:10:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2753ebbd
media-sound/hydrogen: Add build fix for gcc-6, bug 598124
Thanks to Carlos Salvador Pérez Salgado for the patch.
Closes: https://bugs.gentoo.org/598124
Package-Manager: Portage-2.3.10, Repoman-2.3.3
media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch | 12 ++++++++++++
media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
new file mode 100644
index 00000000000..586e82af22a
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
@@ -0,0 +1,12 @@
+diff -ruN hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp
+--- hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp 2011-01-29 00:33:23.000000000 +0100
++++ hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp 2017-09-26 20:07:31.128723252 +0200
+@@ -980,7 +980,7 @@
+
+ std::string playlistInfoFile = patternname;
+ std::ifstream verify( playlistInfoFile.c_str() , std::ios::in | std::ios::binary );
+- if ( verify == NULL ) {
++ if ( !verify ) {
+ //ERRORLOG( "Load Playlist: Data file " + playlistInfoFile + " not found." );
+ return NULL;
+ }
diff --git a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
index 04efe86d056..0a19547038c 100644
--- a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -31,7 +31,8 @@ src_prepare() {
epatch \
patches/portaudio.patch \
"${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch \
- "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-gcc47.patch \
+ "${FILESDIR}"/${P}-gcc6.patch
}
src_compile() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2018-03-18 12:31 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2018-03-18 12:31 UTC (permalink / raw
To: gentoo-commits
commit: d4f9318ddef1ce270387e23f23dd3244e3ea068d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 12:31:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 12:31:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f9318d
media-sound/hydrogen: Drop 0.9.5-r1 (Qt4-based)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-sound/hydrogen/Manifest | 1 -
.../hydrogen/files/hydrogen-0.9.5-gcc47.patch | 27 ---------
.../hydrogen/files/hydrogen-0.9.5-gcc6.patch | 12 ----
.../files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch | 23 --------
media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild | 69 ----------------------
5 files changed, 132 deletions(-)
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index d6bf321efed..785fee5f214 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-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-0.9.5-gcc47.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch
deleted file mode 100644
index 3ea43e36e3c..00000000000
--- a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Build with gcc 4.7
-https://bugs.gentoo.org/show_bug.cgi?id=421913
-
-Index: hydrogen-0.9.5/gui/src/MainForm.cpp
-===================================================================
---- hydrogen-0.9.5.orig/gui/src/MainForm.cpp
-+++ hydrogen-0.9.5/gui/src/MainForm.cpp
-@@ -70,6 +70,7 @@ using namespace H2Core;
-
- #include <memory>
- #include <cassert>
-+#include <unistd.h>
-
- using namespace std;
- using namespace H2Core;
-Index: hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp
-===================================================================
---- hydrogen-0.9.5.orig/gui/src/SongEditor/SongEditor.cpp
-+++ hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp
-@@ -21,6 +21,7 @@
- */
-
- #include <assert.h>
-+#include <unistd.h>
- #include <algorithm>
- #include <memory>
-
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
deleted file mode 100644
index 586e82af22a..00000000000
--- a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp
---- hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp 2011-01-29 00:33:23.000000000 +0100
-+++ hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp 2017-09-26 20:07:31.128723252 +0200
-@@ -980,7 +980,7 @@
-
- std::string playlistInfoFile = patternname;
- std::ifstream verify( playlistInfoFile.c_str() , std::ios::in | std::ios::binary );
-- if ( verify == NULL ) {
-+ if ( !verify ) {
- //ERRORLOG( "Load Playlist: Data file " + playlistInfoFile + " not found." );
- return NULL;
- }
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch
deleted file mode 100644
index 6c862eac583..00000000000
--- a/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-conf.CheckCHeader lrdf.h check fails because of missing -I/usr/include/raptor2, use pkg-config instead
-
---- Sconstruct
-+++ Sconstruct
-@@ -268,7 +268,8 @@
- env.Append( LIBPATH = 'C:\Program Files\GnuWin32\lib' )
- env.Append( LIBS = [ "pthread" ] )
-
-- if str(env['lrdf']) == "1": env.Append( LIBS = ["lrdf"] )
-+ if str(env['lrdf']) == "1":
-+ env.ParseConfig('pkg-config --cflags --libs lrdf')
- if str(env['jack']) == "1": env.Append( LIBS = ["jack"])
- if str(env['alsa']) == "1": env.Append( LIBS = ["asound"])
- if str(env['libarchive']) == "1": env.Append( LIBS = ["archive"])
-@@ -449,7 +450,7 @@
- Exit(1)
-
- #lrdf: categorizing of ladspa effects
--if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'):
-+if str(env['lrdf']) == "1" and not conf.CheckPKG('lrdf >= 0.4.0'):
- print 'lrdf must be installed!'
- Exit(1)
-
diff --git a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
deleted file mode 100644
index 0a19547038c..00000000000
--- a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa +archive jack ladspa lash oss portaudio"
-
-RDEPEND="dev-qt/qtgui:4 dev-qt/qtcore:4
- archive? ( app-arch/libarchive )
- !archive? ( >=dev-libs/libtar-1.2.11-r3 )
- >=media-libs/libsndfile-1.0.18
- alsa? ( media-libs/alsa-lib )
- jack? ( virtual/jack )
- ladspa? ( media-libs/liblrdf )
- lash? ( media-sound/lash )
- portaudio? ( >=media-libs/portaudio-19_pre )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- dev-util/scons"
-
-src_prepare() {
- sed -i -e '/cppflags +=/d' Sconstruct || die
- epatch \
- patches/portaudio.patch \
- "${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch \
- "${FILESDIR}"/${P}-gcc47.patch \
- "${FILESDIR}"/${P}-gcc6.patch
-}
-
-src_compile() {
- # FIXME: The -I/usr/include/raptor2 gets lost in middle of build
- # despite -use_lrdf_pkgconfig.patch
- use ladspa && append-flags $($(tc-getPKG_CONFIG) --cflags lrdf)
-
- export QTDIR="/usr/$(get_libdir)"
- local myconf='portmidi=0' #90614
-
- use alsa || myconf+=' alsa=0'
- use archive && myconf+=' libarchive=1'
- use jack || myconf+=' jack=0'
- use ladspa || myconf+=' lrdf=0'
- use lash && myconf+=' lash=1'
- use oss || myconf+=' oss=0'
- use portaudio && myconf+=' portaudio=1'
-
- scons \
- prefix=/usr \
- DESTDIR="${D}" \
- optflags="${CXXFLAGS}" \
- ${myconf} || die
-}
-
-src_install() {
- dobin hydrogen
- insinto /usr/share/hydrogen
- doins -r data
- doicon data/img/gray/h2-icon.svg
- domenu hydrogen.desktop
- dosym /usr/share/hydrogen/data/doc /usr/share/doc/${PF}/html
- dodoc AUTHORS ChangeLog README.txt
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2018-11-09 1:54 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2018-11-09 1:54 UTC (permalink / raw
To: gentoo-commits
commit: 142089b01723fd10364178f18703ba702afceb17
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 9 01:53:09 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 9 01:53:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142089b0
media-sound/hydrogen: Rebase 9999 gnuinstalldirs patch, add USE doc
Pending upstream: https://github.com/hydrogen-music/hydrogen/pull/668
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/hydrogen-9999-gnuinstalldirs.patch | 120 +++++++++++++++++++++
media-sound/hydrogen/hydrogen-9999.ebuild | 15 ++-
2 files changed, 130 insertions(+), 5 deletions(-)
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 00000000000..14babedefa5
--- /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 <andreas.sturmlechner@gmail.com>
+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 c5712d4665c..2d92d83a64c 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() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2020-04-01 16:23 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2020-04-01 16:23 UTC (permalink / raw
To: gentoo-commits
commit: 8b2d2f9604a554ce399bf80e34857223fe2cba94
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 1 16:22:53 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 1 16:22:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b2d2f96
media-sound/hydrogen: updated patch for 9999
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/hydrogen-9999-gnuinstalldirs.patch | 29 ++++++++++++++++++++++
media-sound/hydrogen/hydrogen-9999.ebuild | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
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 00000000000..9b842975307
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-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-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 25e3e04fb92..29b288106e0 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}"
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-PATCHES=( "${FILESDIR}/${PN}-1.0.0_beta2-gnuinstalldirs.patch" )
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2020-05-12 8:34 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2020-05-12 8:34 UTC (permalink / raw
To: gentoo-commits
commit: 4a3637bed4e198316abd647f3c611d866fd4aa46
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 08:34:37 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 12 08:34:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3637be
media-sound/hydrogen: removed obsolete 1.0.0_beta1_pre20180301
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/hydrogen/Manifest | 1 -
...en-1.0.0_beta1_pre20180301-gnuinstalldirs.patch | 101 ---------------------
.../hydrogen-1.0.0_beta1_pre20180301-r1.ebuild | 82 -----------------
3 files changed, 184 deletions(-)
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 3c42f5cef06..2cd971a65d4 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-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_beta1_pre20180301-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch
deleted file mode 100644
index 59a5486e2ca..00000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 11c72da8b2bf96f650ca6e1e38af0819c4f49c45 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-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/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild
deleted file mode 100644
index d0e4dc0c643..00000000000
--- a/media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2020-06-15 10:02 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2020-06-15 10:02 UTC (permalink / raw
To: gentoo-commits
commit: aab5d29670a6ce5b4693e9de8537f3e0068261fe
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 10:01:32 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 10:02:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aab5d296
media-sound/hydrogen: bumped to 1.0.0_rc1
Bug: https://bugs.gentoo.org/726510
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/hydrogen/Manifest | 1 +
.../files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch | 18 +++++
media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild | 92 ++++++++++++++++++++++
3 files changed, 111 insertions(+)
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 9f1e6abb1b7..d46e36b2dbb 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
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_rc1-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
new file mode 100644
index 00000000000..a137dc580b8
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20368f1..b72a272 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -384,10 +384,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}/appdata")
++ 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/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
new file mode 100644
index 00000000000..7b7b6694b99
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.0_rc1.ebuild
@@ -0,0 +1,92 @@
+# 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} == 9999 ]]; 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 )"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+DEPEND="
+ 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 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+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_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_src_compile doc
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+ cmake_src_install
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2020-08-07 10:26 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2020-08-07 10:26 UTC (permalink / raw
To: gentoo-commits
commit: 24c6d851b72c557bc7804d8b21baeeb8f43e60e4
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 7 10:26:27 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 10:26:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c6d851
media-sound/hydrogen: bump to 1.0.0
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/hydrogen/Manifest | 1 +
...en-9999-gnuinstalldirs.patch => hydrogen-1.0.0-gnuinstalldirs.patch} | 0
media-sound/hydrogen/{hydrogen-9999.ebuild => hydrogen-1.0.0.ebuild} | 0
media-sound/hydrogen/hydrogen-9999.ebuild | 2 +-
4 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 5b7804a6568..ca4de0a3594 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,2 @@
+DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3 SHA512 68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8 SHA512 1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
similarity index 100%
rename from media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
rename to media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
similarity index 100%
copy from media-sound/hydrogen/hydrogen-9999.ebuild
copy to media-sound/hydrogen/hydrogen-1.0.0.ebuild
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index bfd663bbc55..245dc874f11 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -57,7 +57,7 @@ RDEPEND="${CDEPEND}"
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2020-09-07 7:50 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2020-09-07 7:50 UTC (permalink / raw
To: gentoo-commits
commit: f3a7b2d7aa852019000f5281c765b7d82d64f3ff
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 07:49:24 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 07:49:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a7b2d7
media-sound/hydrogen: fixed i18n install path
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch | 13 +++++++++++++
media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch | 13 +++++++++++++
media-sound/hydrogen/hydrogen-1.0.0.ebuild | 5 ++++-
media-sound/hydrogen/hydrogen-9999.ebuild | 5 ++++-
4 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
new file mode 100644
index 00000000000..075d0d444a0
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
@@ -0,0 +1,13 @@
+--- a/data/i18n/CMakeLists.txt 2020-09-07 08:47:15.743516826 +0200
++++ b/data/i18n/CMakeLists.txt 2020-09-07 09:03:56.084304480 +0200
+@@ -5,4 +5,9 @@
+
+ QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
+ ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
+-INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
++
++IF(MINGW)
++ INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
++ELSE()
++ INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
++ENDIF()
diff --git a/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
new file mode 100644
index 00000000000..3c32e2b3e62
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
@@ -0,0 +1,13 @@
+--- a/data/i18n/CMakeLists.txt 2020-09-07 09:31:57.481066097 +0200
++++ b/data/i18n/CMakeLists.txt 2020-09-07 09:29:27.612763184 +0200
+@@ -5,4 +5,9 @@
+
+ QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
+ ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
+-INSTALL(FILES ${QM_FILES} DESTINATION "./data/i18n")
++
++IF(MINGW)
++ INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
++ELSE()
++ INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
++ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-1.0.0.ebuild b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
index bfd663bbc55..12ec74567cf 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
@@ -57,7 +57,10 @@ RDEPEND="${CDEPEND}"
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-i18n-path.patch"
+)
src_prepare() {
cmake_src_prepare
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 245dc874f11..87e5b809fe3 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -57,7 +57,10 @@ RDEPEND="${CDEPEND}"
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-i18n-path.patch"
+)
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2020-09-18 8:21 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2020-09-18 8:21 UTC (permalink / raw
To: gentoo-commits
commit: 01195d156e0bf3ff5a6440074da0e714e82ec28c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 08:20:43 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 08:20:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01195d15
media-sound/hydrogen: removed obsolete 1.0.0_rc1
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/hydrogen/Manifest | 1 -
.../files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch | 18 ----
media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild | 96 ----------------------
3 files changed, 115 deletions(-)
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 781de743824..f7ed7dd1480 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,3 +1,2 @@
DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3 SHA512 68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
-DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8 SHA512 1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be
DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
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
deleted file mode 100644
index 4c6512760b8..00000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 20368f1..b72a272 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -384,10 +384,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/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
deleted file mode 100644
index dd0f1fcfd43..00000000000
--- a/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,96 +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} == 9999 ]]; 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 )"
-
-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? ( 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="
- ${CDEPEND}
- dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
-
-src_prepare() {
- cmake_src_prepare
-}
-
-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_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_src_compile doc
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2020-10-07 8:12 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2020-10-07 8:12 UTC (permalink / raw
To: gentoo-commits
commit: 1dc879391d6243aed4243c1eca2e40220b7d255b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 7 08:10:12 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 7 08:12:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc87939
media-sound/hydrogen: removed obsolete 1.0.0
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/hydrogen/Manifest | 1 -
.../hydrogen/files/hydrogen-1.0.0-i18n-path.patch | 13 ---
media-sound/hydrogen/hydrogen-1.0.0.ebuild | 99 ----------------------
3 files changed, 113 deletions(-)
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index f7ed7dd1480..f5fc3caf85c 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3 SHA512 68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
deleted file mode 100644
index 075d0d444a0..00000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/data/i18n/CMakeLists.txt 2020-09-07 08:47:15.743516826 +0200
-+++ b/data/i18n/CMakeLists.txt 2020-09-07 09:03:56.084304480 +0200
-@@ -5,4 +5,9 @@
-
- QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
- ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
--INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+
-+IF(MINGW)
-+ INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+ELSE()
-+ INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
-+ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-1.0.0.ebuild b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
deleted file mode 100644
index e2d0ee7185f..00000000000
--- a/media-sound/hydrogen/hydrogen-1.0.0.ebuild
+++ /dev/null
@@ -1,99 +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} == 9999 ]]; 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 )"
-
-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? ( 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="
- ${CDEPEND}
- dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=(
- "${FILESDIR}/${P}-gnuinstalldirs.patch"
- "${FILESDIR}/${P}-i18n-path.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-}
-
-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_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_src_compile doc
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2020-11-28 9:53 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2020-11-28 9:53 UTC (permalink / raw
To: gentoo-commits
commit: e6eb98765bc67d766c28d3990b0f70a874867c0d
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 09:12:22 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 09:53:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6eb9876
media-sound/hydrogen: updated 9999's patches
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/hydrogen-9999-gnuinstalldirs.patch | 29 ++++++++++++++++++++++
.../hydrogen/files/hydrogen-9999-i18n-path.patch | 13 ----------
media-sound/hydrogen/hydrogen-9999.ebuild | 3 +--
3 files changed, 30 insertions(+), 15 deletions(-)
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 00000000000..ef70497abf7
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-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 ${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/files/hydrogen-9999-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
deleted file mode 100644
index 3c32e2b3e62..00000000000
--- a/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/data/i18n/CMakeLists.txt 2020-09-07 09:31:57.481066097 +0200
-+++ b/data/i18n/CMakeLists.txt 2020-09-07 09:29:27.612763184 +0200
-@@ -5,4 +5,9 @@
-
- QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
- ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
--INSTALL(FILES ${QM_FILES} DESTINATION "./data/i18n")
-+
-+IF(MINGW)
-+ INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+ELSE()
-+ INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
-+ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 87e5b809fe3..aa141dadf06 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -58,8 +58,7 @@ RDEPEND="${CDEPEND}"
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch"
- "${FILESDIR}/${P}-i18n-path.patch"
+ "${FILESDIR}/${P}-gnuinstalldirs.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2023-10-10 8:39 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2023-10-10 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 854bc899f7db9828268d4ae4a5ca0e0f2143ed48
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 08:39:18 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 08:39:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854bc899
media-sound/hydrogen: fixed cflags propagation
Closes: https://bugs.gentoo.org/913916
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch | 13 +++++++++++++
.../{hydrogen-1.2.2.ebuild => hydrogen-1.2.2-r1.ebuild} | 1 +
media-sound/hydrogen/hydrogen-9999.ebuild | 1 +
3 files changed, 15 insertions(+)
diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
new file mode 100644
index 000000000000..f244b4edcc08
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1fe4013..180aa2f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,7 +141,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/hydrogen-1.2.2.ebuild b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
similarity index 98%
rename from media-sound/hydrogen/hydrogen-1.2.2.ebuild
rename to media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
index 300110e184b2..c8ceca18e253 100644
--- a/media-sound/hydrogen/hydrogen-1.2.2.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
@@ -60,6 +60,7 @@ DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
PATCHES=(
"${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"
+ "${FILESDIR}/${PN}-1.2.2-cflags.patch"
)
src_prepare() {
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 705be8cebc76..28fdaf94ba63 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -60,6 +60,7 @@ DOCS=( AUTHORS ChangeLog DEVELOPERS.md README.md )
PATCHES=(
"${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"
+ "${FILESDIR}/${PN}-1.2.2-cflags.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
@ 2024-04-01 6:46 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-04-01 6:46 UTC (permalink / raw
To: gentoo-commits
commit: fc2e39ec03509d1eea8aa101c7446df215bf5872
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 1 06:45:39 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 06:45:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2e39ec
media-sound/hydrogen: fix build w/o PCH
We recently disabled PCH in cmake.eclass (3867345f8c2d9f24157508bc6372f479a82cf33f)
which had some fallout.
Add a missing include which this exposes.
Thanks to Christian for giving the patch on the bug.
Closes: https://bugs.gentoo.org/922034
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../hydrogen/files/hydrogen-1.2.2-no-pch-include.patch | 11 +++++++++++
media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch b/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch
new file mode 100644
index 000000000000..fd0ee64b76a0
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/922034
+--- a/src/gui/src/Widgets/FileDialog.h
++++ b/src/gui/src/Widgets/FileDialog.h
+@@ -23,6 +23,7 @@
+ #define FILEDIALOG_H
+
+ #include <QDialog>
++#include <QFileDialog>
+ #include <core/Object.h>
+
+ /** Custom file dialog checking whether the user has write access to
diff --git a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
index 08ca329f3266..71df9f243599 100644
--- a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
@@ -61,6 +61,7 @@ DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
PATCHES=(
"${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"
"${FILESDIR}/${PN}-1.2.2-cflags.patch"
+ "${FILESDIR}/${P}-no-pch-include.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-04-01 6:46 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-12 8:34 [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-04-01 6:46 Sam James
2023-10-10 8:39 Miroslav Šulc
2020-11-28 9:53 Miroslav Šulc
2020-10-07 8:12 Miroslav Šulc
2020-09-18 8:21 Miroslav Šulc
2020-09-07 7:50 Miroslav Šulc
2020-08-07 10:26 Miroslav Šulc
2020-06-15 10:02 Miroslav Šulc
2020-04-01 16:23 Miroslav Šulc
2018-11-09 1:54 Andreas Sturmlechner
2018-03-18 12:31 Andreas Sturmlechner
2017-09-26 18:11 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox