From b778654e0749f58999aa86e8ef17910973b9e5ea Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 5 Jun 2014 09:24:34 +0200 Subject: [PATCH] hydrogen: use our CXXFLAGS; make this build again. --- srcpkgs/hydrogen/patches/install.patch | 12 ++++++++++++ srcpkgs/hydrogen/template | 21 +++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/hydrogen/patches/install.patch diff --git a/srcpkgs/hydrogen/patches/install.patch b/srcpkgs/hydrogen/patches/install.patch new file mode 100644 index 00000000000..2e6e707a147 --- /dev/null +++ b/srcpkgs/hydrogen/patches/install.patch @@ -0,0 +1,12 @@ +*** Sconstruct.org 2011-11-06 12:15:40.018119106 +0100 +--- Sconstruct 2011-11-06 12:16:21.124122432 +0100 +*************** +*** 298,304 **** + + for N in glob.glob('./data/i18n/hydrogen.*'): + env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N)) +- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img")) + + #add every img in ./data/img to the install list. + os.path.walk("./data/img/",install_images,env) +--- 298,303 ---- diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template index c1372576595..2c480fb77d9 100644 --- a/srcpkgs/hydrogen/template +++ b/srcpkgs/hydrogen/template @@ -1,23 +1,28 @@ # Template file for 'hydrogen' pkgname=hydrogen version=0.9.5.1 -revision=1 -makedepends="pkg-config scons libsndfile-devel libtar-devel - libarchive-devel>=3.1.2 jack-devel qt-devel" +revision=2 +hostmakedepends="pkg-config scons optipng" +makedepends="libsndfile-devel libtar-devel libarchive-devel>=3.1.2 jack-devel qt-devel desktop-file-utils" depends="desktop-file-utils" short_desc="Advanced drum machine" -maintainer="davehome " +maintainer="Juan RP " license="GPL-2" homepage="http://www.hydrogen-music.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=ebe105fec9ce8e2129f9e1bb5bfe675f1c7143a80babda40620cb3ef9eb97ebb # XXX LASH Support +do_configure() { + find -name '*.png' -exec optipng -quiet -force -fix {} + +} do_build() { - QTDIR=/usr scons lrdf=0 jack=1 alsa=1 lash=0 portaudio=0 portmidi=0 \ - oss=1 gui=1 libarchive=1 debug=1 prefix=/usr + QTDIR=/usr scons ${makejobs} optflags="$CXXFLAGS" \ + lrdf=0 jack=1 alsa=1 lash=0 portaudio=0 portmidi=0 \ + oss=1 gui=1 libarchive=1 debug=0 prefix=/usr } - do_install() { - scons DESTDIR=${DESTDIR} install + scons install ${makejobs} DESTDIR=${DESTDIR} optflags="$CXXFLAGS" \ + lrdf=0 jack=1 alsa=1 lash=0 portaudio=0 portmidi=0 \ + oss=1 gui=1 libarchive=1 debug=0 prefix=/usr }