[arch-commits] Commit in csound/trunk (PKGBUILD)

[David Runge]

    Date: Thursday, February 3, 2022 @ 19:40:43
  Author: dvzrv
Revision: 1124924

upgpkg: csound 6.17.0-1: Upgrade to 6.17.0.

Add debug package.
Run strip-nondterminism in build instead of package().
Simplify calls to cmake/make.
Add correct pkgdesc for csound-doc.
Remove the use of srcdir where not needed.

Modified:
  csound/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-03 19:33:09 UTC (rev 1124923)
+++ PKGBUILD	2022-02-03 19:40:43 UTC (rev 1124924)
@@ -5,10 +5,10 @@
 
 pkgbase=csound
 pkgname=(csound csound-doc)
-pkgver=6.16.2
-_manual_pkgver=6.16.0
-pkgrel=8
-pkgdesc="A programming language for sound rendering and signal processing."
+pkgver=6.17.0
+_manual_pkgver=6.17.0
+pkgrel=1
+pkgdesc="Programming language for sound rendering and signal processing"
 arch=(x86_64)
 url="https://csound.com"
 license=(LGPL2.1)
@@ -41,18 +41,19 @@
   wiiuse
 )
 checkdepends=(cunit)
+options=(debug)
 source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/${pkgbase}/${pkgbase}/archive/${pkgver}.tar.gz"
         "${pkgbase}.sh"
         "https://github.com/${pkgbase}/${pkgbase}/releases/download/${_manual_pkgver}/Csound${_manual_pkgver}_manual_html.zip"
         "https://github.com/${pkgbase}/${pkgbase}/releases/download/${_manual_pkgver}/Csound${_manual_pkgver}_manual_pdf.zip")
-sha512sums=('5feda6f0aa934548b77736f5757a6c18558f295e9ffe6bcf0a41215ea0054a0da5262eb4a101215152b714efd415648a483eea974300f3d62f39eb44aab53cbb'
+sha512sums=('d1555d149429bb94a456c5e65820e137117e81e9fdeab9f897e88909348c72e2e803b001c1221acf0d9cb5136d3703899e7472d370f5b5b5252c716d2d66f3a9'
             '53a8ae1e61db2a3a492930ef0f0881b613ae47108c5e8de0a6e2aa28bcf7a5c93c7fea8b7fc2bbae29ab92e1e68bf94ba406be1255ad8ab5725ea9078c1fd6dc'
-            'e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3'
-            '18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490')
-b2sums=('6c0f569ac52564df75bd63db8381df651c0bb4c5f7569686024e4ecbfe1cf01bd9e891a902487219709cb9b8029749bce36b1d98053eb387cfb8c030aa4f5a83'
+            'ff2098828e51e78aa80b10736ea162d90c0b1bef3265e469951a5df63250d283e852490cb2a6599dcb1b8a5c185cf4f0b9534f501e4cb755b9da67ecfb1f4ba6'
+            'bf664bab1dec073b48853ccf7519086c55ad74af33db86ac7f95746231c18fb10d46a485047788050094e412d27bbd0df65e238d31b01b435989f2fd734189a6')
+b2sums=('6c5548645432047a48cd25cd75ee7353c67f799212b95dfcace544c961297c8278cbe9e359b00a6f1834379c9e4c4df8d69fdd06838b04fb84ec3cc3921f97a1'
         '8a556685d0f9ee55c4de521b3d76fc729936e98e991e8ea860d64b29a1b09d142ab0a51548b2dddadb41ecb796e84ba1f8ed114494b4c67d7d6d8ab3475b2ede'
-        '3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb'
-        '7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754')
+        '3148a60a398d49d6932864d84b2ee37ddf86d5389b91c99443b2c64f7c3b270d040b83ac88b80ebc772c198223682452da1618391fcc8963fe63151b7837037e'
+        'c0210f2fb97a6707ae6cd0a0cf38cd374f4d4c973b188ee8d418a7efd5c98dc1d4e61867de021ed2859bd8264cc0876b46deb565c358b6efea42f471d39671a9')
 
 prepare() {
   # fix file permissions in html manual
@@ -61,7 +62,6 @@
 
 build() {
   local _java_major=$(java --version 2>/dev/null |grep 'openjdk'| cut -d ' ' -f2| cut -d '.' -f1)
-  cd "${pkgbase}-${pkgver}"
   # it's not allowed to redistribute the scansyn opcodes: https://github.com/csound/csound/issues/1148
   # the python plugin is not python3 compatible: https://github.com/csound/csound/issues/631
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -73,12 +73,13 @@
         -DBUILD_STATIC_LIBRARY=ON \
         -W no-dev \
         -B build \
-        -S .
+        -S "${pkgbase}-${pkgver}"
   make VERBOSE=1 -C build
+  # For reproducibility (See https://bugs.archlinux.org/task/70331)
+  find build -name '*.jar' -exec strip-nondeterminism {} +
 }
 
 check() {
-  cd "${pkgbase}-${pkgver}"
   make test -C build
 }
 
@@ -87,7 +88,7 @@
   depends=(gcc-libs glibc libcurl.so libsamplerate.so libsndfile.so)
   optdepends=('alsa-lib: for librtalsa plugin'
               'csound-doc: for the canonical Csound Reference Manual'
-              'csound-plugins: for extra opcodes not shipped with Csound'
+              'csound-plugins: for additional opcodes'
               'csoundqt: for frontend/ editor with integrated help'
               'hdf5: for hdf5ops plugin'
               'java-runtime: java integration'
@@ -108,7 +109,7 @@
               'vim-csound: vim integration'
               'zlib: for libfaustcsound plugin')
   provides=(libcsound64.so libcsnd6.so)
-  cd "${pkgname}-${pkgver}"
+
   make VERBOSE=1 DESTDIR="${pkgdir}/" install -C build
 
   # export vars in profile.d
@@ -119,15 +120,14 @@
   # moving csnd6.jar to /usr/share/java
   install -vdm 755 "${pkgdir}/usr/share/java/"
   mv -v "${pkgdir}/usr/lib/"*.jar "${pkgdir}/usr/share/java/"
-
-  # For reproducibility (See https://bugs.archlinux.org/task/70331)
-  find ${pkgdir} -name '*.jar' -exec strip-nondeterminism {} +
 }
 
 package_csound-doc() {
-  install -vDm 644 "${srcdir}/Csound${_manual_pkgver}_manual.pdf" \
-    "${pkgdir}/usr/share/doc/${pkgname}/${pkgbase}-manual.pdf"
+  pkgdesc+=" - documentation"
+
+  install -vDm 644 Csound${_manual_pkgver}_manual.pdf "${pkgdir}/usr/share/doc/${pkgname}/${pkgbase}-manual.pdf"
+
   install -dv "${pkgdir}/usr/share/doc/${pkgname}/html"
-  cp -av "${srcdir}/html/"* "${pkgdir}/usr/share/doc/${pkgname}/html"
+  cp -av html/* "${pkgdir}/usr/share/doc/${pkgname}/html/"
 }
 # vim:set ts=2 sw=2 et: