From 5999c5518ef7c804448e12f7bc2de7db746c9d42 Mon Sep 17 00:00:00 2001 From: Juan RP <xtraeme@gmail.com> Date: Mon, 13 Oct 2014 10:29:51 +0200 Subject: [PATCH] hydrogen: update to 0.9.6. --- srcpkgs/hydrogen/patches/install.patch | 12 -------- srcpkgs/hydrogen/patches/jack_detection.patch | 17 ----------- srcpkgs/hydrogen/template | 30 ++++++------------- 3 files changed, 9 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/hydrogen/patches/install.patch delete mode 100644 srcpkgs/hydrogen/patches/jack_detection.patch diff --git a/srcpkgs/hydrogen/patches/install.patch b/srcpkgs/hydrogen/patches/install.patch deleted file mode 100644 index 2e6e707a14..0000000000 --- a/srcpkgs/hydrogen/patches/install.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** 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/patches/jack_detection.patch b/srcpkgs/hydrogen/patches/jack_detection.patch deleted file mode 100644 index 152439d396..0000000000 --- a/srcpkgs/hydrogen/patches/jack_detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fails to detect jack is version contains another dot, i.e "x.x.x.x" - ---- Sconstruct.orig 2013-02-20 15:16:36.035716875 +0100 -+++ Sconstruct 2013-02-20 15:16:57.218211973 +0100 -@@ -322,10 +322,11 @@ def get_hydrogen_gui( lib_hydrogen , opt - - - def get_jack_api_flags(xenv, pkg_ver): -- (major, minor, patch) = pkg_ver.rstrip().split('.') -+ (major, minor, patch, micro) = pkg_ver.rstrip().split('.') - major = int(major) - minor = int(minor) - patch = int(patch) -+ micro = int(micro) - rv = "" - if (major == 0) and (minor < 102): - rv = "-DJACK_NO_BBT_OFFSET" diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template index 2c480fb77d..d89b2a3bb2 100644 --- a/srcpkgs/hydrogen/template +++ b/srcpkgs/hydrogen/template @@ -1,28 +1,16 @@ # Template file for 'hydrogen' pkgname=hydrogen -version=0.9.5.1 -revision=2 -hostmakedepends="pkg-config scons optipng" -makedepends="libsndfile-devel libtar-devel libarchive-devel>=3.1.2 jack-devel qt-devel desktop-file-utils" +version=0.9.6 +revision=1 +build_style=cmake +configure_args="-DWANT_LRDF=ON -DWANT_CPPUNIT=OFF" +hostmakedepends="pkg-config cmake" +makedepends="libsndfile-devel libarchive-devel liblrdf-devel + pulseaudio-devel jack-devel qt-devel" depends="desktop-file-utils" short_desc="Advanced drum machine" maintainer="Juan RP <xtraeme@gmail.com>" 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 ${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 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 -} +distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz" +checksum=bc4cf69662714f583a5922951f8a0f1ea5ee9de140a2b36320b7a212b042f2fc