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

[debian] 

* mass package rename from pcsx2 to pcsx2-unstable
* refresh some patches


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3371 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2010-07-02 14:55:41 +00:00
parent 2fda352baf
commit f5fd43f3c9
19 changed files with 72 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
debian-upstream/control
View File

@ -30,10 +30,11 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7.1), cmake (>=2.8),
Standards-Version: 3.9.0
Homepage: http://pcsx2.net/
Package: pcsx2
Package: pcsx2-unstable
# Warning amd64 need additional ia32libs
Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2-data (>= ${binary:Version}), pcsx2-plugins (>= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2-data-unstable (>= ${binary:Version}), pcsx2-plugins-unstable (>= ${binary:Version})
Conflicts: pcsx2
Description: Playstation 2 emulator
PCSX2 is a PlayStation 2 emulator for Windows and
Linux, started by the same team that brought you PCSX
@ -46,10 +47,11 @@ Description: Playstation 2 emulator
This package includes the main binary file.
Package: pcsx2-data
Package: pcsx2-data-unstable
Architecture: all
Depends: ${misc:Depends}
Recommends: pcsx2 (>= ${binary:Version}),
Recommends: pcsx2-unstable (>= ${binary:Version}),
Conflicts: pcsx2-data
Description: data for pcsx2
PCSX2 is a PlayStation 2 emulator for Windows and
Linux, started by the same team that brought you PCSX
@ -61,10 +63,11 @@ Description: data for pcsx2
.
This package includes data files.
Package: pcsx2-plugins
Package: pcsx2-plugins-unstable
# Warning amd64 need additional ia32libs
Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2 (>= ${binary:Version}), pcsx2-data (>= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version})
Conflicts: pcsx2-plugins
Description: Various plugins for pcsx2
PCSX2 is a PlayStation 2 emulator for Windows and
Linux, started by the same team that brought you PCSX
@ -76,12 +79,13 @@ Description: Various plugins for pcsx2
.
This package includes the plugins of the emulator.
Package: pcsx2-dbg
Package: pcsx2-unstable-dbg
Section: debug
Priority: extra
# Warning amd64 need additional ia32libs
Architecture: i386 amd64
Depends: ${misc:Depends}, pcsx2 (= ${binary:Version})
Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version})
Conflicts: pcsx2-dbg
Description: Debug symbols for pcsx2
PCSX2 is a PlayStation 2 emulator for Windows and
Linux, started by the same team that brought you PCSX
@ -89,12 +93,13 @@ Description: Debug symbols for pcsx2
.
This package contains the debug symbol of pcsx2.
Package: pcsx2-plugins-dbg
Package: pcsx2-plugins-unstable-dbg
Section: debug
Priority: extra
# Warning amd64 need additional ia32libs
Architecture: i386 amd64
Depends: ${misc:Depends}, pcsx2-plugins (= ${binary:Version})
Depends: ${misc:Depends}, pcsx2-plugins-unstable (= ${binary:Version})
Conflicts: pcsx2-plugins-dbg
Description: Debug symbols for pcsx2-plugins
PCSX2 is a PlayStation 2 emulator for Windows and
Linux, started by the same team that brought you PCSX

2
debian-upstream/create_pcsx2_tarball_from_svn_repository.sh
View File

@ -60,7 +60,7 @@ mkdir -p $ROOT_DIR;
(cd $ROOT_DIR;
get_svn_file CMakeLists.txt;
get_svn_dir bin common cmake pcsx2 tools;
get_svn_dir debian_unofficial;
get_svn_dir debian-unstable-upstream;
echo "Done")
echo "Donwload Linux compatible plugins ${SVN_CO_VERSION}"

6
debian-upstream/patches/01_rename_binary_generated.patch
View File

@ -1,9 +1,9 @@
Debian specific
Always uses the same executable name for the build. Easier for the install script
Index: pcsx2.snapshot-3343/pcsx2/CMakeLists.txt
Index: pcsx2.snapshot-3369/pcsx2/CMakeLists.txt
===================================================================
--- pcsx2.snapshot-3343.orig/pcsx2/CMakeLists.txt 2010-06-29 13:26:25.000000000 +0200
+++ pcsx2.snapshot-3343/pcsx2/CMakeLists.txt 2010-06-29 13:28:38.334405496 +0200
--- pcsx2.snapshot-3369.orig/pcsx2/CMakeLists.txt
+++ pcsx2.snapshot-3369/pcsx2/CMakeLists.txt
@@ -83,7 +83,7 @@
if(CMAKE_BUILD_TYPE STREQUAL Debug)

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

@ -2,10 +2,10 @@ 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.snapshot-3343/pcsx2/gui/AppConfig.cpp
Index: pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp
===================================================================
--- pcsx2.snapshot-3343.orig/pcsx2/gui/AppConfig.cpp 2010-06-29 13:26:25.000000000 +0200
+++ pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp 2010-06-29 13:28:38.859568437 +0200
--- pcsx2.snapshot-3369.orig/pcsx2/gui/AppConfig.cpp
+++ pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp
@@ -162,7 +162,8 @@
wxDirName GetPlugins()
@ -16,10 +16,10 @@ Index: pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp
}
wxDirName GetSettings()
Index: pcsx2.snapshot-3343/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
Index: pcsx2.snapshot-3369/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
===================================================================
--- pcsx2.snapshot-3343.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp 2010-06-29 13:26:25.000000000 +0200
+++ pcsx2.snapshot-3343/plugins/zzogl-pg/opengl/ZZoglCreate.cpp 2010-06-29 13:28:38.859568437 +0200
--- pcsx2.snapshot-3369.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
+++ pcsx2.snapshot-3369/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
@@ -347,17 +347,12 @@
assert(hShaderGlob != NULL);
s_lpShaderResources = (u8*)LockResource(hShaderGlob);
@ -41,10 +41,10 @@ Index: pcsx2.snapshot-3343/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
}
fseek(fres, 0, SEEK_END);
Index: pcsx2.snapshot-3343/pcsx2/gui/AppGameDatabase.h
Index: pcsx2.snapshot-3369/pcsx2/gui/AppGameDatabase.h
===================================================================
--- pcsx2.snapshot-3343.orig/pcsx2/gui/AppGameDatabase.h 2010-06-29 13:26:25.000000000 +0200
+++ pcsx2.snapshot-3343/pcsx2/gui/AppGameDatabase.h 2010-06-29 13:28:38.859568437 +0200
--- pcsx2.snapshot-3369.orig/pcsx2/gui/AppGameDatabase.h
+++ pcsx2.snapshot-3369/pcsx2/gui/AppGameDatabase.h
@@ -51,8 +51,8 @@
Console.WriteLn( "(GameDB) Unloading..." );
}

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

@ -1,7 +1,7 @@
Index: pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp
Index: pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp
===================================================================
--- pcsx2.snapshot-3343.orig/pcsx2/gui/AppConfig.cpp 2010-06-29 13:28:38.859568437 +0200
+++ pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp 2010-06-29 13:28:39.100612322 +0200
--- pcsx2.snapshot-3369.orig/pcsx2/gui/AppConfig.cpp
+++ pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp
@@ -125,7 +125,12 @@
{
switch( mode )

18
debian-upstream/patches/21_use_legacy_soundtouch_13.patch
View File

@ -2,10 +2,10 @@ This patch removes recording feature beacause it needs libsoundtouch > 1.4.
Howerever only the version 1.3 is in debian. Unfortunately the package seems
to be not actively maintained.
Note it also correct the inlude path.
Index: pcsx2.snapshot-3337/plugins/spu2-x/src/Wavedump_wav.cpp
Index: pcsx2.snapshot-3369/plugins/spu2-x/src/Wavedump_wav.cpp
===================================================================
--- pcsx2.snapshot-3337.orig/plugins/spu2-x/src/Wavedump_wav.cpp 2010-06-28 22:39:30.000000000 +0200
+++ pcsx2.snapshot-3337/plugins/spu2-x/src/Wavedump_wav.cpp 2010-06-28 22:43:07.313797414 +0200
--- pcsx2.snapshot-3369.orig/plugins/spu2-x/src/Wavedump_wav.cpp
+++ pcsx2.snapshot-3369/plugins/spu2-x/src/Wavedump_wav.cpp
@@ -16,16 +16,22 @@
*/
@ -107,10 +107,10 @@ Index: pcsx2.snapshot-3337/plugins/spu2-x/src/Wavedump_wav.cpp
m_wavrecord->write( (s16*)&sample, 2 );
+#endif
}
Index: pcsx2.snapshot-3337/plugins/zerospu2/zerospu2.cpp
Index: pcsx2.snapshot-3369/plugins/zerospu2/zerospu2.cpp
===================================================================
--- pcsx2.snapshot-3337.orig/plugins/zerospu2/zerospu2.cpp 2010-06-28 22:39:30.000000000 +0200
+++ pcsx2.snapshot-3337/plugins/zerospu2/zerospu2.cpp 2010-06-28 22:43:07.313797414 +0200
--- pcsx2.snapshot-3369.orig/plugins/zerospu2/zerospu2.cpp
+++ pcsx2.snapshot-3369/plugins/zerospu2/zerospu2.cpp
@@ -28,7 +28,9 @@
#include <stdlib.h>
@ -141,10 +141,10 @@ Index: pcsx2.snapshot-3337/plugins/zerospu2/zerospu2.cpp
delete pSoundTouch; pSoundTouch = NULL;
for (u32 i = 0; i < ArraySize(s_pAudioBuffers); ++i)
Index: pcsx2.snapshot-3337/plugins/zerospu2/zeroworker.cpp
Index: pcsx2.snapshot-3369/plugins/zerospu2/zeroworker.cpp
===================================================================
--- pcsx2.snapshot-3337.orig/plugins/zerospu2/zeroworker.cpp 2010-06-28 22:39:30.000000000 +0200
+++ pcsx2.snapshot-3337/plugins/zerospu2/zeroworker.cpp 2010-06-28 22:43:07.313797414 +0200
--- pcsx2.snapshot-3369.orig/plugins/zerospu2/zeroworker.cpp
+++ pcsx2.snapshot-3369/plugins/zerospu2/zeroworker.cpp
@@ -19,10 +19,14 @@
#include "zerospu2.h"
#include "zeroworker.h"

18
debian-upstream/patches/55_cmake_opt_clean.patch
View File

@ -1,7 +1,7 @@
Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt
Index: pcsx2.snapshot-3369/pcsx2/CMakeLists.txt
===================================================================
--- pcsx2.snapshot-3337.orig/pcsx2/CMakeLists.txt 2010-06-28 22:43:06.223607055 +0200
+++ pcsx2.snapshot-3337/pcsx2/CMakeLists.txt 2010-06-28 22:43:08.082609942 +0200
--- pcsx2.snapshot-3369.orig/pcsx2/CMakeLists.txt
+++ pcsx2.snapshot-3369/pcsx2/CMakeLists.txt
@@ -17,12 +17,8 @@
set(CMAKE_CXX_FLAGS_RELEASE "")
@ -157,10 +157,10 @@ Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt
# link target with wx
target_link_libraries(${pcsx2Name} ${wxWidgets_LIBRARIES})
Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt
Index: pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt
===================================================================
--- pcsx2.snapshot-3337.orig/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:39:30.000000000 +0200
+++ pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:43:08.084613185 +0200
--- pcsx2.snapshot-3369.orig/common/src/x86emitter/CMakeLists.txt
+++ pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt
@@ -22,10 +22,6 @@
# set common flags
set(CommonFlags
@ -274,10 +274,10 @@ Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt
endif(CMAKE_BUILD_TYPE STREQUAL Release)
# variable with all sources of this library
Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt
Index: pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt
===================================================================
--- pcsx2.snapshot-3337.orig/common/src/Utilities/CMakeLists.txt 2010-06-28 22:39:30.000000000 +0200
+++ pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt 2010-06-28 22:43:08.084613185 +0200
--- pcsx2.snapshot-3369.orig/common/src/Utilities/CMakeLists.txt
+++ pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt
@@ -20,16 +20,12 @@
set(CMAKE_CXX_FLAGS_RELEASE "")

18
debian-upstream/patches/56_cmake_enable_opt1.patch
View File

@ -1,7 +1,7 @@
Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt
Index: pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt
===================================================================
--- pcsx2.snapshot-3337.orig/common/src/Utilities/CMakeLists.txt 2010-06-28 22:43:08.084613185 +0200
+++ pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt 2010-06-28 22:43:08.330002361 +0200
--- pcsx2.snapshot-3369.orig/common/src/Utilities/CMakeLists.txt
+++ pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt
@@ -39,21 +39,9 @@
# Remove optimization that can break the code. Must be retested
@ -24,10 +24,10 @@ Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt
)
Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt
Index: pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt
===================================================================
--- pcsx2.snapshot-3337.orig/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:43:08.084613185 +0200
+++ pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:43:08.330726425 +0200
--- pcsx2.snapshot-3369.orig/common/src/x86emitter/CMakeLists.txt
+++ pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt
@@ -39,21 +39,9 @@
# Remove optimization that can break the code. Must be retested
@ -50,10 +50,10 @@ Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt
)
Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt
Index: pcsx2.snapshot-3369/pcsx2/CMakeLists.txt
===================================================================
--- pcsx2.snapshot-3337.orig/pcsx2/CMakeLists.txt 2010-06-28 22:43:08.082609942 +0200
+++ pcsx2.snapshot-3337/pcsx2/CMakeLists.txt 2010-06-28 22:43:08.330726425 +0200
--- pcsx2.snapshot-3369.orig/pcsx2/CMakeLists.txt
+++ pcsx2.snapshot-3369/pcsx2/CMakeLists.txt
@@ -36,21 +36,9 @@
# Remove optimization that can break the code. Must be retested

18
debian-upstream/patches/57_cmake_enable_opt2.patch
View File

@ -1,7 +1,7 @@
Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt
Index: pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt
===================================================================
--- pcsx2.snapshot-3337.orig/common/src/Utilities/CMakeLists.txt 2010-06-28 22:43:08.330002361 +0200
+++ pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt 2010-06-28 22:43:08.621848268 +0200
--- pcsx2.snapshot-3369.orig/common/src/Utilities/CMakeLists.txt
+++ pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt
@@ -46,13 +46,6 @@
@ -16,10 +16,10 @@ Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt
)
Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt
Index: pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt
===================================================================
--- pcsx2.snapshot-3337.orig/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:43:08.330726425 +0200
+++ pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:43:08.621848268 +0200
--- pcsx2.snapshot-3369.orig/common/src/x86emitter/CMakeLists.txt
+++ pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt
@@ -46,13 +46,6 @@
@ -34,10 +34,10 @@ Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt
)
# set optimization flags
Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt
Index: pcsx2.snapshot-3369/pcsx2/CMakeLists.txt
===================================================================
--- pcsx2.snapshot-3337.orig/pcsx2/CMakeLists.txt 2010-06-28 22:43:08.330726425 +0200
+++ pcsx2.snapshot-3337/pcsx2/CMakeLists.txt 2010-06-28 22:43:08.622848331 +0200
--- pcsx2.snapshot-3369.orig/pcsx2/CMakeLists.txt
+++ pcsx2.snapshot-3369/pcsx2/CMakeLists.txt
@@ -42,13 +42,6 @@
)

0
debian-upstream/pcsx2-data.dirs → debian-upstream/pcsx2-data-unstable.dirs
View File

0
debian-upstream/pcsx2-data.install → debian-upstream/pcsx2-data-unstable.install
View File

0
debian-upstream/pcsx2-plugins.dirs → debian-upstream/pcsx2-plugins-unstable.dirs
View File

0
debian-upstream/pcsx2-plugins.install → debian-upstream/pcsx2-plugins-unstable.install
View File

0
debian-upstream/pcsx2.dirs → debian-upstream/pcsx2-unstable.dirs
View File

0
debian-upstream/pcsx2.install → debian-upstream/pcsx2-unstable.install
View File

2
debian-upstream/pcsx2.menu → debian-upstream/pcsx2-unstable.menu
View File

@ -1,4 +1,4 @@
?package(pcsx2): \
?package(pcsx2-unstable): \
needs="X11" \
section="Applications/Emulators" \
title="pcsx2" \

1
debian-upstream/pcsx2.snapshot-doc.docs
View File

@ -1 +0,0 @@
#DOCS#

1
debian-upstream/pcsx2.snapshot-doc.install
View File

@ -1 +0,0 @@
#DOCS#

8
debian-upstream/rules
View File

@ -73,8 +73,8 @@ install: build
dh_install
# install menu and icon
cp debian/pcsx2.desktop debian/pcsx2/usr/share/applications
cp debian/pcsx2.xpm debian/pcsx2/usr/share/pixmaps
cp debian/pcsx2.desktop debian/pcsx2-unstable/usr/share/applications
cp debian/pcsx2.xpm debian/pcsx2-unstable/usr/share/pixmaps
# Build architecture-independent files here.
binary-indep: build install
@ -99,8 +99,8 @@ binary-arch: build install
dh_installdocs -a
dh_installmenu -a
dh_installman -a
dh_strip --package=pcsx2 --dbg-package=pcsx2-dbg
dh_strip --package=pcsx2-plugins --dbg-package=pcsx2-plugins-dbg
dh_strip --package=pcsx2-unstable --dbg-package=pcsx2-unstable-dbg
dh_strip --package=pcsx2-plugins-unstable --dbg-package=pcsx2-plugins-unstable-dbg
dh_link -a
dh_compress -a
dh_fixperms -a