diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | .gitignore | 11 | ||||
| -rw-r--r-- | PKGBUILD | 30 | ||||
| -rw-r--r-- | carla-pr-895.diff | 37 | ||||
| -rw-r--r-- | changelog.txt | 15 |
5 files changed, 80 insertions, 21 deletions
@@ -1,13 +1,13 @@ pkgbase = carla-git pkgdesc = Audio Plugin Host - pkgver = 2.0.0.r4.g946f9592 + pkgver = 2.1.alpha2.r143.g39960af9 pkgrel = 1 epoch = 1 url = http://kxstudio.sf.net/carla changelog = changelog.txt arch = i686 arch = x86_64 - license = GPL2 + license = GPL2+ makedepends = git makedepends = gtk2 makedepends = gtk3 @@ -23,8 +23,10 @@ pkgbase = carla-git optdepends = python-rdflib: LADSPA-RDF support provides = carla conflicts = carla - source = carla-git::git://github.com/falkTX/Carla.git + source = carla::git+https://github.com/falkTX/Carla.git#branch=develop + source = carla-pr-895.diff md5sums = SKIP + md5sums = df18d9b16820c55e31a83be2e432332c pkgname = carla-git diff --git a/.gitignore b/.gitignore index a37bb0b85440..7006509e42f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ -/pkg/ -/src/ +pkg/ +src/ *~ -*.xz -*.gz -/carla-git/ -*.tar +carla-*.tar.xz +carla-*.tar.gz +carla/ @@ -1,16 +1,17 @@ # Maintainer: Christopher Arndt <aur -at- chrisarndt -dot- de> # Contributor: cocreature <moritz.kiefer<at>purelyfunctional<dot>org> -pkgname=carla-git -pkgver=2.0.0.r4.g946f9592 +_pkgname="carla" +pkgname="${_pkgname}-git" +pkgver=2.1.alpha2.r143.g39960af9 pkgrel=1 epoch=1 pkgdesc="Audio Plugin Host" arch=("i686" "x86_64") url="http://kxstudio.sf.net/carla" -license=("GPL2") -conflicts=("carla") -provides=("carla") +license=("GPL2+") +conflicts=("${_pkgname}") +provides=("${_pkgname}") depends=( 'ffmpeg' 'file' @@ -30,18 +31,25 @@ optdepends=( 'python-pyliblo: OSC control support' 'python-rdflib: LADSPA-RDF support' ) -source=("$pkgname"::"git://github.com/falkTX/Carla.git") -md5sums=('SKIP') +source=("${_pkgname}::git+https://github.com/falkTX/Carla.git#branch=develop" + 'carla-pr-895.diff') +md5sums=('SKIP' + 'df18d9b16820c55e31a83be2e432332c') changelog='changelog.txt' pkgver() { - cd "$srcdir/$pkgname" + cd "${srcdir}/${_pkgname}" git describe --long --tags | sed "s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//" } +prepare() { + cd "${srcdir}/${_pkgname}" + patch -p1 -N -i "$srcdir/carla-pr-895.diff" +} + build() { - cd "$srcdir/$pkgname" + cd "${srcdir}/${_pkgname}" make \ HAVE_QT4=false \ MOC_QT5=/usr/bin/moc-qt5 \ @@ -50,13 +58,13 @@ build() { } package() { - cd "$srcdir/$pkgname" + cd "${srcdir}/${_pkgname}" make \ HAVE_QT4=false \ MOC_QT5=/usr/bin/moc-qt5 \ RCC_QT5=/usr/bin/rcc-qt5 \ UIC_QT5=/usr/bin/uic-qt5 \ - DESTDIR="$pkgdir/" \ + DESTDIR="${pkgdir}/" \ PREFIX=/usr \ install } diff --git a/carla-pr-895.diff b/carla-pr-895.diff new file mode 100644 index 000000000000..35f9a44a9c8d --- /dev/null +++ b/carla-pr-895.diff @@ -0,0 +1,37 @@ +diff --git a/source/bridges-ui/CarlaBridgeToolkitQt.cpp b/source/bridges-ui/CarlaBridgeToolkitQt.cpp +index 81478fd3b..0fbae9cfe 100644 +--- a/source/bridges-ui/CarlaBridgeToolkitQt.cpp ++++ b/source/bridges-ui/CarlaBridgeToolkitQt.cpp +@@ -263,9 +263,7 @@ class CarlaBridgeToolkitQt: public QObject, + # pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" + #endif + +-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) +-# include "CarlaBridgeToolkitQt5.moc" +-#else ++#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) + # include "CarlaBridgeToolkitQt4.moc" + #endif + +@@ -286,6 +284,21 @@ CARLA_BRIDGE_UI_END_NAMESPACE + + // ------------------------------------------------------------------------- + ++#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" ++#endif ++ ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) ++# include "CarlaBridgeToolkitQt5.moc" ++#endif ++ ++#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) ++# pragma GCC diagnostic pop ++#endif ++ ++// ------------------------------------------------------------------------- ++ + #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) + # pragma GCC diagnostic push + # pragma GCC diagnostic ignored "-Wmissing-declarations" diff --git a/changelog.txt b/changelog.txt index 5ef2f94e0302..720e0ee34fb0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,19 @@ +2019-07-10 Christopher Arndt <aur -at- chrisarndt -dot- de> + + * 1:2.1.alpha2.r143.g39960af9-1 + Switched from building 'master' branch to 'develop'. + Change URL scheme of VCS sources to HTTPS and renamed checkout and source + directories to 'carla' (new source checkout required). + Applied patch for Qt >= 5.13 compability. + +2019-06-29 Christopher Arndt <aur -at- chrisarndt -dot- de> + + * 1:2.0.0.r4.g946f9592-1 + Removed Qt4 support. + 2018-03-31 Christopher Arndt <aur -at- chrisarndt -dot- de> - * 1:1.9.8.r54.gebd3f2e5 : + * 1:1.9.8.r54.gebd3f2e5-1 : Removed 'clxclient' from optdepends. Removed DEFAULT_QT5 make flag (Qt5 is now the default). |