[arch-commits] Commit in faust/trunk (3 files)

[David Runge]

    Date: Thursday, July 22, 2021 @ 08:20:25
  Author: dvzrv
Revision: 983029

upgpkg: faust 2.33.1-1: Upgrade to 2.33.1.

Remove all now included patches.

Modified:
  faust/trunk/PKGBUILD
Deleted:
  faust/trunk/faust-2.30.5-llvm12.patch
  faust/trunk/faust-2.30.5-missing_include.patch

------------------------------------+
 PKGBUILD                           |   31 +++++--------------------------
 faust-2.30.5-llvm12.patch          |   27 ---------------------------
 faust-2.30.5-missing_include.patch |   11 -----------
 3 files changed, 5 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-22 08:18:58 UTC (rev 983028)
+++ PKGBUILD	2021-07-22 08:20:25 UTC (rev 983029)
@@ -4,8 +4,8 @@
 # Contributor: bjoern lindig (bjoern _dot_ lindig _at_ google.com)
 
 pkgname=faust
-pkgver=2.30.5
-pkgrel=3
+pkgver=2.33.1
+pkgrel=1
 pkgdesc="A functional programming language for realtime audio signal processing."
 arch=('x86_64')
 url="https://faust.grame.fr/"
@@ -34,31 +34,10 @@
             'texlive-core: for faust2pdf')
 provides=('libfaustmachine.so' 'libfaust.so' 'libOSCFaust.so' 'libHTTPDFaust.so')
 options=('staticlibs')
-source=("https://github.com/grame-cncm/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        "${pkgname}-2.30.5-llvm_patch_level.patch::https://github.com/grame-cncm/faust/commit/5fbe04232cfcf28b3aa6e64a6dd4d9347f3735a8.patch"
-        "${pkgname}-2.30.5-missing_include.patch"
-        "${pkgname}-2.30.5-llvm12.patch")
-sha512sums=('33271a39a465d257d7ccac529d1dac822940d72a1f19dcbbacce5d4d2b9ab5d367e6be001fab6bfd944a1480a2429b054a07d424916419117389154cbcd4d1ef'
-            '71a891f4bc95f72744ffbccbb48eb8cd0d440933810ed6180336a2679beb55364dace63dbe5e4ed3f70cd292320667a98f5669c4a250d87c949e37012d05077b'
-            'd0a501a084ae57d226238c81293588242c04a3675c16de957e2f56609ac570ecdf613f1cdeae5687bd0e535bc4d495638b70b8f3fd13d8582e7f107c28e8431a'
-            'af75f018bf7288704269cfee8e888abdf07b6ad49357c1dd0ef00f5c86778faa56c2a2361fcd83a515a6629773e9566ef07c1aece23d363faa1d2fc8adc01d7e')
-b2sums=('116a6aba81c5b170528e08de2bf23f2f52800dea72a4beb550ff9796a71be7a7ce4415911ec54b7bf32d2eb8227d9193bc37e17750fa596d73a1022a3be2396e'
-        '3028a3bbbefcff40066156e9f6a2382596a0a9c623dda4237153480eacafdd67d480d9fb06d9dab8ab95f2f031d996538a3e8cdbf805c95269b94d56b1b8a41e'
-        'ba4d34661ed959b42495e6ef781544b00c6b5b3901db04e6550f5a66c4e94d34ce468742d8eeb2d900c2640145227e673022a010bf739262fdbef3fd2a0965fb'
-        'bccc62096bff05bf42840ffbf98b7cfc6f5ffe8dc809d0656fd7c209f0fe059c0d765bcb765b0c61293d899b7279d748fee0673cbb845b83ba8b9985cebea761')
+source=("https://github.com/grame-cncm/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('e42ba8db842b189b9fd44fa7fd2b4e0127fd33529bc72794eec385ac081188bc271417d2dac5a1ce2685560ec5f3ba395ae29acaea4242f1be02fd419638a5dc')
+b2sums=('c2cca4b066de9f37e6939eb3246c533587dd0c056d0e0d8020d34ca195ea9b2941d0c8786e6e1be2b3b2b56d6d705ee512c732a8b1f20580b6cec0ef0b7b2efd')
 
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  # make checks against llvm more generic
-  # https://github.com/grame-cncm/faust/issues/573
-  patch -Np1 -i "../${pkgname}-2.30.5-llvm_patch_level.patch"
-  # fix missing include
-  # https://github.com/grame-cncm/faust/issues/586
-  patch -Np1 -i "../${pkgname}-2.30.5-missing_include.patch"
-  # fix build against llvm12
-  patch -Np1 -i "../${pkgname}-2.30.5-llvm12.patch"
-}
-
 build() {
   cd "${pkgname}-${pkgver}"
   cmake -C build/backends/all.cmake \

Deleted: faust-2.30.5-llvm12.patch
===================================================================
--- faust-2.30.5-llvm12.patch	2021-07-22 08:18:58 UTC (rev 983028)
+++ faust-2.30.5-llvm12.patch	2021-07-22 08:20:25 UTC (rev 983029)
@@ -1,27 +0,0 @@
-diff -ruN a/compiler/generator/llvm/llvm_instructions.hh b/compiler/generator/llvm/llvm_instructions.hh
---- a/compiler/generator/llvm/llvm_instructions.hh	2021-01-12 15:20:11.000000000 +0100
-+++ b/compiler/generator/llvm/llvm_instructions.hh	2021-05-29 23:40:20.532368506 +0200
-@@ -170,7 +170,11 @@
-     LLVMType getStructType(const string& name, const LLVMVecTypes& types)
-     {
-         // We want to have a unique creation for struct types, so check if the given type has already been created
-+    #if defined(LLVM_120) || defined(LLVM_130)
-+        StructType* struct_type = StructType::getTypeByName(fModule->getContext(), name);
-+    #else
-         StructType* struct_type = fModule->getTypeByName(name);
-+    #endif
-         if (!struct_type) {
-             struct_type = StructType::create(fModule->getContext(), name);
-             // Create "packed" struct type to match the size of C++ "packed" defined ones
-@@ -191,7 +195,11 @@
-         if (basic_typed) {
-             return fTypeMap[basic_typed->fType];
-         } else if (named_typed) {
-+        #if defined(LLVM_120) || defined(LLVM_130)
-+            LLVMType type = StructType::getTypeByName(fModule->getContext(), "struct.dsp" + named_typed->fName);
-+        #else
-             LLVMType type = fModule->getTypeByName("struct.dsp" + named_typed->fName);
-+        #endif
-             // Subcontainer type (RWTable...)
-             return (type) ? getTyPtr(type) : convertFIRType(named_typed->fType);
-         } else if (array_typed) {

Deleted: faust-2.30.5-missing_include.patch
===================================================================
--- faust-2.30.5-missing_include.patch	2021-07-22 08:18:58 UTC (rev 983028)
+++ faust-2.30.5-missing_include.patch	2021-07-22 08:20:25 UTC (rev 983029)
@@ -1,11 +0,0 @@
-diff -ruN a/architecture/faust/gui/JSONUI.h b/architecture/faust/gui/JSONUI.h
---- a/architecture/faust/gui/JSONUI.h	2021-01-12 15:20:11.000000000 +0100
-+++ b/architecture/faust/gui/JSONUI.h	2021-05-29 17:24:52.786615823 +0200
-@@ -26,6 +26,7 @@
- #define FAUST_JSONUI_H
- 
- #include <vector>
-+#include <limits>
- #include <map>
- #include <string>
- #include <iostream>