diff options
author | tobik <tobik@FreeBSD.org> | 2018-07-30 16:11:14 +0800 |
---|---|---|
committer | tobik <tobik@FreeBSD.org> | 2018-07-30 16:11:14 +0800 |
commit | 143a9bad2f83d1c410f8a5ac789c39255ee9c925 (patch) | |
tree | 660a2bf1c1bb5a40e3166c395f7d16a1d17e5d35 /games | |
parent | 1a3d8ea383b3c90a315c2cfb95983453c8802397 (diff) | |
download | freebsd-ports-gnome-143a9bad2f83d1c410f8a5ac789c39255ee9c925.tar.gz freebsd-ports-gnome-143a9bad2f83d1c410f8a5ac789c39255ee9c925.tar.zst freebsd-ports-gnome-143a9bad2f83d1c410f8a5ac789c39255ee9c925.zip |
games/flukz: Fix build on 12.0-CURRENT
src/soundengine/vorbisdecoder.cpp:352:20: error: cannot initialize return object of type 'unsigned char *' with an rvalue of type 'bool'
return false;
^~~~~
http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475478_s336801/logs/errors/flukz-0.4.log
- While here add missing dependencies
Diffstat (limited to 'games')
-rw-r--r-- | games/flukz/Makefile | 3 | ||||
-rw-r--r-- | games/flukz/files/patch-src_soundengine_vorbisdecoder.cpp | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/games/flukz/Makefile b/games/flukz/Makefile index 7b59e1f5010e..bd1b91197fd2 100644 --- a/games/flukz/Makefile +++ b/games/flukz/Makefile @@ -2,6 +2,7 @@ PORTNAME= flukz PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://download.tuxfamily.org/${PORTNAME}/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -10,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Vertically scrolling shoot'em up USES= qmake qt:4 -USE_QT= multimedia network moc_build rcc_build +USE_QT= corelib gui multimedia network moc_build rcc_build DESKTOP_ENTRIES= Flukz "" ${PORTNAME} \ ${PORTNAME} "Game;ArcadeGame;" true diff --git a/games/flukz/files/patch-src_soundengine_vorbisdecoder.cpp b/games/flukz/files/patch-src_soundengine_vorbisdecoder.cpp new file mode 100644 index 000000000000..7df5ace2af50 --- /dev/null +++ b/games/flukz/files/patch-src_soundengine_vorbisdecoder.cpp @@ -0,0 +1,15 @@ +src/soundengine/vorbisdecoder.cpp:352:20: error: cannot initialize return object of type 'unsigned char *' with an rvalue of type 'bool' + return false; + ^~~~~ + +--- src/soundengine/vorbisdecoder.cpp.orig 2018-07-30 08:05:34 UTC ++++ src/soundengine/vorbisdecoder.cpp +@@ -349,7 +349,7 @@ unsigned char *VorbisDecoder::decodeAll(unsigned int * + if (!vorbisDecode(m_readData, rlen, &leftover, false) || + !m_decSamplesLen) { + DEBUG_INFO("vorbisDecode failed"); +- return false; ++ return NULL; + } + m_readPos += rlen - leftover; + |