Date: Sunday, May 5, 2013 @ 12:45:31 Author: schiv Revision: 184271 archrelease: copy trunk to extra-i686, extra-x86_64
Added: hydrogen/repos/extra-i686/PKGBUILD (from rev 184270, hydrogen/trunk/PKGBUILD) hydrogen/repos/extra-i686/hydrogen.install (from rev 184270, hydrogen/trunk/hydrogen.install) hydrogen/repos/extra-i686/install.patch (from rev 184270, hydrogen/trunk/install.patch) hydrogen/repos/extra-i686/lrdf_raptor2.patch (from rev 184270, hydrogen/trunk/lrdf_raptor2.patch) hydrogen/repos/extra-x86_64/PKGBUILD (from rev 184270, hydrogen/trunk/PKGBUILD) hydrogen/repos/extra-x86_64/hydrogen.install (from rev 184270, hydrogen/trunk/hydrogen.install) hydrogen/repos/extra-x86_64/install.patch (from rev 184270, hydrogen/trunk/install.patch) hydrogen/repos/extra-x86_64/lrdf_raptor2.patch (from rev 184270, hydrogen/trunk/lrdf_raptor2.patch) Deleted: hydrogen/repos/extra-i686/PKGBUILD hydrogen/repos/extra-i686/install.patch hydrogen/repos/extra-i686/lrdf_raptor2.patch hydrogen/repos/extra-x86_64/PKGBUILD hydrogen/repos/extra-x86_64/install.patch hydrogen/repos/extra-x86_64/lrdf_raptor2.patch ---------------------------------+ /PKGBUILD | 112 ++++++++++++++++++++++++++++++++++++++ /install.patch | 24 ++++++++ /lrdf_raptor2.patch | 22 +++++++ extra-i686/PKGBUILD | 40 ------------- extra-i686/hydrogen.install | 9 +++ extra-i686/install.patch | 12 ---- extra-i686/lrdf_raptor2.patch | 11 --- extra-x86_64/PKGBUILD | 40 ------------- extra-x86_64/hydrogen.install | 9 +++ extra-x86_64/install.patch | 12 ---- extra-x86_64/lrdf_raptor2.patch | 11 --- 11 files changed, 176 insertions(+), 126 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-05-05 10:45:11 UTC (rev 184270) +++ extra-i686/PKGBUILD 2013-05-05 10:45:31 UTC (rev 184271) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Ray Rashif <sc...@archlinux.org> -# Contributor: tobias <tob...@archlinux.org> -# Contributor: K. Piche <kpi...@rogers.com> -# Contributor: Giovanni Scafora <giova...@archlinux.org> - -pkgname=hydrogen -pkgver=0.9.5.1 -pkgrel=3 -pkgdesc="Advanced Drum Machine" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.hydrogen-music.org/" -depends=('libarchive' 'liblrdf' 'qt4' 'jack') -makedepends=('scons') -#options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - lrdf_raptor2.patch - install.patch) -md5sums=('52f3a528705818c65acf546a3be4c6fb' - '2124851e890f46158189b5fa90006d40' - 'ce3a83a069b55e46aa532b55e803c9a5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - 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: Copied: hydrogen/repos/extra-i686/PKGBUILD (from rev 184270, hydrogen/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-05-05 10:45:31 UTC (rev 184271) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: tobias <tob...@archlinux.org> +# Contributor: K. Piche <kpi...@rogers.com> +# Contributor: Giovanni Scafora <giova...@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/hydrogen.install (from rev 184270, hydrogen/trunk/hydrogen.install) =================================================================== --- extra-i686/hydrogen.install (rev 0) +++ extra-i686/hydrogen.install 2013-05-05 10:45:31 UTC (rev 184271) @@ -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 2013-05-05 10:45:11 UTC (rev 184270) +++ extra-i686/install.patch 2013-05-05 10:45:31 UTC (rev 184271) @@ -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 ---- Copied: hydrogen/repos/extra-i686/install.patch (from rev 184270, hydrogen/trunk/install.patch) =================================================================== --- extra-i686/install.patch (rev 0) +++ extra-i686/install.patch 2013-05-05 10:45:31 UTC (rev 184271) @@ -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 ---- Deleted: extra-i686/lrdf_raptor2.patch =================================================================== --- extra-i686/lrdf_raptor2.patch 2013-05-05 10:45:11 UTC (rev 184270) +++ extra-i686/lrdf_raptor2.patch 2013-05-05 10:45:31 UTC (rev 184271) @@ -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 184270, hydrogen/trunk/lrdf_raptor2.patch) =================================================================== --- extra-i686/lrdf_raptor2.patch (rev 0) +++ extra-i686/lrdf_raptor2.patch 2013-05-05 10:45:31 UTC (rev 184271) @@ -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' ) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-05-05 10:45:11 UTC (rev 184270) +++ extra-x86_64/PKGBUILD 2013-05-05 10:45:31 UTC (rev 184271) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Ray Rashif <sc...@archlinux.org> -# Contributor: tobias <tob...@archlinux.org> -# Contributor: K. Piche <kpi...@rogers.com> -# Contributor: Giovanni Scafora <giova...@archlinux.org> - -pkgname=hydrogen -pkgver=0.9.5.1 -pkgrel=3 -pkgdesc="Advanced Drum Machine" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.hydrogen-music.org/" -depends=('libarchive' 'liblrdf' 'qt4' 'jack') -makedepends=('scons') -#options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - lrdf_raptor2.patch - install.patch) -md5sums=('52f3a528705818c65acf546a3be4c6fb' - '2124851e890f46158189b5fa90006d40' - 'ce3a83a069b55e46aa532b55e803c9a5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - 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: Copied: hydrogen/repos/extra-x86_64/PKGBUILD (from rev 184270, hydrogen/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-05-05 10:45:31 UTC (rev 184271) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: tobias <tob...@archlinux.org> +# Contributor: K. Piche <kpi...@rogers.com> +# Contributor: Giovanni Scafora <giova...@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/hydrogen.install (from rev 184270, hydrogen/trunk/hydrogen.install) =================================================================== --- extra-x86_64/hydrogen.install (rev 0) +++ extra-x86_64/hydrogen.install 2013-05-05 10:45:31 UTC (rev 184271) @@ -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 2013-05-05 10:45:11 UTC (rev 184270) +++ extra-x86_64/install.patch 2013-05-05 10:45:31 UTC (rev 184271) @@ -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 ---- Copied: hydrogen/repos/extra-x86_64/install.patch (from rev 184270, hydrogen/trunk/install.patch) =================================================================== --- extra-x86_64/install.patch (rev 0) +++ extra-x86_64/install.patch 2013-05-05 10:45:31 UTC (rev 184271) @@ -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 ---- Deleted: extra-x86_64/lrdf_raptor2.patch =================================================================== --- extra-x86_64/lrdf_raptor2.patch 2013-05-05 10:45:11 UTC (rev 184270) +++ extra-x86_64/lrdf_raptor2.patch 2013-05-05 10:45:31 UTC (rev 184271) @@ -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 184270, hydrogen/trunk/lrdf_raptor2.patch) =================================================================== --- extra-x86_64/lrdf_raptor2.patch (rev 0) +++ extra-x86_64/lrdf_raptor2.patch 2013-05-05 10:45:31 UTC (rev 184271) @@ -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' )