Skip to content
Snippets Groups Projects
Commit 11f81d02 authored by Daniel Engberg's avatar Daniel Engberg
Browse files

audio/zmusic: Update to 1.1.12

Unbundle Game_Music_Emu (libgme)

Changelog:
https://github.com/ZDoom/ZMusic/compare/1.1.10...1.1.12

PR:		270808
Reviewed by:	kevans (maintainer)
Sponsored by:	Blinkinblox
parent 673bd61b
Branches
Tags
No related merge requests found
PORTNAME= zmusic
PORTVERSION= 1.1.10
DISTVERSION= 1.1.12
CATEGORIES= audio
MAINTAINER= kevans@FreeBSD.org
......@@ -12,17 +12,24 @@ LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/licenses/bsd.txt
LICENSE_FILE_GPLv3= ${WRKSRC}/licenses/gplv3.txt
LICENSE_FILE_LGPL3= ${WRKSRC}/licenses/lgplv3.txt
LIB_DEPENDS= libsndfile.so:audio/libsndfile \
libfluidsynth.so:audio/fluidsynth
LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth \
libgme.so:audio/libgme \
libmpg123.so:audio/mpg123 \
libsndfile.so:audio/libsndfile
USES= cmake
USES= cmake compiler:c++11-lang localbase:ldflags
USE_GITHUB= yes
GH_ACCOUNT= coelckers
GH_PROJECT= ZMusic
USE_LDCONFIG= yes
CMAKE_OFF= DYN_SNDFILE DYN_FLUIDSYNTH
EXTRACT_AFTER_ARGS+= --exclude thirdparty/fluidsynth \
--exclude thirdparty/game-music-emu \
--exclude thirdparty/zlib
CMAKE_OFF= DYN_MPG123 DYN_SNDFILE
OPTIONS_DEFINE= ALSA
OPTIONS_DEFAULT= ALSA
......
TIMESTAMP = 1666650759
SHA256 (coelckers-ZMusic-1.1.10_GH0.tar.gz) = 378435b35f02a3123ee9e01b5e7990017f9bc1244b788e3bf54b37b34a2985ba
SIZE (coelckers-ZMusic-1.1.10_GH0.tar.gz) = 1812700
TIMESTAMP = 1681314359
SHA256 (coelckers-ZMusic-1.1.12_GH0.tar.gz) = da818594b395aa9174561a36362332b0ab8e7906d2e556ec47669326e67613d4
SIZE (coelckers-ZMusic-1.1.12_GH0.tar.gz) = 2275316
--- source/mididevices/music_fluidsynth_mididevice.cpp.orig 2023-04-12 16:05:39 UTC
+++ source/mididevices/music_fluidsynth_mididevice.cpp
@@ -47,7 +47,7 @@
FluidConfig fluidConfig;
-#include "../thirdparty/fluidsynth/include/fluidsynth.h"
+#include <fluidsynth.h>
class FluidSynthMIDIDevice : public SoftSynthMIDIDevice
{
--- source/streamsources/music_dumb.cpp.orig 2023-04-12 17:17:42 UTC
+++ source/streamsources/music_dumb.cpp
@@ -43,8 +43,8 @@
#undef CDECL // w32api's windef.h defines this
-#include "../dumb/include/dumb.h"
-#include "../dumb/include/internal/it.h"
+#include "dumb.h"
+#include "internal/it.h"
#include "zmusic/m_swap.h"
#include "zmusic/mididefs.h"
#include "zmusic/midiconfig.h"
--- thirdparty/CMakeLists.txt.orig 2023-04-02 07:04:28 UTC
+++ thirdparty/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
# Nuked OPN2 is very accurate emulator, but it eats too much CPU for the workflow
set(GME_YM2612_EMU "Nuked" CACHE STRING "Which YM2612 emulator to use: \"Nuked\" (LGPLv2.1+), \"MAME\" (GPLv2+), or \"GENS\" (LGPLv2.1+)")
mark_as_advanced(GME_YM2612_EMU)
- add_subdirectory(game-music-emu)
+# add_subdirectory(game-music-emu)
#endif()
add_subdirectory(dumb)
@@ -45,4 +45,3 @@ add_subdirectory(timidity)
add_subdirectory(timidityplus)
add_subdirectory(wildmidi)
add_subdirectory(oplsynth)
-add_subdirectory(fluidsynth/src)
--- thirdparty/game-music-emu/gme/blargg_endian.h.orig 2021-05-19 06:13:53 UTC
+++ thirdparty/game-music-emu/gme/blargg_endian.h
@@ -33,9 +33,7 @@
#if defined (LSB_FIRST) || defined (__LITTLE_ENDIAN__) || BLARGG_CPU_X86 || \
(defined (LITTLE_ENDIAN) && LITTLE_ENDIAN+0 != 1234)
#define BLARGG_LITTLE_ENDIAN 1
-#endif
-
-#if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
+#elif defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
defined (__sparc__) || BLARGG_CPU_POWERPC || \
(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
#define BLARGG_BIG_ENDIAN 1
......@@ -7,7 +7,7 @@ lib/cmake/ZMusic/ZMusicLiteTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/ZMusic/ZMusicLiteTargets.cmake
lib/libzmusic.so
lib/libzmusic.so.1
lib/libzmusic.so.1.1.10
lib/libzmusic.so.1.1.12
lib/libzmusiclite.so
lib/libzmusiclite.so.1
lib/libzmusiclite.so.1.1.10
lib/libzmusiclite.so.1.1.12
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment