ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

0.9.8: debian: refresh the remaining patches... 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/0.9.8@4567 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-04-10 14:19:06 +00:00
parent f9dffd2186
commit b78c683dc8
2 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
debian-upstream/patches/02_update_default_path.patch
View File

@ -2,11 +2,11 @@ Debian policy.
This patch updates default plugin path and config path.
It also updates the pcsx2 game db path and shaders data path.
AppInit.cpp:93 could be probably updated
Index: pcsx2-3369/pcsx2/gui/AppConfig.cpp
Index: pcsx2-0.9.8/pcsx2/gui/AppConfig.cpp
===================================================================
--- pcsx2-3369.orig/pcsx2/gui/AppConfig.cpp
+++ pcsx2-3369/pcsx2/gui/AppConfig.cpp
@@ -162,7 +162,8 @@
--- pcsx2-0.9.8.orig/pcsx2/gui/AppConfig.cpp 2011-04-10 15:51:53.000000000 +0200
+++ pcsx2-0.9.8/pcsx2/gui/AppConfig.cpp 2011-04-10 16:10:07.000000000 +0200
@@ -169,7 +169,8 @@
wxDirName GetPlugins()
{
@ -15,44 +15,37 @@ Index: pcsx2-3369/pcsx2/gui/AppConfig.cpp
+ return wxDirName( L"/usr/lib/games/pcsx2" ) + Base::Plugins();
}
wxDirName GetSettings()
Index: pcsx2-3369/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
wxDirName GetThemes()
Index: pcsx2-0.9.8/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
===================================================================
--- pcsx2-3369.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
+++ pcsx2-3369/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
@@ -347,17 +347,12 @@
assert(hShaderGlob != NULL);
s_lpShaderResources = (u8*)LockResource(hShaderGlob);
# else // not _WIN32
- FILE* fres = fopen("ps2hw.dat", "rb");
+ FILE* fres = fopen("/usr/share/games/pcsx2/shaders/ps2hw.dat", "rb");
--- pcsx2-0.9.8.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp 2011-04-10 15:51:53.000000000 +0200
+++ pcsx2-0.9.8/plugins/zzogl-pg/opengl/ZZoglCreate.cpp 2011-04-10 16:11:08.000000000 +0200
@@ -299,8 +299,11 @@
if (fres == NULL)
{
- fres = fopen("plugins/ps2hw.dat", "rb");
-
- if (fres == NULL)
- {
if (fres == NULL)
{
- ZZLog::Error_Log("Cannot find ps2hw.dat in working directory. Exiting.");
- return false;
- }
+ ZZLog::Error_Log("Cannot find ps2hw.dat in working directory. Exiting.");
+ return false;
+ fres = fopen("/usr/share/games/pcsx2/shaders/ps2hw.dat", "rb");
+ if (fres == NULL) {
+ ZZLog::Error_Log("Cannot find ps2hw.dat in working directory. Exiting.");
+ return false;
+ }
}
}
fseek(fres, 0, SEEK_END);
Index: pcsx2-3369/pcsx2/gui/AppGameDatabase.h
Index: pcsx2-0.9.8/pcsx2/gui/AppGameDatabase.h
===================================================================
--- pcsx2-3369.orig/pcsx2/gui/AppGameDatabase.h
+++ pcsx2-3369/pcsx2/gui/AppGameDatabase.h
--- pcsx2-0.9.8.orig/pcsx2/gui/AppGameDatabase.h 2011-04-10 15:51:53.000000000 +0200
+++ pcsx2-0.9.8/pcsx2/gui/AppGameDatabase.h 2011-04-10 16:11:42.000000000 +0200
@@ -51,8 +51,8 @@
Console.WriteLn( "(GameDB) Unloading..." );
}
- AppGameDatabase& LoadFromFile(const wxString& file = L"GameIndex.dbf", const wxString& key = L"Serial" );
- void SaveToFile(const wxString& file = L"GameIndex.dbf");
+ AppGameDatabase& LoadFromFile(const wxString& file = L"/var/games/pcsx2/GameIndex.dbf", const wxString& key = L"Serial" );
+ void SaveToFile(const wxString& file = L"/var/games/pcsx2/GameIndex.dbf");
};
static wxString compatToStringWX(int compat) {
Console.WriteLn( "(GameDB) Unloading..." );
}
- AppGameDatabase& LoadFromFile(const wxString& file = L"GameIndex.dbf", const wxString& key = L"Serial" );
- void SaveToFile(const wxString& file = L"GameIndex.dbf");
+ AppGameDatabase& LoadFromFile(const wxString& file = L"/var/games/pcsx2/GameIndex.dbf", const wxString& key = L"Serial" );
+ void SaveToFile(const wxString& file = L"/var/games/pcsx2/GameIndex.dbf");
};
static wxString compatToStringWX(int compat) {

10
debian-upstream/patches/05_move_data_to_config.patch
View File

@ -1,8 +1,8 @@
Index: pcsx2-3369/pcsx2/gui/AppConfig.cpp
Index: pcsx2-0.9.8/pcsx2/gui/AppConfig.cpp
===================================================================
--- pcsx2-3369.orig/pcsx2/gui/AppConfig.cpp
+++ pcsx2-3369/pcsx2/gui/AppConfig.cpp
@@ -125,7 +125,12 @@
--- pcsx2-0.9.8.orig/pcsx2/gui/AppConfig.cpp 2011-04-10 16:10:07.000000000 +0200
+++ pcsx2-0.9.8/pcsx2/gui/AppConfig.cpp 2011-04-10 16:12:23.000000000 +0200
@@ -133,7 +133,12 @@
{
switch( mode )
{
@ -12,6 +12,6 @@ Index: pcsx2-3369/pcsx2/gui/AppConfig.cpp
+#else
case DocsFolder_User: return (wxDirName)Path::Combine( wxStandardPaths::Get().GetDocumentsDir(), pxGetAppName() );
+#endif
//case DocsFolder_CWD: return (wxDirName)wxGetCwd();
case DocsFolder_Custom: return CustomDocumentsFolder;
jNO_DEFAULT