Attachment #190886 for bug #226111

View | Details | Raw Unified | Return to bug 226111
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	openclonk
PORTVERSION=	8.0
DISTVERSIONSUFFIX=	-src
PORTREVISION=	10
CATEGORIES=	games
MASTER_SITES=	http://www.openclonk.org/builds/release/${DISTVERSION}/


LICENSE_COMB=	multi
LICENSE_FILE_ISCL=	${WRKSRC}/COPYING

BROKEN_powerpc64=	fails to compile: C4Texture.cpp:260:13: error: 'stoul' is not a member of 'std'

LIB_DEPENDS=	libalut.so:audio/freealut \
		libfreetype.so:print/freetype2 \
		libogg.so:audio/libogg \
		libpng.so:graphics/png \
		libvorbis.so:audio/libvorbis

WRKSRC=		${WRKDIR}/openclonk-release-${PORTVERSION}-src

# make install has parallel issues with ninja
USES=		compiler:c++14-lang cmake:noninja desktop-file-utils jpeg pkgconfig tar:bzip2
USE_GL=		glew
USE_SDL=	sdl2
USE_SDL=	sdl mixer
USE_XORG=	x11 xpm
INSTALLS_ICONS=	yes
CMAKE_ARGS=	-DAudio_TK="OpenAL"

post-patch:
	@${REINPLACE_CMD} -e 's|DESTINATION games|DESTINATION bin|' \

Lines 1-2 Link Here

(-)b/games/openclonk/distinfo (-2 / +3 lines)
1	SHA256 (openclonk-7.0-src.tar.bz2) = bc1a231d72774a7aa8819e54e1f79be27a21b579fb057609398f2aa5700b0732	1	TIMESTAMP = 1517953047
2	SIZE (openclonk-7.0-src.tar.bz2) = 102143348	2	SHA256 (openclonk-8.0-src.tar.bz2) = 6fc88e8c9bb0ca7eb3e3c8f60af80f77bd6d8f23632bb03f4f5e6ac4e97ae354
		3	SIZE (openclonk-8.0-src.tar.bz2) = 121422616




--- CMakeLists.txt.orig	2018-02-08 07:27:37 UTC
+++ CMakeLists.txt
@@ -320,8 +320,6 @@ if(READLINE_FOUND)
 endif()
 SET(HAVE_LIBREADLINE ${READLINE_FOUND} CACHE INTERNAL "libreadline available")
 
-find_package(GTK3 COMPONENTS gthread gio gobject glib OPTIONAL_COMPONENTS gtksourceview)
-
 # Select an audio library
 find_package("Audio")
 if(Audio_FOUND)
@@ -339,8 +337,6 @@ set(HAVE_SDL ${SDL2_FOUND})
 include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
 
 # Qt5 for editor
-find_path(Qt5DIR qt.pro PATHS ${CMAKE_ADDITIONAL_DEPS_PATH}/qt-5.5.0)
-find_package(Qt5Widgets 5.4 PATHS ${Qt5DIR}/qtbase/lib/cmake/Qt5Widgets)
 if(Qt5Widgets_FOUND)
 	SET(WITH_QT_EDITOR ${Qt5Widgets_FOUND} "Qt editor dialogues available")
 	set(CMAKE_AUTOMOC ON)




--- src/network/C4NetIO.cpp.orig	2018-02-04 15:39:08 UTC
+++ src/network/C4NetIO.cpp
@@ -523,6 +523,11 @@ C4NetIO::HostAddress::AddressFamily C4Ne
 		gen.sa_family == AF_INET6 ? IPv6 : UnknownFamily;
 }
 
+size_t C4NetIO::HostAddress::GetAddrLen() const
+{
+	return GetFamily() == IPv4 ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
+}
+
 void C4NetIO::EndpointAddress::SetPort(uint16_t port)
 {
 	switch (gen.sa_family)
@@ -1195,7 +1200,7 @@ bool C4NetIOTCP::Connect(const C4NetIO::
 #endif
 
 	// connect (async)
-	if (::connect(nsock, &addr, sizeof addr) == SOCKET_ERROR)
+	if (::connect(nsock, &addr, addr.GetAddrLen()) == SOCKET_ERROR)
 	{
 		if (!HaveWouldBlockError()) // expected
 		{
@@ -1368,7 +1373,7 @@ C4NetIOTCP::Peer *C4NetIOTCP::Accept(SOC
 	addr_t caddr = ConnectAddr;
 
 	// accept incoming connection?
-	C4NetIO::addr_t addr; socklen_t iAddrSize = sizeof addr;
+	C4NetIO::addr_t addr; socklen_t iAddrSize = addr.GetAddrLen();
 	if (nsock == INVALID_SOCKET)
 	{
 		// accept from listener
@@ -1497,7 +1502,7 @@ bool C4NetIOTCP::Listen(uint16_t inListe
 	// bind listen socket
 	addr_t addr = addr_t::Any;
 	addr.SetPort(inListenPort);
-	if (::bind(lsock, &addr, sizeof(addr)) == SOCKET_ERROR)
+	if (::bind(lsock, &addr, addr.GetAddrLen()) == SOCKET_ERROR)
 	{
 		SetError("socket bind failed", true);
 		closesocket(lsock); lsock = INVALID_SOCKET;
@@ -2122,7 +2127,7 @@ bool C4NetIOSimpleUDP::Send(const C4NetI
 	// send it
 	C4NetIO::addr_t addr = rPacket.getAddr();
 	if (::sendto(sock, getBufPtr<char>(rPacket), rPacket.getSize(), 0,
-	             &addr, sizeof(addr))
+	             &addr, addr.GetAddrLen())
 	    != int(rPacket.getSize()) &&
 	    !HaveWouldBlockError())
 	{

Added Link Here

(-)b/games/openclonk/files/patch-src_network_C4NetIO.h (+10 lines)
1	--- src/network/C4NetIO.h.orig 2018-02-04 15:39:08 UTC
2	+++ src/network/C4NetIO.h
3	@@ -94,6 +94,7 @@ public:
4	HostAddress(const sockaddr *addr) { SetHost(addr); }
5
6	AddressFamily GetFamily() const;
7	+ size_t GetAddrLen() const;
8
9	void SetScopeId(int scopeId);
10	int GetScopeId() const;




bin/c4group
bin/openclonk
share/appdata/openclonk.appdata.xml
share/applications/openclonk.desktop
share/icons/hicolor/128x128/apps/openclonk.png
share/icons/hicolor/256x256/apps/openclonk.png

%%DATADIR%%/Graphics.ocg
%%DATADIR%%/Material.ocg
%%DATADIR%%/Missions.ocf
%%DATADIR%%/Music.ocg/@CrushedIceCocktail.ogg
%%DATADIR%%/Music.ocg/Cavern.ogg
%%DATADIR%%/Music.ocg/IslandDreams.ogg
%%DATADIR%%/Music.ocg/LucidDream.ogg
%%DATADIR%%/Music.ocg/Motorway.ogg
%%DATADIR%%/Music.ocg/Offshore.ogg
%%DATADIR%%/Music.ocg/TheSkylands.ogg
%%DATADIR%%/Music.ocg/UrbanBolero.ogg
%%DATADIR%%/Music.ocg/Version.txt
%%DATADIR%%/Music.ocg/authors.txt
%%DATADIR%%/Objects.ocd
%%DATADIR%%/Parkour.ocf
%%DATADIR%%/Sound.ocg

Return to bug 226111

Lines 2-10 Link Here

(-)b/games/openclonk/Makefile (-6 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openclonk	4	PORTNAME= openclonk
5	PORTVERSION= 7.0	5	PORTVERSION= 8.0
6	DISTVERSIONSUFFIX= -src	6	DISTVERSIONSUFFIX= -src
7	PORTREVISION= 10
8	CATEGORIES= games	7	CATEGORIES= games
9	MASTER_SITES= http://www.openclonk.org/builds/release/${DISTVERSION}/	8	MASTER_SITES= http://www.openclonk.org/builds/release/${DISTVERSION}/
10		9
Lines 15-34 LICENSE= ISCL CC0-1.0 Link Here
15	LICENSE_COMB= multi	14	LICENSE_COMB= multi
16	LICENSE_FILE_ISCL= ${WRKSRC}/COPYING	15	LICENSE_FILE_ISCL= ${WRKSRC}/COPYING
17		16
18	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \	17	BROKEN_powerpc64= fails to compile: C4Texture.cpp:260:13: error: 'stoul' is not a member of 'std'
		18
		19	LIB_DEPENDS= libalut.so:audio/freealut \
19	libfreetype.so:print/freetype2 \	20	libfreetype.so:print/freetype2 \
20	libogg.so:audio/libogg \	21	libogg.so:audio/libogg \
21	libpng.so:graphics/png \	22	libpng.so:graphics/png \
22	libvorbis.so:audio/libvorbis	23	libvorbis.so:audio/libvorbis
23		24
24	BROKEN_powerpc64= fails to compile: C4Texture.cpp:260:13: error: 'stoul' is not a member of 'std'	25	WRKSRC= ${WRKDIR}/openclonk-release-${PORTVERSION}-src
25		26
		27	# make install has parallel issues with ninja
26	USES= compiler:c++14-lang cmake:noninja desktop-file-utils jpeg pkgconfig tar:bzip2	28	USES= compiler:c++14-lang cmake:noninja desktop-file-utils jpeg pkgconfig tar:bzip2
27	USE_GL= glew	29	USE_GL= glew
28	USE_GNOME= gtk30	30	USE_SDL= sdl2
29	USE_SDL= sdl mixer
30	USE_XORG= x11 xpm	31	USE_XORG= x11 xpm
31	INSTALLS_ICONS= yes	32	INSTALLS_ICONS= yes
		33	CMAKE_ARGS= -DAudio_TK="OpenAL"
32		34
33	post-patch:	35	post-patch:
34	@${REINPLACE_CMD} -e 's\|DESTINATION games\|DESTINATION bin\|' \	36	@${REINPLACE_CMD} -e 's\|DESTINATION games\|DESTINATION bin\|' \

Added Link Here

(-)b/games/openclonk/files/patch-CMakeLists.txt (+20 lines)
1	--- CMakeLists.txt.orig 2018-02-08 07:27:37 UTC
2	+++ CMakeLists.txt
3	@@ -320,8 +320,6 @@ if(READLINE_FOUND)
4	endif()
5	SET(HAVE_LIBREADLINE ${READLINE_FOUND} CACHE INTERNAL "libreadline available")
6
7	-find_package(GTK3 COMPONENTS gthread gio gobject glib OPTIONAL_COMPONENTS gtksourceview)
8	-
9	# Select an audio library
10	find_package("Audio")
11	if(Audio_FOUND)
12	@@ -339,8 +337,6 @@ set(HAVE_SDL ${SDL2_FOUND})
13	include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
14
15	# Qt5 for editor
16	-find_path(Qt5DIR qt.pro PATHS ${CMAKE_ADDITIONAL_DEPS_PATH}/qt-5.5.0)
17	-find_package(Qt5Widgets 5.4 PATHS ${Qt5DIR}/qtbase/lib/cmake/Qt5Widgets)
18	if(Qt5Widgets_FOUND)
19	SET(WITH_QT_EDITOR ${Qt5Widgets_FOUND} "Qt editor dialogues available")
20	set(CMAKE_AUTOMOC ON)

Added Link Here

(-)b/games/openclonk/files/patch-src_network_C4NetIO.cpp (+50 lines)
1	--- src/network/C4NetIO.cpp.orig 2018-02-04 15:39:08 UTC
2	+++ src/network/C4NetIO.cpp
3	@@ -523,6 +523,11 @@ C4NetIO::HostAddress::AddressFamily C4Ne
4	gen.sa_family == AF_INET6 ? IPv6 : UnknownFamily;
5	}
6
7	+size_t C4NetIO::HostAddress::GetAddrLen() const
8	+{
9	+ return GetFamily() == IPv4 ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
10	+}
11	+
12	void C4NetIO::EndpointAddress::SetPort(uint16_t port)
13	{
14	switch (gen.sa_family)
15	@@ -1195,7 +1200,7 @@ bool C4NetIOTCP::Connect(const C4NetIO::
16	#endif
17
18	// connect (async)
19	- if (::connect(nsock, &addr, sizeof addr) == SOCKET_ERROR)
20	+ if (::connect(nsock, &addr, addr.GetAddrLen()) == SOCKET_ERROR)
21	{
22	if (!HaveWouldBlockError()) // expected
23	{
24	@@ -1368,7 +1373,7 @@ C4NetIOTCP::Peer *C4NetIOTCP::Accept(SOC
25	addr_t caddr = ConnectAddr;
26
27	// accept incoming connection?
28	- C4NetIO::addr_t addr; socklen_t iAddrSize = sizeof addr;
29	+ C4NetIO::addr_t addr; socklen_t iAddrSize = addr.GetAddrLen();
30	if (nsock == INVALID_SOCKET)
31	{
32	// accept from listener
33	@@ -1497,7 +1502,7 @@ bool C4NetIOTCP::Listen(uint16_t inListe
34	// bind listen socket
35	addr_t addr = addr_t::Any;
36	addr.SetPort(inListenPort);
37	- if (::bind(lsock, &addr, sizeof(addr)) == SOCKET_ERROR)
38	+ if (::bind(lsock, &addr, addr.GetAddrLen()) == SOCKET_ERROR)
39	{
40	SetError("socket bind failed", true);
41	closesocket(lsock); lsock = INVALID_SOCKET;
42	@@ -2122,7 +2127,7 @@ bool C4NetIOSimpleUDP::Send(const C4NetI
43	// send it
44	C4NetIO::addr_t addr = rPacket.getAddr();
45	if (::sendto(sock, getBufPtr<char>(rPacket), rPacket.getSize(), 0,
46	- &addr, sizeof(addr))
47	+ &addr, addr.GetAddrLen())
48	!= int(rPacket.getSize()) &&
49	!HaveWouldBlockError())
50	{

Lines 1-5 Link Here

(-)b/games/openclonk/pkg-plist (-1 / +11 lines)
1	bin/c4group	1	bin/c4group
2	bin/openclonk	2	bin/openclonk
		3	share/appdata/openclonk.appdata.xml
3	share/applications/openclonk.desktop	4	share/applications/openclonk.desktop
4	share/icons/hicolor/128x128/apps/openclonk.png	5	share/icons/hicolor/128x128/apps/openclonk.png
5	share/icons/hicolor/256x256/apps/openclonk.png	6	share/icons/hicolor/256x256/apps/openclonk.png
Lines 12-18 share/icons/hicolor/64x64/apps/openclonk.png Link Here
12	%%DATADIR%%/Graphics.ocg	13	%%DATADIR%%/Graphics.ocg
13	%%DATADIR%%/Material.ocg	14	%%DATADIR%%/Material.ocg
14	%%DATADIR%%/Missions.ocf	15	%%DATADIR%%/Missions.ocf
15	%%DATADIR%%/Music.ocg	16	%%DATADIR%%/Music.ocg/@CrushedIceCocktail.ogg
		17	%%DATADIR%%/Music.ocg/Cavern.ogg
		18	%%DATADIR%%/Music.ocg/IslandDreams.ogg
		19	%%DATADIR%%/Music.ocg/LucidDream.ogg
		20	%%DATADIR%%/Music.ocg/Motorway.ogg
		21	%%DATADIR%%/Music.ocg/Offshore.ogg
		22	%%DATADIR%%/Music.ocg/TheSkylands.ogg
		23	%%DATADIR%%/Music.ocg/UrbanBolero.ogg
		24	%%DATADIR%%/Music.ocg/Version.txt
		25	%%DATADIR%%/Music.ocg/authors.txt
16	%%DATADIR%%/Objects.ocd	26	%%DATADIR%%/Objects.ocd
17	%%DATADIR%%/Parkour.ocf	27	%%DATADIR%%/Parkour.ocf
18	%%DATADIR%%/Sound.ocg	28	%%DATADIR%%/Sound.ocg