From 6bd188d89c9703876efd62d0017d6d7e4fdc0332 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 6 Apr 2021 07:53:56 +0000 Subject: [PATCH] libwildmidi: update to 0.4.4. Bug-fix and maintenance update after the previous version 0.4.3. All users of wildmidi-0.4.x are strongly encouraged to upgrade. What's new in 0.4.4: Fixed integer overflow in midi parser sample count calculation (bug #200). Fixed 8 bit ping pong GUS patch loaders (bug #207). Fixed wrong variable use in reverb code (bug #210). Reset block status of tty after playback (bug #211). Fixed broken file name handling for 'save as midi' command during playback. Clamp MUS volume commands (PR #226). CMake project improvements (bugs: #214, #216, #217, #218) - cmake version 3.1 or newer is now required. --- audio/libwildmidi/Makefile | 10 ++------ audio/libwildmidi/PLIST | 6 ++++- audio/libwildmidi/distinfo | 13 +++++----- .../libwildmidi/patches/patch-CMakeLists.txt | 21 +++++----------- .../patches/patch-src_CMakeLists.txt | 24 ------------------- 5 files changed, 19 insertions(+), 55 deletions(-) delete mode 100644 audio/libwildmidi/patches/patch-src_CMakeLists.txt diff --git a/audio/libwildmidi/Makefile b/audio/libwildmidi/Makefile index f8f6116e2be3..74e9ccec4c89 100644 --- a/audio/libwildmidi/Makefile +++ b/audio/libwildmidi/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2020/08/08 21:18:30 schmonz Exp $ +# $NetBSD: Makefile,v 1.11 2021/04/06 07:53:56 wiz Exp $ -DISTNAME= wildmidi-0.4.3 +DISTNAME= wildmidi-0.4.4 PKGNAME= lib${DISTNAME} CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=Mindwerks/} @@ -16,12 +16,6 @@ WRKSRC= ${WRKDIR}/wildmidi-${DISTNAME} USE_LANGUAGES= c99 USE_CMAKE= yes -SUBST_CLASSES+= man -SUBST_SED.man+= -e "s,share/man,${PKGMANDIR}," -SUBST_FILES.man+= src/CMakeLists.txt -SUBST_STAGE.man= post-extract -SUBST_MESSAGE.man= Fixing man page installation path. - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" diff --git a/audio/libwildmidi/PLIST b/audio/libwildmidi/PLIST index c263d15e567d..0cd05c909209 100644 --- a/audio/libwildmidi/PLIST +++ b/audio/libwildmidi/PLIST @@ -1,6 +1,10 @@ -@comment $NetBSD: PLIST,v 1.4 2019/07/15 14:39:54 nia Exp $ +@comment $NetBSD: PLIST,v 1.5 2021/04/06 07:53:56 wiz Exp $ bin/wildmidi include/wildmidi_lib.h +lib/cmake/WildMidi/WildMidiConfig.cmake +lib/cmake/WildMidi/WildMidiConfigVersion.cmake +lib/cmake/WildMidi/WildMidiTargets-debug.cmake +lib/cmake/WildMidi/WildMidiTargets.cmake lib/libWildMidi.so lib/libWildMidi.so.2 lib/libWildMidi.so.2.1.0 diff --git a/audio/libwildmidi/distinfo b/audio/libwildmidi/distinfo index 50230cc0bdc1..6fe519026734 100644 --- a/audio/libwildmidi/distinfo +++ b/audio/libwildmidi/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.8 2020/08/08 21:18:30 schmonz Exp $ +$NetBSD: distinfo,v 1.9 2021/04/06 07:53:56 wiz 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 +SHA1 (wildmidi-0.4.4.tar.gz) = 3c95c8ff211aa8b114d0ae70c5e812cbfa641b7a +RMD160 (wildmidi-0.4.4.tar.gz) = af6573feeee6f443c51d42ebf9e76963c88bdbcf +SHA512 (wildmidi-0.4.4.tar.gz) = 5b74ee83f1d7ce3b45d2f996aaa30ec6e7d7808eab294a3eaf6fcef77443523df1f54bb0fb1b3105edd0d72d75885fda1a2e97c68defb5bbd687bda5077d3454 +Size (wildmidi-0.4.4.tar.gz) = 197597 bytes +SHA1 (patch-CMakeLists.txt) = 62675c407b01fd49d81089f75f4da43fadd2fcf2 diff --git a/audio/libwildmidi/patches/patch-CMakeLists.txt b/audio/libwildmidi/patches/patch-CMakeLists.txt index 0de12a51dd63..cfd65b06b823 100644 --- a/audio/libwildmidi/patches/patch-CMakeLists.txt +++ b/audio/libwildmidi/patches/patch-CMakeLists.txt @@ -1,19 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2020/08/08 21:18:30 schmonz Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2021/04/06 07:53:56 wiz Exp $ Don't build so specially for macOS. ---- CMakeLists.txt.orig 2018-11-24 08:55:50.000000000 +0000 +--- CMakeLists.txt.orig 2021-03-21 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 +@@ -42,7 +42,7 @@ OPTION(WANT_OSX_DEPLOYMENT "OSX Deployme IF (WIN32 AND MSVC) OPTION(WANT_MP_BUILD "Build with Multiple Processes (/MP)" OFF) ENDIF () @@ -22,7 +13,7 @@ Don't build so specially for macOS. 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 +@@ -144,6 +144,7 @@ CHECK_C_SOURCE_COMPILES("static __inline # we must not have any unresolved symbols: if (APPLE) SET(EXTRA_LDFLAGS "-Wl,-undefined,error") @@ -30,7 +21,7 @@ Don't build so specially for macOS. 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) +@@ -261,19 +262,11 @@ IF (AMIGA OR AROS) ENDIF () IF (APPLE) @@ -48,5 +39,5 @@ Don't build so specially for macOS. -ENDIF (APPLE) - # Setup up our config file - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/include/config.h.cmake" "${CMAKE_BINARY_DIR}/include/config.h") + CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/include/config.h.cmake" "${PROJECT_BINARY_DIR}/include/config.h") diff --git a/audio/libwildmidi/patches/patch-src_CMakeLists.txt b/audio/libwildmidi/patches/patch-src_CMakeLists.txt deleted file mode 100644 index 66a05df86ba6..000000000000 --- a/audio/libwildmidi/patches/patch-src_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -$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)