Hydrogen needs to be flushed, adding and deleting.

pull/4/head
audiodef 6 years ago
parent 1db8ed6fab
commit e40548835e

@ -1,2 +1,8 @@
EBUILD hydrogen-9999.ebuild 2027 SHA256 d949c5985193661879cd1afb357c615a93c4949d42421461d9c5ab871f20870f SHA512 7a117111db6a07d34e5b6112d1392701cad09ba49a217a5bcefa5a8080b42922fb2bbdf338104b391eb73a840bf61469fe97350b7c909e15daf2d3fec4b89d76 WHIRLPOOL 2bd74b7203312ab2be7fea2e16c9623cc6c6f6e5cf6fcad8b99ac1beab0aa4b77a1dcc855a609fc508086c5d9e1c7a2348852574b287310cf42d14b5fc5a800d
MISC metadata.xml 595 SHA256 00796170eaec794425201c0d6627401e87c3687caccca292dd893c116e26f41f SHA512 4b63cf220902f6a89d1ec429500eb5c65abd290eaedbfbad04c5844ee3c733fd6da144e14a7e57a94e1487a4b713218b14b257585f33e5f25bf18c60ec3f6a2e WHIRLPOOL b55b5ec5f2062f8b38ac2ab56e90269376588551d282c97ec77d3fbca29eb9c98bffcdf1cf0edc54f7c17a3a0b0c4dadd36201996a60943971ee136037a9a12b
AUX hydrogen-0.9.5-gcc47.patch 761 BLAKE2B 4dcf893c24a6cd8f3669af7f1b5517488adfd6aaf5018959732225f46ce0013faea98554a2e370c0d724100f64cd92308e00bf619271e9de4125dc7b7971f1fe SHA512 ff3a06fbafdce19bf04f9fb71c04ff754e22caa36148a0f5e4a56efc53ce9b9478e9f1aeacdcc037234104762d9fce208aef351c70941b044e2d83bac4131304
AUX hydrogen-0.9.5-gcc6.patch 609 BLAKE2B f34496e0c3c251f135262ff30efaff243ae4fc0a279ad529f0bceb1e6b854b6b8b513a2f2b1c6e15ce1f68d51032817147ae7a357205345bf64876b5f2c7096b SHA512 0078c02e9cb2de557825cd6119ccfb6247f171ccc4a53ea93241891850c82f0924e9e0a4740764d13f1deefcb5e9469137e5d4a69c2bfceedeae8fb110deea8f
AUX hydrogen-0.9.5-use_lrdf_pkgconfig.patch 858 BLAKE2B c43e9a0de36e1eee2c184b6405b3a01284dea8f058ba77aa415e85ee5e4e2bc27b975ee5a1d959471c64154f9be6cc0fe51e66db31abd7149e0350f91e8a9735 SHA512 251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31
AUX hydrogen-gnuinstalldirs.patch 4979 BLAKE2B 02b3894ec8d6893c061a1a7767e44b6d5d0df3fa29fceb731e56dd83be74784195d0da13447c82326638ce7091c26c846d42c70ca6d66ef1a64310de8eab73a3 SHA512 23838dbab56d29f53ff78055f371ce11a57f7cf738c76ce22b684b1de72cefe71767a1237246c24b90034e72a72a16d4999365959563a71906e34b7da6abb3c1
DIST hydrogen-0.9.5.tar.gz 5239702 BLAKE2B 5fb1e7561b65587a6a4b8e642a4e0262cf8521a6847f04e57d4f99af2ef38fecb05f779cd5b0c25d487360db6455b0912729e7deac0d9959e8c32938a44b1adb SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97
EBUILD hydrogen-0.9.5-r1.ebuild 1816 BLAKE2B b66901bef46726ad957b37074ec247d7c9d502f324c8a0a2da2bca3af036a204b6f63fb0047672ef6fa38194c263c210efae02ae33d8eb56a4169bbf4a8529cf SHA512 0bd6ded8debf0915399c1dcc56537730d3c8a8b219262223d567f2240f3019de5675196102da55840c039ab30814ef27ec1f7b1c4313e537e07970e353956b86
EBUILD hydrogen-9999.ebuild 1831 BLAKE2B b05a1bb7a184ccf69846132a79a82c4677b77ac8e6b51bb8114734bc1ac47e19c7d4a9deb3b3ca14237f17d360a702253b8318ffe4bda7d1811ac572b79b9c63 SHA512 26532173d65743e0b102e2169a32bc1e39464e51bcdc4185080be069e49b66a5eb224a31510e79e4f118e09e617754e26d2da85123d1a79967888bae113bc9ca
MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f

@ -0,0 +1,27 @@
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>

@ -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;
}

@ -0,0 +1,23 @@
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)

@ -0,0 +1,112 @@
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")
#
@@ -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 "${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 fb375e48..9cd18e6a 100644
--- 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
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.15.1

@ -0,0 +1,69 @@
# 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
}

@ -1,72 +1,81 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
case "${PV}" in
(*9999*)
KEYWORDS=""
VCS_ECLASS=git-r3
EGIT_REPO_URI="git://github.com/hydrogen-music/${PN}.git"
;;
(*)
KEYWORDS="~amd64"
VCS_ECLASS=vcs-snapshot
SRC_URI="https://github.com/${PN}-music/${PN}/archive/${PVR/_/-}.tar.gz -> ${P}.tar.gz"
;;
esac
inherit eutils cmake-utils multilib flag-o-matic toolchain-funcs ${VCS_ECLASS}
inherit cmake-utils git-r3 xdg-utils
DESCRIPTION="Advanced drum machine"
HOMEPAGE="http://www.hydrogen-music.org"
HOMEPAGE="http://www.hydrogen-music.org/"
EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
LICENSE="GPL-2 ZLIB"
SLOT="0"
IUSE="+alsa +archive debug doc +extra +jack jack-session ladspa lash oss portaudio portmidi -pulseaudio rubberband static"
KEYWORDS=""
IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
REQUIRED_USE="lash? ( alsa )"
# liblo>=0.28 required in order to provide lo_cpp.h to hydrogen-9999
RDEPEND="archive? ( app-arch/libarchive )
!archive? ( >=dev-libs/libtar-1.2.11-r3 )
dev-qt/qtgui:4 dev-qt/qtcore:4
dev-qt/qtxmlpatterns:4
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 )
portaudio? ( >=media-libs/portaudio-19_pre )
osc? ( media-libs/liblo )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
rubberband? ( media-libs/rubberband )
extra? ( media-libs/hydrogen-drumkits )
>=media-libs/liblo-0.28"
"
DEPEND="${RDEPEND}
virtual/pkgconfig
media-libs/raptor
doc? ( app-doc/doxygen )"
"
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
S="${WORKDIR}/${PN}-${PVR/_rc/-RC}"
PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" )
src_configure()
{
sed -e 's/-O2 //g' -i CMakeLists.txt
src_configure() {
local mycmakeargs=(
-DWANT_ALSA="$(usex alsa)"
-DWANT_LIBARCHIVE="$(usex archive)"
-DWANT_DEBUG="$(usex debug)"
-DWANT_JACK="$(usex jack)"
-DWANT_JACKSESSION="$(usex jack-session)"
-DWANT_LRDF="$(usex ladspa)"
-DWANT_LASH="$(usex lash)"
-DWANT_OSS="$(usex oss)"
-DWANT_PORTAUDIO="$(usex portaudio)"
-DWANT_PORTMIDI="$(usex portmidi)"
-DWANT_PULSEAUDIO="$(usex pulseaudio)"
-DWANT_RUBBERBAND="$(usex rubberband)"
-DWANT_SHARED="$(usex static)"
-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
}

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>webmaster@gentoostudio.org</email>
<name>Gentoo Studio/Damien Moody</name>
</maintainer>
<use>
<flag name="archive">Add archive support</flag>
<flag name="extra">Include media-libs/hydrogen-drumkits</flag>
<flag name="jack-session">Add support for saving/loading JACK sessions</flag>
<flag name="portmidi">Add portmidi support</flag>
<flag name="rubberband">Add time-stretching/pitch shifting support</flag>
</use>
<maintainer type="project">
<email>proaudio@gentoo.org</email>
<name>Gentoo ProAudio Project</name>
</maintainer>
<use>
<flag name="archive">Use libarchive instead of libtar</flag>
<flag name="portmidi">Add portmidi support</flag>
</use>
<upstream>
<remote-id type="github">hydrogen-music/hydrogen</remote-id>
</upstream>
</pkgmetadata>

Loading…
Cancel
Save