diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-10-04 13:17:38 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-04 13:17:38 +0100 |
| commit | 78754950ffa3aaba0f48b1ca1d505caa4a3dfbfa (patch) | |
| tree | 285997f09f32d26633ba2beffd30c972a4ec87a2 /media-libs/libsdl2 | |
| parent | bf99f8024d68382f76665735c70ae912331bc2ca (diff) | |
gentoo auto-resync : 04:10:2022 - 13:17:38
Diffstat (limited to 'media-libs/libsdl2')
| -rw-r--r-- | media-libs/libsdl2/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch | 32 | ||||
| -rw-r--r-- | media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild | 1 |
3 files changed, 35 insertions, 1 deletions
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 05758d5026c9..83a2fa528282 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,6 +1,7 @@ AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839ce266dafe8cd79167911bceac5341e58c5ff13ff9604b741ee8726bd4990238345327038cf2cd61df5c28d7a15eeae67b62 SHA512 da34e0da810b119d230e40b17b8f3bb3b3f7c9414960bc41c528a366c9b5f5b2afb321bdfa5871d898ba2bcb98610c2848619ef0f0bc54a0675f75a40a6ce8d4 AUX libsdl2-2.24.0-clang-15-configure.patch 768 BLAKE2B f21f01da86fed778f5ef88cfc692b0588d1ea6de1bd05c0f6d1b9b480175c79a1f7bcc62cca123beb387f174fcf70676997f1e37b6b2baef59143b9222db0d5d SHA512 7d1822a05fae900f572809ba7de7a46cffaa03be7ec2f6d4b1cfa3b164a468ad7c4bea2606da32598519d2f8abb0d9bfcc3268f2cb7858de784244dbe0a68804 AUX libsdl2-2.24.0-cmake-target-fixes.patch 6489 BLAKE2B 3703cae1f4220d6ca7899a2a1b61c083f560db30996f032eb6570f80e7b0bb3969b2c929ec104d461297502d5e46a8ae0a34d38f04d76b274894d124aa486905 SHA512 43710fa7d5321b688b2bd65460fff77d16943ff25280b7ba25c2676112db8e1ce9daeb2c144d41ed5473dcb4b38ad0a91686859949ff4a10ed4bea8769188b15 +AUX libsdl2-2.24.0-fix-build-without-joystick.patch 1263 BLAKE2B 9421e7056496fb46393b53e0d7da85ae0169e5dc769fc5b2be045127eaab13d69ab5d5e00f1a4f2c2223e03bc2cf58fe17f377dad39f35afcccd7ef4f69a94df SHA512 2c24c90503b62c30bd3aa47285d4cbb6372beacc5561390ad998a44fd5342a50ade2983e0731a3a63696c03f5b348ae711ea6e8ab59d5ada64afd0079e5d6d22 DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c0ec99497b409e84c78027c14059338d482bced3bf16b22b9b268e263b718ad3fbcd5642d247d9dc98a601602 SHA512 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212 -EBUILD libsdl2-2.24.0-r2.ebuild 6464 BLAKE2B 0a23c1356dae43988311889f2775beeadb899def9729953aacb54af8eb664c22bf3e06fecb5ebecf7b904541ecb17da30bed9d0d062ec12e1c86106c58b1aad4 SHA512 c1c64049f309b8e26bcb6c293069f7a0baf6f4bcf40a9fd466f1584657ff0d618dd9277e722f7eed1011a4e47ee4a7747771f09798f9ae6dd69d9c70cee380d7 +EBUILD libsdl2-2.24.0-r2.ebuild 6517 BLAKE2B f809229345e39e0c4a0946526181475d18e45dd06c9a74f8df7529afe40cc87af2fe17dfa0256f7ea255be7a49858eaf6ee29b887250817d94c0ce268afe8c86 SHA512 84f2aa5a22dad410e09a86cafb71ec9edbc110f07b9c7a980ce0c5ee77009fbcd48f27e4ba494d909d2a211064a42adf13744d12bf9ecb72b6375a7f46d13281 MISC metadata.xml 2054 BLAKE2B 611185e0b090bc8865c6ef61cf0dfab07a1806fd2db9fc50f2e3eaefba6ccb26127a51d61afd0a96c520d3d11be5a1a789631554705d7aa36270626d69ddfe89 SHA512 3a9bcecb9e0a8bc74ff8eb36d9dc4e8c1f7bf892428b3f6edd91b97082dd16e591117d45ee3d4558fc1b8137f16b54d01703b9c9c7c24cc149856ccc14bed2c1 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 000000000000..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 <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/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}" |