gentoo auto-resync : 03:05:2023 - 17:26:08

4 files changed, 0 insertions, 228 deletions

diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch
deleted file mode 100644
index f5dc8ea6b50b..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/libsdl-org/SDL/pull/6217
-
-From 04b9178a6746cfe9e4f8708befd3e00f95912a18 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 12 Sep 2022 18:02:21 +0100
-Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15
- (implicit function declarations)
-
-Clang 15 makes implicit function declarations fatal by default which
-leads to some configure tests silently failing/returning
-the wrong result.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -2728,6 +2728,7 @@ CheckInputKD()
-     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-       #include <linux/kd.h>
-       #include <linux/keyboard.h>
-+      #include <sys/ioctl.h>
-     ]], [[
-         struct kbentry kbe;
-         kbe.kb_table = KG_CTRL;
-
diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch
deleted file mode 100644
index 59353b98e06d..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-https://github.com/libsdl-org/SDL/commit/329794daf3f58088b56a64bdfa36b2021903be20
-https://github.com/libsdl-org/SDL/commit/62302d08f13ca5303135505c6b355afbbf069745
-
-From: Anonymous Maarten <anonymous.maarten@gmail.com>
-Date: Sun, 21 Aug 2022 04:03:32 +0200
-Subject: [PATCH] cmake: add library directories & pthread to imported targets
- of sdl2-config.cmake
-
-This fixes linking to SDL2::SDL2-static on systems where external libraries such as X11 are not in a standard location.
-Pthread also needs special care.
---- a/sdl2-config.cmake.in
-+++ b/sdl2-config.cmake.in
-@@ -39,18 +39,25 @@ unset(bindir)
- unset(libdir)
- unset(includedir)
- 
--set(_sdl2_libraries "@SDL_LIBS@")
--set(_sdl2_static_private_libs "@SDL_STATIC_LIBS@")
-+set(_sdl2_libraries_in "@SDL_LIBS@")
-+set(_sdl2_static_private_libs_in "@SDL_STATIC_LIBS@")
- 
--# Convert _sdl2_libraries to list and keep only libraries
--string(REGEX MATCHALL "-[lm]([-a-zA-Z0-9._]+)" _sdl2_libraries "${_sdl2_libraries}")
-+# Convert _sdl2_libraries to list and keep only libraries + library directories
-+string(REGEX MATCHALL "-[lm]([-a-zA-Z0-9._]+)" _sdl2_libraries "${_sdl2_libraries_in}")
- string(REGEX REPLACE "^-l" "" _sdl2_libraries "${_sdl2_libraries}")
- string(REGEX REPLACE ";-l" ";" _sdl2_libraries "${_sdl2_libraries}")
-+string(REGEX MATCHALL "-L([-a-zA-Z0-9._/]+)" _sdl2_libdirs "${_sdl2_libraries_in}")
-+string(REGEX REPLACE "^-L" "" _sdl2_libdirs "${_sdl2_libdirs}")
-+string(REGEX REPLACE ";-L" ";" _sdl2_libdirs "${_sdl2_libdirs}")
-+list(APPEND _sdl2_libdirs "${SDL2_LIBDIR}")
- 
--# Convert _sdl2_static_private_libs to list and keep only libraries
--string(REGEX MATCHALL "(-[lm]([-a-zA-Z0-9._]+))|(-Wl,[^ ]*framework[^ ]*)" _sdl2_static_private_libs "${_sdl2_static_private_libs}")
-+# Convert _sdl2_static_private_libs to list and keep only libraries + library directories
-+string(REGEX MATCHALL "(-[lm]([-a-zA-Z0-9._]+))|(-Wl,[^ ]*framework[^ ]*)|(-pthread)" _sdl2_static_private_libs "${_sdl2_static_private_libs_in}")
- string(REGEX REPLACE "^-l" "" _sdl2_static_private_libs "${_sdl2_static_private_libs}")
- string(REGEX REPLACE ";-l" ";" _sdl2_static_private_libs "${_sdl2_static_private_libs}")
-+string(REGEX MATCHALL "-L([-a-zA-Z0-9._/]+)" _sdl2_static_private_libdirs "${_sdl2_static_private_libs_in}")
-+string(REGEX REPLACE "^-L" "" _sdl2_static_private_libdirs "${_sdl2_static_private_libdirs}")
-+string(REGEX REPLACE ";-L" ";" _sdl2_static_private_libdirs "${_sdl2_static_private_libdirs}")
- 
- if(_sdl2_libraries MATCHES ".*SDL2main.*")
-   list(INSERT SDL2_LIBRARIES 0 SDL2::SDL2main)
-@@ -103,6 +110,7 @@ if(WIN32)
-       set_target_properties(SDL2::SDL2 PROPERTIES
-         INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
-         INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries}"
-+        INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs}"
-         IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-         IMPORTED_IMPLIB "${_sdl2_implib}"
-         IMPORTED_LOCATION "${_sdl2_dll}"
-@@ -122,6 +130,7 @@ else()
-       set_target_properties(SDL2::SDL2 PROPERTIES
-         INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
-         INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries}"
-+        INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs}"
-         IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-         IMPORTED_LOCATION "${_sdl2_shared}"
-       )
-@@ -142,6 +151,7 @@ if(EXISTS "${_sdl2_static}")
-         IMPORTED_LOCATION "${_sdl2_static}"
-         INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
-         INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries};${_sdl2_static_private_libs}"
-+        INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs};${_sdl2_static_private_libdirs}"
-         IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-     )
-   endif()
-
-From: Anonymous Maarten <anonymous.maarten@gmail.com>
-Date: Wed, 24 Aug 2022 04:14:52 +0200
-Subject: [PATCH] cmake: always create SDL2::SDL2main target in autotools'
- cmake config script
-
---- a/sdl2-config.cmake.in
-+++ b/sdl2-config.cmake.in
-@@ -62,38 +62,39 @@ string(REGEX REPLACE ";-L" ";" _sdl2_static_private_libdirs "${_sdl2_static_priv
- if(_sdl2_libraries MATCHES ".*SDL2main.*")
-   list(INSERT SDL2_LIBRARIES 0 SDL2::SDL2main)
-   list(INSERT SDL2_STATIC_LIBRARIES 0 SDL2::SDL2main)
--  set(_sdl2main_library ${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX})
--  if(EXISTS "${_sdl2main_library}")
--    set(SDL2MAIN_LIBRARY SDL2::SDL2main)
--    if(NOT TARGET SDL2::SDL2main)
--      add_library(SDL2::SDL2main STATIC IMPORTED)
--      set_target_properties(SDL2::SDL2main
--        PROPERTIES
--          IMPORTED_LOCATION "${_sdl2main_library}"
--      )
--      if(WIN32)
--        # INTERFACE_LINK_OPTIONS needs CMake 3.13
--        cmake_minimum_required(VERSION 3.13)
--        # Mark WinMain/WinMain@16 as undefined, such that it will be withheld by the linker.
--        if(CMAKE_SIZEOF_VOID_P EQUAL 4)
--          set_target_properties(SDL2::SDL2main
--            PROPERTIES
--              INTERFACE_LINK_OPTIONS "-Wl,--undefined=_WinMain@16"
--          )
--        else()
--          set_target_properties(SDL2::SDL2main
--            PROPERTIES
--              INTERFACE_LINK_OPTIONS "-Wl,--undefined=WinMain"
--          )
--        endif()
-+endif()
-+
-+set(_sdl2main_library ${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX})
-+if(EXISTS "${_sdl2main_library}")
-+  set(SDL2MAIN_LIBRARY SDL2::SDL2main)
-+  if(NOT TARGET SDL2::SDL2main)
-+    add_library(SDL2::SDL2main STATIC IMPORTED)
-+    set_target_properties(SDL2::SDL2main
-+      PROPERTIES
-+        IMPORTED_LOCATION "${_sdl2main_library}"
-+    )
-+    if(WIN32)
-+      # INTERFACE_LINK_OPTIONS needs CMake 3.13
-+      cmake_minimum_required(VERSION 3.13)
-+      # Mark WinMain/WinMain@16 as undefined, such that it will be withheld by the linker.
-+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-+        set_target_properties(SDL2::SDL2main
-+          PROPERTIES
-+            INTERFACE_LINK_OPTIONS "-Wl,--undefined=_WinMain@16"
-+        )
-+      else()
-+        set_target_properties(SDL2::SDL2main
-+          PROPERTIES
-+            INTERFACE_LINK_OPTIONS "-Wl,--undefined=WinMain"
-+        )
-       endif()
-     endif()
--    set(SDL2_SDL2main_FOUND TRUE)
--  else()
--    set(SDL2_SDL2main_FOUND FALSE)
-   endif()
--  unset(_sdl2main_library)
-+  set(SDL2_SDL2main_FOUND TRUE)
-+else()
-+  set(SDL2_SDL2main_FOUND FALSE)
- endif()
-+unset(_sdl2main_library)
- 
- # Remove SDL2 since this is the "central" library
- # Remove SDL2main since this will be provided by SDL2::SDL2main (if available)
-
diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch
deleted file mode 100644
index 0370f66ef8c9..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# https://github.com/libsdl-org/SDL/commit/71fb91f7e43c5f046a037bf5ca59214d93fe2d51
-From 71fb91f7e43c5f046a037bf5ca59214d93fe2d51 Mon Sep 17 00:00:00 2001
-From: Cameron Gutman <aicommander@gmail.com>
-Date: Mon, 26 Sep 2022 21:38:09 -0500
-Subject: [PATCH] evdev: Fix build with libudev and joystick subsystem disabled
-
----
- src/core/linux/SDL_evdev_capabilities.h | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/core/linux/SDL_evdev_capabilities.h b/src/core/linux/SDL_evdev_capabilities.h
-index 26fa7400485b..990ebe01b872 100644
---- a/src/core/linux/SDL_evdev_capabilities.h
-+++ b/src/core/linux/SDL_evdev_capabilities.h
-@@ -25,8 +25,6 @@
- #ifndef SDL_evdev_capabilities_h_
- #define SDL_evdev_capabilities_h_
- 
--#if HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX)
--
- #include <linux/input.h>
- 
- /* A device can be any combination of these classes */
-@@ -53,8 +51,6 @@ extern int SDL_EVDEV_GuessDeviceClass(unsigned long bitmask_ev[NBITS(EV_MAX)],
-                                       unsigned long bitmask_key[NBITS(KEY_MAX)],
-                                       unsigned long bitmask_rel[NBITS(REL_MAX)]);
- 
--#endif /* HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) */
--
- #endif /* SDL_evdev_capabilities_h_ */
- 
- /* vi: set ts=4 sw=4 expandtab: */
diff --git a/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch b/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch
deleted file mode 100644
index 6727a3e4f4bc..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.26.0-wayland.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/libsdl-org/SDL/pull/6608
-https://github.com/libsdl-org/SDL/issues/6589
-
-From e99b5df49ec3bddd1d72889d682fedfe0da91307 Mon Sep 17 00:00:00 2001
-From: Frank Praznik <frank.praznik@gmail.com>
-Date: Wed, 23 Nov 2022 23:11:25 -0500
-Subject: [PATCH] wayland: Fix build when not using the shared Wayland
- libraries
-
-Explicitly include the Wayland protocol headers when statically linking against the Wayland libraries or older system headers might be used instead of the local versions.
---- a/src/video/wayland/SDL_waylanddyn.h
-+++ b/src/video/wayland/SDL_waylanddyn.h
-@@ -166,6 +166,13 @@ void SDL_WAYLAND_UnloadSymbols(void);
- 
- #else /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */
- 
-+/*
-+ * These must be included before libdecor.h, otherwise the libdecor header
-+ * pulls in the system Wayland protocol headers instead of ours.
-+ */
-+#include "wayland-client-protocol.h"
-+#include "wayland-egl.h"
-+
- #ifdef HAVE_LIBDECOR_H
- #include <libdecor.h>
- #endif
-