Merge pull request #2896 from fewtarius/dev
Bump wxwidgets, slight 8bitdo improvement, RTW89 should locate modules into the correct directory, bump emulationstation.
This commit is contained in:
commit
2e50e18b5f
4 changed files with 12 additions and 13 deletions
|
@ -43,7 +43,7 @@ SUBSYSTEM=="input", ATTRS{name}=="8Bitdo Joy", MODE="0666", ENV{ID_INPUT_JOYSTIC
|
|||
SUBSYSTEM=="input", ATTRS{name}=="8Bitdo Zero GamePad", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1"
|
||||
|
||||
# 8Bitdo 2.4ghz ultimate
|
||||
ACTION=="add", ATTRS{idVendor}=="2dc8", ATTRS{idProduct}=="3106", RUN+="/sbin/modprobe xpad", RUN+="/bin/bash -c 'echo 2dc8 3106 > /sys/bus/usb/drivers/xpad/new_id'"
|
||||
ACTION=="add", ATTRS{idVendor}=="2dc8", ATTRS{idProduct}=="3106", RUN+="/usr/sbin/modprobe xpad", RUN+="/bin/sh -c 'echo 2dc8 3106 > /sys/bus/usb/drivers/xpad/new_id'"
|
||||
|
||||
# 8Bitdo M30
|
||||
ACTION=="add", ATTRS{idVendor}=="2dc8", ATTRS{idProduct}=="6002", RUN+="/sbin/modprobe xpad", RUN+="/bin/bash -c 'echo 2dc8 6002 > /sys/bus/usb/drivers/xpad/new_id'"
|
||||
ACTION=="add", ATTRS{idVendor}=="2dc8", ATTRS{idProduct}=="6002", RUN+="/usr/sbin/modprobe xpad", RUN+="/bin/sh -c 'echo 2dc8 6002 > /sys/bus/usb/drivers/xpad/new_id'"
|
||||
|
|
|
@ -2,20 +2,19 @@
|
|||
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
|
||||
|
||||
PKG_NAME="wxwidgets"
|
||||
PKG_VERSION="a812fff"
|
||||
#PKG_VERSION="c372724b3448de02a9135835f99f15a26e35f979"
|
||||
PKG_VERSION="b97aee4"
|
||||
PKG_LICENSE="wxWindows Library Licence"
|
||||
PKG_SITE="https://github.com/wxWidgets/wxWidgets"
|
||||
PKG_URL="${PKG_SITE}.git"
|
||||
PKG_GIT_CLONE_BRANCH="3.2.2-hotfix"
|
||||
PKG_GIT_CLONE_BRANCH="3.2"
|
||||
PKG_DEPENDS_TARGET="toolchain zlib libpng libjpeg-turbo gdk-pixbuf gtk3 libaio"
|
||||
PKG_LONGDESC="wxWidgets is a free and open source cross-platform C++ framework for writing advanced GUI applications using native controls."
|
||||
PKG_BUILD_FLAGS="+pic"
|
||||
#PKG_BUILD_FLAGS="+pic"
|
||||
|
||||
pre_configure_target() {
|
||||
LDFLAGS="${LDFLAGS} -fPIC"
|
||||
CXXFLAGS="${CXXFLAGS} -fPIC"
|
||||
}
|
||||
#pre_configure_target() {
|
||||
# LDFLAGS="${LDFLAGS} -fPIC"
|
||||
# CXXFLAGS="${CXXFLAGS} -fPIC"
|
||||
#}
|
||||
|
||||
post_install() {
|
||||
cp ${PKG_BUILD}/.${TARGET_NAME}/lib/wx/config/gtk3-unicode-3.2 ${SYSROOT_PREFIX}/usr/bin/wx-config
|
||||
|
|
|
@ -22,6 +22,6 @@ make_target() {
|
|||
}
|
||||
|
||||
makeinstall_target() {
|
||||
mkdir -p ${INSTALL}/$(get_full_module_dir)/kernel/drivers/net/wireless/
|
||||
cp *.ko ${INSTALL}/$(get_full_module_dir)/kernel/drivers/net/wireless/
|
||||
mkdir -p ${INSTALL}/$(get_full_module_dir)/kernel/drivers/net/wireless/rtw89
|
||||
cp *.ko ${INSTALL}/$(get_full_module_dir)/kernel/drivers/net/wireless/rtw89
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
|
||||
|
||||
PKG_NAME="emulationstation"
|
||||
PKG_VERSION="b690d7c772615f30a69bf52777efe80d269c0df3"
|
||||
PKG_VERSION="41a0233b70693fbdb15f2468d429b9967d9d8ea9"
|
||||
PKG_GIT_CLONE_BRANCH="main"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
|
|
Loading…
Reference in a new issue