[libsfml] 05/11: Refresh patches

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill pushed a commit to branch master
in repository libsfml.

commit 8586f87662c2a9781df3df7cb530bfeeac881779
Author: James Cowgill <jcowgill at debian.org>
Date:   Thu Oct 27 18:36:00 2016 +0100

    Refresh patches
---
 debian/patches/02_hurd.patch              | 10 +++++-----
 debian/patches/06_pkgconfig-freebsd.patch |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/02_hurd.patch b/debian/patches/02_hurd.patch
index ce8c63d..ebb5d2a 100644
--- a/debian/patches/02_hurd.patch
+++ b/debian/patches/02_hurd.patch
@@ -8,7 +8,7 @@ Forwarded: no
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/cmake/Config.cmake
 +++ b/cmake/Config.cmake
-@@ -31,6 +31,12 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Fr
+@@ -31,6 +31,12 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "^k?Fre
      set(SFML_OS_FREEBSD 1)
      # don't use the OpenGL ES implementation on FreeBSD
      set(OPENGL_ES 0)
@@ -38,7 +38,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          // Unsupported UNIX system
 --- a/src/SFML/Window/CMakeLists.txt
 +++ b/src/SFML/Window/CMakeLists.txt
-@@ -92,7 +92,13 @@ elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
+@@ -90,7 +90,13 @@ elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
              ${SRCROOT}/Unix/GlxExtensions.hpp
          )
      endif()
@@ -53,7 +53,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          set(PLATFORM_SRC
              ${PLATFORM_SRC}
              ${SRCROOT}/Unix/JoystickImpl.cpp
-@@ -218,7 +224,7 @@ if(SFML_OPENGL_ES AND SFML_OS_LINUX)
+@@ -212,7 +218,7 @@ if(SFML_OPENGL_ES AND SFML_OS_LINUX)
      find_package(GLES REQUIRED)
      include_directories(${EGL_INCLUDE_DIR} ${GLES_INCLUDE_DIR})
  endif()
@@ -62,14 +62,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      find_package(UDev REQUIRED)
      if(NOT UDEV_FOUND)
          message(FATAL_ERROR "udev library not found")
-@@ -230,6 +236,8 @@ endif()
+@@ -224,6 +230,8 @@ endif()
  # build the list of external libraries to link
  if(SFML_OS_WINDOWS)
      list(APPEND WINDOW_EXT_LIBS winmm gdi32)
 +elseif(SFML_OS_HURD)
 +    list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${LIBXCB_LIBRARIES})
  elseif(SFML_OS_LINUX)
-     list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${LIBXCB_LIBRARIES} ${UDEV_LIBRARIES})
+     list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${X11_Xrandr_LIB} ${UDEV_LIBRARIES})
  elseif(SFML_OS_FREEBSD)
 --- /dev/null
 +++ b/src/SFML/Window/Dummy/JoystickImpl.cpp
diff --git a/debian/patches/06_pkgconfig-freebsd.patch b/debian/patches/06_pkgconfig-freebsd.patch
index 3f30b77..ddb4a37 100644
--- a/debian/patches/06_pkgconfig-freebsd.patch
+++ b/debian/patches/06_pkgconfig-freebsd.patch
@@ -5,7 +5,7 @@ Forwarded: no
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -199,9 +199,6 @@ endif()
+@@ -204,9 +204,6 @@ endif()
  
  if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
      set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/libsfml.git