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

debian: 

* fix a missing \
* refresh the patch


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4294 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-02-12 16:06:28 +00:00
parent 94b0ead7ff
commit a8afd254b6
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
debian-unstable-upstream/patches/02_update_default_path.patch
View File

@ -1,12 +1,11 @@
Debian policy. Debian policy.
This patch updates default plugin path and config path. This patch updates default plugin path, game db path.
It also updates the pcsx2 game db path and shaders data path. It also updates shaders data path.
AppInit.cpp:93 could be probably updated Index: pcsx2.snapshot-4292/pcsx2/gui/AppConfig.cpp
Index: pcsx2.snapshot-4169/pcsx2/gui/AppConfig.cpp
=================================================================== ===================================================================
--- pcsx2.snapshot-4169.orig/pcsx2/gui/AppConfig.cpp --- pcsx2.snapshot-4292.orig/pcsx2/gui/AppConfig.cpp
+++ pcsx2.snapshot-4169/pcsx2/gui/AppConfig.cpp +++ pcsx2.snapshot-4292/pcsx2/gui/AppConfig.cpp
@@ -143,7 +143,8 @@ @@ -164,7 +164,8 @@
wxDirName GetPlugins() wxDirName GetPlugins()
{ {
@ -15,11 +14,11 @@ Index: pcsx2.snapshot-4169/pcsx2/gui/AppConfig.cpp
+ return wxDirName( L"/usr/lib/games/pcsx2" ) + Base::Plugins(); + return wxDirName( L"/usr/lib/games/pcsx2" ) + Base::Plugins();
} }
wxDirName GetSettings() wxDirName GetThemes()
Index: pcsx2.snapshot-4169/plugins/zzogl-pg/opengl/ZZoglCreate.cpp Index: pcsx2.snapshot-4292/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
=================================================================== ===================================================================
--- pcsx2.snapshot-4169.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp --- pcsx2.snapshot-4292.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
+++ pcsx2.snapshot-4169/plugins/zzogl-pg/opengl/ZZoglCreate.cpp +++ pcsx2.snapshot-4292/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
@@ -291,18 +291,23 @@ @@ -291,18 +291,23 @@
__forceinline bool LoadShadersFromDat() __forceinline bool LoadShadersFromDat()
@ -53,10 +52,10 @@ Index: pcsx2.snapshot-4169/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
fseek(fres, 0, SEEK_END); fseek(fres, 0, SEEK_END);
Index: pcsx2.snapshot-4169/pcsx2/gui/AppGameDatabase.h Index: pcsx2.snapshot-4292/pcsx2/gui/AppGameDatabase.h
=================================================================== ===================================================================
--- pcsx2.snapshot-4169.orig/pcsx2/gui/AppGameDatabase.h --- pcsx2.snapshot-4292.orig/pcsx2/gui/AppGameDatabase.h
+++ pcsx2.snapshot-4169/pcsx2/gui/AppGameDatabase.h +++ pcsx2.snapshot-4292/pcsx2/gui/AppGameDatabase.h
@@ -51,8 +51,8 @@ @@ -51,8 +51,8 @@
Console.WriteLn( "(GameDB) Unloading..." ); Console.WriteLn( "(GameDB) Unloading..." );
} }

1
debian-unstable-upstream/patches/05_move_data_to_config.patch
View File

@ -1,3 +1,4 @@
By default, move all users datas into XDG_CONFIG_DIR
Index: pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp Index: pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp
=================================================================== ===================================================================
--- pcsx2.snapshot-3369.orig/pcsx2/gui/AppConfig.cpp --- pcsx2.snapshot-3369.orig/pcsx2/gui/AppConfig.cpp

2
debian-unstable-upstream/rules
View File

@ -32,7 +32,7 @@ build-stamp:
-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \ -DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
-DL10N_PORTABLE=FALSE \ -DL10N_PORTABLE=FALSE \
-DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \ -DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \
-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)" -DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)" \
-DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_PREFIX="/usr" \
-DPACKAGE_MODE=TRUE -DPACKAGE_MODE=TRUE
$(MAKE) $(MAKEFLAGS) $(MAKE) $(MAKEFLAGS)

4
debian-unstable-upstream/rules_fglrx
View File

@ -32,7 +32,9 @@ build-stamp:
-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \ -DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
-DL10N_PORTABLE=FALSE \ -DL10N_PORTABLE=FALSE \
-DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \ -DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \
-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)" -DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)" \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DPACKAGE_MODE=TRUE
$(MAKE) $(MAKEFLAGS) $(MAKE) $(MAKEFLAGS)
touch build-stamp touch build-stamp