Date: Sunday, April 12, 2020 @ 11:05:01 Author: dvzrv Revision: 613400
upgpkg: carla 2.0.0-2: Cleanup and sodeps. Exchanging the hardcoded qt5.13 patch with what upstream provided. Adding sodeps in package() and adding the respective packages to makedepends. Updating maintainer info. Modified: carla/trunk/PKGBUILD Deleted: carla/trunk/carla-qt5.13.patch --------------------+ PKGBUILD | 23 +++++++++++++---------- carla-qt5.13.patch | 26 -------------------------- 2 files changed, 13 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-12 10:54:40 UTC (rev 613399) +++ PKGBUILD 2020-04-12 11:05:01 UTC (rev 613400) @@ -1,4 +1,4 @@ -# Maintainer: David Runge <[email protected]> +# Maintainer: David Runge <[email protected]> # Contributor: Llewelyn Trahaearn <WoefulDerelict [at] GMail [dot] com> # Contributor: falkTX <falktx [at] gmail [dot] com> @@ -5,25 +5,26 @@ _name=Carla pkgname=carla pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Audio Plugin Host" arch=('x86_64') url="https://kxstudio.linuxaudio.org/Applications:Carla"; license=('GPL2') groups=('pro-audio') -depends=('ffmpeg' 'file' 'fluidsynth' 'gtk2' 'gtk3' 'python-pyqt5' -'python-pyliblo' 'python-rdflib' 'qt5-svg') -makedepends=('qt5-tools') +depends=('gcc-libs' 'glibc' 'python-pyqt5' 'python-pyliblo' 'python-rdflib' +'qt5-base' 'qt5-svg') +makedepends=('ffmpeg' 'file' 'fluidsynth' 'glib2' 'gtk2' 'gtk3' 'libsndfile' +'qt5-tools') source=("${pkgname}-${pkgver}.tar.gz::https://github.com/falkTX/${pkgname}/archive/v${pkgver}.tar.gz"; - carla-qt5.13.patch) + "${pkgname}-2.0.0-qt5.13.patch::https://github.com/falkTX/Carla/commit/db6dadd6de2041adf34905d77839cce05273924c.patch";) sha512sums=('7cb1a8a6376e2fbb58a75fc2f60693984b5a8d03e47fe695f59f8a602ccd776ec3a578d93858faa704623fd3bf0521cb2f5e87600f6c55ff2df67f5451c35d5a' - '7b3fb89e3d8470d27a213fd130cccb57e02bd26f1ddd48f5525f39023fae538902c07eaf682086643a2e45593ca6964918c2f12472a287c70b14276175dcc0d5') + 'f710773c5bc19ac4213df89a33c1f55c991e259f24a7de8a2b961c941aeb3198b46c688e29da8f4b4b02c882bb903c5592534cae5d92501ce776586410012e1c') prepare() { mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}" - cd $pkgname-$pkgver - patch -p1 -i ../carla-qt5.13.patch # Fix build with Qt 5.13 + # Fix build with Qt 5.13 + patch -p1 -i "../${pkgname}-2.0.0-qt5.13.patch" } build() { @@ -33,6 +34,9 @@ } package() { + depends+=('libsndfile.so' 'libavcodec.so' 'libavformat.so' 'libavutil.so' + 'libfluidsynth.so' 'libgdk-3.so' 'libgdk-x11-2.0.so' 'libgobject-2.0.so' + 'libglib-2.0.so' 'libmagic.so' 'libgtk-3.so' 'libgtk-x11-2.0.so') cd "${pkgname}-${pkgver}" make DEFAULT_QT=5 \ DESTDIR="${pkgdir}/" \ @@ -40,5 +44,4 @@ install install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}/" } - # vim:set ts=2 sw=2 et: Deleted: carla-qt5.13.patch =================================================================== --- carla-qt5.13.patch 2020-04-12 10:54:40 UTC (rev 613399) +++ carla-qt5.13.patch 2020-04-12 11:05:01 UTC (rev 613400) @@ -1,26 +0,0 @@ ---- carla-2.0.0/source/bridges-ui/CarlaBridgeToolkitQt.cpp.orig 2019-07-02 19:08:36.959433872 +0000 -+++ carla-2.0.0/source/bridges-ui/CarlaBridgeToolkitQt.cpp 2019-07-02 19:09:24.813406097 +0000 -@@ -256,12 +256,6 @@ - #endif - }; - --#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) --# include "CarlaBridgeToolkitQt5.moc" --#else --# include "CarlaBridgeToolkitQt4.moc" --#endif -- - // ------------------------------------------------------------------------- - - CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format) -@@ -285,4 +279,10 @@ - # include "resources.qt4.cpp" - #endif - -+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) -+# include "CarlaBridgeToolkitQt5.moc" -+#else -+# include "CarlaBridgeToolkitQt4.moc" -+#endif -+ - // -------------------------------------------------------------------------
