Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

3 files changed, 71 insertions, 0 deletions

diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD
new file mode 100644
index 000000000..562d4f3fd
--- /dev/null
+++ b/libre/hydrogen-libre/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: K. Piche <kpiche@rogers.com>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+_pkgname=hydrogen
+pkgname=hydrogen-libre
+pkgver=0.9.5.1
+pkgrel=3.1
+pkgdesc="Advanced Drum Machine (without nonfree drumkits recommendation)"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://www.hydrogen-music.org/"
+depends=('libarchive' 'liblrdf' 'qt4' 'jack')
+makedepends=('scons')
+#options=('!makeflags')
+replaces=("${_pkgname}")
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
+source=(http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
+        lrdf_raptor2.patch
+        install.patch)
+md5sums=('52f3a528705818c65acf546a3be4c6fb'
+         '2124851e890f46158189b5fa90006d40'
+         'ce3a83a069b55e46aa532b55e803c9a5')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  # Change to list with only free licensed drumkits
+  sed -i -e 's|www.hydrogen-music.org/feeds/drumkit_list.php|repo.parabolagnulinux.org/other/hydrogen-libre/feeds/drumkit_list.php|'\
+  {data/{hydrogen.default.conf,doc/manual{.docbook,_nl.html,_es.html,_fr.html,.pot,_fr.po,_es.po,_en.html,_ca.html,_it.html}},gui/src/SoundLibrary/SoundLibraryImportDialog.cpp,libs/hydrogen/src/preferences.cpp} || read
+
+  export QTDIR=/usr
+  patch -Np1 -i "${srcdir}/lrdf_raptor2.patch"
+  # http://www.assembla.com/spaces/hydrogen/tickets/204
+  patch -Np0 -i "${srcdir}/install.patch"
+  scons prefix=/usr libarchive=1
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  scons DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/hydrogen-libre/install.patch b/libre/hydrogen-libre/install.patch
new file mode 100644
index 000000000..2e6e707a1
--- /dev/null
+++ b/libre/hydrogen-libre/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/libre/hydrogen-libre/lrdf_raptor2.patch b/libre/hydrogen-libre/lrdf_raptor2.patch
new file mode 100644
index 000000000..ec176b716
--- /dev/null
+++ b/libre/hydrogen-libre/lrdf_raptor2.patch
@@ -0,0 +1,11 @@
+diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
+--- hydrogen-0.9.5.old/Sconstruct	2011-08-11 18:00:07.889112348 +0800
++++ hydrogen-0.9.5/Sconstruct	2011-08-11 18:00:34.945632437 +0800
+@@ -83,6 +83,7 @@
+ 	includes.append( './' )
+ 	includes.append( 'gui/src/' )
+ 	includes.append( '3rdparty/install/include' )
++	includes.append( '/usr/include/raptor2' )
+ 
+ 	if sys.platform == "darwin":
+ 		ldflags.append( '-L/opt/local/lib' )