[arch-commits] Commit in ardour/repos/community-x86_64 (3 files)

David Runge dvzrv at archlinux.org
Thu Jul 9 21:20:53 UTC 2020


    Date: Thursday, July 9, 2020 @ 21:20:52
  Author: dvzrv
Revision: 663028

archrelease: copy trunk to community-x86_64

Added:
  ardour/repos/community-x86_64/PKGBUILD
    (from rev 663027, ardour/trunk/PKGBUILD)
  ardour/repos/community-x86_64/ardour-6.2-vendor_qm-dsp.patch
    (from rev 663027, ardour/trunk/ardour-6.2-vendor_qm-dsp.patch)
Deleted:
  ardour/repos/community-x86_64/PKGBUILD

--------------------------------+
 PKGBUILD                       |  185 ++++++++++++++++++++-------------------
 ardour-6.2-vendor_qm-dsp.patch |   37 +++++++
 2 files changed, 132 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-09 21:20:46 UTC (rev 663027)
+++ PKGBUILD	2020-07-09 21:20:52 UTC (rev 663028)
@@ -1,90 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-_name=Ardour
-pkgname=ardour
-pkgver=6.0
-pkgrel=2
-pkgdesc="Professional-grade digital audio workstation"
-arch=('x86_64')
-url="https://ardour.org/"
-license=('GPL2')
-groups=('pro-audio')
-depends=('atkmm' 'cairo' 'cairomm' 'fontconfig' 'gdk-pixbuf2' 'gcc-libs'
-'glibc' 'glibmm' 'gtkmm' 'libx11' 'libxml2' 'pangomm' 'taglib')
-# TODO: add fluidsynth, hidapi, libltc and qm-dsp and use --use-external-libs
-# NOTE: currently qm-dsp (1.8.0) is not compatible with the included vamp-plugins
-makedepends=('atk' 'aubio' 'boost' 'cppunit' 'curl' 'dbus' 'doxygen' 'fftw'
-'flac' 'freetype2' 'git' 'glib2' 'graphviz' 'gtk2' 'harfbuzz' 'itstool'
-'libarchive' 'liblo' 'liblrdf' 'libogg' 'libpulse' 'libsamplerate' 'libsndfile'
-'libusb' 'libwebsockets' 'lilv' 'lv2' 'pango' 'readline' 'rubberband' 'serd'
-'sord' 'sratom' 'suil' 'vamp-plugin-sdk' 'waf')
-optdepends=('xjadeo: video monitoring'
-            'harvid: video timeline'
-            'non-session-manager: for session management')
-source=("${pkgname}-${pkgver}::git+https://github.com/${pkgname}/${pkgname}.git#tag=${pkgver}")
-sha512sums=('SKIP')
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-
-  # unsetting gtk2 rc (FS#54389)
-  sed -e '8iexport GTK2_RC_FILES=/dev/null' -i gtk2_ardour/ardour.sh.in
-
-  # Fixes to use system waf:
-  # making sure, that subdirectories can be picked up with local includes
-  touch __init__.py
-  # making ancient 'misc.py' include available to system installed waf
-  sed -e "s/('misc')/('misc', tooldir='tools')/" \
-      -i {gtk2_ardour,headless,luasession,session_utils,libs/fst}/wscript
-  # make custom 'autowaf' include compatible with system installed waf
-  find . -type f \
-         -iname "*wscript*" \
-         -exec sed -e 's/from waflib.extras import autowaf/from tools import autowaf/g' \
-                   -e 's/import waflib.extras.autowaf/from tools import autowaf/g' \
-                   -i {} \;
-}
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  waf configure --prefix=/usr \
-                --configdir=/etc \
-                --with-backends="alsa,dummy,jack,pulseaudio" \
-                --libjack=weak \
-                --nls \
-                --optimize \
-                --cxx11 \
-                --freedesktop \
-                --ptformat \
-                --lxvst \
-                --no-phone-home
-  waf build -v
-}
-
-package() {
-  depends+=('libFLAC.so' 'libasound.so' 'libatk-1.0.so' 'libaubio.so'
-  'libarchive.so' 'libcurl.so' 'libdbus-1.so' 'libfftw3f.so'
-  'libfftw3f_threads.so' 'libfreetype.so' 'libgdk-x11-2.0.so' 'libgio-2.0.so'
-  'libglib-2.0.so' 'libgobject-2.0.so' 'libgtk-x11-2.0.so' 'libharfbuzz.so'
-  'liblo.so' 'liblrdf.so' 'liblilv-0.so' 'libogg.so' 'libpango-1.0.so'
-  'libpangocairo-1.0.so' 'libpangoft2-1.0.so' 'libpulse.so' 'libreadline.so'
-  'librubberband.so' 'libsamplerate.so' 'libserd-0.so' 'libsndfile.so'
-  'libsord-0.so' 'libsratom-0.so' 'libsuil-0.so' 'libusb-1.0.so'
-  'libvamp-hostsdk.so' 'libvamp-sdk.so' 'libwebsockets.so')
-  cd "${pkgname}-${pkgver}"
-  waf i18n --destdir="${pkgdir}"
-  waf install --destdir="${pkgdir}"
-  # xdg integration
-  install -vDm 644 "build/gtk2_${pkgname}/${pkgname}.xml" \
-    -t "${pkgdir}/usr/share/mime/packages/"
-  install -vDm 644 "build/gtk2_${pkgname}/${pkgname}${pkgver%%.*}.desktop" \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  for size in 16 22 32 48 256 512; do
-    install -vDm 644 "gtk2_${pkgname}/resources/${_name}-icon_${size}px.png" \
-      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}${pkgver%%.*}.png"
-  done
-  # man pages
-  install -vDm 644 "${pkgname}.1"* -t "${pkgdir}/usr/share/man/man1/"
-}
-# vim:set ts=2 sw=2 et:

Copied: ardour/repos/community-x86_64/PKGBUILD (from rev 663027, ardour/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-09 21:20:52 UTC (rev 663028)
@@ -0,0 +1,95 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+
+_name=Ardour
+pkgname=ardour
+pkgver=6.2
+pkgrel=1
+pkgdesc="Professional-grade digital audio workstation"
+arch=('x86_64')
+url="https://ardour.org/"
+license=('GPL2')
+groups=('pro-audio')
+depends=('atkmm' 'cairo' 'cairomm' 'fontconfig' 'gdk-pixbuf2' 'gcc-libs'
+'glibc' 'glibmm' 'gtkmm' 'libx11' 'libxml2' 'pangomm' 'taglib')
+makedepends=('atk' 'aubio' 'boost' 'cppunit' 'curl' 'dbus' 'doxygen' 'fftw'
+'flac' 'fluidsynth' 'freetype2' 'git' 'glib2' 'graphviz' 'gtk2' 'harfbuzz'
+'itstool' 'libarchive' 'liblo' 'liblrdf' 'libltc' 'libogg' 'libpulse'
+'libsamplerate' 'libsndfile' 'libusb' 'libwebsockets' 'lilv' 'lv2' 'pango'
+'readline' 'rubberband' 'serd' 'sord' 'sratom' 'suil' 'vamp-plugin-sdk' 'waf')
+optdepends=('xjadeo: video monitoring'
+            'harvid: video timeline'
+            'non-session-manager: for session management')
+source=("${pkgname}::git+https://github.com/${pkgname}/${pkgname}.git#tag=${pkgver}"
+        "${pkgname}-6.2-vendor_qm-dsp.patch")
+sha512sums=('SKIP'
+            '2d69e23948ed8679b7fd872c50d2ea44299330c6ed356158689a1f6befb3841f2d9b8a889d4891436c65b57d90601156bc916ad0f0f385c91b22131a766467a8')
+
+prepare() {
+  cd "${pkgname}"
+
+  # using vendored version of qm-dsp because qm-dsp >= 1.8.0 is not compatible
+  patch -Np1 -i "../${pkgname}-6.2-vendor_qm-dsp.patch"
+
+  # unsetting gtk2 rc (FS#54389)
+  sed -e '8iexport GTK2_RC_FILES=/dev/null' -i gtk2_ardour/ardour.sh.in
+
+  # Fixes to use system waf:
+  # making sure, that subdirectories can be picked up with local includes
+  touch __init__.py
+  # making ancient 'misc.py' include available to system installed waf
+  sed -e "s/('misc')/('misc', tooldir='tools')/" \
+      -i {gtk2_ardour,headless,luasession,session_utils,libs/fst}/wscript
+  # make custom 'autowaf' include compatible with system installed waf
+  find . -type f \
+         -iname "*wscript*" \
+         -exec sed -e 's/from waflib.extras import autowaf/from tools import autowaf/g' \
+                   -e 's/import waflib.extras.autowaf/from tools import autowaf/g' \
+                   -i {} \;
+}
+
+build() {
+  cd "${pkgname}"
+  waf configure --prefix=/usr \
+                --configdir=/etc \
+                --with-backends="alsa,dummy,jack,pulseaudio" \
+                --libjack=weak \
+                --nls \
+                --optimize \
+                --cxx11 \
+                --freedesktop \
+                --ptformat \
+                --lxvst \
+                --use-external-libs \
+                --no-phone-home
+  waf build -v
+}
+
+package() {
+  depends+=('libFLAC.so' 'libasound.so' 'libatk-1.0.so' 'libaubio.so'
+  'libarchive.so' 'libcurl.so' 'libdbus-1.so' 'libfftw3f.so'
+  'libfftw3f_threads.so' 'libfluidsynth.so' 'libfreetype.so'
+  'libgdk-x11-2.0.so' 'libgio-2.0.so' 'libglib-2.0.so' 'libgobject-2.0.so'
+  'libgtk-x11-2.0.so' 'libharfbuzz.so' 'liblo.so' 'liblilv-0.so' 'liblrdf.so'
+  'libltc.so' 'libogg.so' 'libpango-1.0.so' 'libpangocairo-1.0.so'
+  'libpangoft2-1.0.so' 'libpulse.so' 'libreadline.so' 'librubberband.so'
+  'libsamplerate.so' 'libserd-0.so' 'libsndfile.so' 'libsord-0.so'
+  'libsratom-0.so' 'libsuil-0.so' 'libusb-1.0.so' 'libvamp-hostsdk.so'
+  'libvamp-sdk.so' 'libwebsockets.so')
+  cd "${pkgname}"
+  waf i18n --destdir="${pkgdir}"
+  waf install --destdir="${pkgdir}"
+  # xdg integration
+  install -vDm 644 "build/gtk2_${pkgname}/${pkgname}.xml" \
+    -t "${pkgdir}/usr/share/mime/packages/"
+  install -vDm 644 "build/gtk2_${pkgname}/${pkgname}${pkgver%%.*}.desktop" \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  for size in 16 22 32 48 256 512; do
+    install -vDm 644 "gtk2_${pkgname}/resources/${_name}-icon_${size}px.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}${pkgver%%.*}.png"
+  done
+  # man pages
+  install -vDm 644 "${pkgname}.1"* -t "${pkgdir}/usr/share/man/man1/"
+}
+# vim:set ts=2 sw=2 et:

Copied: ardour/repos/community-x86_64/ardour-6.2-vendor_qm-dsp.patch (from rev 663027, ardour/trunk/ardour-6.2-vendor_qm-dsp.patch)
===================================================================
--- ardour-6.2-vendor_qm-dsp.patch	                        (rev 0)
+++ ardour-6.2-vendor_qm-dsp.patch	2020-07-09 21:20:52 UTC (rev 663028)
@@ -0,0 +1,37 @@
+diff --git i/libs/qm-dsp/wscript w/libs/qm-dsp/wscript
+index 775098e06b..13f6b9410a 100644
+--- i/libs/qm-dsp/wscript
++++ w/libs/qm-dsp/wscript
+@@ -23,17 +23,10 @@ def options(opt):
+     autowaf.set_options(opt)
+ 
+ def configure(conf):
+-    if conf.is_defined('USE_EXTERNAL_LIBS'):
+-        conf.check_cxx(header_name="base/Pitch.h", mandatory=True)
+-        conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
+-    else:
+-        conf.load('compiler_cxx')
+-        autowaf.configure(conf)
++    conf.load('compiler_cxx')
++    autowaf.configure(conf)
+ 
+ def build(bld):
+-    if bld.is_defined('USE_EXTERNAL_LIBS'):
+-        return
+-
+     # Host Library
+     obj = bld(features = 'c cxx cxxstlib')
+     obj.source = '''
+diff --git i/wscript w/wscript
+index 1c9bb1ff5d..95d377d8a7 100644
+--- i/wscript
++++ w/wscript
+@@ -1041,8 +1041,6 @@ def configure(conf):
+ 
+     if Options.options.use_external_libs:
+         conf.define('USE_EXTERNAL_LIBS', 1)
+-        conf.env.append_value(
+-            'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
+ 
+     if Options.options.boost_include != '':
+         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)


More information about the arch-commits mailing list