diff options
Diffstat (limited to 'libre/hydrogen-libre')
| -rw-r--r-- | libre/hydrogen-libre/PKGBUILD | 49 | ||||
| -rw-r--r-- | libre/hydrogen-libre/install.patch | 12 | ||||
| -rw-r--r-- | libre/hydrogen-libre/lrdf_raptor2.patch | 24 |
3 files changed, 36 insertions, 49 deletions
diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD index df866a6c1..49f7979bf 100644 --- a/libre/hydrogen-libre/PKGBUILD +++ b/libre/hydrogen-libre/PKGBUILD @@ -1,64 +1,61 @@ -# $Id: PKGBUILD 184270 2013-05-05 10:45:11Z schiv $ +# $Id: PKGBUILD 219544 2014-08-11 12:03:56Z schiv $ # Maintainer (Arch): Ray Rashif <schiv@archlinux.org> # Contributor (Arch): tobias <tobias@archlinux.org> -# Contributor (Arch): K. Piche <kpiche@rogers.com> -# Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> +# Contributor (Arch): see .contrib +# Maintainer: André Silva <emulatorman@parabola.nu> _pkgname=hydrogen pkgname=hydrogen-libre -pkgver=0.9.5.1 -pkgrel=4 +pkgver=0.9.6 +pkgrel=1 pkgdesc="An 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' 'optipng') +depends=('libarchive' 'liblrdf' 'qt4' 'jack' 'libpulse') +optdepends=('rubberband') +makedepends=('cmake') replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) -source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz" - 'lrdf_raptor2.patch' - 'install.patch') +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" # 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 + sed -i -e 's|www[.]hydrogen-music[.]org/feeds/drumkit_list[.]php|repo.parabolagnulinux.org/other/hydrogen-libre/feeds/drumkit_list.php|'\ + $(grep -rlI 'www[.]hydrogen-music[.]org/feeds/drumkit_list[.]php') # 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: diff --git a/libre/hydrogen-libre/install.patch b/libre/hydrogen-libre/install.patch deleted file mode 100644 index 2e6e707a1..000000000 --- a/libre/hydrogen-libre/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/libre/hydrogen-libre/lrdf_raptor2.patch b/libre/hydrogen-libre/lrdf_raptor2.patch index ec176b716..efec16700 100644 --- a/libre/hydrogen-libre/lrdf_raptor2.patch +++ b/libre/hydrogen-libre/lrdf_raptor2.patch @@ -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 |