PAD: Update to latest controller database

3 files changed, 31 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d7c13b859e2..2ded7d72f108 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pcsx2-git
 	pkgdesc = A Sony PlayStation 2 emulator
-	pkgver = v1.7.3829.r0.g26d5ee0c9
+	pkgver = v1.7.3842.r0.g2459145db
 	pkgrel = 1
 	url = https://www.pcsx2.net
 	install = post.install
@@ -41,6 +41,6 @@ pkgbase = pcsx2-git
 	source = git+https://github.com/PCSX2/pcsx2.git
 	source = 0001-Fix-resources-Fix-CMake.patch
 	sha256sums = SKIP
-	sha256sums = d345759a6ca19023ba9775c6f4b847d5510c38eea83406571dc0d2fc72ec3d3a
+	sha256sums = b69b3369e62bee6b6063b49621144343bb9ba81fd51f38e5e9bee4efbc731230
 
 pkgname = pcsx2-git
diff --git a/0001-Fix-resources-Fix-CMake.patch b/0001-Fix-resources-Fix-CMake.patch
index f621e159defe..a79c2bdeb866 100644
--- a/0001-Fix-resources-Fix-CMake.patch
+++ b/0001-Fix-resources-Fix-CMake.patch
@@ -1,21 +1,21 @@
-From 4d2bcaa7d92a8a3c02d788bf784e9b3a329dc141 Mon Sep 17 00:00:00 2001
+From 00251d1894fcd819768a3a6fe276a98148cfa86b Mon Sep 17 00:00:00 2001
 From: kenshen112 <finalfantasytimothy@gmail.com>
 Date: Sat, 24 Dec 2022 10:00:03 -0700
 Subject: [PATCH] Fix resources, Fix CMake
 
+S
 ---
- CMakeLists.txt                 | 6 ++++++
- cmake/BuildParameters.cmake    | 9 +++++++++
- linux_various/PCSX2.desktop.in | 2 +-
- pcsx2-qt/CMakeLists.txt        | 7 ++++---
- pcsx2/Frontend/CommonHost.cpp  | 8 +++++---
- 5 files changed, 25 insertions(+), 7 deletions(-)
+ CMakeLists.txt                | 5 +++++
+ cmake/BuildParameters.cmake   | 9 +++++++++
+ pcsx2-qt/CMakeLists.txt       | 6 ++++++
+ pcsx2/Frontend/CommonHost.cpp | 8 +++++---
+ 4 files changed, 25 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4059d9e72..bc0a5e1fc 100644
+index 35622ee3c..bcdca1954 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -18,6 +18,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+@@ -25,6 +25,9 @@ endif()
  # include some generic functions to ensure correctness of the env
  include(Pcsx2Utils)
  
@@ -25,20 +25,18 @@ index 4059d9e72..bc0a5e1fc 100644
  check_no_parenthesis_in_path()
  detectOperatingSystem()
  check_compiler_version("7.0" "7.0")
-@@ -56,3 +59,6 @@ if(ACTUALLY_ENABLE_TESTS)
+@@ -63,3 +66,5 @@ if(ACTUALLY_ENABLE_TESTS)
  	add_subdirectory(tests/ctest)
  endif()
  
-+configure_file("${CMAKE_SOURCE_DIR}/linux_various/PCSX2.desktop.in" "${CMAKE_BINARY_DIR}/linux_various/PCSX2.desktop" @ONLY)
-+
-+INSTALL(FILES "${CMAKE_BINARY_DIR}/linux_various/PCSX2.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-\ No newline at end of file
++INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/bin/resources" DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/PCSX2)
++INSTALL(FILES "${CMAKE_BINARY_DIR}/bin/PCSX2.desktop" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
 diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
-index f38e0bea8..2e11ee7f7 100644
+index a402ab883..abb4b228f 100644
 --- a/cmake/BuildParameters.cmake
 +++ b/cmake/BuildParameters.cmake
-@@ -54,6 +54,15 @@ if(UNIX AND NOT APPLE)
- 	option(WAYLAND_API "Enable Wayland support" OFF)
+@@ -36,6 +36,15 @@ if(UNIX AND NOT APPLE)
+ 	option(WAYLAND_API "Enable Wayland support" ON)
  endif()
  
 +if(PACKAGE_MODE)
@@ -53,39 +51,25 @@ index f38e0bea8..2e11ee7f7 100644
  if(APPLE)
  	option(OSX_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF)
  	option(SKIP_POSTPROCESS_BUNDLE "Skip postprocessing bundle for redistributability" OFF)
-diff --git a/linux_various/PCSX2.desktop.in b/linux_various/PCSX2.desktop.in
-index 9dbc8f2d1..8b6831142 100644
---- a/linux_various/PCSX2.desktop.in
-+++ b/linux_various/PCSX2.desktop.in
-@@ -9,7 +9,7 @@ GenericName[zh_CN]=PlayStation 2 模拟器
- Comment=Sony PlayStation 2 emulator
- Comment[ru]=Эмулятор Sony PlayStation 2
- Comment[zh_CN]=索尼 PlayStation 2 模拟器
--Exec=env GDK_BACKEND=x11 MESA_NO_ERROR=1 pcsx2
-+Exec=env QT_QPA_PLATFORM=xcb MESA_NO_ERROR=1 @EXECUTEABLE@
- Icon=PCSX2
- Keywords=game;emulator;
- Categories=@PCSX2_MENU_CATEGORIES@
 diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt
-index 7e822cb2a..319d442d5 100644
+index 20590de61..10bf6583c 100644
 --- a/pcsx2-qt/CMakeLists.txt
 +++ b/pcsx2-qt/CMakeLists.txt
-@@ -4,9 +4,10 @@ set(CMAKE_AUTOUIC ON)
+@@ -4,6 +4,12 @@ set(CMAKE_AUTOUIC ON)
  
  add_executable(pcsx2-qt)
  
--if (PACKAGE_MODE)
--	message(FATAL_ERROR "Package mode is not supported for Qt builds.")
--else()
 +if(PACKAGE_MODE)
 +	install(TARGETS pcsx2-qt DESTINATION ${CMAKE_INSTALL_BINDIR})
-+	install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/PCSX2)
 + else()
- 	install(TARGETS pcsx2-qt DESTINATION ${CMAKE_SOURCE_DIR}/bin)
- endif()
- 
++	install(TARGETS pcsx2-qt DESTINATION ${CMAKE_SOURCE_DIR}/bin)
++endif()
++
+ target_sources(pcsx2-qt PRIVATE
+ 	AboutDialog.cpp
+ 	AboutDialog.h
 diff --git a/pcsx2/Frontend/CommonHost.cpp b/pcsx2/Frontend/CommonHost.cpp
-index ab992e483..6269b9748 100644
+index 9da1dafd9..d948ac704 100644
 --- a/pcsx2/Frontend/CommonHost.cpp
 +++ b/pcsx2/Frontend/CommonHost.cpp
 @@ -128,12 +128,14 @@ void CommonHost::SetAppRoot()
diff --git a/PKGBUILD b/PKGBUILD
index 0b3c91b2f32b..db60d92fffe9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Themaister <maister@archlinux.us>
 
 pkgname=pcsx2-git
-pkgver=v1.7.3829.r0.g26d5ee0c9
+pkgver=v1.7.3842.r0.g2459145db
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -85,7 +85,6 @@ pkgver()
 build()
 {
   cd $srcdir/pcsx2
-  cp -prv bin/resources/* pcsx2-qt/resources/ | grep '\->'
   cd ..
   mkdir -p build
   cd build
@@ -103,16 +102,18 @@ build()
     -DPACKAGE_MODE=ON \
     -DDISABLE_SETCAP=ON
   ninja -j$(nproc)
+
+  cd ..
+  cp -r pcsx2/.github/workflows/scripts/linux/pcsx2-qt.desktop build/bin/PCSX2.desktop
 }
 
 package()
 {
-  ls
     DESTDIR="${pkgdir}" cmake --install build
 }
 
 # vim: ts=2 sw=2 et:
 
 sha256sums=('SKIP'
-            'd345759a6ca19023ba9775c6f4b847d5510c38eea83406571dc0d2fc72ec3d3a'
+            'b69b3369e62bee6b6063b49621144343bb9ba81fd51f38e5e9bee4efbc731230'
 )