[arch-commits] Commit in hydrogen/trunk (PKGBUILD lrdf_raptor2.patch)

[Ray Rashif]

    Date: Monday, August 11, 2014 @ 14:03:56
  Author: schiv
Revision: 219544

upgpkg: hydrogen 0.9.6-1

upstream release
rework raptor2 patch
upstream build system changed to cmake

Modified:
  hydrogen/trunk/PKGBUILD
  hydrogen/trunk/lrdf_raptor2.patch

--------------------+
 PKGBUILD           |   42 +++++++++++++++++++-----------------------
 lrdf_raptor2.patch |   24 +++++++++++++-----------
 2 files changed, 32 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-11 11:59:20 UTC (rev 219543)
+++ PKGBUILD	2014-08-11 12:03:56 UTC (rev 219544)
@@ -1,26 +1,23 @@
 # $Id$
 # Maintainer: Ray Rashif <schiv at archlinux.org>
 # Contributor: tobias <tobias at archlinux.org>
-# Contributor: K. Piche <kpiche at rogers.com>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: see .contrib
 
 pkgname=hydrogen
-pkgver=0.9.5.1
-pkgrel=4
+pkgver=0.9.6
+pkgrel=1
 pkgdesc="An advanced drum machine"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.hydrogen-music.org/"
-depends=('libarchive' 'liblrdf' 'qt4' 'jack')
-makedepends=('scons' 'optipng')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'lrdf_raptor2.patch'
-        'install.patch')
+depends=('libarchive' 'liblrdf' 'qt4' 'jack' 'libpulse')
+optdepends=('rubberband')
+makedepends=('cmake')
+source=("https://github.com/hydrogen-music/hydrogen/archive/$pkgver.tar.gz"
+        'lrdf_raptor2.patch')
 install=$pkgname.install
-options=('emptydirs')
-md5sums=('52f3a528705818c65acf546a3be4c6fb'
-         '2124851e890f46158189b5fa90006d40'
-         'ce3a83a069b55e46aa532b55e803c9a5')
+md5sums=('e4424926a88af82fb2048b3548723827'
+         '6f15bc059d3c39e9c34e0fbac92baf61')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -27,30 +24,29 @@
 
   # fix building with newer raptor
   # see https://bugs.archlinux.org/task/25060
-  # TODO: report upstream
+  # see https://github.com/hydrogen-music/hydrogen/issues/194
   patch -Np1 -i "$srcdir/lrdf_raptor2.patch"
 
-  # fix some install-time issues
-  # http://www.assembla.com/spaces/hydrogen/tickets/204
-  patch -Np0 -i "$srcdir/install.patch"
-
   # fix some pngs that break with newer libpng
   # see https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
-  msg2 "Fixing PNGs, please wait..."
-  find -name '*.png' -exec optipng -quiet -force -fix {} +
+  #msg2 "Fixing PNGs, please wait..."
+  #find -name '*.png' -exec optipng -quiet -force -fix {} +
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  export QTDIR=/usr
-  scons prefix=/usr libarchive=1
+  # lash will have to wait until I bring it into [extra] --schiv
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
+          -DWANT_CPPUNIT=OFF \
+          -DWANT_LRDF=ON
+  make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  scons DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:

Modified: lrdf_raptor2.patch
===================================================================
--- lrdf_raptor2.patch	2014-08-11 11:59:20 UTC (rev 219543)
+++ lrdf_raptor2.patch	2014-08-11 12:03:56 UTC (rev 219544)
@@ -1,11 +1,13 @@
-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' )
+diff -baur hydrogen-0.9.6.orig/CMakeLists.txt hydrogen-0.9.6/CMakeLists.txt
+--- hydrogen-0.9.6.orig/CMakeLists.txt	2014-08-11 15:10:25.960752930 +0600
++++ hydrogen-0.9.6/CMakeLists.txt	2014-08-11 17:01:48.001219876 +0600
+@@ -193,6 +193,9 @@
+ FIND_HELPER(PULSEAUDIO pulseaudio pulse/pulseaudio.h pulse)
+ FIND_HELPER(LASH lash-1.0 lash/lash.h lash)
+ FIND_HELPER(LRDF lrdf lrdf.h lrdf)
++IF(LRDF_FOUND)
++    include_directories(${LRDF_INCLUDE_DIRS})
++ENDIF(LRDF_FOUND)
+ FIND_HELPER(RUBBERBAND rubberband RubberBandStretcher.h rubberband)
+ FIND_HELPER(CPPUNIT cppunit cppunit/TestCase.h cppunit)
+ # CHECK FOR Qt4