csound6181: fix build; don't build as a framework on Darwin

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: csound6181: fix build; don't build as a framework on Darwin
From: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Date: Sat, 21 Oct 2023 14:11:51 +0000
Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Sat Oct 21 16:11:51 2023 +0200
Changeset:	3bb74dd59fea9319e370b4527647a3c1e5ea98c6

Modified Files:
	Makefile
	csound6181/Makefile
	csound6181/PLIST
	csound6181/distinfo
	csound6181/patches/patch-CMakeLists.txt
	csound6181/patches/patch-Frontends_csound_csound_main.c
	csound6181/patches/patch-InOut_libsnd.c
	csound6181/patches/patch-InOut_winEPS.c
	csound6181/patches/patch-installer_macosx_release-build-azure.sh

Log Message:
csound6181: fix build; don't build as a framework on Darwin

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

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

diffstat:
 Makefile                                           |  2 +-
 csound6181/Makefile                                | 46 +++++++---------
 csound6181/PLIST                                   | 23 ++++++++
 csound6181/distinfo                                | 10 +++-
 csound6181/patches/patch-CMakeLists.txt            | 62 ++++++++++++++++++++--
 .../patches/patch-Frontends_csound_csound_main.c   |  5 +-
 csound6181/patches/patch-InOut_libsnd.c            |  2 +-
 csound6181/patches/patch-InOut_winEPS.c            |  2 +-
 .../patch-installer_macosx_release-build-azure.sh  |  2 +-
 9 files changed, 116 insertions(+), 38 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 287113a798..af99f71e31 100644
--- a/Makefile
+++ b/Makefile
@@ -559,7 +559,7 @@ SUBDIR+=	crystal
 SUBDIR+=	crystal-bin
 SUBDIR+=	cskk
 SUBDIR+=	csoap
-SUBDIR*=    csound6181
+SUBDIR+=	csound6181
 SUBDIR+=	csp2b
 SUBDIR+=	csstidy
 SUBDIR+=	csv-mode
diff --git a/csound6181/Makefile b/csound6181/Makefile
index 5286b69f7f..055da38ce5 100644
--- a/csound6181/Makefile
+++ b/csound6181/Makefile
@@ -1,28 +1,22 @@
 # $NetBSD: Makefile,v 1.79 2023/08/14 05:23:46 wiz Exp $
 
-DISTNAME=		csound-${CSOUND_VERSION}
-PKGNAME=		csound6-${CSOUND_VERSION}
-PKGREVISION=		26
-CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_GITHUB:=csound/}
-GITHUB_PROJECT=		csound
-
-MAINTAINER=		mrg%eterna.com.au@localhost
-HOMEPAGE=		https://github.com/csound
-COMMENT=		Software synthesizer and sequencer
-LICENSE=		gnu-lgpl-v2.1 # or later
-
-CSOUND_VERSION=		6.18.1
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		bison flex
-CFLAGS+=		-g -DBETA
-#CFLAGS+=               -DCS_DEFAULT_PLUGINDIR=\"${PREFIX}/lib/csound/plugins64-6.0\"
-USE_CMAKE=		yes
-CMAKE_ARGS+=		-DBUILD_RELEASE=1
-CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=		-DBUILD_HDF5_OPCODES=OFF
+DISTNAME=	csound-6.18.1
+PKGNAME=	${DISTNAME:S/csound/csound6/}
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_GITHUB:=csound/}
+GITHUB_PROJECT=	csound
+
+MAINTAINER=	mrg%eterna.com.au@localhost
+HOMEPAGE=	https://github.com/csound/csound
+COMMENT=	Software synthesizer and sequencer
+LICENSE=	gnu-lgpl-v2.1 # or later
+
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	bison flex
+
+CMAKE_ARGS+=	-DBUILD_HDF5_OPCODES=OFF
 # CMAKE_INSTALL_RPATH doesn't work for some reason, so do it here.
-LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/csound6
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/csound6
 
 INSTALLATION_DIRS=	bin
 
@@ -40,21 +34,21 @@ CHECK_PORTABILITY_SKIP+= \
 
 post-install:
 	cd ${DESTDIR}${PREFIX} && \
-		rm -f bin/csound6 && \
-		${LN} -s csound bin/csound6
+	${LN} -f -s csound bin/csound6
 
 .include "options.mk"
 
 .include "../../audio/fluidsynth/buildlink3.mk"
+.include "../../audio/liblo/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/liblo/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../math/eigen3/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/fltk13/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/csound6181/PLIST b/csound6181/PLIST
index 711edf3a89..3f19719a87 100644
--- a/csound6181/PLIST
+++ b/csound6181/PLIST
@@ -27,8 +27,31 @@ bin/sdif2ad
 bin/sndinfo
 bin/src_conv
 bin/srconv
+lib/csound/plugins64-6.0/libampmidid.so
+lib/csound/plugins64-6.0/libarrayops.so
+lib/csound/plugins64-6.0/libbformdec2.so
+lib/csound/plugins64-6.0/libcmidi.so
+lib/csound/plugins64-6.0/libcontrol.so
+lib/csound/plugins64-6.0/libdeprecated.so
+lib/csound/plugins64-6.0/libdoppler.so
+lib/csound/plugins64-6.0/libfractalnoise.so
+lib/csound/plugins64-6.0/libftsamplebank.so
+lib/csound/plugins64-6.0/libipmidi.so
+lib/csound/plugins64-6.0/liblfsr.so
+lib/csound/plugins64-6.0/libmixer.so
+lib/csound/plugins64-6.0/libosc.so
+lib/csound/plugins64-6.0/libpadsynth.so
+lib/csound/plugins64-6.0/libpvsops.so
+lib/csound/plugins64-6.0/librtauhal.so
+lib/csound/plugins64-6.0/libscansyn.so
+lib/csound/plugins64-6.0/libsignalflowgraph.so
+lib/csound/plugins64-6.0/libstdutil.so
+lib/csound/plugins64-6.0/libtrigenvsegs.so
+lib/csound/plugins64-6.0/liburandom.so
 lib/libcsnd6.6.0.dylib
 lib/libcsnd6.dylib
+lib/libcsound64.so
+lib/libcsound64.so.6.0
 share/cmake/Csound/FindCsound.cmake
 share/locale/de/LC_MESSAGES/csound6.mo
 share/locale/en_US/LC_MESSAGES/csound6.mo
diff --git a/csound6181/distinfo b/csound6181/distinfo
index 0011677950..cf0af47cce 100644
--- a/csound6181/distinfo
+++ b/csound6181/distinfo
@@ -3,4 +3,12 @@ $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-installer_macosx_release-build-azure.sh) = 23f21df0fca0fa38129b2940c6c91b8d6c279784
+SHA1 (patch-CMakeLists.txt) = 85502db4ea5c73b2b13b1a10b429350a18bf8bdc
+SHA1 (patch-Engine_linevent.c) = b141da5b28d775f44f5804a08c22371be0cad3aa
+SHA1 (patch-Frontends_csound_csound_main.c) = 871863a02e8b1a27b06a1a7cbc4b46b0f56f4149
+SHA1 (patch-InOut_libsnd.c) = d02c8d78beb4b762308f614650451c18ba0f6187
+SHA1 (patch-InOut_winEPS.c) = bf81045e5ca55ad516794fe8cc81090ed52cb5f3
+SHA1 (patch-Opcodes_cpumeter.c) = d1b80026b3f0ea203a1055553bb4bd43c7a1dde1
+SHA1 (patch-Opcodes_wavegde.h) = a94da3b1cf6bf5497c6b0ccc15bd9e1e554146d5
+SHA1 (patch-Top_threads.c) = 1c296a92b62561428f5dd010834d6858ff83e481
+SHA1 (patch-installer_macosx_release-build-azure.sh) = 2d7d273b91ef72ea093ecc11fee6c6b36200fd0e
diff --git a/csound6181/patches/patch-CMakeLists.txt b/csound6181/patches/patch-CMakeLists.txt
index c9d4d577e4..6d2064a58b 100644
--- a/csound6181/patches/patch-CMakeLists.txt
+++ b/csound6181/patches/patch-CMakeLists.txt
@@ -1,13 +1,40 @@
 $NetBSD$
 
+On Darwin, don't build as a framework.
 Add NetBSD support.
 
---- CMakeLists.txt.orig 2022-11-23 19:53:55.000000000 +0000
+--- CMakeLists.txt.orig	2022-11-23 19:53:55.000000000 +0000
 +++ CMakeLists.txt
+@@ -357,14 +357,14 @@ endif()
+ 
+ # Set plugins install directory
+ if(USE_DOUBLE)
+-    if(APPLE)
++    if(FALSE)
+         set(CSOUNDLIB "CsoundLib64")
+         set(PLUGIN_INSTALL_DIR "${CS_FRAMEWORK_DEST}/${CSOUNDLIB}.framework/Versions/${APIVERSION}/Resources/Opcodes64")
+     else()
+         set(CSOUNDLIB "csound64")
+     endif()
+ else()
+-    if(APPLE)
++    if(FALSE)
+         set(CSOUNDLIB "CsoundLib")
+         set(PLUGIN_INSTALL_DIR "${CS_FRAMEWORK_DEST}/${CSOUNDLIB}.framework/Versions/${APIVERSION}/Resources/Opcodes")
+     else()
+@@ -373,7 +373,7 @@ else()
+ endif()
+ 
+ # set default user plugin directory
+-if(APPLE)
++if(FALSE)
+     if(BUILD_INSTALLER)
+        	set(CS_FRAMEWORK_FULL_PATH "/Library/Frameworks/${CSOUNDLIB}.framework/Versions/${APIVERSION}/Resources/Opcodes64")
+     else()
 @@ -395,6 +395,12 @@ if(APPLE)
      add_definitions("-DCS_DEFAULT_USER_PLUGINDIR=\"${DEFAULT_USER_PLUGINDIR}\"")
  endif()
-
+ 
 +if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
 +     set(NETBSD YES)
 +else()
@@ -17,13 +44,40 @@ Add NetBSD support.
  # LINUX definition
  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
      set(LINUX YES)
+@@ -405,7 +411,7 @@ endif()
+ 
+ 
+ 
+-if(LINUX)
++if(UNIX)
+     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)
+     set_target_properties(${CSOUNDLIB} PROPERTIES COMPILE_FLAGS "-DINIT_STATIC_MODULES")
+ endif()
+ 
+-if(APPLE)
++if(FALSE)
+     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})
 @@ -1230,7 +1236,9 @@ if(LINUX)
        list(APPEND libcsound_LIBS ${LIBRT_LIBRARY})
        message(STATUS "  ADDING LIBRT LIBRARY: ${LIBRT_LIBRARY}.")
      endif()
 +endif()
-
+ 
 +if(LINUX OR NETBSD)
      find_library(LIBEXECINFO_LIBRARY execinfo)
-
+ 
      if(LIBEXECINFO_LIBRARY)
diff --git a/csound6181/patches/patch-Frontends_csound_csound_main.c b/csound6181/patches/patch-Frontends_csound_csound_main.c
index 96b89f16bf..1318298b18 100644
--- a/csound6181/patches/patch-Frontends_csound_csound_main.c
+++ b/csound6181/patches/patch-Frontends_csound_csound_main.c
@@ -8,9 +8,8 @@ Port to NetBSD and DragonFly.
  #if defined(ANDROID) || (!defined(LINUX) && !defined(SGI) && \
                           !defined(__HAIKU__) && !defined(__BEOS__) && \
                           !defined(__MACH__) && !defined(__EMSCRIPTEN__))
-+·························!defined(__MACH__)·&&·!defined(__EMSCRIPTEN__)·&&·\
-+·························!defined(__NetBSD__)·&&·!defined(__DragonFly__))
++                         !defined(__MACH__) && !defined(__EMSCRIPTEN__) && \
++                         !defined(__NetBSD__) && !defined(__DragonFly__))
  static char *signal_to_string(int sig)
  {
      switch(sig) {
-
diff --git a/csound6181/patches/patch-InOut_libsnd.c b/csound6181/patches/patch-InOut_libsnd.c
index 9f1d832d4a..f704508ced 100644
--- a/csound6181/patches/patch-InOut_libsnd.c
+++ b/csound6181/patches/patch-InOut_libsnd.c
@@ -9,7 +9,7 @@ Add NetBSD and DragonFlyBSD support.
  #ifdef PIPES
  # if defined(SGI) || defined(LINUX) || defined(__BEOS__) || defined(NeXT) ||  \
 -     defined(__MACH__)
-+     defined(__MACH__) ||·defined(__NetBSD__)·||·defined(__DragonFly__)
++     defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
  #  define _popen popen
  #  define _pclose pclose
  # endif
diff --git a/csound6181/patches/patch-InOut_winEPS.c b/csound6181/patches/patch-InOut_winEPS.c
index a83fef90a9..2c6840db18 100644
--- a/csound6181/patches/patch-InOut_winEPS.c
+++ b/csound6181/patches/patch-InOut_winEPS.c
@@ -9,7 +9,7 @@ Add NetBSD and DragonFlyBSD support.
       */
      lt = time(NULL);
 -#ifndef LINUX
-+#if·!defined(LINUX)·&&·!defined(__NetBSD__)·&&·!defined(__DragonFly__)
++#if !defined(LINUX) && !defined(__NetBSD__) && !defined(__DragonFly__)
      {
        struct tm *date_ptr;
        char      *date;
diff --git a/csound6181/patches/patch-installer_macosx_release-build-azure.sh b/csound6181/patches/patch-installer_macosx_release-build-azure.sh
index 5eefc9c0c5..0ed17f8914 100644
--- a/csound6181/patches/patch-installer_macosx_release-build-azure.sh
+++ b/csound6181/patches/patch-installer_macosx_release-build-azure.sh
@@ -1,6 +1,6 @@
 $NetBSD: patch-installer_macosx_release-build-azure.sh,v 1.1 2020/10/10 14:02:37 mef Exp $
 
-ERROR: [check-portability.awk]
+Portability fix.
 
 --- installer/macosx/release-build-azure.sh.orig	2020-08-13 23:03:03.000000000 +0000
 +++ installer/macosx/release-build-azure.sh
Prev by Date: runas: Update to 0.1.1.4
Next by Date: modified PLIST
Previous by Thread: runas: Update to 0.1.1.4
Next by Thread: modified PLIST
Indexes:
Home | Main Index | Thread Index | Old Index