<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0a445f3e7d55a18f4cba806ab1b5e44b801f2e83">https://github.com/macports/macports-ports/commit/0a445f3e7d55a18f4cba806ab1b5e44b801f2e83</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0a445f3e7d5 musikcube: update to 3.0.4
</span>0a445f3e7d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0a445f3e7d55a18f4cba806ab1b5e44b801f2e83
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Jul 22 15:14:54 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> musikcube: update to 3.0.4
</span>---
multimedia/musikcube/Portfile | 43 ++++++++++------
multimedia/musikcube/files/patch-CMakeLists.diff | 65 ++++++++++++++++++++----
multimedia/musikcube/files/patch-fix-curses.diff | 6 +--
3 files changed, 87 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/musikcube/Portfile b/multimedia/musikcube/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a18ea59ffae..3a918e0a27a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/musikcube/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/musikcube/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,18 +2,19 @@
</span>
PortSystem 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span> PortGroup github 1.0
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup clangen musikcube 3.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup clangen musikcube 3.0.4
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 455138d428e6e60a68191b820f8d4b84f8e4ce24 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 65f82db36d635bdbfd99f67d1d68c9e1aedf8e38efa627f303cf7971c306d063 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4800648
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 63cfb4264a8eb90eaa14c1cdad80531eb9c86a07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 25bb95b8705d8c79bde447e7c7019372eea7eaed9d0268510278e7fcdb1378a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4827124
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories multimedia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories multimedia audio
</span> license BSD
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,14 +32,23 @@ compiler.cxx_standard \
</span> # instead a standalone Asio is used.
depends_build-append \
port:asio \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Care should be taken with regard to FFMpeg.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ffmpeg6 is broken presently: avoid it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# unless it is fixed and works across the board.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Its API changes, and musikcube source may fail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to maintain compatibility with older or newer versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ffmpg_ver 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Once ffmpeg-devel is switched to ffmpeg7, drop it from here:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build ffmpeg ffmpeg-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pkg_config_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/libexec/ffmpeg${ffmpg_ver}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:curl \
port:flac \
port:lame \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libavcodec.dylib:ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ffmpeg${ffmpg_ver} \
</span> port:libev \
port:libmicrohttpd \
port:libogg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,11 +64,14 @@ depends_lib-append port:curl \
</span> patchfiles-append patch-CMakeLists.diff \
patch-fix-curses.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The following will be relevant only if a custom-located FFMpeg is used,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and CMakeLists patch has related lines uncommented.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace "s,@PREFIX@,${prefix}," ${worksrcpath}/src/plugins/stockencoders/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@PREFIX@,${prefix},g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/plugins/ffmpegdecoder/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/plugins/stockencoders/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@FFMPG_VER@,${ffmpg_ver},g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/plugins/ffmpegdecoder/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/plugins/stockencoders/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# Please do not change default settings without a good reason to
# and sufficient testing on all supported systems. In particular,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/musikcube/files/patch-CMakeLists.diff b/multimedia/musikcube/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f58d13ce14..71a0683d920 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/musikcube/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/musikcube/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,15 +41,62 @@
</span>
--- src/plugins/stockencoders/CMakeLists.txt 2023-09-11 10:03:12.000000000 +0800
+++ src/plugins/stockencoders/CMakeLists.txt 2024-01-18 13:47:58.000000000 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,9 +13,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_vendor_library(SWRESAMPLE swresample-musikcube)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_vendor_library(MP3LAME mp3lame)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,22 +5,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(stockencoders SHARED ${stockencoders_SOURCES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (${BUILD_STANDALONE} MATCHES "true")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories(BEFORE ${VENDOR_INCLUDE_DIRECTORIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_vendor_library(AVCODEC avcodec-musikcube)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_vendor_library(AVUTIL avutil-musikcube)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_vendor_library(AVFORMAT avformat-musikcube)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_vendor_library(SWRESAMPLE swresample-musikcube)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_vendor_library(MP3LAME mp3lame)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else()
</span> - # fedora (and probably other RPM-based distros) put ffmpeg includes here...
- include_directories("/usr/include/ffmpeg")
- include_directories("/usr/local/include/ffmpeg")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # This will be needed only for FFMpeg 6:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_directories("@PREFIX@/libexec/ffmpeg6")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(AVCODEC NAMES avcodec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(AVUTIL NAMES avutil)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(AVFORMAT NAMES avformat)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(AVCODEC NAMES avcodec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(AVUTIL NAMES avutil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(AVFORMAT NAMES avformat)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(SWRESAMPLE NAMES swresample)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(MP3LAME NAMES mp3lame)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories("@PREFIX@/libexec/ffmpeg@FFMPG_VER@/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(AVCODEC NAMES avcodec PATHS @PREFIX@/libexec/ffmpeg@FFMPG_VER@/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(AVUTIL NAMES avutil PATHS @PREFIX@/libexec/ffmpeg@FFMPG_VER@/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(AVFORMAT NAMES avformat PATHS @PREFIX@/libexec/ffmpeg@FFMPG_VER@/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(SWRESAMPLE NAMES swresample PATHS @PREFIX@/libexec/ffmpeg@FFMPG_VER@/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(MP3LAME NAMES mp3lame)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(stockencoders ${AVCODEC} ${AVUTIL} ${AVFORMAT} ${SWRESAMPLE} ${MP3LAME})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/ffmpegdecoder/CMakeLists.txt 2024-07-06 04:54:06.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/ffmpegdecoder/CMakeLists.txt 2024-07-06 19:11:13.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,21 +4,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(ffmpegdecoder SHARED ${ffmpegdecoder_SOURCES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (${BUILD_STANDALONE} MATCHES "true")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories(AFTER ${VENDOR_INCLUDE_DIRECTORIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "[ffmpegdecoder] using include dirs: ${VENDOR_INCLUDE_DIRECTORIES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_vendor_library(AVCODEC avcodec-musikcube)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_vendor_library(AVUTIL avutil-musikcube)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_vendor_library(AVFORMAT avformat-musikcube)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_vendor_library(SWRESAMPLE swresample-musikcube)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # fedora (and probably other RPM-based distros) put ffmpeg includes here...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories("/usr/include/ffmpeg")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories("/usr/local/include/ffmpeg")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(AVCODEC NAMES avcodec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(AVUTIL NAMES avutil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(AVFORMAT NAMES avformat)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(SWRESAMPLE NAMES swresample)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories("@PREFIX@/libexec/ffmpeg@FFMPG_VER@/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(AVCODEC NAMES avcodec PATHS @PREFIX@/libexec/ffmpeg@FFMPG_VER@/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(AVUTIL NAMES avutil PATHS @PREFIX@/libexec/ffmpeg@FFMPG_VER@/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(AVFORMAT NAMES avformat PATHS @PREFIX@/libexec/ffmpeg@FFMPG_VER@/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(SWRESAMPLE NAMES swresample PATHS @PREFIX@/libexec/ffmpeg@FFMPG_VER@/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(ffmpegdecoder ${AVCODEC} ${AVUTIL} ${AVFORMAT} ${SWRESAMPLE})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/musikcube/files/patch-fix-curses.diff b/multimedia/musikcube/files/patch-fix-curses.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d9994a268c..806e8500bd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/musikcube/files/patch-fix-curses.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/musikcube/files/patch-fix-curses.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span> endif()
# figure out if we have a "w" suffix or not...
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if ((${DISABLE_WIDE_NCURSES_LIB_SUFFIXES} MATCHES "true") OR ((APPLE) AND (${ENABLE_MACOS_SYSTEM_NCURSES} MATCHES "true")))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if ((${DISABLE_WIDE_NCURSES_LIB_SUFFIXES} MATCHES "true") OR ((APPLE) AND (${ENABLE_MACOS_SYSTEM_NCURSES} MATCHES "true")) OR (CMAKE_SYSTEM_NAME MATCHES "DragonFly"))
</span> +if (${DISABLE_WIDE_NCURSES_LIB_SUFFIXES} MATCHES "true")
message(STATUS "[ncurses] using library names *WITHOUT* 'w' prefix")
set(CURSES_LIBRARY_NAME ncurses)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +29,8 @@
</span> #undef MOUSE_MOVED
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(WIN32) || defined(NO_NCURSESW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(WIN32) || defined(NO_NCURSESW) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(WIN32) || defined(NO_NCURSESW) && !defined(__DragonFly__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(WIN32) || defined(NO_NCURSESW) && !defined(__DragonFly__) || defined(__APPLE__)
</span> #include <curses.h>
#include <panel.h>
#else
</pre><pre style='margin:0'>
</pre>