Merge 2.6.x to master

.github/workflows/ci.yml

@@ -107,7 +107,7 @@ jobs:
         fail_ci_if_error: true
 
     - name: Test Install Interface
-      if: matrix.platform.name != 'Android' && matrix.config.name != 'Frameworks' && matrix.config.name != 'iOS' && matrix.config.name != 'Static DRM'
+      if: matrix.platform.name != 'Android' && matrix.config.name != 'Frameworks' && matrix.config.name != 'iOS'
       shell: bash
       run: |
         cmake -S $GITHUB_WORKSPACE/test/install -B $GITHUB_WORKSPACE/test/install/build -DSFML_ROOT=$GITHUB_WORKSPACE/install -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=${{ matrix.type.name == 'Debug' && 'Debug' || 'Release' }} ${{matrix.platform.flags}} ${{matrix.config.flags}} ${{matrix.type.flags}}

cmake/SFMLConfigDependencies.cmake.in

@@ -7,6 +7,10 @@ if(SFML_STATIC_LIBRARIES)
         set(FIND_SFML_OS_WINDOWS 1)
     elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         set(FIND_SFML_OS_LINUX 1)
+
+        if(@SFML_USE_DRM@)
+            set(FIND_SFML_USE_DRM 1)
+        endif()
     elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
         set(FIND_SFML_OS_FREEBSD 1)
     elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -41,7 +45,10 @@ if(SFML_STATIC_LIBRARIES)
     # SFML::Window
     list(FIND SFML_FIND_COMPONENTS "Window" FIND_SFML_WINDOW_COMPONENT_INDEX)
     if(FIND_SFML_WINDOW_COMPONENT_INDEX GREATER -1)
-        if(FIND_SFML_OS_LINUX OR FIND_SFML_OS_FREEBSD)
+        if(FIND_SFML_USE_DRM)
+            sfml_bind_dependency(TARGET DRM FRIENDLY_NAME "drm" SEARCH_NAMES "drm")
+            sfml_bind_dependency(TARGET GBM FRIENDLY_NAME "gbm" SEARCH_NAMES "gbm")
+        elseif(FIND_SFML_OS_LINUX OR FIND_SFML_OS_FREEBSD)
             find_dependency(X11 REQUIRED COMPONENTS Xrandr Xcursor)
         endif()
 

license.md

@@ -6,4 +6,4 @@ Permission is granted to anyone to use this software for any purpose, including
 
   1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software.  If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
   2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
+  3. This notice may not be removed or altered from any source distribution.

src/SFML/Main/CMakeLists.txt

@@ -18,6 +18,9 @@ endif()
 sfml_add_library(Main STATIC SOURCES ${SRC})
 
 if(SFML_OS_ANDROID)
+    # ensure that linking into shared libraries doesn't fail
+    set_target_properties(sfml-main PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
     # glad sources
     target_include_directories(sfml-main SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/glad/include")
 endif()

src/SFML/Window/DRM/DRMContext.cpp

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2020 Andrew Mickelson
+// Copyright (C) 2023 Andrew Mickelson
 //               2013 Jonathan De Wachter (dewachter.jonathan@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.

src/SFML/Window/DRM/DRMContext.hpp

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2020 Andrew Mickelson
+// Copyright (C) 2023 Andrew Mickelson
 //               2013 Jonathan De Wachter (dewachter.jonathan@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.

src/SFML/Window/DRM/VideoModeImpl.cpp

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2020 Andrew Mickelson
+// Copyright (C) 2023 Andrew Mickelson
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.

src/SFML/Window/DRM/WindowImplDRM.cpp

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2020 Andrew Mickelson
+// Copyright (C) 2023 Andrew Mickelson
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.

src/SFML/Window/DRM/WindowImplDRM.hpp

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2020 Andrew Mickelson
+// Copyright (C) 2023 Andrew Mickelson
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.