Attachment 149390 Details for Bug 194617 – C11 fixes (incomplete)

[patch] C11 fixes (incomplete)

patch-openclonk.diff (text/plain), 1.34 KB, created by Kevin Zheng on 2014-11-14 05:06:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Zheng

Created: 2014-11-14 05:06:02 UTC

Size: 1.34 KB

patch

obsolete

>diff --git a/games/openclonk/Makefile b/games/openclonk/Makefile
>index 5aa42bc..b690aa2 100644
>--- a/games/openclonk/Makefile
>+++ b/games/openclonk/Makefile
>@@ -21,7 +21,7 @@ LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
> 		libpng.so:${PORTSDIR}/graphics/png \
> 		libvorbis.so:${PORTSDIR}/audio/libvorbis
> 
>-USES=		cmake iconv pkgconfig tar:bzip2
>+USES=		cmake compiler:c++11-lib iconv pkgconfig tar:bzip2
> USE_GL=		glew
> USE_GNOME=	gtk20
> USE_SDL=	sdl mixer
>diff --git a/games/openclonk/files/patch-src_platform_StdSync.h b/games/openclonk/files/patch-src_platform_StdSync.h
>new file mode 100644
>index 0000000..d05a4a8
>--- /dev/null
>+++ b/games/openclonk/files/patch-src_platform_StdSync.h
>@@ -0,0 +1,12 @@
>+--- src/platform/StdSync.h.orig	2014-10-05 13:22:07 UTC
>++++ src/platform/StdSync.h
>+@@ -135,7 +135,8 @@ public:
>+ 		{
>+ 			// Use pthread_cond_wait or pthread_cond_timedwait depending on wait length. Check return value.
>+ 			// Note this will temporarily unlock the mutex, so no deadlock should occur.
>+-			timespec ts = { iMillis / 1000, (iMillis % 1000) * 1000000 };
>++			timespec ts = { static_cast<time_t>(iMillis / 1000),
>++				static_cast<long>((iMillis % 1000) * 1000000) };
>+ 			if (0 != (iMillis != INFINITE ? pthread_cond_timedwait(&cond, &mutex, &ts) : pthread_cond_wait(&cond, &mutex)))
>+ 			{
>+ 				pthread_mutex_unlock(&mutex);

Actions: View | Diff

Attachments on bug 194617: 148674 | 148675 | 148897 | 149145 | 149390