CVS commit: pkgsrc/audio/libwildmidi

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Aug  8 21:18:30 UTC 2020

Modified Files:
        pkgsrc/audio/libwildmidi: Makefile distinfo
Added Files:
        pkgsrc/audio/libwildmidi/patches: patch-CMakeLists.txt
            patch-src_CMakeLists.txt

Log Message:
Fix macOS build by treating it more like other platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/libwildmidi/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/libwildmidi/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/libwildmidi/patches/patch-CMakeLists.txt \
    pkgsrc/audio/libwildmidi/patches/patch-src_CMakeLists.txt

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

Modified files:

Index: pkgsrc/audio/libwildmidi/Makefile
diff -u pkgsrc/audio/libwildmidi/Makefile:1.9 pkgsrc/audio/libwildmidi/Makefile:1.10
--- pkgsrc/audio/libwildmidi/Makefile:1.9       Sun Mar 22 06:57:54 2020
+++ pkgsrc/audio/libwildmidi/Makefile   Sat Aug  8 21:18:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/03/22 06:57:54 nia Exp $
+# $NetBSD: Makefile,v 1.10 2020/08/08 21:18:30 schmonz Exp $
 
 DISTNAME=      wildmidi-0.4.3
 PKGNAME=       lib${DISTNAME}
@@ -24,7 +24,12 @@ SUBST_MESSAGE.man=   Fixing man page insta
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "Darwin"
+CMAKE_ARGS+=   -DWANT_OPENAL=ON
+.else
 CMAKE_ARGS+=   -DWANT_OPENAL=OFF
+.endif
+
 .if ${OPSYS} == "Linux"
 CMAKE_ARGS+=   -DWANT_ALSA=ON
 .  include "../../audio/alsa-lib/buildlink3.mk"

Index: pkgsrc/audio/libwildmidi/distinfo
diff -u pkgsrc/audio/libwildmidi/distinfo:1.7 pkgsrc/audio/libwildmidi/distinfo:1.8
--- pkgsrc/audio/libwildmidi/distinfo:1.7       Mon Jul 15 14:39:54 2019
+++ pkgsrc/audio/libwildmidi/distinfo   Sat Aug  8 21:18:30 2020
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.7 2019/07/15 14:39:54 nia Exp $
+$NetBSD: distinfo,v 1.8 2020/08/08 21:18:30 schmonz Exp $
 
 SHA1 (wildmidi-0.4.3.tar.gz) = 0a2294106690709263f9bf2b5604edb5ad8f5920
 RMD160 (wildmidi-0.4.3.tar.gz) = 366715c08a344e07bdf783c21b2f00c078feea8f
 SHA512 (wildmidi-0.4.3.tar.gz) = 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f
 Size (wildmidi-0.4.3.tar.gz) = 196750 bytes
+SHA1 (patch-CMakeLists.txt) = fc91d32db65d9b33b74e96ce5cc9254d93e73dcd
+SHA1 (patch-src_CMakeLists.txt) = e5d391fc3a341f0e1d7a4523f51e96b6cfa921a4

Added files:

Index: pkgsrc/audio/libwildmidi/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/audio/libwildmidi/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat Aug  8 21:18:30 2020
+++ pkgsrc/audio/libwildmidi/patches/patch-CMakeLists.txt       Sat Aug  8 21:18:30 2020
@@ -0,0 +1,52 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2020/08/08 21:18:30 schmonz Exp $
+
+Don't build so specially for macOS.
+
+--- CMakeLists.txt.orig        2018-11-24 08:55:50.000000000 +0000
++++ CMakeLists.txt
+@@ -13,7 +13,7 @@ SET(SOVERSION 2)
+ SET(VERSION 2.1.0)
+ 
+ # Find Macros
+-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
++SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+ 
+ INCLUDE(CMakeDependentOption)
+ INCLUDE(CheckCCompilerFlag)
+@@ -44,7 +44,7 @@ OPTION(WANT_OSX_DEPLOYMENT "OSX Deployme
+ IF (WIN32 AND MSVC)
+     OPTION(WANT_MP_BUILD "Build with Multiple Processes (/MP)" OFF)
+ ENDIF ()
+-IF (UNIX AND NOT APPLE AND NOT RISCOS)
++IF (UNIX AND NOT RISCOS)
+     SET(WILDMIDI_CFG "/etc/wildmidi/wildmidi.cfg" CACHE STRING "default config location")
+ ELSE ()
+     SET(WILDMIDI_CFG "wildmidi.cfg" CACHE STRING "default config location")
+@@ -152,6 +152,7 @@ CHECK_C_SOURCE_COMPILES("static __inline
+ # we must not have any unresolved symbols:
+ if (APPLE)
+     SET(EXTRA_LDFLAGS "-Wl,-undefined,error")
++    SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ ELSE()
+     SET(OLD_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+     SET(CMAKE_REQUIRED_FLAGS "${OLD_REQUIRED_FLAGS} -Wl,--no-undefined")
+@@ -284,19 +285,11 @@ IF (AMIGA OR AROS)
+ ENDIF ()
+ 
+ IF (APPLE)
+-    SET(APP_BUNDLE_NAME "${CMAKE_PROJECT_NAME}.app")
+-    SET(APP_BUNDLE_DIR "${wildmidi_BINARY_DIR}/${APP_BUNDLE_NAME}")
+     IF (WANT_OSX_DEPLOYMENT)
+         SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+     ENDIF ()
+ ENDIF (APPLE)
+ 
+-IF (APPLE)
+-    SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${APP_BUNDLE_DIR}/Contents/MacOS")
+-ELSE (APPLE)
+-    SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${wildmidi_BINARY_DIR}")
+-ENDIF (APPLE)
+-
+ # Setup up our config file
+ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/include/config.h.cmake" "${CMAKE_BINARY_DIR}/include/config.h")
+ 
Index: pkgsrc/audio/libwildmidi/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/audio/libwildmidi/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Sat Aug  8 21:18:30 2020
+++ pkgsrc/audio/libwildmidi/patches/patch-src_CMakeLists.txt   Sat Aug  8 21:18:30 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2020/08/08 21:18:30 schmonz Exp $
+
+Don't build so specially for macOS.
+
+--- src/CMakeLists.txt.orig    2020-08-08 14:29:25.000000000 +0000
++++ src/CMakeLists.txt
+@@ -247,7 +247,7 @@ SET(WILDMIDILIB_LIBDIR "${WILDMIDILIB_IN
+ CONFIGURE_FILE("wildmidi.pc.in" "${CMAKE_BINARY_DIR}/wildmidi.pc" @ONLY)
+ 
+ # install target (*nix OSes)
+-IF (UNIX AND NOT APPLE)
++IF (UNIX)
+     # install our libraries
+     IF (WANT_STATIC)
+         INSTALL(TARGETS libwildmidi_static DESTINATION ${WILDMIDILIB_INSTALLDIR})
+@@ -274,7 +274,7 @@ IF (UNIX AND NOT APPLE)
+     # install supporting man pages and headers
+     INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/wildmidi_lib.h DESTINATION include)
+     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/docs/man/ DESTINATION man)
+-ENDIF (UNIX AND NOT APPLE)
++ENDIF (UNIX)
+ 
+ # install target (Windows: MinGW or MinGW-w64)
+ IF (WIN32 AND CMAKE_COMPILER_IS_MINGW)