Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Jul 2018 08:11:14 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r475867 - in head/games/flukz: . files
Message-ID:  <201807300811.w6U8BEGR084838@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Mon Jul 30 08:11:14 2018
New Revision: 475867
URL: https://svnweb.freebsd.org/changeset/ports/475867

Log:
  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

Added:
  head/games/flukz/files/
  head/games/flukz/files/patch-src_soundengine_vorbisdecoder.cpp   (contents, props changed)
Modified:
  head/games/flukz/Makefile

Modified: head/games/flukz/Makefile
==============================================================================
--- head/games/flukz/Makefile	Mon Jul 30 08:02:34 2018	(r475866)
+++ head/games/flukz/Makefile	Mon Jul 30 08:11:14 2018	(r475867)
@@ -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

Added: head/games/flukz/files/patch-src_soundengine_vorbisdecoder.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/flukz/files/patch-src_soundengine_vorbisdecoder.cpp	Mon Jul 30 08:11:14 2018	(r475867)
@@ -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;
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807300811.w6U8BEGR084838>