diff options
| author | Steve Wills <swills@FreeBSD.org> | 2021-02-05 02:03:38 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2021-02-05 02:03:38 +0000 |
| commit | be407ef7340e77caa45c8abcb8dbb4b1af6e1d43 (patch) | |
| tree | f0f105dadce186af67dae5c4bcace148cf80723d /multimedia/musikcube | |
| parent | a639e98df9e38b33ef3b8c7d8f77fb1ff64f44db (diff) | |
| download | ports-be407ef7340e77caa45c8abcb8dbb4b1af6e1d43.tar.gz ports-be407ef7340e77caa45c8abcb8dbb4b1af6e1d43.zip | |
multimedia/musikcube: build with base ncurses
Fixes issues seen previously with startup crashes with base ncurses
PR: 252817
Approved by: yuri (maintainer)
Notes
Notes:
svn path=/head/; revision=564074
Diffstat (limited to 'multimedia/musikcube')
| -rw-r--r-- | multimedia/musikcube/Makefile | 13 | ||||
| -rw-r--r-- | multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/multimedia/musikcube/Makefile b/multimedia/musikcube/Makefile index d6bce7ee30f3..e963086d4b7e 100644 --- a/multimedia/musikcube/Makefile +++ b/multimedia/musikcube/Makefile @@ -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> diff --git a/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt b/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt index 0e45390cb59b..55f73c00b19a 100644 --- a/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt +++ b/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt @@ -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") |