Skip to content

Commit 7490e42

Browse files
fordfrogfordfrog
committed
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 <[email protected]>
1 parent e1e9ed3 commit 7490e42

6 files changed

+143
-6
lines changed

‎media-sound/hydrogen/Manifest

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
1+
DIST hydrogen-1.0.0_beta1_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
2+
DIST hydrogen-1.0.0_beta2.tar.gz 11375853 BLAKE2B a7b5e8f0fa675a9869d84cad922f8d9119c88983e80c278dced2d03140619f4d8f70eb132319fd75be0a130cbd65a247dc4a8176a09b4c0a678d0f02385aa5aa SHA512 e87b57fb52a1ff00ef0d011321ad721902df5d1d31f3136d702498b9b5b3580cc7df43c0d7f4cecf55fd96957caf9c44a400eddb3bef07d7fe2cfda85ca1e00e

‎media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch ‎media-sound/hydrogen/files/hydrogen-1.0.0_beta1_pre20180301-gnuinstalldirs.patch

File renamed without changes.

‎media-sound/hydrogen/files/hydrogen-1.0.0_beta2-gnuinstalldirs.patch

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 5d9e146..986e435 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -362,10 +362,10 @@ ELSE()
6+
INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
7+
ENDIF()
8+
IF(NOT MINGW AND NOT APPLE)
9+
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
10+
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
11+
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg")
12+
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
13+
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
14+
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
15+
+ 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")
16+
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
17+
ENDIF()
18+
19+
#
20+
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
21+
index cfdc72a..b7b0dbc 100644
22+
--- a/src/core/CMakeLists.txt
23+
+++ b/src/core/CMakeLists.txt
24+
@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION}
25+
26+
IF(NOT APPLE AND NOT WIN32)
27+
INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
28+
- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
29+
+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
30+
ENDIF()

‎media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild ‎media-sound/hydrogen/hydrogen-1.0.0_beta1_pre20180301-r1.ebuild

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2018 Gentoo Foundation
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=6

‎media-sound/hydrogen/hydrogen-1.0.0_beta2.ebuild

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Copyright 1999-2020 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=7
5+
6+
inherit cmake xdg
7+
8+
DESCRIPTION="Advanced drum machine"
9+
HOMEPAGE="http://www.hydrogen-music.org/"
10+
11+
if [[ ${PV} == 9999 ]]; then
12+
inherit git-r3
13+
EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
14+
KEYWORDS=""
15+
else
16+
MY_PV=${PV/_/-}
17+
SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
18+
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
19+
S="${WORKDIR}"/${PN}-${MY_PV}
20+
fi
21+
22+
LICENSE="GPL-2 ZLIB"
23+
SLOT="0"
24+
IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
25+
26+
REQUIRED_USE="lash? ( alsa )"
27+
28+
BDEPEND="
29+
virtual/pkgconfig
30+
doc? ( app-doc/doxygen )
31+
"
32+
DEPEND="
33+
dev-qt/qtcore:5
34+
dev-qt/qtgui:5
35+
dev-qt/qtnetwork:5
36+
dev-qt/qtwidgets:5
37+
dev-qt/qtxml:5
38+
dev-qt/qtxmlpatterns:5
39+
>=media-libs/libsndfile-1.0.18
40+
alsa? ( media-libs/alsa-lib )
41+
archive? ( app-arch/libarchive )
42+
!archive? ( >=dev-libs/libtar-1.2.11-r3 )
43+
jack? ( virtual/jack )
44+
ladspa? ( media-libs/liblrdf )
45+
lash? ( media-sound/lash )
46+
osc? ( media-libs/liblo )
47+
portaudio? ( media-libs/portaudio )
48+
portmidi? ( media-libs/portmidi )
49+
pulseaudio? ( media-sound/pulseaudio )
50+
"
51+
RDEPEND="${DEPEND}"
52+
53+
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
54+
55+
PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
56+
57+
src_prepare() {
58+
cmake_src_prepare
59+
}
60+
61+
src_configure() {
62+
local mycmakeargs=(
63+
-DWANT_ALSA=$(usex alsa)
64+
-DWANT_CPPUNIT=OFF
65+
-DWANT_DEBUG=OFF
66+
-DWANT_JACK=$(usex jack)
67+
-DWANT_JACKSESSION=$(usex jack)
68+
-DWANT_LADSPA=$(usex ladspa)
69+
-DWANT_LASH=$(usex lash)
70+
-DWANT_LIBARCHIVE=$(usex archive)
71+
-DWANT_LRDF=$(usex ladspa)
72+
-DWANT_OSC=$(usex osc)
73+
-DWANT_OSS=$(usex oss)
74+
-DWANT_PORTAUDIO=$(usex portaudio)
75+
-DWANT_PORTMIDI=$(usex portmidi)
76+
-DWANT_PULSEAUDIO=$(usex pulseaudio)
77+
-DWANT_RUBBERBAND=OFF
78+
)
79+
80+
cmake_src_configure
81+
}
82+
83+
src_compile() {
84+
cmake_src_compile
85+
use doc && cmake_src_compile doc
86+
}
87+
88+
src_install() {
89+
use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
90+
cmake_src_install
91+
}

‎media-sound/hydrogen/hydrogen-9999.ebuild

+19-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=7
55

6-
inherit git-r3 xdg cmake
6+
inherit cmake xdg
77

88
DESCRIPTION="Advanced drum machine"
99
HOMEPAGE="http://www.hydrogen-music.org/"
10-
EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
10+
11+
if [[ ${PV} == 9999 ]]; then
12+
inherit git-r3
13+
EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
14+
KEYWORDS=""
15+
else
16+
MY_PV=${PV/_/-}
17+
SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
18+
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
19+
S="${WORKDIR}"/${PN}-${MY_PV}
20+
fi
1121

1222
LICENSE="GPL-2 ZLIB"
1323
SLOT="0"
14-
KEYWORDS=""
1524
IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
1625

1726
REQUIRED_USE="lash? ( alsa )"
@@ -43,6 +52,12 @@ RDEPEND="${DEPEND}"
4352

4453
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
4554

55+
PATCHES=( "${FILESDIR}/${PN}-1.0.0_beta2-gnuinstalldirs.patch" )
56+
57+
src_prepare() {
58+
cmake_src_prepare
59+
}
60+
4661
src_configure() {
4762
local mycmakeargs=(
4863
-DWANT_ALSA=$(usex alsa)

0 commit comments

Comments
 (0)