summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/hydrogen/PKGBUILD24
-rw-r--r--libre/hydrogen/lrdf_raptor2.patch13
2 files changed, 6 insertions, 31 deletions
diff --git a/libre/hydrogen/PKGBUILD b/libre/hydrogen/PKGBUILD
index b2cf267e7..c4c35c76d 100644
--- a/libre/hydrogen/PKGBUILD
+++ b/libre/hydrogen/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 219544 2014-08-11 12:03:56Z schiv $
+# $Id: PKGBUILD 229588 2015-01-19 16:59:30Z schiv $
# Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
# Contributor (Arch): tobias <tobias@archlinux.org>
# Contributor (Arch): see .contrib
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=hydrogen
-pkgver=0.9.6
-pkgrel=1.parabola2
+pkgver=0.9.6.1
+pkgrel=1.parabola1
pkgdesc="An advanced drum machine, without nonfree drumkits recommendation"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -16,28 +16,16 @@ optdepends=('rubberband')
makedepends=('cmake')
replaces=(${pkgname}-libre)
conflicts=(${pkgname}-libre)
-source=("https://github.com/hydrogen-music/hydrogen/archive/$pkgver.tar.gz"
- 'lrdf_raptor2.patch')
+source=("https://github.com/hydrogen-music/hydrogen/archive/$pkgver.tar.gz")
install=$pkgname.install
-md5sums=('e4424926a88af82fb2048b3548723827'
- '6f15bc059d3c39e9c34e0fbac92baf61')
+md5sums=('527a44eec22fd31f55e6b3cf1089613d')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # Change to list with only free licensed drumkits
+ # Change to list with free licensed drumkits only
sed -i -e 's|www[.]hydrogen-music[.]org/feeds/drumkit_list[.]php|repo.parabola.nu/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
- # 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() {
diff --git a/libre/hydrogen/lrdf_raptor2.patch b/libre/hydrogen/lrdf_raptor2.patch
deleted file mode 100644
index efec16700..000000000
--- a/libre/hydrogen/lrdf_raptor2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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