diff --git a/debian-unstable-upstream/control b/debian-unstable-upstream/control index 4619130a0..5deed3640 100644 --- a/debian-unstable-upstream/control +++ b/debian-unstable-upstream/control @@ -3,7 +3,7 @@ Section: contrib/games Priority: optional Maintainer: Gregory Hainaut # 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. . diff --git a/debian-unstable-upstream/patches/02_update_default_path.patch b/debian-unstable-upstream/patches/02_update_default_path.patch deleted file mode 100644 index a983ac99f..000000000 --- a/debian-unstable-upstream/patches/02_update_default_path.patch +++ /dev/null @@ -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) { diff --git a/debian-unstable-upstream/patches/series b/debian-unstable-upstream/patches/series index 6531bbd75..8cb69197a 100644 --- a/debian-unstable-upstream/patches/series +++ b/debian-unstable-upstream/patches/series @@ -1,2 +1 @@ -02_update_default_path.patch 05_move_data_to_config.patch diff --git a/debian-unstable-upstream/pcsx2-data-unstable.dirs b/debian-unstable-upstream/pcsx2-data-unstable.dirs deleted file mode 100644 index 3ce4f58c9..000000000 --- a/debian-unstable-upstream/pcsx2-data-unstable.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/games/pcsx2/shaders -var/games/pcsx2/ diff --git a/debian-unstable-upstream/pcsx2-data-unstable.install b/debian-unstable-upstream/pcsx2-data-unstable.install deleted file mode 100644 index e21883425..000000000 --- a/debian-unstable-upstream/pcsx2-data-unstable.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/games/pcsx2/shaders -bin/GameIndex.dbf var/games/pcsx2/ diff --git a/debian-unstable-upstream/pcsx2-unstable.dirs b/debian-unstable-upstream/pcsx2-unstable.dirs index 23debd585..ee8082573 100644 --- a/debian-unstable-upstream/pcsx2-unstable.dirs +++ b/debian-unstable-upstream/pcsx2-unstable.dirs @@ -1,3 +1,4 @@ -usr/games +usr/bin usr/share/pixmaps usr/share/applications +var/games/pcsx2 diff --git a/debian-unstable-upstream/pcsx2-unstable.install b/debian-unstable-upstream/pcsx2-unstable.install index 969d195c2..a2ab6ffff 100644 --- a/debian-unstable-upstream/pcsx2-unstable.install +++ b/debian-unstable-upstream/pcsx2-unstable.install @@ -1,3 +1,4 @@ usr/bin/pcsx2 debian/pcsx2.desktop usr/share/applications debian/pcsx2.xpm usr/share/pixmaps +var/games/pcsx2 diff --git a/debian-unstable-upstream/rules b/debian-unstable-upstream/rules index a52d70abb..42ab526e4 100755 --- a/debian-unstable-upstream/rules +++ b/debian-unstable-upstream/rules @@ -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