Unverified Commit ce9450fb authored by Marcin Serwin's avatar Marcin Serwin
Browse files

pcsx2: 2.4.0 -> 2.6.0 



Signed-off-by: default avatarMarcin Serwin <marcin@serwin.dev>
parent 915bca56

pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake

index 504b7a3..100a024 100644

--- a/cmake/SearchForStuff.cmake

+++ b/cmake/SearchForStuff.cmake

@@ -107,7 +107,7 @@ disable_compiler_warnings_for_target(cubeb)

 disable_compiler_warnings_for_target(speex)

 

 # Find the Qt components that we need.

-find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)

+find_package(Qt6 6.7.3 COMPONENTS CoreTools Core CorePrivate GuiTools Gui GuiPrivate WidgetsTools Widgets WidgetsPrivate LinguistTools REQUIRED)

 

 if(WIN32)

   add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)

diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt

index a62df95..4883c64 100644

--- a/pcsx2-qt/CMakeLists.txt

+++ b/pcsx2-qt/CMakeLists.txt

@@ -266,6 +266,7 @@ target_link_libraries(pcsx2-qt PRIVATE

 	Qt6::Core

 	Qt6::Gui

 	Qt6::Widgets

+	Qt6::GuiPrivate

 	KDAB::kddockwidgets

 )

pkgs/by-name/pc/pcsx2/package.nix

+4 −7
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ let 
  pcsx2_patches = fetchFromGitHub {

    owner = "PCSX2";

    repo = "pcsx2_patches";

    rev = "9b193aa0a61f5e93d3bd4124b111e8f296ef9fa8";

    hash = "sha256-1hhdjFxJCNfeO/FIAnjRHESfiyzkErYddZqpRxzG7VQ=";

    rev = "37b2b6b85dd8a02f3adf5282a7d1aaa3ab493836";

    hash = "sha256-UkILUj59Mo/pGqe6wfrkJp0h15afyFx0mbZiGcoGkBA=";

  };



  inherit (qt6)
@@ -49,13 +49,13 @@ let 
in

llvmPackages.stdenv.mkDerivation (finalAttrs: {

  pname = "pcsx2";

  version = "2.4.0";

  version = "2.6.0";

  src = fetchFromGitHub {

    pname = "pcsx2-source";

    owner = "PCSX2";

    repo = "pcsx2";

    tag = "v${finalAttrs.version}";

    hash = "sha256-R+BdywkZKxR/+Z+o1512O3A1mg9A6s7i+JZjFyUbJVs=";

    hash = "sha256-v1kSQbJSp7kJNL9KKyLXAsMDjPGIhMraq6ywa7TMq6Y=";

  };



  patches = [
@@ -63,9 +63,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { 
    ./0000-define-rev.patch



    ./remove-cubeb-vendor.patch



    # Based on https://github.com/PCSX2/pcsx2/commit/8dffc857079e942ca77b091486c20c3c6530e4ed which doesn't apply cleanly

    ./fix-qt-6.10.patch

  ];



  cmakeFlags = [

pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch

+0 −17
Original line number Diff line number Diff line
@@ -14,20 +14,3 @@ index ff66f9c..e177c90 100644 
 

 # Find the Qt components that we need.

 find_package(Qt6 6.7.2 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
 
diff --git a/pcsx2/Host/CubebAudioStream.cpp b/pcsx2/Host/CubebAudioStream.cpp

index 4cd9993..74c2f5a 100644

--- a/pcsx2/Host/CubebAudioStream.cpp

+++ b/pcsx2/Host/CubebAudioStream.cpp

@@ -288,9 +288,9 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName

 	std::vector<std::pair<std::string, std::string>> names;

 	names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));

 

-	const char** cubeb_names = cubeb_get_backend_names();

-	for (u32 i = 0; cubeb_names[i] != nullptr; i++)

-		names.emplace_back(cubeb_names[i], cubeb_names[i]);

+	cubeb_backend_names backends = cubeb_get_backend_names();

+	for (u32 i = 0; i < backends.count; i++)

+		names.emplace_back(backends.names[i], backends.names[i]);

 

 	return names;

 }