pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sfml+: added patches that were forgotten



Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Wed Jul 27 12:02:00 2016 +0300
Changeset:	25b411fb33859771459405ef05d916fbe12b01bb

Added Files:
	sfml+/patches/patch-CMakeLists.txt
	sfml+/patches/patch-cmake_Config.cmake
	sfml+/patches/patch-src_SFML_System_CMakeLists.txt
	sfml+/patches/patch-src_SFML_Window_CMakeLists.txt
	sfml+/patches/patch-src_SFML_Window_FreeBSD_JoystickImpl.hpp
	sfml+/patches/patch-src_SFML_Window_GlContext.cpp
	sfml+/patches/patch-src_SFML_Window_InputImpl.hpp
	sfml+/patches/patch-src_SFML_Window_JoystickImpl.hpp
	sfml+/patches/patch-src_SFML_Window_SensorImpl.hpp
	sfml+/patches/patch-src_SFML_Window_WindowImpl.cpp

Log Message:
sfml+: added patches that were forgotten

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=25b411fb33859771459405ef05d916fbe12b01bb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sfml+/patches/patch-CMakeLists.txt                 | 20 +++++++++
 sfml+/patches/patch-cmake_Config.cmake             | 24 +++++++++++
 sfml+/patches/patch-src_SFML_System_CMakeLists.txt | 13 ++++++
 sfml+/patches/patch-src_SFML_Window_CMakeLists.txt | 49 ++++++++++++++++++++++
 .../patch-src_SFML_Window_FreeBSD_JoystickImpl.hpp | 12 ++++++
 sfml+/patches/patch-src_SFML_Window_GlContext.cpp  | 13 ++++++
 sfml+/patches/patch-src_SFML_Window_InputImpl.hpp  | 13 ++++++
 .../patches/patch-src_SFML_Window_JoystickImpl.hpp | 13 ++++++
 sfml+/patches/patch-src_SFML_Window_SensorImpl.hpp | 13 ++++++
 sfml+/patches/patch-src_SFML_Window_WindowImpl.cpp | 13 ++++++
 10 files changed, 183 insertions(+)

diffs:
diff --git a/sfml+/patches/patch-CMakeLists.txt b/sfml+/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000..2034c45
--- /dev/null
+++ b/sfml+/patches/patch-CMakeLists.txt
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2015-08-24 16:01:06.000000000 +0000
++++ CMakeLists.txt
+@@ -188,11 +188,14 @@ if(SFML_OS_MACOSX)
+     endif()
+ endif()
+ 
+-if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
++if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_NETBSD)
+     set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
+     if(SFML_OS_FREEBSD)
+         set(PKGCONFIG_DIR libdata/pkgconfig)
+     endif()
++    if(SFML_OS_NETSD)
++        set(PKGCONFIG_DIR lib/pkgconfig)
++    endif()
+     if(BUILD_SHARED_LIBS)
+         sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
+         if(SFML_INSTALL_PKGCONFIG_FILES)
diff --git a/sfml+/patches/patch-cmake_Config.cmake b/sfml+/patches/patch-cmake_Config.cmake
new file mode 100644
index 0000000..e5ccaff
--- /dev/null
+++ b/sfml+/patches/patch-cmake_Config.cmake
@@ -0,0 +1,24 @@
+$NetBSD$
+
+--- cmake/Config.cmake.orig	2015-08-24 16:01:06.000000000 +0000
++++ cmake/Config.cmake
+@@ -31,6 +31,10 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Fre
+     set(SFML_OS_FREEBSD 1)
+     # don't use the OpenGL ES implementation on FreeBSD
+     set(OPENGL_ES 0)
++elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
++    set(SFML_OS_NETBSD 1)
++    # XXX we want to use OPENGL_ES for some NetBSD, but which?
++    set(OPENGL_ES 0)
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+     if(IOS)
+         set(SFML_OS_IOS 1)
+@@ -110,7 +114,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_NETBSD OR SFML_OS_MACOSX)
+     set(INSTALL_MISC_DIR share/SFML)
+ elseif(SFML_OS_ANDROID)
+     set(INSTALL_MISC_DIR ${ANDROID_NDK}/sources/sfml)
diff --git a/sfml+/patches/patch-src_SFML_System_CMakeLists.txt b/sfml+/patches/patch-src_SFML_System_CMakeLists.txt
new file mode 100644
index 0000000..2855bd3
--- /dev/null
+++ b/sfml+/patches/patch-src_SFML_System_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/SFML/System/CMakeLists.txt.orig	2015-08-24 16:01:06.000000000 +0000
++++ src/SFML/System/CMakeLists.txt
+@@ -84,7 +84,7 @@ else()
+ endif()
+ 
+ # build the list of external libraries to link
+-if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_MACOSX)
++if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_NETBSD OR SFML_OS_MACOSX)
+     list(APPEND SYSTEM_EXT_LIBS pthread)
+ endif()
+ if(SFML_OS_LINUX)
diff --git a/sfml+/patches/patch-src_SFML_Window_CMakeLists.txt b/sfml+/patches/patch-src_SFML_Window_CMakeLists.txt
new file mode 100644
index 0000000..8c7650e
--- /dev/null
+++ b/sfml+/patches/patch-src_SFML_Window_CMakeLists.txt
@@ -0,0 +1,49 @@
+$NetBSD$
+
+--- src/SFML/Window/CMakeLists.txt.orig	2015-08-24 16:01:06.000000000 +0000
++++ src/SFML/Window/CMakeLists.txt
+@@ -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_NETBSD)
+     set(PLATFORM_SRC
+         ${SRCROOT}/Unix/Display.cpp
+         ${SRCROOT}/Unix/Display.hpp
+@@ -98,7 +98,7 @@ elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
+             ${SRCROOT}/Unix/JoystickImpl.cpp
+             ${SRCROOT}/Unix/JoystickImpl.hpp
+         )
+-    elseif(SFML_OS_FREEBSD)
++    elseif(SFML_OS_FREEBSD OR SFML_OS_NETBSD)
+         set(PLATFORM_SRC
+             ${PLATFORM_SRC}
+             ${SRCROOT}/FreeBSD/JoystickImpl.cpp
+@@ -188,7 +188,7 @@ elseif(SFML_OS_ANDROID)
+ endif()
+ 
+ # find external libraries
+-if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
++if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_NETBSD)
+     find_package(X11 REQUIRED)
+     if(NOT X11_FOUND)
+         message(FATAL_ERROR "X11 library not found")
+@@ -198,7 +198,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_NETBSD)
+         find_package(XCB COMPONENTS xlib_xcb image randr REQUIRED)
+         if(NOT LIBXCB_FOUND)
+             message(FATAL_ERROR "Xcb library not found")
+@@ -225,7 +225,7 @@ if(SFML_OS_WINDOWS)
+     list(APPEND WINDOW_EXT_LIBS winmm gdi32)
+ elseif(SFML_OS_LINUX)
+     list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${LIBXCB_LIBRARIES} ${UDEV_LIBRARIES})
+-elseif(SFML_OS_FREEBSD)
++elseif(SFML_OS_FREEBSD OR SFML_OS_NETBSD)
+     list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${LIBXCB_LIBRARIES} usbhid)
+ elseif(SFML_OS_MACOSX)
+     list(APPEND WINDOW_EXT_LIBS "-framework Foundation -framework AppKit -framework IOKit -framework Carbon")
diff --git a/sfml+/patches/patch-src_SFML_Window_FreeBSD_JoystickImpl.hpp b/sfml+/patches/patch-src_SFML_Window_FreeBSD_JoystickImpl.hpp
new file mode 100644
index 0000000..4e791da
--- /dev/null
+++ b/sfml+/patches/patch-src_SFML_Window_FreeBSD_JoystickImpl.hpp
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/SFML/Window/FreeBSD/JoystickImpl.hpp.orig	2015-08-24 16:01:06.000000000 +0000
++++ src/SFML/Window/FreeBSD/JoystickImpl.hpp
+@@ -28,6 +28,7 @@
+ ////////////////////////////////////////////////////////////
+ // Headers
+ ////////////////////////////////////////////////////////////
++#include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
+ #include <usbhid.h>
+ #include <vector>
diff --git a/sfml+/patches/patch-src_SFML_Window_GlContext.cpp b/sfml+/patches/patch-src_SFML_Window_GlContext.cpp
new file mode 100644
index 0000000..a99ac2b
--- /dev/null
+++ b/sfml+/patches/patch-src_SFML_Window_GlContext.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/SFML/Window/GlContext.cpp.orig	2015-08-24 16:01:06.000000000 +0000
++++ src/SFML/Window/GlContext.cpp
+@@ -42,7 +42,7 @@
+         #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_NETBSD)
+ 
+         #include <SFML/Window/Unix/GlxContext.hpp>
+         typedef sf::priv::GlxContext ContextType;
diff --git a/sfml+/patches/patch-src_SFML_Window_InputImpl.hpp b/sfml+/patches/patch-src_SFML_Window_InputImpl.hpp
new file mode 100644
index 0000000..c8e505b
--- /dev/null
+++ b/sfml+/patches/patch-src_SFML_Window_InputImpl.hpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/SFML/Window/InputImpl.hpp.orig	2015-08-24 16:01:06.000000000 +0000
++++ src/SFML/Window/InputImpl.hpp
+@@ -32,7 +32,7 @@
+ 
+ #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_NETBSD)
+     #include <SFML/Window/Unix/InputImpl.hpp>
+ #elif defined(SFML_SYSTEM_MACOS)
+     #include <SFML/Window/OSX/InputImpl.hpp>
diff --git a/sfml+/patches/patch-src_SFML_Window_JoystickImpl.hpp b/sfml+/patches/patch-src_SFML_Window_JoystickImpl.hpp
new file mode 100644
index 0000000..3b63b99
--- /dev/null
+++ b/sfml+/patches/patch-src_SFML_Window_JoystickImpl.hpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/SFML/Window/JoystickImpl.hpp.orig	2015-08-24 16:01:06.000000000 +0000
++++ src/SFML/Window/JoystickImpl.hpp
+@@ -86,7 +86,7 @@ struct JoystickState
+ 
+     #include <SFML/Window/Unix/JoystickImpl.hpp>
+ 
+-#elif defined(SFML_SYSTEM_FREEBSD)
++#elif defined(SFML_SYSTEM_FREEBSD) || defined (SFML_SYSTEM_NETBSD)
+ 
+     #include <SFML/Window/FreeBSD/JoystickImpl.hpp>
+ 
diff --git a/sfml+/patches/patch-src_SFML_Window_SensorImpl.hpp b/sfml+/patches/patch-src_SFML_Window_SensorImpl.hpp
new file mode 100644
index 0000000..36bb5a3
--- /dev/null
+++ b/sfml+/patches/patch-src_SFML_Window_SensorImpl.hpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/SFML/Window/SensorImpl.hpp.orig	2015-08-24 16:01:06.000000000 +0000
++++ src/SFML/Window/SensorImpl.hpp
+@@ -35,7 +35,7 @@
+ 
+     #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_NETBSD)
+ 
+     #include <SFML/Window/Unix/SensorImpl.hpp>
+ 
diff --git a/sfml+/patches/patch-src_SFML_Window_WindowImpl.cpp b/sfml+/patches/patch-src_SFML_Window_WindowImpl.cpp
new file mode 100644
index 0000000..639d3bb
--- /dev/null
+++ b/sfml+/patches/patch-src_SFML_Window_WindowImpl.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/SFML/Window/WindowImpl.cpp.orig	2015-08-24 16:01:06.000000000 +0000
++++ src/SFML/Window/WindowImpl.cpp
+@@ -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_NETBSD)
+ 
+     #include <SFML/Window/Unix/WindowImplX11.hpp>
+     typedef sf::priv::WindowImplX11 WindowImplType;


Home | Main Index | Thread Index | Old Index