Merge pull request #2235 from fewtarius/dev

Kernel / Emulator / Core / Theme updates.
This commit is contained in:
fewtarius 2023-10-22 07:02:58 -04:00 committed by GitHub
commit 6b8376c7ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 19 additions and 230 deletions

View file

@ -14,7 +14,7 @@ if [ "${TARGET_ARCH}" = "x86_64" ]
then
PKG_SITE+="qt"
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="2d1e16fe50b2c3a41108ca46c879124048334287"
PKG_VERSION="413993ab6fc97bbd3650d06ccb1a54a915f58fee"
PKG_DEPENDS_TARGET+=" qt5"
PKG_TOOLCHAIN="manual"
make_target() {

View file

@ -2,7 +2,7 @@
# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
PKG_NAME="bsnes-lr"
PKG_VERSION="6e73d33127a1e2e4b5e49f4aa4f0619364e473c2"
PKG_VERSION="e71eca1199d1359af53c806811dc3f05c64f8d91"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/bsnes-libretro"
PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"

View file

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dosbox-pure-lr"
PKG_VERSION="ec0c8e4798e207ae2b9cda2cd3e94d1d0e6a38c2"
PKG_VERSION="3793b9f291f37d99f662de0d3058c6b0ac1607fc"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -3,7 +3,7 @@
# Copyright (C) 2022-present Lakka (https://www.lakka.tv)
PKG_NAME="fake08-lr"
PKG_VERSION="b0f0f424b7cd4b53d4a7181e5677ea44747bf661"
PKG_VERSION="8594cfd27029857d6e0937e8f35a88f652aadccc"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/jtothebell/fake-08"
PKG_URL="${PKG_SITE}.git"

View file

@ -21,7 +21,7 @@
################################################################################
PKG_NAME="genesis-plus-gx-lr"
PKG_VERSION="8d644682b6a88d662d1a07e063fa863633a99311"
PKG_VERSION="3dc6af4b93b54ff524e7e93cc1407ad26c1f0340"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Non-commercial"

View file

@ -21,7 +21,7 @@
################################################################################
PKG_NAME="mame2003-plus-lr"
PKG_VERSION="e1719ffa2efe76549e57b833660e8f7cc517b391"
PKG_VERSION="419021fc003bd00fee2ce896d3e802caa5d1274a"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MAME"

View file

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="o2em-lr"
PKG_VERSION="a2a12472fde910b6089ac3ca6de805bd58a9c999"
PKG_VERSION="44fe5f306033242f7d74144105e19a7d4939477e"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Artistic License"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="ppsspp-lr"
PKG_VERSION="fd55f1f4a8ae8e0751a9685b3ddc44e651c92fc3"
PKG_VERSION="e93f9f64cc3979ff7d1dddc2fbec7ddc410da3dc"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/hrydgard/ppsspp"
PKG_URL="https://github.com/hrydgard/ppsspp.git"

View file

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="scummvm-lr"
PKG_VERSION="c2f97be7773ca5b20ea52b070b19a9e546f1c876"
PKG_VERSION="d836ec97edb3aca21ab1d2aea6a4dbf00420cbf9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"

View file

@ -3,7 +3,7 @@
# Copyright (C) 2022-present Fewtarius
PKG_NAME="cemu-sa"
PKG_VERSION="d8b9a74"
PKG_VERSION="f3c95f7"
PKG_ARCH="x86_64"
PKG_LICENSE="MPL-2.0"
PKG_SITE="https://github.com/cemu-project/Cemu"

View file

@ -1,11 +0,0 @@
--- a/src/gui/CemuApp.cpp
+++ b/src/gui/CemuApp.cpp
@@ -132,7 +132,6 @@
{
if (!wxLocale::IsAvailable(wxLANGUAGE_DEFAULT) || !m_locale.Init(wxLANGUAGE_DEFAULT))
{
- m_locale.Init(wxLANGUAGE_ENGLISH);
m_locale.AddCatalogLookupPathPrefix(ActiveSettings::GetDataPath("resources").generic_string());
m_locale.AddCatalog("cemu");
}

View file

@ -4,7 +4,7 @@
# Copyright (C) 2022-present Fewtarius
PKG_NAME="flycast-sa"
PKG_VERSION="e96b38ff5c03e736d4990658d4163fa5dd58f002"
PKG_VERSION="35b7be39053a7564026417c33a4b956fe23e2608"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/flyinghead/flycast"
PKG_URL="${PKG_SITE}.git"

View file

@ -7,7 +7,7 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_SITE="https://github.com/hrydgard/ppsspp"
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="fd55f1f4a8ae8e0751a9685b3ddc44e651c92fc3"
PKG_VERSION="e93f9f64cc3979ff7d1dddc2fbec7ddc410da3dc"
PKG_LICENSE="GPLv2"
PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
PKG_SHORTDESC="PPSSPPDL"

View file

@ -3,7 +3,7 @@
# Copyright (C) 2023-present Fewtarius
PKG_NAME="retroarch"
PKG_VERSION="7011d0c3de5be8e2a8244eda46d5055bb8f4e6be"
PKG_VERSION="b53bce6877642b66739c82cee6c6af8d0a09ac1c"
PKG_SITE="https://github.com/libretro/RetroArch"
PKG_URL="${PKG_SITE}.git"
PKG_LICENSE="GPLv3"

View file

@ -2,7 +2,7 @@
# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
PKG_NAME="yuzu-sa"
PKG_VERSION="53f904b740c00ee491565578012a8c739bd9ed77"
PKG_VERSION="249db0a59bb4aadb031f270ed79044f91defb98d"
PKG_ARCH="x86_64"
PKG_LICENSE="GPLv3"
PKG_SITE="https://github.com/yuzu-emu/yuzu"

View file

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="retroarch-assets"
PKG_VERSION="7b735ef18bcc6508b1c9a626eb237779ff787179"
PKG_VERSION="39c44632e3be156246f2bd34cff08ac9f842126e"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/libretro/retroarch-assets"
PKG_URL="https://github.com/libretro/retroarch-assets/archive/${PKG_VERSION}.tar.gz"

View file

@ -4,7 +4,7 @@
PKG_NAME="linux"
PKG_LICENSE="GPL"
PKG_VERSION="6.4.16"
PKG_VERSION="6.5.8"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_SITE="http://www.kernel.org"
PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"

View file

@ -1,38 +0,0 @@
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index d1094bb1aa42..e74683295691 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
@@ -910,6 +910,11 @@ static int asus_input_mapping(struct hid_device *hdev,
/* Fn+Right Aura mode next on N-Key keyboard */
case 0xb3: asus_map_key_clear(KEY_PROG3); break;
+
+ case 0xa5: asus_map_key_clear(KEY_F15); break; /* ROG Ally left back */
+ case 0xa6: asus_map_key_clear(KEY_F16); break; /* ROG Ally QAM button */
+ case 0xa7: asus_map_key_clear(KEY_F17); break; /* ROG Ally ROG long-press */
+ case 0xa8: asus_map_key_clear(KEY_F18); break; /* ROG Ally ROG long-press-release */
default:
/* ASUS lazily declares 256 usages, ignore the rest,
@@ -1267,6 +1272,9 @@ static const struct hid_device_id asus_devices[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2),
QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
+ USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY),
+ QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD),
QUIRK_ROG_CLAYMORE_II_KEYBOARD },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index c2e9b6d1fd7d..cd6efa46a2bd 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -207,6 +207,7 @@
#define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD 0x1866
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2 0x19b6
+#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY 0x1abe
#define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD 0x196b
#define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD 0x1869

View file

@ -1,162 +0,0 @@
diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5227.c linux-6.4.16/drivers/misc/cardreader/rts5227.c
--- linux-6.4.16.orig/drivers/misc/cardreader/rts5227.c 2023-09-15 23:50:58.706129852 +0000
+++ linux-6.4.16/drivers/misc/cardreader/rts5227.c 2023-09-15 23:51:13.267034740 +0000
@@ -195,7 +195,7 @@ static int rts5227_extra_init_hw(struct
}
}
- if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG)
+ if (option->force_clkreq_0)
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG,
FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
else
diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5228.c linux-6.4.16/drivers/misc/cardreader/rts5228.c
--- linux-6.4.16.orig/drivers/misc/cardreader/rts5228.c 2023-09-15 23:50:58.706129852 +0000
+++ linux-6.4.16/drivers/misc/cardreader/rts5228.c 2023-09-15 23:51:13.267034740 +0000
@@ -435,10 +435,17 @@ static void rts5228_init_from_cfg(struct
option->ltr_enabled = false;
}
}
+
+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
+ | PM_L1_1_EN | PM_L1_2_EN))
+ option->force_clkreq_0 = false;
+ else
+ option->force_clkreq_0 = true;
}
static int rts5228_extra_init_hw(struct rtsx_pcr *pcr)
{
+ struct rtsx_cr_option *option = &pcr->option;
rtsx_pci_write_register(pcr, RTS5228_AUTOLOAD_CFG1,
CD_RESUME_EN_MASK, CD_RESUME_EN_MASK);
@@ -469,6 +476,17 @@ static int rts5228_extra_init_hw(struct
else
rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00);
+ /*
+ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
+ * to drive low, and we forcibly request clock.
+ */
+ if (option->force_clkreq_0)
+ rtsx_pci_write_register(pcr, PETXCFG,
+ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
+ else
+ rtsx_pci_write_register(pcr, PETXCFG,
+ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
+
rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB);
if (pcr->rtd3_en) {
diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5249.c linux-6.4.16/drivers/misc/cardreader/rts5249.c
--- linux-6.4.16.orig/drivers/misc/cardreader/rts5249.c 2023-09-15 23:50:58.706129852 +0000
+++ linux-6.4.16/drivers/misc/cardreader/rts5249.c 2023-09-15 23:51:13.267034740 +0000
@@ -327,11 +327,12 @@ static int rts5249_extra_init_hw(struct
}
}
+
/*
* If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
* to drive low, and we forcibly request clock.
*/
- if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG)
+ if (option->force_clkreq_0)
rtsx_pci_write_register(pcr, PETXCFG,
FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
else
diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5260.c linux-6.4.16/drivers/misc/cardreader/rts5260.c
--- linux-6.4.16.orig/drivers/misc/cardreader/rts5260.c 2023-09-15 23:50:58.706129852 +0000
+++ linux-6.4.16/drivers/misc/cardreader/rts5260.c 2023-09-15 23:51:13.267034740 +0000
@@ -517,10 +517,17 @@ static void rts5260_init_from_cfg(struct
option->ltr_enabled = false;
}
}
+
+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
+ | PM_L1_1_EN | PM_L1_2_EN))
+ option->force_clkreq_0 = false;
+ else
+ option->force_clkreq_0 = true;
}
static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)
{
+ struct rtsx_cr_option *option = &pcr->option;
/* Set mcu_cnt to 7 to ensure data can be sampled properly */
rtsx_pci_write_register(pcr, 0xFC03, 0x7F, 0x07);
@@ -539,6 +546,17 @@ static int rts5260_extra_init_hw(struct
rts5260_init_hw(pcr);
+ /*
+ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
+ * to drive low, and we forcibly request clock.
+ */
+ if (option->force_clkreq_0)
+ rtsx_pci_write_register(pcr, PETXCFG,
+ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
+ else
+ rtsx_pci_write_register(pcr, PETXCFG,
+ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
+
rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x10, 0x00);
return 0;
diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5261.c linux-6.4.16/drivers/misc/cardreader/rts5261.c
--- linux-6.4.16.orig/drivers/misc/cardreader/rts5261.c 2023-09-15 23:50:58.706129852 +0000
+++ linux-6.4.16/drivers/misc/cardreader/rts5261.c 2023-09-15 23:51:13.267034740 +0000
@@ -498,10 +498,17 @@ static void rts5261_init_from_cfg(struct
option->ltr_enabled = false;
}
}
+
+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
+ | PM_L1_1_EN | PM_L1_2_EN))
+ option->force_clkreq_0 = false;
+ else
+ option->force_clkreq_0 = true;
}
static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)
{
+ struct rtsx_cr_option *option = &pcr->option;
u32 val;
rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG1,
@@ -547,6 +554,17 @@ static int rts5261_extra_init_hw(struct
else
rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00);
+ /*
+ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
+ * to drive low, and we forcibly request clock.
+ */
+ if (option->force_clkreq_0)
+ rtsx_pci_write_register(pcr, PETXCFG,
+ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
+ else
+ rtsx_pci_write_register(pcr, PETXCFG,
+ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
+
rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB);
if (pcr->rtd3_en) {
diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rtsx_pcr.c linux-6.4.16/drivers/misc/cardreader/rtsx_pcr.c
--- linux-6.4.16.orig/drivers/misc/cardreader/rtsx_pcr.c 2023-09-15 23:50:58.706129852 +0000
+++ linux-6.4.16/drivers/misc/cardreader/rtsx_pcr.c 2023-09-15 23:51:13.271034986 +0000
@@ -1326,11 +1326,8 @@ static int rtsx_pci_init_hw(struct rtsx_
return err;
}
- if (pcr->aspm_mode == ASPM_MODE_REG) {
+ if (pcr->aspm_mode == ASPM_MODE_REG)
rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30);
- rtsx_pci_write_register(pcr, PETXCFG,
- FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
- }
/* No CD interrupt if probing driver with card inserted.
* So we need to initialize pcr->card_exist here.

View file

@ -4,7 +4,7 @@
# Copyright (C) 2021 Fewtarius
PKG_NAME="es-theme-art-book-next"
PKG_VERSION="86369b3cc7c76a2b6921d5ec7010e0b363471754"
PKG_VERSION="b9979c32d9ba25a31b28e9ff159e8397ca0b307a"
PKG_ARCH="any"
PKG_LICENSE="CUSTOM"
PKG_SITE="https://github.com/anthonycaccese/art-book-next-jelos"

View file

@ -19,7 +19,7 @@ PKG_PATCH_DIRS+="${DEVICE}"
case ${DEVICE} in
S922X*)
PKG_VERSION="6.1.58"
PKG_VERSION="6.1.59"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
;;
esac

View file

@ -37,7 +37,7 @@ case ${DEVICE} in
PKG_GIT_CLONE_BRANCH="main"
;;
RK33*)
PKG_VERSION="6.1.58"
PKG_VERSION="6.1.59"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
;;
esac