pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

csound6181: fix plugin build on Darwin



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Thu Oct 26 14:57:09 2023 +0200
Changeset:	a757efd0206e99168b425a6d904928bc187bc7c7

Modified Files:
	csound6181/distinfo
	csound6181/patches/patch-CMakeLists.txt

Log Message:
csound6181: fix plugin build on Darwin

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a757efd0206e99168b425a6d904928bc187bc7c7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 csound6181/distinfo                     |  2 +-
 csound6181/patches/patch-CMakeLists.txt | 35 ++++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diffs:
diff --git a/csound6181/distinfo b/csound6181/distinfo
index cf0af47cce..e0e5e25bfc 100644
--- a/csound6181/distinfo
+++ b/csound6181/distinfo
@@ -3,7 +3,7 @@ $NetBSD: distinfo,v 1.13 2021/10/26 09:58:51 nia Exp $
 BLAKE2s (csound-6.18.1.tar.gz) = 2ac0b7c3bb2d00befb27ef8f6fef5eab0f6408f4839bd29082b369aa07fae828
 SHA512 (csound-6.18.1.tar.gz) = 4ea4dccb36017c96482389a8d139f6f55c79c5ceb9cc34e6d2bfabcb930b4833d0301be4a4b21929db27b2d8ce30754b5c5867acd2ea5a849135e1b8d1506acf
 Size (csound-6.18.1.tar.gz) = 31925161 bytes
-SHA1 (patch-CMakeLists.txt) = 85502db4ea5c73b2b13b1a10b429350a18bf8bdc
+SHA1 (patch-CMakeLists.txt) = 09e27c0e936aba60d663db53720a17d07a96378c
 SHA1 (patch-Engine_linevent.c) = b141da5b28d775f44f5804a08c22371be0cad3aa
 SHA1 (patch-Frontends_csound_csound_main.c) = 871863a02e8b1a27b06a1a7cbc4b46b0f56f4149
 SHA1 (patch-InOut_libsnd.c) = d02c8d78beb4b762308f614650451c18ba0f6187
diff --git a/csound6181/patches/patch-CMakeLists.txt b/csound6181/patches/patch-CMakeLists.txt
index 6d2064a58b..64665b0dc0 100644
--- a/csound6181/patches/patch-CMakeLists.txt
+++ b/csound6181/patches/patch-CMakeLists.txt
@@ -5,7 +5,15 @@ Add NetBSD support.
 
 --- CMakeLists.txt.orig	2022-11-23 19:53:55.000000000 +0000
 +++ CMakeLists.txt
-@@ -357,14 +357,14 @@ endif()
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.5)
+ 
+ # silence RPATH cmake warning
+-set(CMAKE_MACOSX_RPATH 1)
+ set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
+ 
+ 
+@@ -357,14 +356,14 @@ endif()
  
  # Set plugins install directory
  if(USE_DOUBLE)
@@ -22,7 +30,7 @@ Add NetBSD support.
          set(CSOUNDLIB "CsoundLib")
          set(PLUGIN_INSTALL_DIR "${CS_FRAMEWORK_DEST}/${CSOUNDLIB}.framework/Versions/${APIVERSION}/Resources/Opcodes")
      else()
-@@ -373,7 +373,7 @@ else()
+@@ -373,7 +372,7 @@ else()
  endif()
  
  # set default user plugin directory
@@ -31,7 +39,7 @@ Add NetBSD support.
      if(BUILD_INSTALLER)
         	set(CS_FRAMEWORK_FULL_PATH "/Library/Frameworks/${CSOUNDLIB}.framework/Versions/${APIVERSION}/Resources/Opcodes64")
      else()
-@@ -395,6 +395,12 @@ if(APPLE)
+@@ -395,6 +394,12 @@ if(APPLE)
      add_definitions("-DCS_DEFAULT_USER_PLUGINDIR=\"${DEFAULT_USER_PLUGINDIR}\"")
  endif()
  
@@ -44,7 +52,7 @@ Add NetBSD support.
  # LINUX definition
  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
      set(LINUX YES)
-@@ -405,7 +411,7 @@ endif()
+@@ -405,7 +410,7 @@ endif()
  
  
  
@@ -53,7 +61,7 @@ Add NetBSD support.
      set(DEFAULT_OPCODEDIR "${PLUGIN_INSTALL_DIR}")
      add_definitions("-DCS_DEFAULT_PLUGINDIR=\"${DEFAULT_OPCODEDIR}\"")
      # dir relative to $HOME
-@@ -1112,7 +1118,7 @@ if(INIT_STATIC_MODULES)
+@@ -1112,7 +1117,7 @@ if(INIT_STATIC_MODULES)
      set_target_properties(${CSOUNDLIB} PROPERTIES COMPILE_FLAGS "-DINIT_STATIC_MODULES")
  endif()
  
@@ -62,15 +70,14 @@ Add NetBSD support.
      set_target_properties(${CSOUNDLIB} PROPERTIES FRAMEWORK YES)
      set_target_properties(${CSOUNDLIB} PROPERTIES FRAMEWORK_VERSION "${APIVERSION}")
      set_target_properties(${CSOUNDLIB} PROPERTIES PUBLIC_HEADER
-@@ -1132,7 +1138,7 @@ endif()
- # NB - this was moved here as it needs some VARS defined above
- # for setting up the framework
- function(make_plugin libname srcs)
--    if(APPLE)
-+    if(FALSE)
-         add_library(${libname} SHARED ${srcs})
-     else()
-         add_library(${libname} MODULE ${srcs})
+@@ -1145,6 +1150,7 @@ function(make_plugin libname srcs)
+     endwhile()
+ 
+     set_target_properties(${libname} PROPERTIES
++        INSTALL_NAME_DIR "${PLUGIN_INSTALL_DIR}"
+         RUNTIME_OUTPUT_DIRECTORY ${BUILD_PLUGINS_DIR}
+         LIBRARY_OUTPUT_DIRECTORY ${BUILD_PLUGINS_DIR}
+         ARCHIVE_OUTPUT_DIRECTORY ${BUILD_PLUGINS_DIR})
 @@ -1230,7 +1236,9 @@ if(LINUX)
        list(APPEND libcsound_LIBS ${LIBRT_LIBRARY})
        message(STATUS "  ADDING LIBRT LIBRARY: ${LIBRT_LIBRARY}.")


Home | Main Index | Thread Index | Old Index