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

debian: reduce package complexity. Merge pcsx2-data (only 2 files) into pcsx2 and pcsx2-plugin. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4812 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-07-17 11:29:29 +00:00
parent 5adba505e7
commit e5cedbe9d9
8 changed files with 11 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
debian-unstable-upstream/control
View File

@ -3,7 +3,7 @@ Section: contrib/games
Priority: optional
Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
# WARNING we need dpkg-dev 1.15.7 to support dpkg-buildflags but ubunutu 10.04 have only 1.15.5.6...
# WARNING Natty need at least cmake 2.8.5
# WARNING Natty need at least cmake 2.8.5 (multiarch issue)
Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
gcc-multilib [amd64], g++-multilib [amd64],
locales|locales-all,
@ -38,9 +38,10 @@ Package: pcsx2-unstable
# Warning amd64 need additional ia32libs
Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends},
pcsx2-data-unstable (>= ${source:Version}),
pcsx2-plugins-unstable (>= ${binary:Version})
Conflicts: pcsx2
Conflicts: pcsx2,
pcsx2-data-unstable
Replaces: pcsx2-data-unstable
Description: Playstation 2 emulator
PCSX2 is a PlayStation 2 emulator for Windows and Linux.
.
@ -50,20 +51,6 @@ Description: Playstation 2 emulator
.
This package includes the main binary file.
Package: pcsx2-data-unstable
Architecture: all
Depends: ${misc:Depends}
Recommends: pcsx2-unstable (>= ${source:Version}), pcsx2-plugins-unstable (>= ${source:Version})
Conflicts: pcsx2-data
Description: data for pcsx2
PCSX2 is a PlayStation 2 emulator for Windows and Linux.
.
WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support
this instruction set, it does not have enough horse power to run this emulator
anyway.
.
This package includes data files.
Package: pcsx2-plugins-unstable
# Warning amd64 need additional ia32libs
Architecture: i386 amd64
@ -71,8 +58,9 @@ Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends},
nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1), ia32-nvidia-cg-toolkit-pcsx2 [amd64]
Recommends: pcsx2-unstable (>= ${binary:Version}),
pcsx2-data-unstable (>= ${source:Version})
Conflicts: pcsx2-plugins
Conflicts: pcsx2-plugins,
pcsx2-data-unstable
Replaces: pcsx2-data-unstable
Description: Various plugins for pcsx2
PCSX2 is a PlayStation 2 emulator for Windows and Linux.
.

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

@ -1,69 +0,0 @@
Debian policy.
This patch updates default plugin path, game db path.
It also updates shaders data path.
Index: pcsx2.snapshot-4292/pcsx2/gui/AppConfig.cpp
===================================================================
--- pcsx2.snapshot-4292.orig/pcsx2/gui/AppConfig.cpp
+++ pcsx2.snapshot-4292/pcsx2/gui/AppConfig.cpp
@@ -164,7 +164,8 @@
wxDirName GetPlugins()
{
- return AppRoot() + Base::Plugins();
+ // return AppRoot() + Base::Plugins();
+ return wxDirName( L"/usr/lib/games/pcsx2" );
}
wxDirName GetThemes()
Index: pcsx2.snapshot-4292/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
===================================================================
--- pcsx2.snapshot-4292.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
+++ pcsx2.snapshot-4292/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
@@ -291,18 +291,23 @@
__forceinline bool LoadShadersFromDat()
{
- FILE* fres = fopen("ps2hw.dat", "rb");
+ // First try an absolute location for linux distribution
+ FILE* fres = fopen("/usr/share/games/pcsx2/shaders/ps2hw.dat", "rb");
if (fres == NULL)
- {
- fres = fopen("plugins/ps2hw.dat", "rb");
+ {
+ fres = fopen("ps2hw.dat", "rb");
+ if (fres == NULL)
+ {
+ fres = fopen("plugins/ps2hw.dat", "rb");
- if (fres == NULL)
- {
- ZZLog::Error_Log("Cannot find ps2hw.dat in working directory. Exiting.");
- return false;
- }
- }
+ if (fres == NULL)
+ {
+ ZZLog::Error_Log("Cannot find ps2hw.dat in working directory. Exiting.");
+ return false;
+ }
+ }
+ }
fseek(fres, 0, SEEK_END);
Index: pcsx2.snapshot-4292/pcsx2/gui/AppGameDatabase.h
===================================================================
--- pcsx2.snapshot-4292.orig/pcsx2/gui/AppGameDatabase.h
+++ pcsx2.snapshot-4292/pcsx2/gui/AppGameDatabase.h
@@ -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) {

1
debian-unstable-upstream/patches/series
View File

@ -1,2 +1 @@
02_update_default_path.patch
05_move_data_to_config.patch

2
debian-unstable-upstream/pcsx2-data-unstable.dirs
View File

@ -1,2 +0,0 @@
usr/share/games/pcsx2/shaders
var/games/pcsx2/

2
debian-unstable-upstream/pcsx2-data-unstable.install
View File

@ -1,2 +0,0 @@
usr/share/games/pcsx2/shaders
bin/GameIndex.dbf var/games/pcsx2/

3
debian-unstable-upstream/pcsx2-unstable.dirs
View File

@ -1,3 +1,4 @@
usr/games
usr/bin
usr/share/pixmaps
usr/share/applications
var/games/pcsx2

1
debian-unstable-upstream/pcsx2-unstable.install
View File

@ -1,3 +1,4 @@
usr/bin/pcsx2
debian/pcsx2.desktop usr/share/applications
debian/pcsx2.xpm usr/share/pixmaps
var/games/pcsx2

6
debian-unstable-upstream/rules
View File

@ -10,8 +10,6 @@ else
CMAKE_BUILD_TYPE=Release
endif
USER_CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
USER_CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
override_dh_auto_configure:
dh_auto_configure -- \
@ -19,8 +17,6 @@ override_dh_auto_configure:
-DCMAKE_BUILD_STRIP=FALSE \
-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
-DPACKAGE_MODE=TRUE
-DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \
-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)"
clean:
dh_testdir
@ -42,4 +38,4 @@ override_dh_strip:
%:
dh $@ --parallel
.PHONY: build clean install
.PHONY: clean