From 7e30f82cca4a7981438e2a64c0c8d3b74ca09705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 5 Sep 2014 01:05:25 -0300 Subject: hydrogen: remove libre suffix and add complex pkgrel --- libre/hydrogen-libre/PKGBUILD | 61 --------------------------------- libre/hydrogen-libre/hydrogen.install | 9 ----- libre/hydrogen-libre/lrdf_raptor2.patch | 13 ------- libre/hydrogen/PKGBUILD | 59 +++++++++++++++++++++++++++++++ libre/hydrogen/hydrogen.install | 9 +++++ libre/hydrogen/lrdf_raptor2.patch | 13 +++++++ 6 files changed, 81 insertions(+), 83 deletions(-) delete mode 100644 libre/hydrogen-libre/PKGBUILD delete mode 100644 libre/hydrogen-libre/hydrogen.install delete mode 100644 libre/hydrogen-libre/lrdf_raptor2.patch create mode 100644 libre/hydrogen/PKGBUILD create mode 100644 libre/hydrogen/hydrogen.install create mode 100644 libre/hydrogen/lrdf_raptor2.patch (limited to 'libre') diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD deleted file mode 100644 index 49f7979bf..000000000 --- a/libre/hydrogen-libre/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 219544 2014-08-11 12:03:56Z schiv $ -# Maintainer (Arch): Ray Rashif -# Contributor (Arch): tobias -# Contributor (Arch): see .contrib -# Maintainer: André Silva - -_pkgname=hydrogen -pkgname=hydrogen-libre -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' 'libpulse') -optdepends=('rubberband') -makedepends=('cmake') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -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" - - # 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|'\ - $(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() { - 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: diff --git a/libre/hydrogen-libre/hydrogen.install b/libre/hydrogen-libre/hydrogen.install deleted file mode 100644 index ef354d1f5..000000000 --- a/libre/hydrogen-libre/hydrogen.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/hydrogen-libre/lrdf_raptor2.patch b/libre/hydrogen-libre/lrdf_raptor2.patch deleted file mode 100644 index efec16700..000000000 --- a/libre/hydrogen-libre/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 diff --git a/libre/hydrogen/PKGBUILD b/libre/hydrogen/PKGBUILD new file mode 100644 index 000000000..9f16eb692 --- /dev/null +++ b/libre/hydrogen/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 219544 2014-08-11 12:03:56Z schiv $ +# Maintainer (Arch): Ray Rashif +# Contributor (Arch): tobias +# Contributor (Arch): see .contrib +# Maintainer: André Silva + +pkgname=hydrogen +pkgver=0.9.6 +pkgrel=1.parabola1 +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' 'libpulse') +optdepends=('rubberband') +makedepends=('cmake') +replaces=(${pkgname}-libre) +conflicts=(${pkgname}-libre) +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" + + # 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|'\ + $(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() { + 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: diff --git a/libre/hydrogen/hydrogen.install b/libre/hydrogen/hydrogen.install new file mode 100644 index 000000000..ef354d1f5 --- /dev/null +++ b/libre/hydrogen/hydrogen.install @@ -0,0 +1,9 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/hydrogen/lrdf_raptor2.patch b/libre/hydrogen/lrdf_raptor2.patch new file mode 100644 index 000000000..efec16700 --- /dev/null +++ b/libre/hydrogen/lrdf_raptor2.patch @@ -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 -- cgit v1.2.3-2-g168b