Date: Monday, December 23, 2019 @ 19:37:59 Author: dvzrv Revision: 539483
upgpkg: faust 2.20.2-1: Upgrading to 2.20.2. Updating maintainer info. Adding all direct library dependencies. Switching from python2 to python in optdepends (changes have been upstreamed). Removing now unreqired patches and fixes for llvm >= 9.0.0 and achieving full RELRO. Modified: faust/trunk/PKGBUILD Deleted: faust/trunk/faust-2.15.11-llvm9.diff --------------------------+ PKGBUILD | 34 ++------- faust-2.15.11-llvm9.diff | 165 --------------------------------------------- 2 files changed, 10 insertions(+), 189 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-23 19:03:37 UTC (rev 539482) +++ PKGBUILD 2019-12-23 19:37:59 UTC (rev 539483) @@ -1,17 +1,17 @@ -# Maintainer: David Runge <[email protected]> +# Maintainer: David Runge <[email protected]> # Contributor: Albert Graef <aggraef at gmail.com> # Contributor: Bernardo Barros <bernardobarros at gmail dot com> # Contributor: bjoern lindig (bjoern _dot_ lindig _at_ google.com) pkgname=faust -pkgver=2.15.11 -pkgrel=2 +pkgver=2.20.2 +pkgrel=1 pkgdesc="A functional programming language for realtime audio signal processing." arch=('x86_64') url="https://faust.grame.fr/"; license=('GPL2') groups=('pro-audio') -depends=('llvm-libs' 'libsndfile' 'libmicrohttpd') +depends=('gcc-libs' 'glibc' 'llvm-libs' 'libmicrohttpd' 'libsndfile') makedepends=('cmake' 'llvm' 'xxd') optdepends=('clang: for sound2reader' 'csound: for faust2csound' @@ -24,7 +24,7 @@ 'octave: for faust2octave' 'pd: for faust2puredata' 'portaudio: for faust2paqt' - 'python2: for faust2md and faust2atomsnippets' + 'python: for faust2md and faust2atomsnippets' 'qt5-tools: for faust2{faustvst,jaqt,lv2}' 'rtaudio: for faust2raqt' 'ruby: for faust2sc and scbuilder' @@ -31,25 +31,11 @@ 'rust: for faust2jackrust' 'supercollider: for faust2supercollider' '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.15.11-llvm9.diff") -sha512sums=('24590a2f726e5aff577a8be57293940a2cb80bcacff7e33986c66c0aa1e4d27bbba6b1335b2855efc35e83b3a8206a12f4f3bb83aa813a817a648e174a3c15fc' - '3e3edee491bf2c2ab9c6eb7a04f792448ef00bf364bea04babdf9c8b7bcf002b4ef142e413b0d8ba5f40cce413176a9ff021a1bab371500468cec5ee11cd1c12') +source=("https://github.com/grame-cncm/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz";) +sha512sums=('35c0025eb16d80bf927573b07c3cb4350521ec9efb563712f256c2d6bc0635c81f57f4e6e33c2318e6dd73c77d2c7334814add47f2393d1f00e87614a4d93e1e') -prepare() { - cd "${pkgname}-${pkgver}" - patch -Np1 -i "../${pkgname}-2.15.11-llvm9.diff" - # fix scripts requiring python2: - # https://github.com/grame-cncm/faust/issues/301 - sed -e '1s/python/&2/' \ - -i "tools/${pkgname}2appls/${pkgname}2atomsnippets" - # RELRO for sound2faust and sound2file - # https://github.com/grame-cncm/faust/issues/302 - sed -e "/\$(LIBS)/ s/$/ $LDFLAGS/g" \ - -i tools/sound2faust/Makefile -} - build() { cd "${pkgname}-${pkgver}" make PREFIX=/usr world @@ -60,8 +46,8 @@ make install PREFIX=/usr DESTDIR="$pkgdir" # docs - install -t "${pkgdir}/usr/share/doc/${pkgname}" \ - -vDm 644 documentation/{,misc/}*.pdf + install -vDm 644 documentation/{,misc/}*.pdf \ + -t "${pkgdir}/usr/share/doc/${pkgname}" \ # examples install -vd "${pkgdir}/usr/share/${pkgname}/examples" Deleted: faust-2.15.11-llvm9.diff =================================================================== --- faust-2.15.11-llvm9.diff 2019-12-23 19:03:37 UTC (rev 539482) +++ faust-2.15.11-llvm9.diff 2019-12-23 19:37:59 UTC (rev 539483) @@ -1,165 +0,0 @@ -diff -ruN a/compiler/generator/llvm/llvm_code_container.cpp b/compiler/generator/llvm/llvm_code_container.cpp ---- a/compiler/generator/llvm/llvm_code_container.cpp 2019-03-14 10:42:49.000000000 +0100 -+++ b/compiler/generator/llvm/llvm_code_container.cpp 2019-10-05 22:44:42.735096142 +0200 -@@ -76,7 +76,7 @@ - - // Set "-fast-math" - FastMathFlags FMF; --#if defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - FMF.setFast(); // has replaced the below function - #else - FMF.setUnsafeAlgebra(); -@@ -106,7 +106,7 @@ - - // Set "-fast-math" - FastMathFlags FMF; --#if defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - FMF.setFast(); // has replaced the below function - #else - FMF.setUnsafeAlgebra(); -@@ -228,7 +228,7 @@ - Function::Create(llvm_compute_type, GlobalValue::ExternalLinkage, "compute" + fKlassName, fModule); - llvm_compute->setCallingConv(CallingConv::C); - --#if !defined(LLVM_50) && !defined(LLVM_60) && !defined(LLVM_70) && !defined(LLVM_80) -+#if !defined(LLVM_50) && !defined(LLVM_60) && !defined(LLVM_70) && !defined(LLVM_80) && !defined(LLVM_90) - llvm_compute->setDoesNotAlias(3U); - llvm_compute->setDoesNotAlias(4U); - #endif -diff -ruN a/compiler/generator/llvm/llvm_dsp_aux.cpp b/compiler/generator/llvm/llvm_dsp_aux.cpp ---- a/compiler/generator/llvm/llvm_dsp_aux.cpp 2019-03-14 10:42:49.000000000 +0100 -+++ b/compiler/generator/llvm/llvm_dsp_aux.cpp 2019-10-05 22:47:39.383479149 +0200 -@@ -43,7 +43,7 @@ - #include <llvm/Support/FileSystem.h> - #include <llvm/Support/TargetSelect.h> - --#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - #include <llvm/Bitcode/BitcodeReader.h> - #include <llvm/Bitcode/BitcodeWriter.h> - #else -diff -ruN a/compiler/generator/llvm/llvm_dynamic_dsp_aux.cpp b/compiler/generator/llvm/llvm_dynamic_dsp_aux.cpp ---- a/compiler/generator/llvm/llvm_dynamic_dsp_aux.cpp 2019-03-14 10:42:49.000000000 +0100 -+++ b/compiler/generator/llvm/llvm_dynamic_dsp_aux.cpp 2019-10-05 22:47:06.543779403 +0200 -@@ -76,7 +76,7 @@ - #include <llvm/Target/TargetLibraryInfo.h> - #endif - --#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - #include <llvm/Bitcode/BitcodeReader.h> - #include <llvm/Bitcode/BitcodeWriter.h> - #include <llvm/Transforms/IPO/AlwaysInliner.h> -@@ -113,7 +113,7 @@ - return def; - } - --#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - static Module* ParseBitcodeFile(MEMORY_BUFFER Buffer, LLVMContext& Context, string* ErrMsg) - { - using namespace llvm; -@@ -157,7 +157,7 @@ - string res; - raw_string_ostream out_str(res); - if (binary) { --#if defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - WriteBitcodeToFile(*fModule, out_str); - #else - WriteBitcodeToFile(fModule, out_str); -@@ -173,7 +173,7 @@ - { - string res; - raw_string_ostream out(res); --#if defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - WriteBitcodeToFile(*fModule, out); - #else - WriteBitcodeToFile(fModule, out); -@@ -190,7 +190,7 @@ - std::cerr << "ERROR : writeDSPFactoryToBitcodeFile could not open file : " << err.message(); - return false; - } --#if defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - WriteBitcodeToFile(*fModule, out); - #else - WriteBitcodeToFile(fModule, out); -@@ -251,7 +251,7 @@ - } - Builder.Inliner = createFunctionInliningPass(Threshold); - } else { --#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - Builder.Inliner = createAlwaysInlinerLegacyPass(); - #else - Builder.Inliner = createAlwaysInlinerPass(); -@@ -317,7 +317,7 @@ - - builder.setOptLevel(CodeGenOpt::Aggressive); - builder.setEngineKind(EngineKind::JIT); --#if !defined(LLVM_60) && !defined(LLVM_70) && !defined(LLVM_80) -+#if !defined(LLVM_60) && !defined(LLVM_70) && !defined(LLVM_80) && !defined(LLVM_90) - builder.setCodeModel(CodeModel::JITDefault); - #endif - -@@ -347,7 +347,7 @@ - - // -fastmath is activated at IR level, and has to be setup at JIT level also - --#if !defined(LLVM_50) && !defined(LLVM_60) && !defined(LLVM_70) && !defined(LLVM_80) -+#if !defined(LLVM_50) && !defined(LLVM_60) && !defined(LLVM_70) && !defined(LLVM_80) && !defined(LLVM_90) - targetOptions.LessPreciseFPMADOption = true; - #endif - targetOptions.AllowFPOpFusion = FPOpFusion::Fast; -@@ -356,7 +356,7 @@ - targetOptions.NoNaNsFPMath = true; - targetOptions.GuaranteedTailCallOpt = true; - --#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - targetOptions.NoTrappingFPMath = true; - targetOptions.FPDenormalMode = FPDenormal::IEEE; - #endif -@@ -409,7 +409,7 @@ - } - - if ((debug_var != "") && (debug_var.find("FAUST_LLVM1") != string::npos)) { --#if defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - // TargetRegistry::printRegisteredTargetsForVersion(cout); - #else - TargetRegistry::printRegisteredTargetsForVersion(); -@@ -426,7 +426,7 @@ - pm.add(createVerifierPass()); - - if ((debug_var != "") && (debug_var.find("FAUST_LLVM4") != string::npos)) { --#if defined(LLVM_38) || defined(LLVM_39) || defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_38) || defined(LLVM_39) || defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - // TODO - #else - tm->addPassesToEmitFile(pm, fouts(), TargetMachine::CGFT_AssemblyFile, true); -@@ -608,7 +608,7 @@ - legacy::PassManager pass; - auto FileType = TargetMachine::CGFT_ObjectFile; - --#if defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - if (TheTargetMachine->addPassesToEmitFile(pass, dest, nullptr, FileType)) { - #else - if (TheTargetMachine->addPassesToEmitFile(pass, dest, FileType, true)) { -diff -ruN a/compiler/generator/llvm/llvm_instructions.hh b/compiler/generator/llvm/llvm_instructions.hh ---- a/compiler/generator/llvm/llvm_instructions.hh 2019-03-14 10:42:49.000000000 +0100 -+++ b/compiler/generator/llvm/llvm_instructions.hh 2019-10-05 22:48:00.693284389 +0200 -@@ -58,7 +58,7 @@ - #include <llvm/Support/raw_ostream.h> - #include <llvm/Transforms/Scalar.h> - --#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) -+#if defined(LLVM_40) || defined(LLVM_50) || defined(LLVM_60) || defined(LLVM_70) || defined(LLVM_80) || defined(LLVM_90) - #include <llvm/Bitcode/BitcodeReader.h> - #include <llvm/Bitcode/BitcodeWriter.h> - #else
