Date: Fri, 5 Feb 2021 02:03:39 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564074 - in head/multimedia/musikcube: . files Message-ID: <202102050203.11523dpI026770@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Feb 5 02:03:38 2021 New Revision: 564074 URL: https://svnweb.freebsd.org/changeset/ports/564074 Log: multimedia/musikcube: build with base ncurses Fixes issues seen previously with startup crashes with base ncurses PR: 252817 Approved by: yuri (maintainer) Modified: head/multimedia/musikcube/Makefile (contents, props changed) head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt (contents, props changed) Modified: head/multimedia/musikcube/Makefile ============================================================================== --- head/multimedia/musikcube/Makefile Fri Feb 5 01:45:38 2021 (r564073) +++ head/multimedia/musikcube/Makefile Fri Feb 5 02:03:38 2021 (r564074) @@ -2,6 +2,7 @@ PORTNAME= musikcube DISTVERSION= 0.96.5 +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= yuri@FreeBSD.org @@ -23,11 +24,21 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libtag.so:audio/taglib \ libvorbis.so:audio/libvorbis -USES= cmake:noninja compiler:c++14-lang ncurses:port pkgconfig ssl # ncurses:port was changed to base by bug#249572, but this caused it to abort (bug#252817) and was reverted +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 +.else +USES+= ncurses:port +CFLAGS+= -I${LOCALBASE}/include/ncurses +.endif .include <bsd.port.mk> Modified: head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt ============================================================================== --- head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt Fri Feb 5 01:45:38 2021 (r564073) +++ head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt Fri Feb 5 02:03:38 2021 (r564074) @@ -5,7 +5,7 @@ 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 REQUIRED ncurses panel) ++ 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")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102050203.11523dpI026770>