Attachment #248938 for bug #277491




PORTNAME=	sfml
PORTVERSION=	2.6.1
PORTREVISION=	4
CATEGORIES=	devel

MAINTAINER=	amdmi3@FreeBSD.org

LICENSE=	ZLIB
LICENSE_FILE=	${WRKSRC}/license.md

USES=		cmake compiler:c++11-lang
USE_CXXSTD=	c++14
USE_GITHUB=	yes
GH_ACCOUNT=	SFML
GH_PROJECT=	SFML
USE_LDCONFIG=	yes

USES=		cmake compiler:c++11-lang
USE_CXXSTD=	c++14
CMAKE_ARGS=	-DSFML_INSTALL_PKGCONFIG_FILES=ON \
		-DSFML_USE_SYSTEM_DEPS=ON
USE_LDCONFIG=	yes

DATADIR=	${PREFIX}/share/${PORTNAME:tu}
DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:tu}
PORTDATA=	*
PORTDOCS=	*
PORTEXAMPLES=	*

OPTIONS_DEFINE=		DOCS DOXYGEN EXAMPLES
OPTIONS_DEFAULT=	${OPTIONS_GROUP_MODULES}
OPTIONS_GROUP=		MODULES
OPTIONS_GROUP_MODULES=	AUDIO GRAPHICS NETWORK WINDOW
OPTIONS_SUB=		yes

AUDIO_DESC=	SFML Audio module
GRAPHICS_DESC=	SFML Graphics module
MODULES_DESC=	SFML modules
NETWORK_DESC=	SFML Network module
WINDOW_DESC=	SFML Window module

WINDOW_DESC=		SFML Window module
WINDOW_CMAKE_BOOL=	SFML_BUILD_WINDOW
WINDOW_USES=		gl xorg
WINDOW_USE=		XORG=x11,xrandr GL=gl

GRAPHICS_DESC=		SFML Graphics module
GRAPHICS_CMAKE_BOOL=	SFML_BUILD_GRAPHICS
GRAPHICS_LIB_DEPENDS=	libfreetype.so:print/freetype2
GRAPHICS_IMPLIES=	WINDOW

AUDIO_DESC=		SFML Audio module
AUDIO_CMAKE_BOOL=	SFML_BUILD_AUDIO
AUDIO_USES=		openal:al
AUDIO_LIB_DEPENDS=	libFLAC.so:audio/flac \
			libogg.so:audio/libogg \
			libvorbis.so:audio/libvorbis
AUDIO_USES=		openal:al
AUDIO_CMAKE_BOOL=	SFML_BUILD_AUDIO
NETWORK_CMAKE_BOOL=	SFML_BUILD_NETWORK

DOXYGEN_CMAKE_BOOL=	SFML_BUILD_DOC
DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
DOXYGEN_IMPLIES=	DOCS
DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
DOXYGEN_CMAKE_BOOL=	SFML_BUILD_DOC
EXAMPLES_CMAKE_BOOL=	SFML_BUILD_EXAMPLES
GRAPHICS_IMPLIES=	WINDOW
GRAPHICS_LIB_DEPENDS=	libfreetype.so:print/freetype2
GRAPHICS_CMAKE_BOOL=	SFML_BUILD_GRAPHICS
NETWORK_CMAKE_BOOL=	SFML_BUILD_NETWORK
WINDOW_USES=		gl xorg
WINDOW_USE=		GL=gl \
			XORG=x11,xcursor,xrandr
WINDOW_CMAKE_BOOL=	SFML_BUILD_WINDOW

post-install:
	@${RM} ${STAGEDIR}${PREFIX}/*.pc
	${RM} ${STAGEDIR}${DATADIR}/*.md

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-3 Link Here

(-)b/devel/sfml/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1539702187	1	TIMESTAMP = 1709547693
2	SHA256 (SFML-SFML-2.5.1_GH0.tar.gz) = 438c91a917cc8aa19e82c6f59f8714da353c488584a007d401efac8368e1c785	2	SHA256 (SFML-SFML-2.6.1_GH0.tar.gz) = 82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d
3	SIZE (SFML-SFML-2.5.1_GH0.tar.gz) = 22868556	3	SIZE (SFML-SFML-2.6.1_GH0.tar.gz) = 25499153




src/SFML/Window/Unix/WindowImplX11.cpp:1278:36: error: reinterpret_cast from 'nullptr_t' to 'void *' is not allowed
                                   reinterpret_cast<void*>(NULL));
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

--- src/SFML/Window/Unix/WindowImplX11.cpp.orig	2017-02-08 11:29:16 UTC
+++ src/SFML/Window/Unix/WindowImplX11.cpp
@@ -1275,7 +1275,7 @@ void WindowImplX11::initialize()
                                    m_window,
                                    XNInputStyle,
                                    XIMPreeditNothing | XIMStatusNothing,
-                                   reinterpret_cast<void*>(NULL));
+                                   static_cast<void*>(NULL));
     }
     else
     {




include/SFML/Window/Sensor.hpp
include/SFML/Window/Touch.hpp
include/SFML/Window/VideoMode.hpp
include/SFML/Window/Vulkan.hpp
include/SFML/Window/Window.hpp
include/SFML/Window/WindowBase.hpp
include/SFML/Window/WindowHandle.hpp
include/SFML/Window/WindowStyle.hpp
lib/cmake/SFML/SFMLConfig.cmake

lib/cmake/SFML/SFMLSharedTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/SFML/SFMLSharedTargets.cmake
%%AUDIO%%lib/libsfml-audio.so
%%AUDIO%%lib/libsfml-audio.so.2.6
%%AUDIO%%lib/libsfml-audio.so.2.6.1
%%GRAPHICS%%lib/libsfml-graphics.so
%%GRAPHICS%%lib/libsfml-graphics.so.2.6
%%GRAPHICS%%lib/libsfml-graphics.so.2.6.1
%%NETWORK%%lib/libsfml-network.so
%%NETWORK%%lib/libsfml-network.so.2.6
%%NETWORK%%lib/libsfml-network.so.2.6.1
lib/libsfml-system.so
lib/libsfml-system.so.2.6
lib/libsfml-system.so.2.6.1
%%WINDOW%%lib/libsfml-window.so
%%WINDOW%%lib/libsfml-window.so.2.6
%%WINDOW%%lib/libsfml-window.so.2.6.1
libdata/pkgconfig/sfml-all.pc
%%AUDIO%%libdata/pkgconfig/sfml-audio.pc
%%GRAPHICS%%libdata/pkgconfig/sfml-graphics.pc
- 

Return to bug 277491

Lines 102-108 include/SFML/Window/Mouse.hpp Link Here

(-)b/devel/sfml/pkg-plist (-11 / +12 lines)
102	include/SFML/Window/Sensor.hpp	102	include/SFML/Window/Sensor.hpp
103	include/SFML/Window/Touch.hpp	103	include/SFML/Window/Touch.hpp
104	include/SFML/Window/VideoMode.hpp	104	include/SFML/Window/VideoMode.hpp
		105	include/SFML/Window/Vulkan.hpp
105	include/SFML/Window/Window.hpp	106	include/SFML/Window/Window.hpp
		107	include/SFML/Window/WindowBase.hpp
106	include/SFML/Window/WindowHandle.hpp	108	include/SFML/Window/WindowHandle.hpp
107	include/SFML/Window/WindowStyle.hpp	109	include/SFML/Window/WindowStyle.hpp
108	lib/cmake/SFML/SFMLConfig.cmake	110	lib/cmake/SFML/SFMLConfig.cmake
Lines 111-130 lib/cmake/SFML/SFMLConfigVersion.cmake Link Here
111	lib/cmake/SFML/SFMLSharedTargets-%%CMAKE_BUILD_TYPE%%.cmake	113	lib/cmake/SFML/SFMLSharedTargets-%%CMAKE_BUILD_TYPE%%.cmake
112	lib/cmake/SFML/SFMLSharedTargets.cmake	114	lib/cmake/SFML/SFMLSharedTargets.cmake
113	%%AUDIO%%lib/libsfml-audio.so	115	%%AUDIO%%lib/libsfml-audio.so
114	%%AUDIO%%lib/libsfml-audio.so.2.5	116	%%AUDIO%%lib/libsfml-audio.so.2.6
115	%%AUDIO%%lib/libsfml-audio.so.2.5.1	117	%%AUDIO%%lib/libsfml-audio.so.2.6.1
116	%%GRAPHICS%%lib/libsfml-graphics.so	118	%%GRAPHICS%%lib/libsfml-graphics.so
117	%%GRAPHICS%%lib/libsfml-graphics.so.2.5	119	%%GRAPHICS%%lib/libsfml-graphics.so.2.6
118	%%GRAPHICS%%lib/libsfml-graphics.so.2.5.1	120	%%GRAPHICS%%lib/libsfml-graphics.so.2.6.1
119	%%NETWORK%%lib/libsfml-network.so	121	%%NETWORK%%lib/libsfml-network.so
120	%%NETWORK%%lib/libsfml-network.so.2.5	122	%%NETWORK%%lib/libsfml-network.so.2.6
121	%%NETWORK%%lib/libsfml-network.so.2.5.1	123	%%NETWORK%%lib/libsfml-network.so.2.6.1
122	lib/libsfml-system.so	124	lib/libsfml-system.so
123	lib/libsfml-system.so.2.5	125	lib/libsfml-system.so.2.6
124	lib/libsfml-system.so.2.5.1	126	lib/libsfml-system.so.2.6.1
125	%%WINDOW%%lib/libsfml-window.so	127	%%WINDOW%%lib/libsfml-window.so
126	%%WINDOW%%lib/libsfml-window.so.2.5	128	%%WINDOW%%lib/libsfml-window.so.2.6
127	%%WINDOW%%lib/libsfml-window.so.2.5.1	129	%%WINDOW%%lib/libsfml-window.so.2.6.1
128	libdata/pkgconfig/sfml-all.pc	130	libdata/pkgconfig/sfml-all.pc
129	%%AUDIO%%libdata/pkgconfig/sfml-audio.pc	131	%%AUDIO%%libdata/pkgconfig/sfml-audio.pc
130	%%GRAPHICS%%libdata/pkgconfig/sfml-graphics.pc	132	%%GRAPHICS%%libdata/pkgconfig/sfml-graphics.pc
131	-

Lines 1-6 Link Here

(-)b/devel/sfml/Makefile (-31 / +28 lines)
1	PORTNAME= sfml	1	PORTNAME= sfml
2	PORTVERSION= 2.5.1	2	PORTVERSION= 2.6.1
3	PORTREVISION= 4
4	CATEGORIES= devel	3	CATEGORIES= devel
5		4
6	MAINTAINER= amdmi3@FreeBSD.org	5	MAINTAINER= amdmi3@FreeBSD.org
Lines 10-66 WWW= https://www.sfml-dev.org/ Link Here
10	LICENSE= ZLIB	9	LICENSE= ZLIB
11	LICENSE_FILE= ${WRKSRC}/license.md	10	LICENSE_FILE= ${WRKSRC}/license.md
12		11
		12	USES= cmake compiler:c++11-lang
		13	USE_CXXSTD= c++14
13	USE_GITHUB= yes	14	USE_GITHUB= yes
14	GH_ACCOUNT= SFML	15	GH_ACCOUNT= SFML
15	GH_PROJECT= SFML	16	GH_PROJECT= SFML
		17	USE_LDCONFIG= yes
16		18
17	USES= cmake compiler:c++11-lang
18	USE_CXXSTD= c++14
19	CMAKE_ARGS= -DSFML_INSTALL_PKGCONFIG_FILES=ON \	19	CMAKE_ARGS= -DSFML_INSTALL_PKGCONFIG_FILES=ON \
20	-DSFML_USE_SYSTEM_DEPS=ON	20	-DSFML_USE_SYSTEM_DEPS=ON
21	USE_LDCONFIG= yes
22		21
23	DATADIR= ${PREFIX}/share/SFML	22	DATADIR= ${PREFIX}/share/${PORTNAME:tu}
		23	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:tu}
24	PORTDATA= *	24	PORTDATA= *
25	PORTDOCS= *	25	PORTDOCS= *
26	PORTEXAMPLES= *	26	PORTEXAMPLES= *
27		27
28	OPTIONS_DEFINE= DOCS EXAMPLES DOXYGEN	28	OPTIONS_DEFINE= DOCS DOXYGEN EXAMPLES
29	OPTIONS_GROUP= MODULES	29	OPTIONS_DEFAULT= ${OPTIONS_GROUP_MODULES}
30	OPTIONS_GROUP_MODULES= WINDOW GRAPHICS AUDIO NETWORK	30	OPTIONS_GROUP= MODULES
31	OPTIONS_DEFAULT=${OPTIONS_GROUP_MODULES}	31	OPTIONS_GROUP_MODULES= AUDIO GRAPHICS NETWORK WINDOW
32	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
33		33
		34	AUDIO_DESC= SFML Audio module
		35	GRAPHICS_DESC= SFML Graphics module
34	MODULES_DESC= SFML modules	36	MODULES_DESC= SFML modules
		37	NETWORK_DESC= SFML Network module
		38	WINDOW_DESC= SFML Window module
35		39
36	WINDOW_DESC= SFML Window module
37	WINDOW_CMAKE_BOOL= SFML_BUILD_WINDOW
38	WINDOW_USES= gl xorg
39	WINDOW_USE= XORG=x11,xrandr GL=gl
40
41	GRAPHICS_DESC= SFML Graphics module
42	GRAPHICS_CMAKE_BOOL= SFML_BUILD_GRAPHICS
43	GRAPHICS_LIB_DEPENDS= libfreetype.so:print/freetype2
44	GRAPHICS_IMPLIES= WINDOW
45
46	AUDIO_DESC= SFML Audio module
47	AUDIO_CMAKE_BOOL= SFML_BUILD_AUDIO
48	AUDIO_USES= openal:al
49	AUDIO_LIB_DEPENDS= libFLAC.so:audio/flac \	40	AUDIO_LIB_DEPENDS= libFLAC.so:audio/flac \
50	libogg.so:audio/libogg \	41	libogg.so:audio/libogg \
51	libvorbis.so:audio/libvorbis	42	libvorbis.so:audio/libvorbis
52		43	AUDIO_USES= openal:al
53	NETWORK_DESC= SFML Network module	44	AUDIO_CMAKE_BOOL= SFML_BUILD_AUDIO
54	NETWORK_CMAKE_BOOL= SFML_BUILD_NETWORK
55
56	DOXYGEN_CMAKE_BOOL= SFML_BUILD_DOC
57	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
58	DOXYGEN_IMPLIES= DOCS	45	DOXYGEN_IMPLIES= DOCS
59		46	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
		47	DOXYGEN_CMAKE_BOOL= SFML_BUILD_DOC
60	EXAMPLES_CMAKE_BOOL= SFML_BUILD_EXAMPLES	48	EXAMPLES_CMAKE_BOOL= SFML_BUILD_EXAMPLES
		49	GRAPHICS_IMPLIES= WINDOW
		50	GRAPHICS_LIB_DEPENDS= libfreetype.so:print/freetype2
		51	GRAPHICS_CMAKE_BOOL= SFML_BUILD_GRAPHICS
		52	NETWORK_CMAKE_BOOL= SFML_BUILD_NETWORK
		53	WINDOW_USES= gl xorg
		54	WINDOW_USE= GL=gl \
		55	XORG=x11,xcursor,xrandr
		56	WINDOW_CMAKE_BOOL= SFML_BUILD_WINDOW
61		57
62	post-install:	58	post-install:
63	@${RM} ${STAGEDIR}${PREFIX}/*.pc	59	@${RM} ${STAGEDIR}${PREFIX}/*.pc
		60	${RM} ${STAGEDIR}${DATADIR}/*.md
64		61
65	post-install-DOCS-on:	62	post-install-DOCS-on:
66	@${MKDIR} ${STAGEDIR}${DOCSDIR}	63	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Removed Link Here

(-)a/devel/sfml/files/patch-src_SFML_Window_Unix_WindowImplX11.cpp (-15 lines)
1	src/SFML/Window/Unix/WindowImplX11.cpp:1278:36: error: reinterpret_cast from 'nullptr_t' to 'void *' is not allowed
2	reinterpret_cast<void*>(NULL));
3	^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4
5	--- src/SFML/Window/Unix/WindowImplX11.cpp.orig 2017-02-08 11:29:16 UTC
6	+++ src/SFML/Window/Unix/WindowImplX11.cpp
7	@@ -1275,7 +1275,7 @@ void WindowImplX11::initialize()
8	m_window,
9	XNInputStyle,
10	XIMPreeditNothing \| XIMStatusNothing,
11	- reinterpret_cast<void*>(NULL));
12	+ static_cast<void*>(NULL));
13	}
14	else
15	{