Date: Mon, 19 Apr 2021 03:35:43 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: ee6e3de19154 - 2021Q2 - multimedia/musikcube: Update 0.96.5 -> 0.96.6 with unbreak at run-time Message-ID: <202104190335.13J3Zhp8047144@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee6e3de191547bbe04854c115999ccc250fb6a1d commit ee6e3de191547bbe04854c115999ccc250fb6a1d Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2021-04-19 03:31:59 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2021-04-19 03:35:40 +0000 multimedia/musikcube: Update 0.96.5 -> 0.96.6 with unbreak at run-time It was broken on 12 and 11 due to ncurses port vs. base library confusion. (cherry picked from commit 68457b801edd40093c0b8b624c7423868b5db95a) --- multimedia/musikcube/Makefile | 7 +++---- multimedia/musikcube/distinfo | 6 +++--- multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt | 11 ----------- multimedia/musikcube/pkg-plist | 1 + 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/multimedia/musikcube/Makefile b/multimedia/musikcube/Makefile index 61de2bf8592c..a2cba8a2b404 100644 --- a/multimedia/musikcube/Makefile +++ b/multimedia/musikcube/Makefile @@ -1,7 +1,6 @@ PORTNAME= musikcube -DISTVERSION= 0.96.5 -PORTREVISION= 1 +DISTVERSION= 0.96.6 CATEGORIES= multimedia audio MAINTAINER= yuri@FreeBSD.org @@ -24,20 +23,20 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libvorbis.so:audio/libvorbis USES= cmake:noninja compiler:c++14-lang pkgconfig ssl - USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= clangen -LDFLAGS+= -lncursesw -lpanelw -ltinfow .include <bsd.port.options.mk> .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079 USES+= ncurses +CMAKE_ARGS= -DNCURSES_DISABLE_LIB_SUFFIXES=false .else USES+= ncurses:port CFLAGS+= -I${LOCALBASE}/include/ncurses +CMAKE_ARGS= -DNCURSES_DISABLE_LIB_SUFFIXES=true .endif .include <bsd.port.mk> diff --git a/multimedia/musikcube/distinfo b/multimedia/musikcube/distinfo index 5b5b37f2ba1d..1e865de42de0 100644 --- a/multimedia/musikcube/distinfo +++ b/multimedia/musikcube/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611944934 -SHA256 (clangen-musikcube-0.96.5_GH0.tar.gz) = ee00667ea172a557c00de485fbbaa3fde3eb5ec1867c94b5f1705c1b72807490 -SIZE (clangen-musikcube-0.96.5_GH0.tar.gz) = 9474635 +TIMESTAMP = 1618798011 +SHA256 (clangen-musikcube-0.96.6_GH0.tar.gz) = 3d3512ae03ff5a233de8d6787417b32731e50d813035fd49188b2fca66c6d21e +SIZE (clangen-musikcube-0.96.6_GH0.tar.gz) = 9506235 diff --git a/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt b/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt deleted file mode 100644 index 55f73c00b19a..000000000000 --- a/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- src/musikcube/CMakeLists.txt.orig 2021-01-24 21:53:38 UTC -+++ src/musikcube/CMakeLists.txt -@@ -83,7 +83,7 @@ set_target_properties(musikcube PROPERTIES LINK_FLAGS - - if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - find_package(PkgConfig) -- pkg_check_modules(NCURSES REQUIRED ncursesw panelw) -+ pkg_check_modules(NCURSES ncurses panel) - target_link_libraries(musikcube ${musikcube_LINK_LIBS} ${NCURSES_LIBRARIES} musikcore) - elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin") - if (${LINK_STATICALLY} MATCHES "true") diff --git a/multimedia/musikcube/pkg-plist b/multimedia/musikcube/pkg-plist index 7bdf8fa55c94..1b2d9287fc6c 100644 --- a/multimedia/musikcube/pkg-plist +++ b/multimedia/musikcube/pkg-plist @@ -46,6 +46,7 @@ include/musikcube/musikcore/sdk/ReplayGain.h include/musikcube/musikcore/sdk/String.h include/musikcube/musikcore/sdk/constants.h %%DATADIR%%/libmusikcore.so +%%DATADIR%%/locales/de_DE.json %%DATADIR%%/locales/en_US.json %%DATADIR%%/locales/fr_FR.json %%DATADIR%%/locales/it_IT.json
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104190335.13J3Zhp8047144>