wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #764 from fewtarius/dev

Browse source 
Update SDL2, fix ppsspp libretro package.
This commit is contained in:
fewtarius 2022-12-04 07:39:11 -05:00 committed by GitHub
commit 047bf06b32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 58 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
packages/games/libretro/ppsspp/package.mk
View file

@ -47,17 +47,16 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
-DUSING_X11_VULKAN=OFF"
fi
### Vulkan is still not working for PPSSPP on the win600 yet.
#if [ "${VULKAN_SUPPORT}" = "yes" ]
#then
# PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
# PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=ON \
# -DVULKAN=ON \
# -DEGL_NO_X11=1
# -DMESA_EGL_NO_X11_HEADERS=1"
#else
# PKG_CMAKE_OPTS_TARGET+=" -DVULKAN=OFF"
#fi
if [ "${VULKAN_SUPPORT}" = "yes" ]
then
PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=ON \
-DVULKAN=ON \
-DEGL_NO_X11=1
-DMESA_EGL_NO_X11_HEADERS=1"
else
PKG_CMAKE_OPTS_TARGET+=" -DVULKAN=OFF"
fi
if [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"

2
packages/games/tools/gamecontrollerdb/package.mk
View file

@ -2,7 +2,7 @@
# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
PKG_NAME="gamecontrollerdb"
PKG_VERSION="219df0c"
PKG_VERSION="219df0c837f9390e439a6a8cc550f8b56ae80172"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_DEPENDS_TARGET="toolchain SDL2"

15
packages/graphics/SDL2/package.mk
View file

@ -3,8 +3,7 @@
# Copyright (C) 2022-present Fewtarius
PKG_NAME="SDL2"
PKG_VERSION="2.0.20"
PKG_SHA256="c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06"
PKG_VERSION="2.26.0"
PKG_LICENSE="GPL"
PKG_SITE="https://www.libsdl.org/"
PKG_URL="https://www.libsdl.org/release/SDL2-${PKG_VERSION}.tar.gz"
@ -53,13 +52,15 @@ then
-DVIDEO_WAYLAND_QT_TOUCH=OFF \
-DWAYLAND_SHARED=ON \
-DVIDEO_X11=OFF \
-DSDL_X11=OFF"
-DSDL_X11=OFF \
-DSDL_HIDAPI_JOYSTICK=ON"
else
PKG_CMAKE_OPTS_TARGET+=" -DVIDEO_WAYLAND=OFF \
-DVIDEO_WAYLAND_QT_TOUCH=ON \
-DWAYLAND_SHARED=OFF \
-DVIDEO_X11=OFF \
-DSDL_X11=OFF"
-DSDL_X11=OFF \
-DSDL_HIDAPI_JOYSTICK=OFF"
fi
case ${PROJECT} in
@ -78,7 +79,7 @@ esac
pre_configure_target(){
export LDFLAGS="${LDFLAGS} -ludev"
PKG_CMAKE_OPTS_TARGET="-DSDL_STATIC=OFF \
PKG_CMAKE_OPTS_TARGET+="-DSDL_STATIC=OFF \
-DLIBC=ON \
-DGCC_ATOMICS=ON \
-DALTIVEC=OFF \
@ -120,6 +121,6 @@ pre_configure_target(){
}
post_makeinstall_target() {
sed -e "s:\(['=LI]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i $SYSROOT_PREFIX/usr/bin/sdl2-config
rm -rf $INSTALL/usr/bin
sed -e "s:\(['=LI]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/sdl2-config
rm -rf ${INSTALL}/usr/bin
}

31
packages/graphics/SDL2/patches/0001-no-cursor.patch Normal file
View file

@ -0,0 +1,31 @@
From 7c4b7b8f46a3d688fe34c30741e260fa08a70813 Mon Sep 17 00:00:00 2001
From: Fewtarius <fewtarius@gmail.com>
Date: Sun, 4 Apr 2021 09:42:49 -0400
Subject: [PATCH] Split V and P/M
---
.../packages/SDL2/patches/0003-no-cursor.patch | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 projects/Rockchip/devices/RG351P/packages/SDL2/patches/0003-no-cursor.patch
diff --git a/projects/Rockchip/devices/RG351P/packages/SDL2/patches/0003-no-cursor.patch b/projects/Rockchip/devices/RG351P/packages/SDL2/patches/0003-no-cursor.patch
new file mode 100644
index 00000000..d912a67a
--- /dev/null
+++ b/projects/Rockchip/devices/RG351P/packages/SDL2/patches/0003-no-cursor.patch
@@ -0,0 +1,12 @@
+diff -rupN SDL2-2.0.10.orig/src/events/SDL_mouse.c SDL2-2.0.10.new/src/events/SDL_mouse.c
+--- SDL2-2.0.10.orig/src/events/SDL_mouse.c 2019-07-25 00:32:36.000000000 -0400
++++ SDL2-2.0.10.new/src/events/SDL_mouse.c 2021-01-08 19:35:14.792357252 -0500
+@@ -158,7 +158,7 @@ SDL_MouseInit(void)
+
+ mouse->was_touch_mouse_events = SDL_FALSE; /* no touch to mouse movement event pending */
+
+- mouse->cursor_shown = SDL_TRUE;
++ mouse->cursor_shown = SDL_FALSE;
+
+ return (0);
+ }
--
2.25.1

16
packages/ui/emulationstation/config/device/X86_64/es_input.cfg
View file

@ -214,7 +214,7 @@
<input name="x" type="button" id="3" value="1" code="308" />
<input name="y" type="button" id="2" value="1" code="307" />
</inputConfig>
<inputConfig type="joystick" deviceName="PLAYSTATION(R)3 Controller" deviceGUID="060000004c0500006802000000010000">
<inputConfig type="joystick" deviceName="PLAYSTATION(R)3 Controller" deviceGUID="060000004c0500000010000000010000">
<input name="a" type="button" id="13" value="1" code="301" />
<input name="b" type="button" id="14" value="1" code="302" />
<input name="down" type="button" id="6" value="1" code="294" />
@ -237,7 +237,7 @@
<input name="x" type="button" id="12" value="1" code="300" />
<input name="y" type="button" id="15" value="1" code="303" />
</inputConfig>
<inputConfig type="joystick" deviceName="Sony PLAYSTATION(R)3 Controller" deviceGUID="030000004c0500006802000011010000">
<inputConfig type="joystick" deviceName="Sony PLAYSTATION(R)3 Controller" deviceGUID="030000004c0500000010000011010000">
<input name="a" type="button" id="13" value="1" code="301" />
<input name="b" type="button" id="14" value="1" code="302" />
<input name="down" type="button" id="6" value="1" code="294" />
@ -260,7 +260,7 @@
<input name="x" type="button" id="12" value="1" code="300" />
<input name="y" type="button" id="15" value="1" code="303" />
</inputConfig>
<inputConfig type="joystick" deviceName="Sony PLAYSTATION(R)3 Controller" deviceGUID="050000004c0500006802000000000000">
<inputConfig type="joystick" deviceName="Sony PLAYSTATION(R)3 Controller" deviceGUID="050000004c0500000010000000000000">
<input name="a" type="button" id="13" value="1" code="301" />
<input name="b" type="button" id="14" value="1" code="302" />
<input name="down" type="button" id="6" value="1" code="294" />
@ -803,7 +803,7 @@
<input name="x" type="button" id="0" value="1" code="304" />
<input name="y" type="button" id="3" value="1" code="307" />
</inputConfig>
<inputConfig type="joystick" deviceName="Sony PLAYSTATION(R)3 Controller" deviceGUID="030000004c0500006802000011810000">
<inputConfig type="joystick" deviceName="Sony PLAYSTATION(R)3 Controller" deviceGUID="030000004c0500000010000011810000">
<input name="a" type="button" id="1" value="1" code="305" />
<input name="b" type="button" id="0" value="1" code="304" />
<input name="down" type="button" id="14" value="1" code="545" />
@ -826,7 +826,7 @@
<input name="x" type="button" id="2" value="1" code="307" />
<input name="y" type="button" id="3" value="1" code="308" />
</inputConfig>
<inputConfig type="joystick" deviceName="HID 054c:0268" deviceGUID="030000004c0500006802000011810000">
<inputConfig type="joystick" deviceName="HID 054c:0268" deviceGUID="030000004c0500000010000011810000">
<input name="a" type="button" id="1" value="1" code="305" />
<input name="b" type="button" id="0" value="1" code="304" />
<input name="down" type="button" id="14" value="1" code="545" />
@ -849,7 +849,7 @@
<input name="x" type="button" id="2" value="1" code="307" />
<input name="y" type="button" id="3" value="1" code="308" />
</inputConfig>
<inputConfig type="joystick" deviceName="USB Downlo01.80 PS3/USB Corded Gamepad" deviceGUID="030000004c0500006802000011810000">
<inputConfig type="joystick" deviceName="USB Downlo01.80 PS3/USB Corded Gamepad" deviceGUID="030000004c0500000010000011810000">
<input name="a" type="button" id="1" value="1" code="305" />
<input name="b" type="button" id="0" value="1" code="304" />
<input name="down" type="button" id="14" value="1" code="545" />
@ -872,7 +872,7 @@
<input name="x" type="button" id="2" value="1" code="307" />
<input name="y" type="button" id="3" value="1" code="308" />
</inputConfig>
<inputConfig type="joystick" deviceName="Gasia Co.,Ltd PS(R) Gamepad" deviceGUID="030000004c0500006802000011810000">
<inputConfig type="joystick" deviceName="Gasia Co.,Ltd PS(R) Gamepad" deviceGUID="030000004c0500000010000011810000">
<input name="a" type="button" id="1" value="1" code="305" />
<input name="b" type="button" id="0" value="1" code="304" />
<input name="down" type="button" id="14" value="1" code="545" />
@ -895,7 +895,7 @@
<input name="x" type="button" id="2" value="1" code="307" />
<input name="y" type="utton" id="3" value="1" code="308" />
</inputConfig>
<inputConfig type="joystick" deviceName="SZMY-POWER CO.,LTD. PLAYSTATION(R)3 Controller" deviceGUID="030000004c0500006802000011810000">
<inputConfig type="joystick" deviceName="SZMY-POWER CO.,LTD. PLAYSTATION(R)3 Controller" deviceGUID="030000004c0500000010000011810000">
<input name="a" type="button" id="1" value="1" code="305" />
<input name="b" type="button" id="0" value="1" code="304" />
<input name="down" type="button" id="14" value="1" code="545" />