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

Merge pull request #1556 from fewtarius/dev

Browse source 
Fixes
This commit is contained in:
fewtarius 2023-06-12 08:20:49 -04:00 committed by GitHub
commit 105a33692f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 145 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
packages/devel/cups/package.mk Normal file
View file

@ -0,0 +1,28 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2017 Escalade
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="cups"
PKG_VERSION="2.4.2"
PKG_SHA256="7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682"
PKG_LICENSE="GPL"
PKG_SITE="http://www.cups.org"
PKG_URL="https://github.com/openprinting/cups/archive/v${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain gnutls zlib"
PKG_LONGDESC="CUPS printing system."
PKG_BUILD_FLAGS="+pic -sysroot"
PKG_CONFIGURE_OPTS_TARGET="--libdir=/usr/lib \
--disable-gssapi \
--with-dnssd=no \
--with-tls=gnutls
--disable-unit-tests"
pre_configure_target() {
cd ..
rm -rf .${TARGET_NAME}
}
makeinstall_target() {
make BUILDROOT="${INSTALL}" install
}

13
packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh
View file

@ -11,6 +11,19 @@ if [ ! -d "/storage/.config/drastic" ]; then
cp -r /usr/config/drastic/* /storage/.config/drastic/
fi
if [ ! -d "/storage/.config/drastic/system" ]; then
mkdir -p mkdir -p /storage/.config/drastic/system
fi
for bios in nds_bios_arm9.bin nds_bios_arm7.bin
do
if [ ! -e "/storage/.config/drastic/system/${bios}"]; then
if [ -e "/storage/roms/bios/${bios}" ]; then
ln -sf /storage/roms/bios/${bios} /storage/.config/drastic/system
fi
fi
done
#Make drastic savestate folder
if [ ! -d "/storage/roms/savestates/nds" ]; then
mkdir -p /storage/roms/savestates/nds

92
packages/graphics/SDL2/patches/RK3566/4bd7cefb06711cc5a16da1ec8afae4352a3b9292.patch Normal file
View file

@ -0,0 +1,92 @@
From 4bd7cefb06711cc5a16da1ec8afae4352a3b9292 Mon Sep 17 00:00:00 2001
From: Christian_Haitian <mckman@comcast.net>
Date: Thu, 25 May 2023 02:15:05 +0000
Subject: [PATCH] Add touch mouse patch for sdl2 thanks to @anaximan (aka
tomtomp)
---
patches/sdl2-patch-0004-touch-mouse.patch | 75 +++++++++++++++++++++++
1 file changed, 75 insertions(+)
create mode 100644 patches/sdl2-patch-0004-touch-mouse.patch
diff --git a/patches/sdl2-patch-0004-touch-mouse.patch b/patches/sdl2-patch-0004-touch-mouse.patch
new file mode 100644
index 0000000..7cc9d67
--- /dev/null
+++ b/patches/sdl2-patch-0004-touch-mouse.patch
@@ -0,0 +1,75 @@
+diff --git a/src/events/SDL_touch.c b/src/events/SDL_touch.c
+index d8210d5fa..4e932f9c7 100644
+--- a/src/events/SDL_touch.c
++++ b/src/events/SDL_touch.c
+@@ -35,6 +35,7 @@ static SDL_Touch **SDL_touchDevices = NULL;
+ #define SYNTHESIZE_TOUCH_TO_MOUSE 1
+
+ #if SYNTHESIZE_TOUCH_TO_MOUSE
++static SDL_bool cursor_init = SDL_FALSE;
+ static SDL_bool finger_touching = SDL_FALSE;
+ static SDL_FingerID track_fingerid;
+ static SDL_TouchID track_touchid;
+@@ -261,6 +262,11 @@ SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid, SDL_Window * window,
+ return -1;
+ }
+
++ if (!window) {
++ // Fallback to the main application window.
++ window = SDL_GetWindowFromID(1);
++ }
++
+ mouse = SDL_GetMouse();
+
+ #if SYNTHESIZE_TOUCH_TO_MOUSE
+@@ -275,6 +281,13 @@ SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid, SDL_Window * window,
+ /* FIXME: maybe we should only restrict to a few SDL_TouchDeviceType */
+ if (id != SDL_MOUSE_TOUCHID) {
+ if (window) {
++ if (cursor_init == SDL_FALSE) {
++ // TODO - Initialization hack to reset cursor position to <0, 0>
++ SDL_SendMouseMotion(window, 0, SDL_TRUE, -window->w, -window->h);
++ mouse->x = 0; mouse->y = 0;
++ x = 0.0f; y = 0.0f;
++ cursor_init = SDL_TRUE;
++ }
+ if (down) {
+ if (finger_touching == SDL_FALSE) {
+ int pos_x = (int)(x * (float)window->w);
+@@ -283,12 +296,12 @@ SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid, SDL_Window * window,
+ if (pos_x > window->w - 1) pos_x = window->w - 1;
+ if (pos_y < 0) pos_y = 0;
+ if (pos_y > window->h - 1) pos_y = window->h - 1;
+- SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
+- SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
++ SDL_SendMouseMotion(window, 0, 0, pos_x, pos_y);
++ SDL_SendMouseButton(window, 0, SDL_PRESSED, SDL_BUTTON_LEFT);
+ }
+ } else {
+ if (finger_touching == SDL_TRUE && track_touchid == id && track_fingerid == fingerid) {
+- SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
++ SDL_SendMouseButton(window, 0, SDL_RELEASED, SDL_BUTTON_LEFT);
+ }
+ }
+ }
+@@ -383,6 +396,11 @@ SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid, SDL_Window * window,
+ return -1;
+ }
+
++ if (!window) {
++ // Fallback to the main application window.
++ window = SDL_GetWindowFromID(1);
++ }
++
+ mouse = SDL_GetMouse();
+
+ #if SYNTHESIZE_TOUCH_TO_MOUSE
+@@ -398,7 +416,7 @@ SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid, SDL_Window * window,
+ if (pos_x > window->w - 1) pos_x = window->w - 1;
+ if (pos_y < 0) pos_y = 0;
+ if (pos_y > window->h - 1) pos_y = window->h - 1;
+- SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
++ SDL_SendMouseMotion(window, 0, 0, pos_x, pos_y);
+ }
+ }
+ }

6
packages/sysutils/busybox/scripts/fs-resize
View file

@ -58,4 +58,10 @@ if [ -e /storage/.please_resize_me ] ; then
StartProgress countdown "Rebooting in 5s... " 5 "NOW"
fi
fi
for module in $(lsmod | awk '{print $1}')
do
rmmod ${module}
done
shutdown -r now &>/dev/null

3
packages/sysutils/systemd/package.mk
View file

@ -151,6 +151,9 @@ post_makeinstall_target() {
safe_remove ${INSTALL}/usr/lib/systemd/system/systemd-update-done.service
safe_remove ${INSTALL}/usr/lib/systemd/system/*.target.wants/systemd-update-done.service
safe_remove ${INSTALL}/usr/lib/systemd/system/dev-hugepages.mount
safe_remove ${INSTALL}/usr/lib/systemd/system/*.target.wants/dev-hugepages.mount
# adjust systemd-hwdb-update (we have read-only /etc).
sed '/^ConditionNeedsUpdate=.*$/d' -i ${INSTALL}/usr/lib/systemd/system/systemd-hwdb-update.service

2
packages/x11/lib/libXcomposite/package.mk
View file

@ -12,7 +12,7 @@ PKG_DEPENDS_TARGET="toolchain util-macros libXfixes libXext libX11"
PKG_LONGDESC="X Composite Library"
PKG_BUILD_FLAGS="+pic"
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
PKG_CONFIGURE_OPTS_TARGET="--enable-shared --disable-static"
post_configure_target() {
libtool_remove_rpath libtool

2
packages/x11/lib/libXdamage/package.mk
View file

@ -12,7 +12,7 @@ PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes"
PKG_LONGDESC="LibXdamage provides an X Window System client interface to the DAMAGE extension to the X protocol."
PKG_BUILD_FLAGS="+pic"
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
PKG_CONFIGURE_OPTS_TARGET="--enable-shared --disable-static"
post_configure_target() {
libtool_remove_rpath libtool

2
packages/x11/lib/libXfixes/package.mk
View file

@ -12,7 +12,7 @@ PKG_DEPENDS_TARGET="toolchain util-macros libX11"
PKG_LONGDESC="X Fixes Library"
PKG_BUILD_FLAGS="+pic"
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
PKG_CONFIGURE_OPTS_TARGET="--enable-shared --disable-static"
post_configure_target() {
libtool_remove_rpath libtool