Here's an update to graphics/sfml. games/mars needs some light
patching.
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/sfml/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 7 May 2016 12:40:57 -0000 1.3
+++ Makefile 31 Aug 2016 17:11:24 -0000
@@ -2,17 +2,16 @@
COMMENT = simple and fast multimedia library
-V = 2.1
+V = 2.4.0
DISTNAME = SFML-${V}-sources
PKGNAME = sfml-${V}
EXTRACT_SUFX = .zip
-REVISION = 0
-SHARED_LIBS += sfml-audio 0.0 # 2.1
-SHARED_LIBS += sfml-graphics 0.0 # 2.1
-SHARED_LIBS += sfml-network 0.0 # 2.1
-SHARED_LIBS += sfml-system 0.0 # 2.1
-SHARED_LIBS += sfml-window 0.0 # 2.1
+SHARED_LIBS += sfml-audio 1.0 # 2.1
+SHARED_LIBS += sfml-graphics 1.0 # 2.1
+SHARED_LIBS += sfml-network 1.0 # 2.1
+SHARED_LIBS += sfml-system 1.0 # 2.1
+SHARED_LIBS += sfml-window 1.0 # 2.1
CATEGORIES = multimedia
@@ -23,17 +22,21 @@ MAINTAINER = Pascal Stumpf <pascal@stum
# zlib/libpng
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL GLEW ICE SM X11 Xext Xrandr freetype jpeg m openal
-WANTLIB += pthread sndfile stdc++
+WANTLIB += FLAC GL X11-xcb freetype jpeg m ogg openal vorbis vorbisenc
+WANTLIB += vorbisfile xcb xcb-image xcb-randr
MASTER_SITES = http://www.sfml-dev.org/download/sfml/${V}/
-MODULES = devel/cmake
+MODULES = devel/cmake gcc4
+MODGCC4_LANGS = c c++
+MODGCC4_ARCHS = *
LIB_DEPENDS = audio/openal \
- audio/libsndfile \
- graphics/glew \
- graphics/jpeg
+ graphics/jpeg \
+ audio/libvorbis \
+ audio/flac
+
+CONFIGURE_ARGS += -DSFML_INSTALL_PKGCONFIG_FILES=BOOL:TRUE
FAKE_FLAGS = DESTDIR=${DESTDIR} PREFIX=${PREFIX}
.for l v in ${SHARED_LIBS}
@@ -48,7 +51,7 @@ WRKDIST = ${WRKDIR}/SFML-${V}
post-extract:
find ${WRKSRC} -type f -exec perl -pi -e 's/\015//g' {} \;
-post-patch:
- find ${WRKSRC}/include -name '*.orig' -exec rm {} \;
+post-install:
+ find ${PREFIX}/include -name '*.orig' -exec rm {} \;
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/sfml/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 14 Sep 2014 21:01:52 -0000 1.1.1.1
+++ distinfo 31 Aug 2016 17:11:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (SFML-2.1-sources.zip) = X0bXdIIjvj8Map/PGMABbSJ/exkDzbzYX2HdvILvlb8=
-SIZE (SFML-2.1-sources.zip) = 9728420
+SHA256 (SFML-2.4.0-sources.zip) = hooaHkOn7kDBqQ78vOoGG28KbtEpB12ajxnIxp5kSw8=
+SIZE (SFML-2.4.0-sources.zip) = 24965927
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 31 Aug 2016 17:11:24 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- CMakeLists.txt.orig Wed Aug 31 17:33:23 2016
++++ CMakeLists.txt Wed Aug 31 17:33:36 2016
+@@ -197,7 +197,7 @@ if(SFML_OS_MACOSX)
+ set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
+ endif()
+
+-if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
++if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
+ set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
+ if(SFML_OS_FREEBSD)
+ set(PKGCONFIG_DIR libdata/pkgconfig)
Index: patches/patch-cmake_Config_cmake
===================================================================
RCS file: /cvs/ports/multimedia/sfml/patches/patch-cmake_Config_cmake,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-cmake_Config_cmake
--- patches/patch-cmake_Config_cmake 14 Sep 2014 21:01:52 -0000 1.1.1.1
+++ patches/patch-cmake_Config_cmake 31 Aug 2016 17:11:24 -0000
@@ -1,13 +1,23 @@
$OpenBSD: patch-cmake_Config_cmake,v 1.1.1.1 2014/09/14 21:01:52 pascal Exp $
---- cmake/Config.cmake.orig Wed Mar 19 23:29:50 2014
-+++ cmake/Config.cmake Wed Mar 19 23:30:08 2014
-@@ -18,6 +18,9 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
- # FreeBSD compile path is the same as Linux
- set(LINUX 1)
-+elseif(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-+ # OpenBSD compile path is the same as Linux
-+ set(LINUX 1)
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- set(MACOSX 1)
-
+--- cmake/Config.cmake.orig Wed Aug 31 17:33:23 2016
++++ cmake/Config.cmake Wed Aug 31 17:34:48 2016
+@@ -31,6 +31,10 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+ set(SFML_OS_FREEBSD 1)
+ # don't use the OpenGL ES implementation on FreeBSD
+ set(OPENGL_ES 0)
++elseif(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++ set(SFML_OS_OPENBSD 1)
++ # don't use the OpenGL ES implementation on OpenBSD
++ set(OPENGL_ES 0)
+ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+ if(IOS)
+ set(SFML_OS_IOS 1)
+@@ -112,7 +116,7 @@ endif()
+ # define the install directory for miscellaneous files
+ if(SFML_OS_WINDOWS OR SFML_OS_IOS)
+ set(INSTALL_MISC_DIR .)
+-elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_MACOSX)
++elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_MACOSX OR SFML_OS_OPENBSD)
+ set(INSTALL_MISC_DIR share/SFML)
+ elseif(SFML_OS_ANDROID)
+ set(INSTALL_MISC_DIR ${ANDROID_NDK}/sources/sfml)
Index: patches/patch-include_SFML_Config_hpp
===================================================================
RCS file: /cvs/ports/multimedia/sfml/patches/patch-include_SFML_Config_hpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-include_SFML_Config_hpp
--- patches/patch-include_SFML_Config_hpp 14 Sep 2014 21:01:52 -0000
1.1.1.1
+++ patches/patch-include_SFML_Config_hpp 31 Aug 2016 17:11:24 -0000
@@ -1,24 +1,15 @@
-$OpenBSD: patch-include_SFML_Config_hpp,v 1.1.1.1 2014/09/14 21:01:52 pascal
Exp $
---- include/SFML/Config.hpp.orig Wed Mar 19 23:32:08 2014
-+++ include/SFML/Config.hpp Wed Mar 19 23:33:06 2014
-@@ -59,6 +59,11 @@
- // FreeBSD
- #define SFML_SYSTEM_FREEBSD
+$OpenBSD$
+--- include/SFML/Config.hpp.orig Mon Feb 29 18:38:15 2016
++++ include/SFML/Config.hpp Mon Feb 29 18:39:04 2016
+@@ -86,6 +86,11 @@
+ // FreeBSD
+ #define SFML_SYSTEM_FREEBSD
-+#elif defined(__OpenBSD__)
++ #elif defined(__OpenBSD__)
+
-+ // OpenBSD
-+ #define SFML_SYSTEM_OPENBSD
++ // OpenBSD
++ #define SFML_SYSTEM_OPENBSD
+
- #else
-
- // Unsupported system
-@@ -95,7 +100,7 @@
-
- #endif
-
-- #else // Linux, FreeBSD, Mac OS X
-+ #else // Linux, FreeBSD, OpenBSD, Mac OS X
-
- #if __GNUC__ >= 4
+ #else
+ // Unsupported UNIX system
Index: patches/patch-include_SFML_OpenGL_hpp
===================================================================
RCS file: /cvs/ports/multimedia/sfml/patches/patch-include_SFML_OpenGL_hpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-include_SFML_OpenGL_hpp
--- patches/patch-include_SFML_OpenGL_hpp 14 Sep 2014 21:01:52 -0000
1.1.1.1
+++ patches/patch-include_SFML_OpenGL_hpp 31 Aug 2016 17:11:24 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-include_SFML_OpenGL_hpp,v 1.1.1.1 2014/09/14 21:01:52 pascal
Exp $
---- include/SFML/OpenGL.hpp.orig Wed Mar 19 23:33:39 2014
-+++ include/SFML/OpenGL.hpp Wed Mar 19 23:33:56 2014
-@@ -46,7 +46,7 @@
+$OpenBSD$
+--- include/SFML/OpenGL.hpp.orig Mon Feb 29 18:39:14 2016
++++ include/SFML/OpenGL.hpp Mon Feb 29 18:39:32 2016
+@@ -45,7 +45,7 @@
+
#include <GL/gl.h>
- #include <GL/glu.h>
-#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) ||
defined(SFML_SYSTEM_OPENBSD)
- #include <GL/gl.h>
- #include <GL/glu.h>
+ #if defined(SFML_OPENGL_ES)
+ #include <GLES/gl.h>
Index: patches/patch-include_SFML_Window_WindowHandle_hpp
===================================================================
RCS file:
/cvs/ports/multimedia/sfml/patches/patch-include_SFML_Window_WindowHandle_hpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-include_SFML_Window_WindowHandle_hpp
--- patches/patch-include_SFML_Window_WindowHandle_hpp 14 Sep 2014 21:01:52
-0000 1.1.1.1
+++ patches/patch-include_SFML_Window_WindowHandle_hpp 31 Aug 2016 17:11:24
-0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-include_SFML_Window_WindowHandle_hpp,v 1.1.1.1 2014/09/14
21:01:52 pascal Exp $
---- include/SFML/Window/WindowHandle.hpp.orig Wed Mar 19 23:34:17 2014
-+++ include/SFML/Window/WindowHandle.hpp Wed Mar 19 23:34:30 2014
-@@ -46,7 +46,7 @@ namespace sf
+$OpenBSD$
+--- include/SFML/Window/WindowHandle.hpp.orig Wed Aug 31 17:33:32 2016
++++ include/SFML/Window/WindowHandle.hpp Wed Aug 31 17:33:36 2016
+@@ -42,7 +42,7 @@ namespace sf
// Window handle is HWND (HWND__*) on Windows
typedef HWND__* WindowHandle;
Index: patches/patch-src_SFML_System_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_SFML_System_CMakeLists_txt
diff -N patches/patch-src_SFML_System_CMakeLists_txt
--- patches/patch-src_SFML_System_CMakeLists_txt 14 Sep 2014 21:01:52
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_SFML_System_CMakeLists_txt,v 1.1.1.1 2014/09/14 21:01:52
pascal Exp $
---- src/SFML/System/CMakeLists.txt.orig Wed Mar 19 23:43:18 2014
-+++ src/SFML/System/CMakeLists.txt Wed Mar 19 23:43:31 2014
-@@ -74,7 +74,7 @@ if(UNIX)
- set(SYSTEM_EXT_LIBS ${SYSTEM_EXT_LIBS} pthread)
- endif()
- if(LINUX)
-- set(SYSTEM_EXT_LIBS ${SYSTEM_EXT_LIBS} rt)
-+ set(SYSTEM_EXT_LIBS ${SYSTEM_EXT_LIBS})
- endif()
-
- # define the sfml-system target
Index: patches/patch-src_SFML_Window_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/multimedia/sfml/patches/patch-src_SFML_Window_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_SFML_Window_CMakeLists_txt
--- patches/patch-src_SFML_Window_CMakeLists_txt 14 Sep 2014 21:01:52
-0000 1.1.1.1
+++ patches/patch-src_SFML_Window_CMakeLists_txt 31 Aug 2016 17:11:24
-0000
@@ -1,31 +1,43 @@
$OpenBSD: patch-src_SFML_Window_CMakeLists_txt,v 1.1.1.1 2014/09/14 21:01:52
pascal Exp $
---- src/SFML/Window/CMakeLists.txt.orig Thu Mar 20 02:16:11 2014
-+++ src/SFML/Window/CMakeLists.txt Thu Mar 20 02:17:41 2014
-@@ -14,11 +14,11 @@ set(SRC
- ${INCROOT}/ContextSettings.hpp
- ${INCROOT}/Event.hpp
- ${SRCROOT}/InputImpl.hpp
-- ${INCROOT}/Joystick.hpp
-- ${SRCROOT}/Joystick.cpp
-- ${SRCROOT}/JoystickImpl.hpp
-- ${SRCROOT}/JoystickManager.cpp
-- ${SRCROOT}/JoystickManager.hpp
-+# ${INCROOT}/Joystick.hpp
-+# ${SRCROOT}/Joystick.cpp
-+# ${SRCROOT}/JoystickImpl.hpp
-+# ${SRCROOT}/JoystickManager.cpp
-+# ${SRCROOT}/JoystickManager.hpp
- ${INCROOT}/Keyboard.hpp
- ${SRCROOT}/Keyboard.cpp
- ${INCROOT}/Mouse.hpp
-@@ -57,8 +57,8 @@ elseif(LINUX)
- ${SRCROOT}/Linux/GlxContext.hpp
- ${SRCROOT}/Linux/InputImpl.cpp
- ${SRCROOT}/Linux/InputImpl.hpp
-- ${SRCROOT}/Linux/JoystickImpl.cpp
-- ${SRCROOT}/Linux/JoystickImpl.hpp
-+# ${SRCROOT}/Linux/JoystickImpl.cpp
-+# ${SRCROOT}/Linux/JoystickImpl.hpp
- ${SRCROOT}/Linux/VideoModeImpl.cpp
- ${SRCROOT}/Linux/WindowImplX11.cpp
- ${SRCROOT}/Linux/WindowImplX11.hpp
+--- src/SFML/Window/CMakeLists.txt.orig Wed Aug 31 17:33:33 2016
++++ src/SFML/Window/CMakeLists.txt Wed Aug 31 17:33:36 2016
+@@ -69,7 +69,7 @@ if(SFML_OS_WINDOWS)
+
+ # make sure that we use the Unicode version of the Win API functions
+ add_definitions(-DUNICODE -D_UNICODE)
+-elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
++elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
+ set(PLATFORM_SRC
+ ${SRCROOT}/Unix/Display.cpp
+ ${SRCROOT}/Unix/Display.hpp
+@@ -104,6 +104,12 @@ elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
+ ${SRCROOT}/FreeBSD/JoystickImpl.cpp
+ ${SRCROOT}/FreeBSD/JoystickImpl.hpp
+ )
++ elseif(SFML_OS_OPENBSD)
++ set(PLATFORM_SRC
++ ${PLATFORM_SRC}
++ ${SRCROOT}/Android/JoystickImpl.cpp
++ ${SRCROOT}/Android/JoystickImpl.hpp
++ )
+ endif()
+ source_group("unix" FILES ${PLATFORM_SRC})
+ elseif(SFML_OS_MACOSX)
+@@ -205,7 +211,7 @@ endif()
+ if(NOT SFML_OPENGL_ES)
+ find_package(OpenGL REQUIRED)
+ include_directories(${OPENGL_INCLUDE_DIR})
+- if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
++ if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
+ find_package(XCB COMPONENTS xlib_xcb image randr REQUIRED)
+ if(NOT LIBXCB_FOUND)
+ message(FATAL_ERROR "Xcb library not found")
+@@ -234,6 +240,8 @@ elseif(SFML_OS_LINUX)
+ list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${LIBXCB_LIBRARIES}
${UDEV_LIBRARIES})
+ elseif(SFML_OS_FREEBSD)
+ list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${LIBXCB_LIBRARIES} usbhid)
++elseif(SFML_OS_OPENBSD)
++ list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${LIBXCB_LIBRARIES})
+ elseif(SFML_OS_MACOSX)
+ list(APPEND WINDOW_EXT_LIBS "-framework Foundation -framework AppKit
-framework IOKit -framework Carbon")
+ elseif(SFML_OS_IOS)
Index: patches/patch-src_SFML_Window_GlContext_cpp
===================================================================
RCS file:
/cvs/ports/multimedia/sfml/patches/patch-src_SFML_Window_GlContext_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_SFML_Window_GlContext_cpp
--- patches/patch-src_SFML_Window_GlContext_cpp 14 Sep 2014 21:01:52 -0000
1.1.1.1
+++ patches/patch-src_SFML_Window_GlContext_cpp 31 Aug 2016 17:11:24 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-src_SFML_Window_GlContext_cpp,v 1.1.1.1 2014/09/14 21:01:52
pascal Exp $
---- src/SFML/Window/GlContext.cpp.orig Wed Mar 19 23:35:03 2014
-+++ src/SFML/Window/GlContext.cpp Wed Mar 19 23:35:20 2014
-@@ -41,7 +41,7 @@
- #include <SFML/Window/Win32/WglContext.hpp>
- typedef sf::priv::WglContext ContextType;
+--- src/SFML/Window/GlContext.cpp.orig Sat Jan 30 19:48:09 2016
++++ src/SFML/Window/GlContext.cpp Sat Jan 30 19:52:57 2016
+@@ -42,7 +42,8 @@
+ #include <SFML/Window/Win32/WglContext.hpp>
+ typedef sf::priv::WglContext ContextType;
--#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) ||
defined(SFML_SYSTEM_OPENBSD)
+- #elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
++ #elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || \
++ defined(SFML_SYSTEM_OPENBSD)
- #include <SFML/Window/Linux/GlxContext.hpp>
- typedef sf::priv::GlxContext ContextType;
+ #include <SFML/Window/Unix/GlxContext.hpp>
+ typedef sf::priv::GlxContext ContextType;
Index: patches/patch-src_SFML_Window_InputImpl_hpp
===================================================================
RCS file:
/cvs/ports/multimedia/sfml/patches/patch-src_SFML_Window_InputImpl_hpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_SFML_Window_InputImpl_hpp
--- patches/patch-src_SFML_Window_InputImpl_hpp 14 Sep 2014 21:01:52 -0000
1.1.1.1
+++ patches/patch-src_SFML_Window_InputImpl_hpp 31 Aug 2016 17:11:24 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-src_SFML_Window_InputImpl_hpp,v 1.1.1.1 2014/09/14 21:01:52
pascal Exp $
---- src/SFML/Window/InputImpl.hpp.orig Wed Mar 19 23:35:27 2014
-+++ src/SFML/Window/InputImpl.hpp Wed Mar 19 23:35:40 2014
-@@ -32,7 +32,7 @@
+--- src/SFML/Window/InputImpl.hpp.orig Sat Jan 30 19:48:09 2016
++++ src/SFML/Window/InputImpl.hpp Sat Jan 30 19:53:43 2016
+@@ -32,7 +32,8 @@
#if defined(SFML_SYSTEM_WINDOWS)
#include <SFML/Window/Win32/InputImpl.hpp>
-#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) ||
defined(SFML_SYSTEM_OPENBSD)
- #include <SFML/Window/Linux/InputImpl.hpp>
++#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || \
++ defined(SFML_SYSTEM_OPENBSD)
+ #include <SFML/Window/Unix/InputImpl.hpp>
#elif defined(SFML_SYSTEM_MACOS)
#include <SFML/Window/OSX/InputImpl.hpp>
Index: patches/patch-src_SFML_Window_JoystickImpl_hpp
===================================================================
RCS file:
/cvs/ports/multimedia/sfml/patches/patch-src_SFML_Window_JoystickImpl_hpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_SFML_Window_JoystickImpl_hpp
--- patches/patch-src_SFML_Window_JoystickImpl_hpp 14 Sep 2014 21:01:52
-0000 1.1.1.1
+++ patches/patch-src_SFML_Window_JoystickImpl_hpp 31 Aug 2016 17:11:24
-0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_SFML_Window_JoystickImpl_hpp,v 1.1.1.1 2014/09/14 21:01:52
pascal Exp $
---- src/SFML/Window/JoystickImpl.hpp.orig Wed Mar 19 23:35:48 2014
-+++ src/SFML/Window/JoystickImpl.hpp Wed Mar 19 23:36:04 2014
-@@ -79,7 +79,7 @@ struct JoystickState
+--- src/SFML/Window/JoystickImpl.hpp.orig Sat Jan 30 21:26:30 2016
++++ src/SFML/Window/JoystickImpl.hpp Mon Feb 29 17:55:13 2016
+@@ -98,7 +98,7 @@ struct JoystickState
+
+ #include <SFML/Window/iOS/JoystickImpl.hpp>
+
+-#elif defined(SFML_SYSTEM_ANDROID)
++#elif defined(SFML_SYSTEM_ANDROID) || defined(SFML_SYSTEM_OPENBSD)
+
+ #include <SFML/Window/Android/JoystickImpl.hpp>
- #if defined(SFML_SYSTEM_WINDOWS)
- #include <SFML/Window/Win32/JoystickImpl.hpp>
--#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) ||
defined(SFML_SYSTEM_OPENBSD)
- #include <SFML/Window/Linux/JoystickImpl.hpp>
- #elif defined(SFML_SYSTEM_MACOS)
- #include <SFML/Window/OSX/JoystickImpl.hpp>
Index: patches/patch-src_SFML_Window_Linux_JoystickImpl_hpp
===================================================================
RCS file: patches/patch-src_SFML_Window_Linux_JoystickImpl_hpp
diff -N patches/patch-src_SFML_Window_Linux_JoystickImpl_hpp
--- patches/patch-src_SFML_Window_Linux_JoystickImpl_hpp 14 Sep 2014
21:01:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_SFML_Window_Linux_JoystickImpl_hpp,v 1.1.1.1 2014/09/14
21:01:52 pascal Exp $
---- src/SFML/Window/Linux/JoystickImpl.hpp.orig Thu Mar 20 02:12:52 2014
-+++ src/SFML/Window/Linux/JoystickImpl.hpp Thu Mar 20 02:13:09 2014
-@@ -31,7 +31,7 @@
- #if defined(SFML_SYSTEM_LINUX)
- #include <linux/joystick.h>
- #include <fcntl.h>
--#elif defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_OPENBSD)
- // #include <sys/joystick.h> ?
- #define ABS_MAX 1
- #endif
Index: patches/patch-src_SFML_Window_Linux_WindowImplX11_cpp
===================================================================
RCS file: patches/patch-src_SFML_Window_Linux_WindowImplX11_cpp
diff -N patches/patch-src_SFML_Window_Linux_WindowImplX11_cpp
--- patches/patch-src_SFML_Window_Linux_WindowImplX11_cpp 14 Sep 2014
21:01:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_SFML_Window_Linux_WindowImplX11_cpp,v 1.1.1.1 2014/09/14
21:01:52 pascal Exp $
---- src/SFML/Window/Linux/WindowImplX11.cpp.orig Wed Mar 19 23:53:29 2014
-+++ src/SFML/Window/Linux/WindowImplX11.cpp Wed Mar 19 23:54:03 2014
-@@ -41,6 +41,10 @@
- #include <string>
- #include <iterator>
-
-+#if defined(SFML_SYSTEM_OPENBSD)
-+#include <libgen.h>
-+#endif
-+
-
- ////////////////////////////////////////////////////////////
- // Private data
Index: patches/patch-src_SFML_Window_SensorImpl_hpp
===================================================================
RCS file: patches/patch-src_SFML_Window_SensorImpl_hpp
diff -N patches/patch-src_SFML_Window_SensorImpl_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_SFML_Window_SensorImpl_hpp 31 Aug 2016 17:11:24
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/SFML/Window/SensorImpl.hpp.orig Sat Jan 30 20:04:26 2016
++++ src/SFML/Window/SensorImpl.hpp Sat Jan 30 20:04:43 2016
+@@ -35,7 +35,8 @@
+
+ #include <SFML/Window/Win32/SensorImpl.hpp>
+
+-#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
++#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || \
++ defined(SFML_SYSTEM_OPENBSD)
+
+ #include <SFML/Window/Unix/SensorImpl.hpp>
+
Index: patches/patch-src_SFML_Window_WindowImpl_cpp
===================================================================
RCS file:
/cvs/ports/multimedia/sfml/patches/patch-src_SFML_Window_WindowImpl_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_SFML_Window_WindowImpl_cpp
--- patches/patch-src_SFML_Window_WindowImpl_cpp 14 Sep 2014 21:01:52
-0000 1.1.1.1
+++ patches/patch-src_SFML_Window_WindowImpl_cpp 31 Aug 2016 17:11:24
-0000
@@ -1,120 +1,12 @@
$OpenBSD: patch-src_SFML_Window_WindowImpl_cpp,v 1.1.1.1 2014/09/14 21:01:52
pascal Exp $
---- src/SFML/Window/WindowImpl.cpp.orig Thu Mar 20 02:18:17 2014
-+++ src/SFML/Window/WindowImpl.cpp Thu Mar 20 02:23:23 2014
-@@ -27,7 +27,6 @@
- ////////////////////////////////////////////////////////////
- #include <SFML/Window/WindowImpl.hpp>
- #include <SFML/Window/Event.hpp>
--#include <SFML/Window/JoystickManager.hpp>
- #include <SFML/System/Sleep.hpp>
- #include <algorithm>
- #include <cmath>
-@@ -37,7 +36,7 @@
+--- src/SFML/Window/WindowImpl.cpp.orig Sat Jan 30 19:48:10 2016
++++ src/SFML/Window/WindowImpl.cpp Sat Jan 30 19:48:20 2016
+@@ -38,7 +38,7 @@
#include <SFML/Window/Win32/WindowImplWin32.hpp>
typedef sf::priv::WindowImplWin32 WindowImplType;
-#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) ||
defined(SFML_SYSTEM_OPENBSD)
- #include <SFML/Window/Linux/WindowImplX11.hpp>
+ #include <SFML/Window/Unix/WindowImplX11.hpp>
typedef sf::priv::WindowImplX11 WindowImplType;
-@@ -73,9 +72,6 @@ WindowImpl::WindowImpl() :
- m_joyThreshold(0.1f)
- {
- // Get the initial joystick states
-- JoystickManager::getInstance().update();
-- for (unsigned int i = 0; i < Joystick::Count; ++i)
-- m_joyStates[i] = JoystickManager::getInstance().getState(i);
- }
-
-
-@@ -89,7 +85,7 @@ WindowImpl::~WindowImpl()
- ////////////////////////////////////////////////////////////
- void WindowImpl::setJoystickThreshold(float threshold)
- {
-- m_joyThreshold = threshold;
-+ // Nothing to do
- }
-
-
-@@ -102,7 +98,6 @@ bool WindowImpl::popEvent(Event& event, bool block)
- if (!block)
- {
- // Non-blocking mode: process events and continue
-- processJoystickEvents();
- processEvents();
- }
- else
-@@ -114,7 +109,6 @@ bool WindowImpl::popEvent(Event& event, bool block)
- // events (which require polling)
- while (m_events.empty())
- {
-- processJoystickEvents();
- processEvents();
- sleep(milliseconds(10));
- }
-@@ -145,64 +139,6 @@ void WindowImpl::pushEvent(const Event& event)
- void WindowImpl::processJoystickEvents()
- {
- // First update the global joystick states
-- JoystickManager::getInstance().update();
--
-- for (unsigned int i = 0; i < Joystick::Count; ++i)
-- {
-- // Copy the previous state of the joystick and get the new one
-- JoystickState previousState = m_joyStates[i];
-- m_joyStates[i] = JoystickManager::getInstance().getState(i);
-- JoystickCaps caps = JoystickManager::getInstance().getCapabilities(i);
--
-- // Connection state
-- bool connected = m_joyStates[i].connected;
-- if (previousState.connected ^ connected)
-- {
-- Event event;
-- event.type = connected ? Event::JoystickConnected :
Event::JoystickDisconnected;
-- event.joystickButton.joystickId = i;
-- pushEvent(event);
-- }
--
-- if (connected)
-- {
-- // Axes
-- for (unsigned int j = 0; j < Joystick::AxisCount; ++j)
-- {
-- if (caps.axes[j])
-- {
-- Joystick::Axis axis = static_cast<Joystick::Axis>(j);
-- float prevPos = previousState.axes[axis];
-- float currPos = m_joyStates[i].axes[axis];
-- if (fabs(currPos - prevPos) >= m_joyThreshold)
-- {
-- Event event;
-- event.type = Event::JoystickMoved;
-- event.joystickMove.joystickId = i;
-- event.joystickMove.axis = axis;
-- event.joystickMove.position = currPos;
-- pushEvent(event);
-- }
-- }
-- }
--
-- // Buttons
-- for (unsigned int j = 0; j < caps.buttonCount; ++j)
-- {
-- bool prevPressed = previousState.buttons[j];
-- bool currPressed = m_joyStates[i].buttons[j];
--
-- if (prevPressed ^ currPressed)
-- {
-- Event event;
-- event.type = currPressed ? Event::JoystickButtonPressed :
Event::JoystickButtonReleased;
-- event.joystickButton.joystickId = i;
-- event.joystickButton.button = j;
-- pushEvent(event);
-- }
-- }
-- }
-- }
- }
-
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/sfml/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 14 Sep 2014 21:01:52 -0000 1.1.1.1
+++ pkg/PLIST 31 Aug 2016 17:11:24 -0000
@@ -2,12 +2,19 @@
include/SFML/
include/SFML/Audio/
include/SFML/Audio.hpp
+include/SFML/Audio/AlResource.hpp
include/SFML/Audio/Export.hpp
+include/SFML/Audio/InputSoundFile.hpp
include/SFML/Audio/Listener.hpp
include/SFML/Audio/Music.hpp
+include/SFML/Audio/OutputSoundFile.hpp
include/SFML/Audio/Sound.hpp
include/SFML/Audio/SoundBuffer.hpp
include/SFML/Audio/SoundBufferRecorder.hpp
+include/SFML/Audio/SoundFileFactory.hpp
+include/SFML/Audio/SoundFileFactory.inl
+include/SFML/Audio/SoundFileReader.hpp
+include/SFML/Audio/SoundFileWriter.hpp
include/SFML/Audio/SoundRecorder.hpp
include/SFML/Audio/SoundSource.hpp
include/SFML/Audio/SoundStream.hpp
@@ -21,6 +28,8 @@ include/SFML/Graphics/ConvexShape.hpp
include/SFML/Graphics/Drawable.hpp
include/SFML/Graphics/Export.hpp
include/SFML/Graphics/Font.hpp
+include/SFML/Graphics/Glsl.hpp
+include/SFML/Graphics/Glsl.inl
include/SFML/Graphics/Glyph.hpp
include/SFML/Graphics/Image.hpp
include/SFML/Graphics/PrimitiveType.hpp
@@ -41,6 +50,7 @@ include/SFML/Graphics/Transformable.hpp
include/SFML/Graphics/Vertex.hpp
include/SFML/Graphics/VertexArray.hpp
include/SFML/Graphics/View.hpp
+include/SFML/Main.hpp
include/SFML/Network/
include/SFML/Network.hpp
include/SFML/Network/Export.hpp
@@ -60,12 +70,16 @@ include/SFML/System.hpp
include/SFML/System/Clock.hpp
include/SFML/System/Err.hpp
include/SFML/System/Export.hpp
+include/SFML/System/FileInputStream.hpp
include/SFML/System/InputStream.hpp
include/SFML/System/Lock.hpp
+include/SFML/System/MemoryInputStream.hpp
include/SFML/System/Mutex.hpp
+include/SFML/System/NativeActivity.hpp
include/SFML/System/NonCopyable.hpp
include/SFML/System/Sleep.hpp
include/SFML/System/String.hpp
+include/SFML/System/String.inl
include/SFML/System/Thread.hpp
include/SFML/System/Thread.inl
include/SFML/System/ThreadLocal.hpp
@@ -88,6 +102,8 @@ include/SFML/Window/GlResource.hpp
include/SFML/Window/Joystick.hpp
include/SFML/Window/Keyboard.hpp
include/SFML/Window/Mouse.hpp
+include/SFML/Window/Sensor.hpp
+include/SFML/Window/Touch.hpp
include/SFML/Window/VideoMode.hpp
include/SFML/Window/Window.hpp
include/SFML/Window/WindowHandle.hpp
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/mars/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 16 Aug 2016 16:42:02 -0000 1.4
+++ Makefile 31 Aug 2016 17:11:34 -0000
@@ -12,8 +12,8 @@ HOMEPAGE = http://mars-game.sourceforge.
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL GLU ICE SM X11 Xext Xrandr c fribidi m pthread sfml-audio
-WANTLIB += sfml-graphics sfml-system sfml-window stdc++ tag
+WANTLIB += GL GLU Xrandr c fribidi m pthread sfml-audio sfml-graphics
+WANTLIB += sfml-system sfml-window stdc++ tag
# Not using the GH_* variables on purpose. The tarball was generated
# separately. Will update to use GH_* next time M.A.R.S. is updated.
Index: patches/patch-src_Shaders_postFX_cpp
===================================================================
RCS file: patches/patch-src_Shaders_postFX_cpp
diff -N patches/patch-src_Shaders_postFX_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Shaders_postFX_cpp 31 Aug 2016 17:11:34 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/Shaders/postFX.cpp.orig Wed Aug 31 17:44:56 2016
++++ src/Shaders/postFX.cpp Wed Aug 31 17:45:26 2016
+@@ -25,6 +25,7 @@ this program. If not, see <http://www.gnu.org/license
+ # include "defines.hpp"
+
+ # include <SFML/OpenGL.hpp>
++# include <GL/glu.h>
+ # include <iostream>
+
+ namespace postFX {
Index: patches/patch-src_System_window_cpp
===================================================================
RCS file: /cvs/ports/games/mars/patches/patch-src_System_window_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_System_window_cpp
--- patches/patch-src_System_window_cpp 29 Sep 2014 05:25:04 -0000 1.1.1.1
+++ patches/patch-src_System_window_cpp 31 Aug 2016 17:11:34 -0000
@@ -7,9 +7,17 @@ From:
https://github.com/kenkeiras/M.A.R.S./commit/a97d0d6a19b5b43e3c53081e36f1f1747b6674e6
but not merged in main tree.
---- src/System/window.cpp.orig Fri Jun 29 10:43:13 2012
-+++ src/System/window.cpp Sun Sep 14 21:22:58 2014
-@@ -131,26 +131,6 @@ namespace window {
+--- src/System/window.cpp.orig Fri Jun 29 15:43:13 2012
++++ src/System/window.cpp Wed Aug 31 17:48:23 2016
+@@ -31,6 +31,7 @@ this program. If not, see <http://www.gnu.org/license
+ # include "defines.hpp"
+
+ # include <SFML/OpenGL.hpp>
++# include <GL/glu.h>
+ # include <sstream>
+ # include <time.h>
+ # include <sys/stat.h>
+@@ -131,26 +132,6 @@ namespace window {
if (menus::visible() && event.mouseButton.button ==
sf::Mouse::Left)
menus::mouseLeft(false);
}
@@ -36,7 +44,7 @@ but not merged in main tree.
else if (event.type == sf::Event::MouseWheelMoved) {
if (menus::visible())
menus::mouseWheelMoved(Vector2f(event.mouseWheel.x -
(window_.getSize().x - viewPort_.x_)/2, event.mouseWheel.y -
(window_.getSize().y - viewPort_.y_)/2), event.mouseWheel.delta);
-@@ -307,13 +287,11 @@ namespace window {
+@@ -307,13 +288,11 @@ namespace window {
window_.setActive(true);
glEnable(GL_TEXTURE_2D);
@@ -52,7 +60,7 @@ but not merged in main tree.
window_.popGLStates();
glPopMatrix();
-@@ -327,17 +305,6 @@ namespace window {
+@@ -327,17 +306,6 @@ namespace window {
return 100;
break;
@@ -70,7 +78,7 @@ but not merged in main tree.
}
return 0;
}
-@@ -362,7 +329,7 @@ namespace window {
+@@ -362,7 +330,7 @@ namespace window {
std::stringstream filename;
filename << "ScreenShot_" << timeinfo->tm_year << timeinfo->tm_mon <<
timeinfo->tm_mday << timeinfo->tm_hour << timeinfo->tm_min << timeinfo->tm_sec
<< "." << settings::C_screenShotFormat;
