summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Arndt2020-08-06 19:08:53 +0200
committerChristopher Arndt2020-08-06 19:08:53 +0200
commit5639f34e7b1f6cc0e43743e58a0405b3bfe09b9d (patch)
treeb8f1230eb349678047272d6876fba3b5cff973a4
parent44300ddaf61b4b385b992bfdde1fce61da99d225 (diff)
downloadaur-5639f34e7b1f6cc0e43743e58a0405b3bfe09b9d.tar.gz
Various PKGBUILD updates
Remove obsolete patch Put doc submodule in sources Update dependencies Enable portaudio and pulseaudio Signed-off-by: Christopher Arndt <chris@chrisarndt.de>
-rw-r--r--.SRCINFO48
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD57
-rw-r--r--fix_missing_locale.patch10
4 files changed, 71 insertions, 48 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c96f37c1a82..37f405bca7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,61 @@
pkgbase = hydrogen-git
pkgdesc = An advanced drum machine (git version)
- pkgver = 1.0.0.beta1.r3380.51cddb05
+ pkgver = 1.0.0.r3715.7cdf94d3
pkgrel = 1
url = https://github.com/hydrogen-music/hydrogen
- arch = i686
arch = x86_64
+ groups = pro-audio
license = GPL
makedepends = git
+ makedepends = alsa-lib
makedepends = cmake
+ makedepends = jack
+ makedepends = ladspa
+ makedepends = libarchive
+ makedepends = liblo
+ makedepends = liblrdf
+ makedepends = libpulse
+ makedepends = libsndfile
+ makedepends = portaudio
+ makedepends = portmidi
+ makedepends = python
+ makedepends = qt5-tools
makedepends = docbook-xml
makedepends = docbook-sgml
makedepends = docbook-utils
makedepends = docbook-xsl
makedepends = poxml
makedepends = xmlto
- depends = desktop-file-utils
- depends = jack
- depends = libarchive
- depends = liblrdf
- depends = liblo
- depends = libpulse
- depends = qt5-tools
+ depends = gcc-libs
+ depends = glibc
+ depends = hicolor-icon-theme
+ depends = qt5-base
depends = qt5-xmlpatterns
+ optdepends = new-session-manager: for session management
provides = hydrogen
+ provides = hydrogen=1.0.0
conflicts = hydrogen
source = hydrogen::git://github.com/hydrogen-music/hydrogen.git
+ source = hydrogen-docs::git+https://github.com/hydrogen-music/documentation.git
source = fix_dtd_version.patch
- source = fix_missing_locale.patch
+ md5sums = SKIP
md5sums = SKIP
md5sums = 67122f71e3be7546d0b483f6fc923b19
- md5sums = 90ca9817a9976c483fbe0e9605d73058
pkgname = hydrogen-git
+ depends = gcc-libs
+ depends = glibc
+ depends = hicolor-icon-theme
+ depends = qt5-base
+ depends = qt5-xmlpatterns
+ depends = libarchive.so
+ depends = libasound.so
+ depends = liblo.so
+ depends = libjack.so
+ depends = liblrdf.so
+ depends = liblo.so
+ depends = libportaudio.so
+ depends = libportmidi.so
+ depends = libpulse.so
+ depends = libsndfile.so
diff --git a/.gitignore b/.gitignore
index 2a97644e81d..b6c6724e9ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,7 @@ pkg/
src/
.AURINFO
hydrogen/
-hydrogen-git-*.tar.xz
+hydrogen-docs/
+hydrogen-git-*.pkg.tar.xz
+hydrogen-git-*.pkg.tar.zst
hydrogen-git-*.src.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index a34637f577f..c4f2706360f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,27 @@
_pkgname=hydrogen
pkgname="${_pkgname}-git"
-pkgver=1.0.0.beta1.r3380.51cddb05
+pkgver=1.0.0.r3715.7cdf94d3
pkgrel=1
pkgdesc="An advanced drum machine (git version)"
-arch=('i686' 'x86_64')
+arch=('x86_64')
license=('GPL')
+groups=('pro-audio')
url="https://github.com/hydrogen-music/hydrogen"
-depends=('desktop-file-utils' 'jack' 'libarchive' 'liblrdf' 'liblo' 'libpulse' 'qt5-tools'
- 'qt5-xmlpatterns')
-makedepends=('git' 'cmake' 'docbook-xml' 'docbook-sgml' 'docbook-utils' 'docbook-xsl' 'poxml' 'xmlto')
+depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-xmlpatterns')
+makedepends=('git' 'alsa-lib' 'cmake' 'jack' 'ladspa' 'libarchive' 'liblo'
+ 'liblrdf' 'libpulse' 'libsndfile' 'portaudio' 'portmidi' 'python'
+ 'qt5-tools' 'docbook-xml' 'docbook-sgml' 'docbook-utils'
+ 'docbook-xsl' 'poxml' 'xmlto')
+optdepends=('new-session-manager: for session management')
source=("${_pkgname}"::'git://github.com/hydrogen-music/hydrogen.git'
- 'fix_dtd_version.patch'
- 'fix_missing_locale.patch')
-provides=("${_pkgname}")
+ "hydrogen-docs::git+https://github.com/hydrogen-music/documentation.git"
+ 'fix_dtd_version.patch')
+provides=("${_pkgname}" "${_pkgname}=${pkgver//.r*/}")
conflicts=("${_pkgname}")
md5sums=('SKIP'
- '67122f71e3be7546d0b483f6fc923b19'
- '90ca9817a9976c483fbe0e9605d73058')
+ 'SKIP'
+ '67122f71e3be7546d0b483f6fc923b19')
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -39,33 +43,31 @@ prepare() {
mkdir build
- # get docs sources
- git submodule update --init
+ # link docs sources
+ git submodule init
+ git config submodule.doc.url "${srcdir}/hydrogen-docs"
+ git submodule update
- # various fixes
+ # update docbook dtd version
patch -Np1 -i "${srcdir}/fix_dtd_version.patch" || true
- patch -Np1 -i "${srcdir}/fix_missing_locale.patch" || true
-
- # fix python2 shebang
- sed -e 's/python/python2/' -i data/i18n/stats.py
- # Fix none FHS-compliant installation paths
- sed -i \
- -e 's|/usr/share/pixmaps|${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps|' \
- -e 's|/man/man1|/share/man/man1|' \
- CMakeLists.txt
}
build() {
cd "${srcdir}/${_pkgname}/build"
cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE='None' \
-DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWANT_CPPUNIT=OFF \
+ -DWANT_DEBUG=OFF \
-DWANT_LASH=OFF \
-DWANT_LRDF=ON \
- -DWANT_DEBUG=OFF \
- -DWANT_CPPUNIT=OFF
- make
+ -DWANT_PORTAUDIO=ON \
+ -DWANT_PORTMIDI=ON \
+ -DWANT_PULSEAUDIO=ON \
+ -Wno-dev
+ make
# build html manual & tutorial
cd "${srcdir}/${_pkgname}/data/doc"
make
@@ -75,6 +77,9 @@ build() {
}
package() {
+ depends+=('libarchive.so' 'libasound.so' 'liblo.so' 'libjack.so' 'liblrdf.so'
+ 'liblo.so' 'libportaudio.so' 'libportmidi.so' 'libpulse.so'
+ 'libsndfile.so')
cd "${srcdir}/${_pkgname}/build"
make DESTDIR="${pkgdir}" install
diff --git a/fix_missing_locale.patch b/fix_missing_locale.patch
deleted file mode 100644
index 75845b28869..00000000000
--- a/fix_missing_locale.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/data/i18n/updateTranslations.sh 2016-11-05 09:22:50.000000000 +0100
-+++ b/data/i18n/updateTranslations.sh 2017-07-28 12:25:19.230534851 +0200
-@@ -35,6 +35,7 @@
- $CMD ../../data/i18n/hydrogen.de.ts
- $CMD ../../data/i18n/hydrogen.sv.ts
- $CMD ../../data/i18n/hydrogen.hr.ts
-+$CMD ../../data/i18n/hydrogen.ca.ts
- $CMD ../../data/i18n/hydrogen.cs.ts
- $CMD ../../data/i18n/hydrogen.el.ts
- $CMD ../../data/i18n/hydrogen.gl.ts