Date: Saturday, October 15, 2022 @ 22:40:49
  Author: dvzrv
Revision: 1329376

archrelease: copy trunk to community-x86_64

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

-----------------------------------+
 PKGBUILD                          |  224 ++++++++++++++++++++----------------
 ardour-6.2-vendor_qm-dsp.patch    |   37 -----
 ardour-7.0-re-vendor_qm-dsp.patch |   22 +++
 3 files changed, 151 insertions(+), 132 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-15 22:40:32 UTC (rev 1329375)
+++ PKGBUILD    2022-10-15 22:40:49 UTC (rev 1329376)
@@ -1,95 +0,0 @@
-# Maintainer: David Runge <dv...@archlinux.org>
-# Contributor: Ray Rashif <sc...@archlinux.org>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-_name=Ardour
-pkgname=ardour
-pkgver=6.9
-pkgrel=5
-pkgdesc="Professional-grade digital audio workstation"
-arch=(x86_64)
-url="https://ardour.org/";
-license=(GPL2)
-groups=(pro-audio)
-depends=(cairo gcc-libs glibc glibmm gtkmm libx11 libxml2
-soundtouch taglib)
-makedepends=(atkmm aubio boost cairomm cppunit curl dbus doxygen fftw flac
-fluidsynth fontconfig freetype2 gdk-pixbuf2 git glib2 graphviz gtk2 hidapi
-itstool jack libarchive liblo liblrdf libltc libogg libpulse libsamplerate
-libsndfile libusb libwebsockets lilv lv2 pango pangomm readline rubberband serd
-sord sratom suil vamp-plugin-sdk waf)
-optdepends=(
-  'harvid: for video timeline and MP3 export'
-  'new-session-manager: for session management'
-  'xjadeo: for video monitoring'
-)
-provides=(ladspa-host lv2-host vst-host vst3-host)
-options=(debug)
-source=("${pkgname}::git+https://github.com/${pkgname}/${pkgname}.git#tag=${pkgver}";
-        "${pkgname}-6.2-vendor_qm-dsp.patch")
-sha512sums=('SKIP'
-            
'2d69e23948ed8679b7fd872c50d2ea44299330c6ed356158689a1f6befb3841f2d9b8a889d4891436c65b57d90601156bc916ad0f0f385c91b22131a766467a8')
-b2sums=('SKIP'
-        
'b28aebf0a5791795d94e29780c064faa1b858da6b89f1ff32edb2aea9de138f2e91b01fcbd16d278e47fd1c7bf892cf7838fea946b38d1196d758873f62742aa')
-
-prepare() {
-  cd "${pkgname}"
-
-  # fix mime package installation location: 
https://bugs.archlinux.org/task/72867
-  git cherry-pick -n b95078ae464f0d132d2d0a9d5727a72bd1ee88d7
-  # 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}"
-  export LINKFLAGS="$LDFLAGS"
-  waf configure --prefix=/usr \
-                --configdir=/etc \
-                --cxx11 \
-                --freedesktop \
-                --lxvst \
-                --nls \
-                --no-phone-home \
-                --optimize \
-                --ptformat \
-                --use-external-libs \
-                --with-backends="alsa,dummy,jack,pulseaudio"
-  waf build -v
-}
-
-package() {
-  depends+=(libasound.so libatkmm-1.6.so libaubio.so libarchive.so
-  libcairomm-1.0.so libcurl.so libdbus-1.so libfftw3f.so libfftw3f_threads.so
-  libfluidsynth.so libfontconfig.so libgdk_pixbuf-2.0.so
-  libgdk-x11-2.0.so libglib-2.0.so libgobject-2.0.so
-  libgtk-x11-2.0.so libjack.so liblo.so liblilv-0.so liblrdf.so libltc.so
-  libpango-1.0.so libpangocairo-1.0.so libpangoft2-1.0.so
-  libpangomm-1.4.so libpulse.so libreadline.so librubberband.so
-  libsamplerate.so libsndfile.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}"
-  # 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 1329375, 
ardour/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2022-10-15 22:40:49 UTC (rev 1329376)
@@ -0,0 +1,129 @@
+# Maintainer: David Runge <dv...@archlinux.org>
+# Contributor: Ray Rashif <sc...@archlinux.org>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+
+pkgname=ardour
+pkgver=7.0
+_commit=a1e19f7ed7687692d05459a425e5b14f34a835ba  # refs/tags/7.0
+pkgrel=2
+pkgdesc="Professional-grade digital audio workstation"
+arch=(x86_64)
+url="https://ardour.org/";
+license=(custom:CC0 GPL2 MIT)
+groups=(pro-audio)
+depends=(cairo gcc-libs glibc gtkmm libx11 taglib)
+makedepends=(atkmm aubio boost cairomm cppunit curl dbus doxygen fftw flac
+fluidsynth fontconfig freetype2 gdk-pixbuf2 git glib2 glibmm graphviz gtk2
+hidapi itstool jack libarchive liblo liblrdf libltc libogg libpulse
+libsamplerate libsndfile libusb libwebsockets libxml2 lilv lv2 pango pangomm
+readline rubberband serd sord sratom suil unzip vamp-plugin-sdk waf)
+optdepends=(
+  'harvid: for video timeline and MP3 export'
+  'new-session-manager: for session management'
+  'xjadeo: for video monitoring'
+)
+provides=(ladspa-host lv2-host vamp-host vst-host vst3-host)
+options=(debug)
+source=(
+  $pkgname::git+https://github.com/$pkgname/$pkgname.git#tag=$_commit
+  
$pkgname-midi-$pkgver.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip
+  $pkgname-7.0-re-vendor_qm-dsp.patch
+)
+noextract=($pkgname-midi-$pkgver.zip)
+sha512sums=('SKIP'
+            
'94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65'
+            
'a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d')
+b2sums=('SKIP'
+        
'e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be'
+        
'73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017')
+
+prepare() {
+  # using vendored version of qm-dsp because qm-dsp >= 1.8.0 is not compatible
+  patch -Np1 -d $pkgname -i ../$pkgname-7.0-re-vendor_qm-dsp.patch
+
+  cd $pkgname
+  # 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
+  export LINKFLAGS="$LDFLAGS"
+  waf configure --prefix=/usr \
+                --configdir=/etc \
+                --cxx11 \
+                --freedesktop \
+                --lxvst \
+                --nls \
+                --no-phone-home \
+                --optimize \
+                --ptformat \
+                --use-external-libs \
+                --with-backends="alsa,dummy,jack,pulseaudio"
+  waf build -v
+}
+
+package() {
+  depends+=(
+    alsa-lib libasound.so
+    atkmm libatkmm-1.6.so
+    aubio libaubio.so
+    cairomm libcairomm-1.0.so
+    curl libcurl.so
+    dbus libdbus-1.so
+    fftw libfftw3f.so libfftw3f_threads.so
+    fluidsynth libfluidsynth.so
+    fontconfig libfontconfig.so
+    gdk-pixbuf2 libgdk_pixbuf-2.0.so
+    glib2 libglib-2.0.so libgobject-2.0.so
+    glibmm libglibmm-2.4.so
+    gtk2 libgdk-x11-2.0.so libgtk-x11-2.0.so 
+    jack libjack.so
+    libarchive libarchive.so
+    liblo liblo.so
+    libpulse libpulse.so
+    liblrdf liblrdf.so
+    libltc libltc.so
+    libsamplerate libsamplerate.so
+    libsndfile libsndfile.so
+    libusb libusb-1.0.so
+    libwebsockets libwebsockets.so
+    libxml2 libxml2.so
+    lilv liblilv-0.so
+    pango libpango-1.0.so libpangocairo-1.0.so libpangoft2-1.0.so
+    pangomm libpangomm-1.4.so
+    readline libreadline.so
+    rubberband librubberband.so
+    suil libsuil-0.so
+    vamp-plugin-sdk libvamp-hostsdk.so libvamp-sdk.so
+  )
+
+  (
+  cd $pkgname
+  waf i18n --destdir="$pkgdir"
+  waf install --destdir="$pkgdir"
+  install -vDm 644 $pkgname.1 -t "$pkgdir/usr/share/man/man1/"
+  )
+
+  # installation of MIDI files is a bit of a horrorshow, as upstream is not 
flexible about tarball naming, etc.
+  install -vdm 755 "$pkgdir/usr/share/$pkgname${pkgver/.*/}/media/"
+  unzip $pkgname-midi-$pkgver.zip -d 
"$pkgdir/usr/share/$pkgname${pkgver/.*/}/media/"
+  install -vdm 755 "$pkgdir/usr/share/licenses/$pkgname/"
+  ln -s "/usr/share/$pkgname${pkgver/.*/}/media/MIDI Beats/LICENSE" 
"$pkgdir/usr/share/licenses/$pkgname/LICENSE.beats"
+  ln -s "/usr/share/$pkgname${pkgver/.*/}/media/MIDI Chords/LICENSE" 
"$pkgdir/usr/share/licenses/$pkgname/LICENSE.chords"
+  ln -s "/usr/share/$pkgname${pkgver/.*/}/media/MIDI Progressions/LICENSE" 
"$pkgdir/usr/share/licenses/$pkgname/LICENSE.progressions"
+}
+# vim:set ts=2 sw=2 et:

Deleted: ardour-6.2-vendor_qm-dsp.patch
===================================================================
--- ardour-6.2-vendor_qm-dsp.patch      2022-10-15 22:40:32 UTC (rev 1329375)
+++ ardour-6.2-vendor_qm-dsp.patch      2022-10-15 22:40:49 UTC (rev 1329376)
@@ -1,37 +0,0 @@
-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)

Copied: ardour/repos/community-x86_64/ardour-7.0-re-vendor_qm-dsp.patch (from 
rev 1329375, ardour/trunk/ardour-7.0-re-vendor_qm-dsp.patch)
===================================================================
--- ardour-7.0-re-vendor_qm-dsp.patch                           (rev 0)
+++ ardour-7.0-re-vendor_qm-dsp.patch   2022-10-15 22:40:49 UTC (rev 1329376)
@@ -0,0 +1,22 @@
+diff --git i/libs/qm-dsp/wscript w/libs/qm-dsp/wscript
+index a59801bf36..8432c89f0c 100644
+--- i/libs/qm-dsp/wscript
++++ w/libs/qm-dsp/wscript
+@@ -23,6 +23,7 @@ def options(opt):
+     autowaf.set_options(opt)
+ 
+ def configure(conf):
++    return
+     if conf.is_defined('USE_EXTERNAL_LIBS'):
+         conf.check_cxx(header_name="base/Pitch.h", mandatory=True, 
msg="Checking for qm-dsp headers")
+         conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
+@@ -51,9 +52,6 @@ def configure(conf):
+                            )
+ 
+ def build(bld):
+-    if bld.is_defined('USE_EXTERNAL_LIBS'):
+-        return
+-
+     # Host Library
+     obj = bld(features = 'c cxx cxxstlib')
+     obj.source = '''

Reply via email to