[arch-commits] Commit in sc3-plugins/trunk (PKGBUILD fixing-supernova-check.patch)

Thu Sep 3 18:43:14 UTC 2020

Date: Thursday, September 3, 2020 @ 18:43:12
  Author: dvzrv
Revision: 697525

upgpkg: sc3-plugins 3.11.0-1: Upgrade to 3.11.0.

Drop all upstreamed patches.
Add all required makedepends.
Add 0B7D1EA4E32B5C3C4275D3C70796CC538BEFF177 to validpgpkeys as upstream now provides detached signatures for source tarballs.

Modified:
  sc3-plugins/trunk/PKGBUILD
Deleted:
  sc3-plugins/trunk/fixing-supernova-check.patch

------------------------------+
 PKGBUILD                     |   27 +++--------
 fixing-supernova-check.patch |   97 -----------------------------------------
 2 files changed, 9 insertions(+), 115 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2020-09-03 18:28:50 UTC (rev 697524)
+++ PKGBUILD	2020-09-03 18:43:12 UTC (rev 697525)
@@ -1,8 +1,8 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
 
 pkgname=sc3-plugins
-pkgver=3.10.0
-pkgrel=4
+pkgver=3.11.0
+pkgrel=1
 pkgdesc="Extension plugins for the SuperCollider3 audio synthesis server."
 arch=('x86_64')
 url="https://github.com/supercollider/sc3-plugins"
@@ -9,25 +9,16 @@
 license=('GPL2')
 groups=('pro-audio')
 depends=('gcc-libs' 'glibc' 'supercollider')
-makedepends=('cmake' 'stk')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/supercollider/${pkgname}/releases/download/Version-${pkgver}/${pkgname}-${pkgver}-Source.tar.bz2"
-        "${pkgname}-3.10.0-fix_missing_cstdio_include.patch::https://github.com/supercollider/sc3-plugins/commit/643709850b2f22f68792372aaece5fc6512defc6.patch"
-        "fixing-supernova-check.patch")
-sha512sums=('2105e049046ae595ed7e2e57be5f3d7ba20b940530ea448bde098cd2cdfdddc6ab17d7f16b27ef41f9e245f879d287ecb51f66bc0535814e0a2be4b0a806e377'
-            'fcaffe181370f7b666873900e0be81b61b8de2e3e7097a99e0c5157194047bd24dd7c24d05ff14555e89302ccf1db203f4573d9b4ef7139c90b4e2ccd0a9b80d'
-            '34a0753c116a763d4e3576c0207cf20ccc24043829d0b8a3ffa77e3928ffa98ccba9640854e4a728f698eeda23283c6f44f713c5bf155de3bf5f174f597f2805')
-b2sums=('266bc784fb9ff18d7b4967c47f402c6d6671fe5cb0318aafae156e77121436c12bfcafd6006c8e313fb9040bc3477193598c979d64b04ca473c0a46ca2577cf6'
-        '575b722932d1029f00120d756e8113c5180e24655902e7e26294a7476fdc1130f1496123ac1feefdf8b466bb30d9ebca27aed52b6dd4815be8c131b747984162'
-        'f9c2cf572ae9c7f1b2d1d9971e433f9bf1cbe46d2060018edc302cd6de34a9d5d240ff4c7b4503fbbe47b1142e407fe5e8286fb99ce50cf8c3627343874140ec')
+makedepends=('cmake' 'fftw' 'stk')
+source=("https://github.com/supercollider/${pkgname}/releases/download/Version-${pkgver}/${pkgname}-${pkgver}-Source.tar.bz2"{,.asc})
+sha512sums=('f90ee3da189d66df76176ab4a4c7fd722f022119bcc381daaaf4322f6874d84f274977ee8d63b877aba5b89c32177e471ecd971250680a7595f87cef48452f49'
+            'SKIP')
+b2sums=('ece0c9d88042114fef7e67dcab6baa0ef2345146e9865f78e7d9aab2b3006a0e4075a7c47652b474dae672ffea2c19e842ea2c7d91579d0b927599d3dd09bad4'
+        'SKIP')
+validpgpkeys=('0B7D1EA4E32B5C3C4275D3C70796CC538BEFF177') # Brian Heim <self at brianlheim.com>
 
 prepare() {
   mv -v "$pkgname-$pkgver-Source" "${pkgname}-${pkgver}"
-  cd "${pkgname}-${pkgver}"
-  # fixing wrong check for SUPERNOVA
-  # https://github.com/supercollider/sc3-plugins/issues/185
-  patch -Np1 -i "../fixing-supernova-check.patch"
-  # fixing missing include
-  patch -Np1 -i "../${pkgname}-3.10.0-fix_missing_cstdio_include.patch"
 }
 
 build() {

Deleted: fixing-supernova-check.patch
===================================================================
--- fixing-supernova-check.patch	2020-09-03 18:28:50 UTC (rev 697524)
+++ fixing-supernova-check.patch	2020-09-03 18:43:12 UTC (rev 697525)
@@ -1,97 +0,0 @@
-From 01e34e40a896165f8ac6ebf85bab2e38e900d44b Mon Sep 17 00:00:00 2001
-From: David Runge <dave at sleepmap.de>
-Date: Wed, 21 Mar 2018 16:15:12 +0100
-Subject: [PATCH] CMakeLists.txt: Changing check for SUPERNOVA to be check for
- NOVA_DISK_IO, so default builds won't fail, if the SuperCollider sources are
- not around during build time.
-
----
- CMakeLists.txt | 37 ++++++++++++++++++++-----------------
- 1 file changed, 20 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd9d782..96a993a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,9 +12,12 @@ if (NOT SYSTEM_STK)
-   endif()
- endif()
- 
--if (SUPERNOVA)
-+if (NOVA_DISK_IO)
-   if (NOT EXISTS ${SC_PATH}/external_libraries/nova-tt/CMakeLists.txt)
--    message(FATAL_ERROR "The nova-tt submodule in the SuperCollider repository is missing (required for SuperNova plugins). This probably means you forgot to clone submodules. To fix this, run `git submodule update --init` from the root folder of the SuperCollider repository")
-+    message(FATAL_ERROR "The nova-tt submodule in the SuperCollider repository
-+    is missing (required for NovaDiskIO plugin). This probably means you forgot
-+    to clone submodules. To fix this, run `git submodule update --init` from
-+    the root folder of the SuperCollider repository")
-   endif()
- endif()
- 
-@@ -31,9 +34,9 @@ add_custom_target(uninstall
- 
- find_package(SuperCollider3)
- if (NOT SC_FOUND)
--	message(SEND_ERROR "cannot find SuperCollider3 headers. Set the variable SC_PATH.")
-+  message(SEND_ERROR "cannot find SuperCollider3 headers. Set the variable SC_PATH.")
- else()
--	message(STATUS "Using SC source located at ${SC_PATH}")
-+  message(STATUS "Using SC source located at ${SC_PATH}")
- endif()
- 
- include("${SC_PATH}/SCVersion.txt")
-@@ -41,9 +44,9 @@ set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}${PROJECT_
- message(STATUS "Building plugins for SuperCollider version: ${PROJECT_VERSION}")
- 
- if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_VERSION VERSION_LESS SUPERNOVA_CMAKE_MINVERSION)
--	option(SUPERNOVA "Build plugins for supernova" ON)
-+  option(SUPERNOVA "Build plugins for supernova" ON)
- else()
--	option(SUPERNOVA "Build plugins for supernova" OFF)
-+  option(SUPERNOVA "Build plugins for supernova" OFF)
- endif()
- 
- option(AY "Build with AY ugens" ON)
-@@ -58,7 +61,7 @@ option(SYSTEM_STK "Use STK libraries from system" OFF)
- option(NOVA_DISK_IO "Build with Nova's DiskIO UGens. Requires boost source tree, break warranty & eats your children." OFF)
- 
- if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
--	set(CMAKE_COMPILER_IS_CLANG 1)
-+  set(CMAKE_COMPILER_IS_CLANG 1)
- endif()
- 
- if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-@@ -97,20 +100,20 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
-     endif()
- 
--	if(NATIVE)
--		add_definitions(-march=native)
--	endif()
-+  if(NATIVE)
-+    add_definitions(-march=native)
-+  endif()
- 
--	if(CPP11)
-+  if(CPP11)
-         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
--		if(CMAKE_COMPILER_IS_CLANG)
--			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
--		endif()
--	endif()
-+    if(CMAKE_COMPILER_IS_CLANG)
-+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-+    endif()
-+  endif()
- endif()
- if(MINGW)
--	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mstackrealign")
--	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mstackrealign")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign")
- endif()
- 
- if (NOVA_SIMD)
--- 
-2.16.2
-

