subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-libs\/libsdl2\/, media\-libs\/libsdl2\/files\/"

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2022-10-04 Thread Sam James

commit: 3c24f1026227c0be0e9a5b32532f8c6e73671bca
Author: Pavel Zhukov  zhukoff  net>
AuthorDate: Tue Oct  4 09:57:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  4 11:35:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c24f102

media-libs/libsdl2: Fix build with libudev and joystick subsystem disabled

Upstream commit: 71fb91f7e43c5f046a037bf5ca59214d93fe2d51

Signed-off-by: Pavel Zhukov  zhukoff.net>
Closes: https://github.com/gentoo/gentoo/pull/27607
Signed-off-by: Sam James  gentoo.org>

 ...libsdl2-2.24.0-fix-build-without-joystick.patch | 32 ++
 media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild|  1 +
 2 files changed, 33 insertions(+)

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
new file mode 100644
index ..0370f66ef8c9
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch
@@ -0,0 +1,32 @@
+# 
https://github.com/libsdl-org/SDL/commit/71fb91f7e43c5f046a037bf5ca59214d93fe2d51
+From 71fb91f7e43c5f046a037bf5ca59214d93fe2d51 Mon Sep 17 00:00:00 2001
+From: Cameron Gutman 
+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 
+ 
+ /* 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/libsdl2-2.24.0-r2.ebuild 
b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild
index df06e35c7b52..481ce62c0cdf 100644
--- a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild
@@ -97,6 +97,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.0.16-static-libs.patch
"${FILESDIR}"/${PN}-2.24.0-clang-15-configure.patch
"${FILESDIR}"/${P}-cmake-target-fixes.patch
+   "${FILESDIR}"/${P}-fix-build-without-joystick.patch
 )
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2022-08-30 Thread Sam James

commit: 31d9717391661df9bfc70bd4fb1902730961f115
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 31 02:00:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 31 02:00:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d97173

media-libs/libsdl2: backport CMake config file fixes

Fixes build of consumers/reverse dependencies using CMake
to discover SDL2.

devilutionx failed like:
```
-- Configuring done
CMake Error at CMakeLists.txt:243 (target_link_libraries):
  Target "devilutionx" links to:

SDL2::SDL2main

  but the target was not found.  Possible reasons include:

* There is a typo in the target name.
* A find_package call is missing for an IMPORTED target.
* An ALIAS target is missing.
```

See https://forums.gentoo.org/viewtopic-p-8741497.html.

Signed-off-by: Sam James  gentoo.org>

 .../files/libsdl2-2.24.0-cmake-target-fixes.patch  | 145 +
 media-libs/libsdl2/libsdl2-2.24.0-r1.ebuild| 228 +
 2 files changed, 373 insertions(+)

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
new file mode 100644
index ..59353b98e06d
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch
@@ -0,0 +1,145 @@
+https://github.com/libsdl-org/SDL/commit/329794daf3f58088b56a64bdfa36b2021903be20
+https://github.com/libsdl-org/SDL/commit/62302d08f13ca5303135505c6b355afbbf069745
+
+From: Anonymous Maarten 
+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

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2021-10-02 Thread James Le Cuirot

commit: 4d0a1b310fa79c52a6e70d2657fcc8608bfdb3f9
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Oct  2 19:46:27 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct  2 19:46:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d0a1b31

media-libs/libsdl2: Drop old 2.0.14-r1

Closes: https://bugs.gentoo.org/814332
Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/libsdl2/Manifest|   1 -
 .../libsdl2/files/libsdl2-2.0.14-static-libs.patch |  34 
 .../libsdl2/files/libsdl2-2.0.14-vulkan.patch  |  13 --
 media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild| 210 -
 4 files changed, 258 deletions(-)

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 580340a47af..f599232c762 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,2 +1 @@
-DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 
5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27
 SHA512 
ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
 DIST SDL2-2.0.16.tar.gz 7227262 BLAKE2B 
b17c531bc51157c7e64c6ea457342f0707f3f069f0cc096bcd658acc9d70c52416427d9e84bb18f36abe2d6e85095f1704ce6e7bba9e45a9766d78cbe93a5d17
 SHA512 
ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
deleted file mode 100644
index 0d4dfdcb445..000
--- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix --disable-static.
-
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-
 SDL2-2.0.14/configure.ac
-+++ SDL2-2.0.14/configure.ac
-@@ -3863,7 +3863,7 @@
- if test -f /lib/w32api/libuuid.a; then
- LIBUUID=/lib/w32api/libuuid.a
- else
--LIBUUID=-luuid
-+LIBUUID=-Wl,-luuid
- fi
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 
-lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
- # The Windows platform requires special setup
 SDL2-2.0.14/Makefile.in
-+++ SDL2-2.0.14/Makefile.in
-@@ -151,13 +151,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib 
install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib 
uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
- 
- $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) 
$(VERSION_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) 
$(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ 
$(SDLMAIN_OBJECTS) -rpath $(libdir)
-+  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static
- 
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ 
$(SDLTEST_OBJECTS) -rpath $(libdir)
-+  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static
- 
- install: all install-bin install-hdrs install-lib install-data
- install-bin:

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch
deleted file mode 100644
index 948f68fe234..000
--- a/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 SDL2-2.0.14/src/video/SDL_vulkan_utils.c
-+++ SDL2-2.0.14/src/video/SDL_vulkan_utils.c
-@@ -91,8 +91,10 @@
- return "VK_ERROR_VALIDATION_FAILED_EXT";
- case VK_ERROR_INVALID_SHADER_NV:
- return "VK_ERROR_INVALID_SHADER_NV";
-+#if VK_HEADER_VERSION < 162
- case VK_ERROR_INCOMPATIBLE_VERSION_KHR:
- return "VK_ERROR_INCOMPATIBLE_VERSION_KHR";
-+#endif
- case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT:
- return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT";
- case VK_ERROR_NOT_PERMITTED_EXT:

diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild 
b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
deleted file mode 100644
index 263553b6bc0..000
--- a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-MY_P="SDL2-${PV}"
-DESCRIPTION="Simple Direct

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2021-07-24 Thread Ionen Wolkens

commit: b7123d5088482b6a414f9f3b7da7738360b6d853
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Jul 25 00:39:37 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Jul 25 01:35:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7123d50

media-libs/libsdl2: drop vulnerable 2.0.12-r2

Bug: https://bugs.gentoo.org/766204
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-libs/libsdl2/Manifest|   1 -
 .../files/libsdl2-2.0.12-egl-detection.patch   |  24 ---
 .../libsdl2/files/libsdl2-2.0.12-static-libs.patch |  48 -
 .../files/libsdl2-2.0.12-vulkan-headers.patch  |  17 --
 media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild| 204 -
 media-libs/libsdl2/metadata.xml|   1 -
 6 files changed, 295 deletions(-)

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index fef6b59307f..d4a910d2b22 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,2 +1 @@
-DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 
1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0
 SHA512 
3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
 DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 
5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27
 SHA512 
ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch
deleted file mode 100644
index 7655ca67494..000
--- a/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix wayland support on systems without X11.
-
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5270
-
 a/configureTue Aug 25 04:05:36 2020 +0200
-+++ a/configureTue Aug 25 06:40:03 2020 -0700
-@@ -22306,6 +22306,7 @@
-   #define LINUX
-   #define EGL_API_FB
-   #define MESA_EGL_NO_X11_HEADERS
-+  #define EGL_NO_X11
-   #include 
-   #include 
-
 a/configure.ac Tue Aug 25 04:05:36 2020 +0200
-+++ a/configure.ac Tue Aug 25 06:40:03 2020 -0700
-@@ -2373,6 +2373,7 @@
-   #define LINUX
-   #define EGL_API_FB
-   #define MESA_EGL_NO_X11_HEADERS
-+  #define EGL_NO_X11
-   #include 
-   #include 
- ],[

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch
deleted file mode 100644
index f80dc6c222c..000
--- a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Fix --disable-static.
-
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-
 SDL2-2.0.12/configure.ac
-+++ SDL2-2.0.12/configure.ac
-@@ -3751,7 +3751,7 @@
- if test -f /lib/w32api/libuuid.a; then
- LIBUUID=/lib/w32api/libuuid.a
- else
--LIBUUID=-luuid
-+LIBUUID=-Wl,-luuid
- fi
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 
-lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
- # The Windows platform requires special setup
-@@ -4194,10 +4194,10 @@
- 
- VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
--VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.o,g'`
-+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.lo,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.rc,
--\\$(objects)/\\2.o: \\1/\\2.rc \\$(objects)/.created
--  \\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc \\$(objects)/.created
-+  \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
- 
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
 SDL2-2.0.12/Makefile.in
-+++ SDL2-2.0.12/Makefile.in
-@@ -148,13 +148,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib 
install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib 
uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
- 
- $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) 
$(VERSION_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) 
$(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2020-09-08 Thread Miroslav Šulc

commit: 986dc0cd77afb7ea01afee0e32d80afa4fe4719a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Sep  8 08:02:28 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Sep  8 08:02:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986dc0cd

media-libs/libsdl2: removed obsolete 2.0.10-r1

Closes: https://bugs.gentoo.org/737606
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/libsdl2/Manifest|   1 -
 .../libsdl2/files/libsdl2-2.0.10-static-libs.patch |  44 -
 media-libs/libsdl2/libsdl2-2.0.10-r1.ebuild| 189 -
 3 files changed, 234 deletions(-)

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 9a9229da56f..13e81b9f1b2 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,2 +1 @@
-DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B 
b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af
 SHA512 
f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 
1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0
 SHA512 
3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch
deleted file mode 100644
index 0b01568af6a..000
--- a/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
 SDL2-2.0.10/configure.ac
-+++ SDL2-2.0.10/configure.ac
-@@ -3648,7 +3648,7 @@
- if test -f /lib/w32api/libuuid.a; then
- LIBUUID=/lib/w32api/libuuid.a
- else
--LIBUUID=-luuid
-+LIBUUID=-Wl,-luuid
- fi
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 
-lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
- # The Windows platform requires special setup
-@@ -4069,10 +4069,10 @@
- 
- VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
--VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.o,g'`
-+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.lo,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.rc,
--\\$(objects)/\\2.o: \\1/\\2.rc
--  \\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc
-+  \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
- 
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
 SDL2-2.0.10/Makefile.in
-+++ SDL2-2.0.10/Makefile.in
-@@ -147,13 +147,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib 
install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib 
uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
- 
- $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) 
$(VERSION_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) 
$(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ 
$(SDLMAIN_OBJECTS) -rpath $(libdir)
-+  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ 
$(SDLTEST_OBJECTS) -rpath $(libdir)
-+  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- install: all install-bin install-hdrs install-lib install-data
- install-bin:

diff --git a/media-libs/libsdl2/libsdl2-2.0.10-r1.ebuild 
b/media-libs/libsdl2/libsdl2-2.0.10-r1.ebuild
deleted file mode 100644
index 97257298668..000
--- a/media-libs/libsdl2/libsdl2-2.0.10-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal
-
-MY_P="SDL2-${PV}"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org;
-SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz;
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-IUSE="cpu_flags_x86_3dnow alsa

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2020-09-05 Thread James Le Cuirot

commit: 9e656cb039645db3c3510a0eaf30b0004125bd13
Author: Brian Kubisiak  kubisiak  com>
AuthorDate: Tue Sep  1 17:41:02 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Sep  5 21:28:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e656cb0

media-libs/libsdl2: Fix EGL and wayland support on systems without X11.

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Brian Kubisiak  kubisiak.com>
Closes: https://github.com/gentoo/gentoo/pull/17365
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/libsdl2-2.0.12-egl-detection.patch   |  24 +++
 media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild| 193 +
 2 files changed, 217 insertions(+)

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch
new file mode 100644
index 000..7655ca67494
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch
@@ -0,0 +1,24 @@
+Fix wayland support on systems without X11.
+
+Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5270
+
+--- a/configureTue Aug 25 04:05:36 2020 +0200
 a/configureTue Aug 25 06:40:03 2020 -0700
+@@ -22306,6 +22306,7 @@
+   #define LINUX
+   #define EGL_API_FB
+   #define MESA_EGL_NO_X11_HEADERS
++  #define EGL_NO_X11
+   #include 
+   #include 
+
+--- a/configure.ac Tue Aug 25 04:05:36 2020 +0200
 a/configure.ac Tue Aug 25 06:40:03 2020 -0700
+@@ -2373,6 +2373,7 @@
+   #define LINUX
+   #define EGL_API_FB
+   #define MESA_EGL_NO_X11_HEADERS
++  #define EGL_NO_X11
+   #include 
+   #include 
+ ],[

diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild 
b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
new file mode 100644
index 000..2d3f0b84734
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+MY_P="SDL2-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="https://www.libsdl.org/;
+SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz;
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx 
cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus gles2 haptic jack 
+joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs 
+threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama 
xscreensaver"
+REQUIRED_USE="
+   alsa? ( sound )
+   gles2? ( video )
+   jack? ( sound )
+   nas? ( sound )
+   opengl? ( video )
+   pulseaudio? ( sound )
+   vulkan? ( video )
+   wayland? ( gles2 )
+   xinerama? ( X )
+   xscreensaver? ( X )"
+
+CDEPEND="
+   alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+   dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+   gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+   jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+   kms? (
+   >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+   >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm]
+   )
+   libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+   nas? (
+   >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+   >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+   )
+   opengl? (
+   >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+   >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+   )
+   pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+   tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
+   udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+   wayland? (
+   >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
+   >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
+   >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
+   )
+   X? (
+   >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+   >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+   >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+   >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+   >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+   >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+   xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+   xscreensaver? ( 
>=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+   )"
+RDEPEND="${CDEPEND}
+   vulkan? ( media-libs/vulkan-loader )"
+DEPEND="${CDEPEND}
+   vulkan? ( dev-util/vulkan-headers )
+   X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2020-04-02 Thread James Le Cuirot

commit: 1124f943b9eea126703d0c1df75df502e104232c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Apr  2 22:39:54 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Apr  2 22:39:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1124f943

media-libs/libsdl2: Drop old and vulnerable 2.0.9

Bug: https://bugs.gentoo.org/690064
Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/libsdl2/Manifest|   1 -
 .../libsdl2/files/libsdl2-2.0.6-static-libs.patch  |  44 -
 media-libs/libsdl2/libsdl2-2.0.9.ebuild| 189 -
 3 files changed, 234 deletions(-)

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 50f7dae1564..9a9229da56f 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,3 +1,2 @@
 DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B 
b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af
 SHA512 
f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 
1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0
 SHA512 
3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
-DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 
901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03
 SHA512 
a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch
deleted file mode 100644
index a1427a075b4..000
--- a/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
 SDL2-2.0.6/configure.in
-+++ SDL2-2.0.6/configure.in
-@@ -3546,7 +3546,7 @@
- if test -f /lib/w32api/libuuid.a; then
- LIBUUID=/lib/w32api/libuuid.a
- else
--LIBUUID=-luuid
-+LIBUUID=-Wl,-luuid
- fi
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 
-lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc"
- # The Windows platform requires special setup
-@@ -3956,10 +3956,10 @@
- 
- VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
--VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.o,g'`
-+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.lo,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.rc,
--\\$(objects)/\\2.o: \\1/\\2.rc
--  \\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc
-+  \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
- 
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
 SDL2-2.0.6/Makefile.in
-+++ SDL2-2.0.6/Makefile.in
-@@ -143,13 +143,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib 
install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib 
uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
- 
- $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) 
$(VERSION_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) 
$(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ 
$(SDLMAIN_OBJECTS) -rpath $(libdir)
-+  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
--  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ 
$(SDLTEST_OBJECTS) -rpath $(libdir)
-+  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- install: all install-bin install-hdrs install-lib install-data
- install-bin:

diff --git a/media-libs/libsdl2/libsdl2-2.0.9.ebuild 
b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
deleted file mode 100644
index 788a50db924..000
--- a/media-libs/libsdl2/libsdl2-2.0.9.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2019-07-26 Thread Lars Wendler

commit: 1ab804d7dfd299720ab731ce28d75c0e647b34b0
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jul 26 11:34:10 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul 26 11:34:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab804d7

media-libs/libsdl2: Bump to version 2.0.10

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/libsdl2/Manifest|   1 +
 .../libsdl2/files/libsdl2-2.0.10-static-libs.patch |  44 +
 media-libs/libsdl2/libsdl2-2.0.10.ebuild   | 189 +
 3 files changed, 234 insertions(+)

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index eb6a0001cc4..e75ffdfd92e 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,2 +1,3 @@
+DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B 
b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af
 SHA512 
f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B 
f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1
 SHA512 
673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 
901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03
 SHA512 
a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch
new file mode 100644
index 000..0b01568af6a
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch
@@ -0,0 +1,44 @@
+--- SDL2-2.0.10/configure.ac
 SDL2-2.0.10/configure.ac
+@@ -3648,7 +3648,7 @@
+ if test -f /lib/w32api/libuuid.a; then
+ LIBUUID=/lib/w32api/libuuid.a
+ else
+-LIBUUID=-luuid
++LIBUUID=-Wl,-luuid
+ fi
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 
-lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
+ # The Windows platform requires special setup
+@@ -4069,10 +4069,10 @@
+ 
+ VERSION_OBJECTS=`echo $VERSION_SOURCES`
+ VERSION_DEPENDS=`echo $VERSION_SOURCES`
+-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.o,g'`
++VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.lo,g'`
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.rc,
+-\\$(objects)/\\2.o: \\1/\\2.rc
+-  \\$(WINDRES) \\$< \\$@,g"`
++\\$(objects)/\\2.lo: \\1/\\2.rc
++  \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
+ 
+ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
+ SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
+--- SDL2-2.0.10/Makefile.in
 SDL2-2.0.10/Makefile.in
+@@ -147,13 +147,13 @@
+ .PHONY: all update-revision install install-bin install-hdrs install-lib 
install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib 
uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
+ 
+ $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) 
$(VERSION_OBJECTS)
+-  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) 
$(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
+-  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ 
$(SDLMAIN_OBJECTS) -rpath $(libdir)
++  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
+ 
+ $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
+-  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ 
$(SDLTEST_OBJECTS) -rpath $(libdir)
++  $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
+ 
+ install: all install-bin install-hdrs install-lib install-data
+ install-bin:

diff --git a/media-libs/libsdl2/libsdl2-2.0.10.ebuild 
b/media-libs/libsdl2/libsdl2-2.0.10.ebuild
new file mode 100644
index 000..20b9115c6f4
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.10.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+MY_P="SDL2-${PV}"

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2018-08-11 Thread Andreas Sturmlechner

commit: 7b7033606de2112e760d22c4215481a5b03b18eb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 11 19:39:02 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 11 19:39:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b703360

media-libs/libsdl2: Drop 2.0.4

Package-Manager: Portage-2.3.45, Repoman-2.3.10

 media-libs/libsdl2/Manifest|   1 -
 .../libsdl2/files/libsdl2-2.0.4-static-libs.patch  |  89 
 media-libs/libsdl2/libsdl2-2.0.4.ebuild| 150 -
 media-libs/libsdl2/metadata.xml|   1 -
 4 files changed, 241 deletions(-)

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 6f3ef4735ad..7007e6ba1a7 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,2 +1 @@
-DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 
374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7
 SHA512 
dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B 
f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1
 SHA512 
673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch
deleted file mode 100644
index bee2fd580aa..000
--- a/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch
+++ /dev/null
@@ -1,89 +0,0 @@
 SDL2-2.0.4.orig/configure.in
-+++ SDL2-2.0.4/configure.in
-@@ -3114,7 +3114,7 @@
- if test -f /lib/w32api/libuuid.a; then
- LIBUUID=/lib/w32api/libuuid.a
- else
--LIBUUID=-luuid
-+LIBUUID=-Wl,-luuid
- fi
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 
-lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc"
- # The Windows platform requires special setup
-@@ -3464,23 +3464,23 @@
- 
- VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
--VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.o,g'`
-+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.lo,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.rc,
--\\$(objects)/\\2.o: \\1/\\2.rc
--  \\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc
-+  \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
- 
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
--SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.c,$(objects)/\1.o,g'`
-+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.c,$(objects)/\1.lo,g'`
- SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.c,
--\\$(objects)/\\2.o: \\1/\\2.c
-+\\$(objects)/\\2.lo: \\1/\\2.c
-   \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) 
\\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- 
- SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
- SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
--SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.c,$(objects)/\1.o,g'`
-+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.c,$(objects)/\1.lo,g'`
- SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.c,
--\\$(objects)/\\2.o: \\1/\\2.c
-+\\$(objects)/\\2.lo: \\1/\\2.c
-   \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) 
\\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- 
- # Set runtime shared library paths as needed
 SDL2-2.0.4.orig/Makefile.in
-+++ SDL2-2.0.4/Makefile.in
-@@ -33,10 +33,10 @@
- OBJECTS = @OBJECTS@
- VERSION_OBJECTS = @VERSION_OBJECTS@
- 
--SDLMAIN_TARGET = libSDL2main.a
-+SDLMAIN_TARGET = libSDL2main.la
- SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
- 
--SDLTEST_TARGET = libSDL2_test.a
-+SDLTEST_TARGET = libSDL2_test.la
- SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
- 
- SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project 
build-scripts cmake cmake_uninstall.cmake.in configure configure.in debian docs 
include Makefile.* sdl2-config.cmake.in sdl2-config.in sdl2.m4 sdl2.pc.in 
SDL2.spec.in src test VisualC.html VisualC VisualC-WinRT Xcode Xcode-iOS
-@@ -138,15 +138,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib 
install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib 
uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
- 
- $(objects)/$(TARGET): $(OBJECTS)

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2018-05-07 Thread James Le Cuirot

commit: e993186d745cece33c2085c215cdeb17c30b5696
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Sat Apr 21 09:04:45 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon May  7 21:05:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e993186d

media-libs/libsdl2: Fix to CMake building errors

Generated sdl2.pc contains trailing spaces which considered as error in
CMake policy CMP0004. Added patch that fixes that.

Upstream bug: https://bugzilla.libsdl.org/show_bug.cgi?id=4144
Bug: https://bugs.gentoo.org/646364
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/8098

 .../files/libsdl2-2.0.8-rework-variables.patch |  68 
 media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild | 171 +
 2 files changed, 239 insertions(+)

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch
new file mode 100644
index 000..9fc43f2b38c
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch
@@ -0,0 +1,68 @@
+
+# HG changeset patch
+# User Sam Lantinga 
+# Date 1524545759 25200
+# Node ID 28be2719184c8177899d96b696bcf5e28451266f
+# Parent  2a7839691e3d88c0480c4a855126d5fa03f9ff6a
+Fixed bug 4144 - CMake complains about trailing spaces in sdl2.pc
+
+ Azamat H. Hackimov
+
+When you try use SDL2 2.0.8 in CMake project in Linux, it complains about 
trailing spaces in sdl2.pc:
+
+CMake Error at CMakeLists.txt:147 (add_executable):
+  Target "TestSimpleMain" links to item "-L/usr/lib64 -lSDL2 " which has
+  leading or trailing whitespace.  This is now an error according to policy
+  CMP0004.
+
+diff -r 2a7839691e3d -r 28be2719184c configure
+--- a/configureMon Apr 23 21:50:03 2018 -0700
 b/configureMon Apr 23 21:55:59 2018 -0700
+@@ -15752,10 +15752,17 @@
+ #fi
+ #done
+ SDL_CFLAGS="$BASE_CFLAGS"
+-SDL_LIBS="-lSDL2 $BASE_LDFLAGS"
+-CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
+-CFLAGS="$CFLAGS $EXTRA_CFLAGS"
+-LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
++SDL_LIBS="-lSDL2"
++if  "$BASE_LDFLAGS" != "" ; then
++SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS"
++fi
++if  "$EXTRA_CFLAGS" != "" ; then
++CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
++CFLAGS="$CFLAGS $EXTRA_CFLAGS"
++fi
++if  "$EXTRA_LDFLAGS" != "" ; then
++LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
++fi
+ 
+ base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
+ 
+diff -r 2a7839691e3d -r 28be2719184c configure.in
+--- a/configure.in Mon Apr 23 21:50:03 2018 -0700
 b/configure.in Mon Apr 23 21:55:59 2018 -0700
+@@ -123,10 +123,17 @@
+ #fi
+ #done
+ SDL_CFLAGS="$BASE_CFLAGS"
+-SDL_LIBS="-lSDL2 $BASE_LDFLAGS"
+-CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
+-CFLAGS="$CFLAGS $EXTRA_CFLAGS"
+-LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
++SDL_LIBS="-lSDL2"
++if [ "$BASE_LDFLAGS" != "" ]; then
++SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS"
++fi
++if [ "$EXTRA_CFLAGS" != "" ]; then
++CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
++CFLAGS="$CFLAGS $EXTRA_CFLAGS"
++fi
++if [ "$EXTRA_LDFLAGS" != "" ]; then
++LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
++fi
+ 
+ dnl set this to use on systems that use lib64 instead of lib
+ base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
+

diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild 
b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
new file mode 100644
index 000..0690eaf5b39
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic ltprune toolchain-funcs multilib-minimal
+
+MY_P="SDL2-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org;
+SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz;
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic 
libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound 
cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video 
wayland X xinerama xscreensaver"
+REQUIRED_USE="
+   alsa? ( sound )
+   gles? ( video )
+   nas? ( sound )
+   opengl? ( video )
+   pulseaudio? ( sound )
+   wayland? ( gles )
+   xinerama? ( X )
+   xscreensaver? ( X )"
+
+RDEPEND="
+   alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+   dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+   gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+   libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+   nas? (
+   >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+   >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
+   opengl? (
+   >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2017-08-07 Thread Patrick McLean

commit: adbfacbfc968c7415595487972dbbe73a0b163da
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Aug  7 22:29:52 2017 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Aug  7 22:30:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adbfacbf

media-libs/libsdl2: Revision bump, add patch to fix DS4 support in new kernels

This patch has been merged in to master, but upstream hasn't done a
release in quite awhile.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch  |  48 +++
 media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild | 158 +
 2 files changed, 206 insertions(+)

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch
new file mode 100644
index 000..34455663a56
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch
@@ -0,0 +1,48 @@
+diff --git a/src/joystick/SDL_gamecontrollerdb.h 
b/src/joystick/SDL_gamecontrollerdb.h
+index 1e623cb..ae84c6d 100644
+--- a/src/joystick/SDL_gamecontrollerdb.h
 b/src/joystick/SDL_gamecontrollerdb.h
+@@ -47,6 +47,8 @@ static const char *s_ControllerMappings [] =
+ "4c056802504944564944,PS3 
Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,",
+ "25090500504944564944,PS3 
DualShock,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,",
+ "4c05c405504944564944,PS4 
Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
++"4c05cc09504944564944,PS4 
Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
++"4c05a00b504944564944,PS4 
Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
+ #endif
+ #if defined(__MACOSX__)
+ "10280900,8Bitdo SFC30 GamePad 
Joystick,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,",
+@@ -62,6 +64,10 @@ static const char *s_ControllerMappings [] =
+ "11012014,SteelSeries 
Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,",
+ "11011714,SteelSeries Stratus 
XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,",
+ "5e048e02,X360 
Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,",
++"03004c0568020001,PS3 
Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,",
++"03004c05c4050001,PS4 
Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
++"03004c05cc090001,PS4 
Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
++"03004c05a00b0001,PS4 
Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
+ #endif
+ #if defined(__LINUX__)
+ "050010280901,8Bitdo SFC30 
GamePad,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,",
+@@ -85,12

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2016-05-06 Thread Michael Sterrett

commit: 4f9e81a49b1e76bd49e908a62de183b527fc9e08
Author: Michael Sterrett  gentoo  org>
AuthorDate: Fri May  6 16:59:43 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Fri May  6 17:09:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9e81a4

media-libs/libsdl2: clean old

Package-Manager: portage-2.2.26

 media-libs/libsdl2/Manifest|   1 -
 .../libsdl2/files/libsdl2-2.0.3-gles-wayland.patch |  59 
 .../libsdl2/files/libsdl2-2.0.3-static-libs.patch  |  89 
 media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild   | 152 -
 4 files changed, 301 deletions(-)

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 2f64355..b878bc5 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,2 +1 @@
-DIST SDL2-2.0.3.tar.gz 3871267 SHA256 
a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c SHA512 
b6d2485154fbc07ab86a4305485e116d35fac25a97033b9e1c65ee0eb8251a18209cb1de3a914d9c0ddc53aa1ffac66c865b111d218e79eb5a10ed00dfec7540
 WHIRLPOOL 
d88658953cb668b8d4167b799b4a2e9b90a426fddd0cdddb4914420063e5768c609c2b4a954b50c14cbc5728894646db6bad0e5244ef6a563d4e2ec3da26298b
 DIST SDL2-2.0.4.tar.gz 4136230 SHA256 
da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b SHA512 
dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
 WHIRLPOOL 
2203061d32d51552e5bcfaa9752de5cb3173c0c733698894de177f9a0c1bad73706633e2d232f9b893e4c3736a93aff00ae94eb044b19a05a1cdd7a4c030b574

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.3-gles-wayland.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.3-gles-wayland.patch
deleted file mode 100644
index e71f465..000
--- a/media-libs/libsdl2/files/libsdl2-2.0.3-gles-wayland.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-# HG changeset patch
-# User Gabriel Jacobo 
-# Date 1400020960 10800
-# Node ID 3e2b3019a879f2efd846a6c04b55c20fc2752238
-# Parent  83077b1f989a44670a69286848034d7f4999b8fe
-Fixes #2541, build failure with Wayland enabled, OpenGL ES disabled
-
-Also includes an attempt at fixing building SDL on Ubuntu 13.10, which 
hopefully
-won't break 14.04
-
-diff -r 83077b1f989a -r 3e2b3019a879 configure.in
 a/configure.in Tue May 13 12:10:37 2014 -0700
-+++ b/configure.in Tue May 13 19:42:40 2014 -0300
-@@ -1174,7 +1174,9 @@
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- AC_MSG_CHECKING(for Wayland support)
- video_wayland=no
--if test x$PKG_CONFIG != xno; then
-+if  test x$PKG_CONFIG != xno && \
-+test x$video_opengl_egl = xyes && \
-+test x$video_opengles_v2 = xyes; then
- if $PKG_CONFIG --exists wayland-client wayland-egl wayland-cursor 
egl xkbcommon ; then
- WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client 
wayland-egl wayland-cursor xkbcommon`
- WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl 
wayland-cursor xkbcommon`
-@@ -1256,7 +1258,18 @@
- if $PKG_CONFIG --exists mirclient egl xkbcommon ; then
- MIR_CFLAGS=`$PKG_CONFIG --cflags mirclient egl xkbcommon`
- MIR_LIBS=`$PKG_CONFIG --libs mirclient egl xkbcommon`
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$save_CFLAGS $MIR_CFLAGS"
-+
-+dnl This will disable Mir on Ubuntu < 14.04
-+AC_TRY_COMPILE([
-+#include 
-+],[
-+MirMotionToolType tool = mir_motion_tool_type_mouse;
-+],[
- video_mir=yes
-+])
-+CFLAGS="$save_CFLAGS"
- fi
- fi
- AC_MSG_RESULT($video_mir)
-@@ -2691,12 +2704,12 @@
- CheckNAS
- CheckSNDIO
- CheckX11
--CheckWayland
--CheckMir
- CheckDirectFB
- CheckFusionSound
- CheckOpenGLX11
- CheckOpenGLESX11
-+CheckMir
-+CheckWayland
- CheckLibUDev
- CheckDBus
- CheckInputEvents
-

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.3-static-libs.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.3-static-libs.patch
deleted file mode 100644
index e4823e1..000
--- a/media-libs/libsdl2/files/libsdl2-2.0.3-static-libs.patch
+++ /dev/null
@@ -1,89 +0,0 @@
 SDL2-2.0.2.orig/Makefile.in
-+++ SDL2-2.0.2/Makefile.in
-@@ -33,10 +33,10 @@
- OBJECTS = @OBJECTS@
- VERSION_OBJECTS = @VERSION_OBJECTS@
- 
--SDLMAIN_TARGET = libSDL2main.a
-+SDLMAIN_TARGET = libSDL2main.la
- SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
- 
--SDLTEST_TARGET = libSDL2_test.a
-+SDLTEST_TARGET = libSDL2_test.la
- SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
- 
- SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project 
build-scripts cmake configure configure.in debian include Makefile.* 
sdl2-config.in sdl2.m4 sdl2.pc.in

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

2016-01-03 Thread Michael Sterrett

commit: acc8e628fca1259593b9b4bcf97c8a32b9612fab
Author: Michael Sterrett  gentoo  org>
AuthorDate: Mon Jan  4 02:32:37 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Mon Jan  4 02:33:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc8e628

media-libs/libsdl2: version bump

Package-Manager: portage-2.2.24

 media-libs/libsdl2/Manifest|   1 +
 .../libsdl2/files/libsdl2-2.0.4-static-libs.patch  |  89 
 media-libs/libsdl2/libsdl2-2.0.4.ebuild| 153 +
 3 files changed, 243 insertions(+)

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 0cc1481..2f64355 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1 +1,2 @@
 DIST SDL2-2.0.3.tar.gz 3871267 SHA256 
a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c SHA512 
b6d2485154fbc07ab86a4305485e116d35fac25a97033b9e1c65ee0eb8251a18209cb1de3a914d9c0ddc53aa1ffac66c865b111d218e79eb5a10ed00dfec7540
 WHIRLPOOL 
d88658953cb668b8d4167b799b4a2e9b90a426fddd0cdddb4914420063e5768c609c2b4a954b50c14cbc5728894646db6bad0e5244ef6a563d4e2ec3da26298b
+DIST SDL2-2.0.4.tar.gz 4136230 SHA256 
da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b SHA512 
dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
 WHIRLPOOL 
2203061d32d51552e5bcfaa9752de5cb3173c0c733698894de177f9a0c1bad73706633e2d232f9b893e4c3736a93aff00ae94eb044b19a05a1cdd7a4c030b574

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch
new file mode 100644
index 000..bee2fd5
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch
@@ -0,0 +1,89 @@
+--- SDL2-2.0.4.orig/configure.in
 SDL2-2.0.4/configure.in
+@@ -3114,7 +3114,7 @@
+ if test -f /lib/w32api/libuuid.a; then
+ LIBUUID=/lib/w32api/libuuid.a
+ else
+-LIBUUID=-luuid
++LIBUUID=-Wl,-luuid
+ fi
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 
-lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc"
+ # The Windows platform requires special setup
+@@ -3464,23 +3464,23 @@
+ 
+ VERSION_OBJECTS=`echo $VERSION_SOURCES`
+ VERSION_DEPENDS=`echo $VERSION_SOURCES`
+-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.o,g'`
++VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.rc,$(objects)/\1.lo,g'`
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.rc,
+-\\$(objects)/\\2.o: \\1/\\2.rc
+-  \\$(WINDRES) \\$< \\$@,g"`
++\\$(objects)/\\2.lo: \\1/\\2.rc
++  \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
+ 
+ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
+ SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
+-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.c,$(objects)/\1.o,g'`
++SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.c,$(objects)/\1.lo,g'`
+ SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.c,
+-\\$(objects)/\\2.o: \\1/\\2.c
++\\$(objects)/\\2.lo: \\1/\\2.c
+   \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) 
\\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
+ 
+ SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
+ SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
+-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.c,$(objects)/\1.o,g'`
++SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.c,$(objects)/\1.lo,g'`
+ SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.c,
+-\\$(objects)/\\2.o: \\1/\\2.c
++\\$(objects)/\\2.lo: \\1/\\2.c
+   \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) 
\\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
+ 
+ # Set runtime shared library paths as needed
+--- SDL2-2.0.4.orig/Makefile.in
 SDL2-2.0.4/Makefile.in
+@@ -33,10 +33,10 @@
+ OBJECTS = @OBJECTS@
+ VERSION_OBJECTS = @VERSION_OBJECTS@
+ 
+-SDLMAIN_TARGET = libSDL2main.a
++SDLMAIN_TARGET = libSDL2main.la
+ SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
+ 
+-SDLTEST_TARGET = libSDL2_test.a
++SDLTEST_TARGET = libSDL2_test.la
+ SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
+ 
+ SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project 
build-scripts cmake cmake_uninstall.cmake.in configure configure.in debian docs 
include Makefile.* sdl2-config.cmake.in sdl2-config.in sdl2.m4 sdl2.pc.in 
SDL2.spec.in src test VisualC.html VisualC VisualC-WinRT Xcode Xcode-iOS
+@@ -138,15 +138,13 @@
+ .PHONY: all update-revision install install-bin install-hdrs install-lib 
install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib 
uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
+ 
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/, media-libs/libsdl2/files/

13 matches

Site Navigation

Mail list logo

Footer information