[arch-commits] Commit in hydrogen/repos (16 files)
Ray Rashif
schiv at archlinux.org
Mon Aug 11 12:12:45 UTC 2014
Date: Monday, August 11, 2014 @ 14:12:45
Author: schiv
Revision: 219546
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
hydrogen/repos/extra-i686/.contrib
(from rev 219545, hydrogen/trunk/.contrib)
hydrogen/repos/extra-i686/PKGBUILD
(from rev 219545, hydrogen/trunk/PKGBUILD)
hydrogen/repos/extra-i686/hydrogen.install
(from rev 219545, hydrogen/trunk/hydrogen.install)
hydrogen/repos/extra-i686/lrdf_raptor2.patch
(from rev 219545, hydrogen/trunk/lrdf_raptor2.patch)
hydrogen/repos/extra-x86_64/.contrib
(from rev 219545, hydrogen/trunk/.contrib)
hydrogen/repos/extra-x86_64/PKGBUILD
(from rev 219545, hydrogen/trunk/PKGBUILD)
hydrogen/repos/extra-x86_64/hydrogen.install
(from rev 219545, hydrogen/trunk/hydrogen.install)
hydrogen/repos/extra-x86_64/lrdf_raptor2.patch
(from rev 219545, hydrogen/trunk/lrdf_raptor2.patch)
Deleted:
hydrogen/repos/extra-i686/PKGBUILD
hydrogen/repos/extra-i686/hydrogen.install
hydrogen/repos/extra-i686/install.patch
hydrogen/repos/extra-i686/lrdf_raptor2.patch
hydrogen/repos/extra-x86_64/PKGBUILD
hydrogen/repos/extra-x86_64/hydrogen.install
hydrogen/repos/extra-x86_64/install.patch
hydrogen/repos/extra-x86_64/lrdf_raptor2.patch
---------------------------------+
/PKGBUILD | 104 ++++++++++++++++++++++++++++++++++++++
/hydrogen.install | 18 ++++++
/lrdf_raptor2.patch | 26 +++++++++
extra-i686/.contrib | 2
extra-i686/PKGBUILD | 56 --------------------
extra-i686/hydrogen.install | 9 ---
extra-i686/install.patch | 12 ----
extra-i686/lrdf_raptor2.patch | 11 ----
extra-x86_64/.contrib | 2
extra-x86_64/PKGBUILD | 56 --------------------
extra-x86_64/hydrogen.install | 9 ---
extra-x86_64/install.patch | 12 ----
extra-x86_64/lrdf_raptor2.patch | 11 ----
13 files changed, 152 insertions(+), 176 deletions(-)
Copied: hydrogen/repos/extra-i686/.contrib (from rev 219545, hydrogen/trunk/.contrib)
===================================================================
--- extra-i686/.contrib (rev 0)
+++ extra-i686/.contrib 2014-08-11 12:12:45 UTC (rev 219546)
@@ -0,0 +1,2 @@
+# Contributor: K. Piche <kpiche at rogers.com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-08-11 12:12:22 UTC (rev 219545)
+++ extra-i686/PKGBUILD 2014-08-11 12:12:45 UTC (rev 219546)
@@ -1,56 +0,0 @@
-# $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>
-
-pkgname=hydrogen
-pkgver=0.9.5.1
-pkgrel=4
-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')
-install=$pkgname.install
-options=('emptydirs')
-md5sums=('52f3a528705818c65acf546a3be4c6fb'
- '2124851e890f46158189b5fa90006d40'
- 'ce3a83a069b55e46aa532b55e803c9a5')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # fix building with newer raptor
- # see https://bugs.archlinux.org/task/25060
- # TODO: report upstream
- 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 {} +
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- export QTDIR=/usr
- scons prefix=/usr libarchive=1
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- scons DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: hydrogen/repos/extra-i686/PKGBUILD (from rev 219545, hydrogen/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-08-11 12:12:45 UTC (rev 219546)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: see .contrib
+
+pkgname=hydrogen
+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' 'libpulse')
+optdepends=('rubberband')
+makedepends=('cmake')
+source=("https://github.com/hydrogen-music/hydrogen/archive/$pkgver.tar.gz"
+ 'lrdf_raptor2.patch')
+install=$pkgname.install
+md5sums=('e4424926a88af82fb2048b3548723827'
+ '6f15bc059d3c39e9c34e0fbac92baf61')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix building with newer raptor
+ # see https://bugs.archlinux.org/task/25060
+ # see https://github.com/hydrogen-music/hydrogen/issues/194
+ patch -Np1 -i "$srcdir/lrdf_raptor2.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 {} +
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # 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"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/hydrogen.install
===================================================================
--- extra-i686/hydrogen.install 2014-08-11 12:12:22 UTC (rev 219545)
+++ extra-i686/hydrogen.install 2014-08-11 12:12:45 UTC (rev 219546)
@@ -1,9 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: hydrogen/repos/extra-i686/hydrogen.install (from rev 219545, hydrogen/trunk/hydrogen.install)
===================================================================
--- extra-i686/hydrogen.install (rev 0)
+++ extra-i686/hydrogen.install 2014-08-11 12:12:45 UTC (rev 219546)
@@ -0,0 +1,9 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/install.patch
===================================================================
--- extra-i686/install.patch 2014-08-11 12:12:22 UTC (rev 219545)
+++ extra-i686/install.patch 2014-08-11 12:12:45 UTC (rev 219546)
@@ -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 ----
Deleted: extra-i686/lrdf_raptor2.patch
===================================================================
--- extra-i686/lrdf_raptor2.patch 2014-08-11 12:12:22 UTC (rev 219545)
+++ extra-i686/lrdf_raptor2.patch 2014-08-11 12:12:45 UTC (rev 219546)
@@ -1,11 +0,0 @@
-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' )
Copied: hydrogen/repos/extra-i686/lrdf_raptor2.patch (from rev 219545, hydrogen/trunk/lrdf_raptor2.patch)
===================================================================
--- extra-i686/lrdf_raptor2.patch (rev 0)
+++ extra-i686/lrdf_raptor2.patch 2014-08-11 12:12:45 UTC (rev 219546)
@@ -0,0 +1,13 @@
+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
Copied: hydrogen/repos/extra-x86_64/.contrib (from rev 219545, hydrogen/trunk/.contrib)
===================================================================
--- extra-x86_64/.contrib (rev 0)
+++ extra-x86_64/.contrib 2014-08-11 12:12:45 UTC (rev 219546)
@@ -0,0 +1,2 @@
+# Contributor: K. Piche <kpiche at rogers.com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-08-11 12:12:22 UTC (rev 219545)
+++ extra-x86_64/PKGBUILD 2014-08-11 12:12:45 UTC (rev 219546)
@@ -1,56 +0,0 @@
-# $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>
-
-pkgname=hydrogen
-pkgver=0.9.5.1
-pkgrel=4
-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')
-install=$pkgname.install
-options=('emptydirs')
-md5sums=('52f3a528705818c65acf546a3be4c6fb'
- '2124851e890f46158189b5fa90006d40'
- 'ce3a83a069b55e46aa532b55e803c9a5')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # fix building with newer raptor
- # see https://bugs.archlinux.org/task/25060
- # TODO: report upstream
- 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 {} +
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- export QTDIR=/usr
- scons prefix=/usr libarchive=1
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- scons DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: hydrogen/repos/extra-x86_64/PKGBUILD (from rev 219545, hydrogen/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-08-11 12:12:45 UTC (rev 219546)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: see .contrib
+
+pkgname=hydrogen
+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' 'libpulse')
+optdepends=('rubberband')
+makedepends=('cmake')
+source=("https://github.com/hydrogen-music/hydrogen/archive/$pkgver.tar.gz"
+ 'lrdf_raptor2.patch')
+install=$pkgname.install
+md5sums=('e4424926a88af82fb2048b3548723827'
+ '6f15bc059d3c39e9c34e0fbac92baf61')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix building with newer raptor
+ # see https://bugs.archlinux.org/task/25060
+ # see https://github.com/hydrogen-music/hydrogen/issues/194
+ patch -Np1 -i "$srcdir/lrdf_raptor2.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 {} +
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # 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"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/hydrogen.install
===================================================================
--- extra-x86_64/hydrogen.install 2014-08-11 12:12:22 UTC (rev 219545)
+++ extra-x86_64/hydrogen.install 2014-08-11 12:12:45 UTC (rev 219546)
@@ -1,9 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: hydrogen/repos/extra-x86_64/hydrogen.install (from rev 219545, hydrogen/trunk/hydrogen.install)
===================================================================
--- extra-x86_64/hydrogen.install (rev 0)
+++ extra-x86_64/hydrogen.install 2014-08-11 12:12:45 UTC (rev 219546)
@@ -0,0 +1,9 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/install.patch
===================================================================
--- extra-x86_64/install.patch 2014-08-11 12:12:22 UTC (rev 219545)
+++ extra-x86_64/install.patch 2014-08-11 12:12:45 UTC (rev 219546)
@@ -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 ----
Deleted: extra-x86_64/lrdf_raptor2.patch
===================================================================
--- extra-x86_64/lrdf_raptor2.patch 2014-08-11 12:12:22 UTC (rev 219545)
+++ extra-x86_64/lrdf_raptor2.patch 2014-08-11 12:12:45 UTC (rev 219546)
@@ -1,11 +0,0 @@
-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' )
Copied: hydrogen/repos/extra-x86_64/lrdf_raptor2.patch (from rev 219545, hydrogen/trunk/lrdf_raptor2.patch)
===================================================================
--- extra-x86_64/lrdf_raptor2.patch (rev 0)
+++ extra-x86_64/lrdf_raptor2.patch 2014-08-11 12:12:45 UTC (rev 219546)
@@ -0,0 +1,13 @@
+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
More information about the arch-commits
mailing list