mirror of https://github.com/PCSX2/pcsx2.git
i18n: add more fallback for some languages (thanks to pg)
cmake: implement the new XDG_STD options It allow to move all pcsx2 data from $HOME/PCSX2 to $XDG_CONFIG_DIR/pcsx2. Clearly a matter of personnal preference. debian: drop the useless stable packet from the trunk. Only keep a copy on branch release git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5001 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut
parent
1691ab2cf0
commit
fff11cf207
|
|
@ -18,6 +18,7 @@
|
|||
# Installation path : -DPACKAGE_MODE=TRUE(follow FHS)|FALSE(local bin/)
|
||||
# Plugin installation path : -DPLUGIN_DIR="/usr/lib/pcsx2"
|
||||
# Game DB installation path : -DGAMEINDEX_DIR="/var/games/pcsx2"
|
||||
# Follow XDG standard : -DXDG_STD=TRUE|FALSE
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
|
@ -60,11 +61,7 @@ if(FORCE_INTERNAL_ALL)
|
|||
endif(FORCE_INTERNAL_ALL)
|
||||
|
||||
if(NOT DEFINED FORCE_INTERNAL_SOUNDTOUCH)
|
||||
set(FORCE_INTERNAL_SOUNDTOUCH TRUE)
|
||||
message(STATUS "Use internal version of Soundtouch by default.
|
||||
Note: There have been issues in the past with sound quality depending on the version of Soundtouch
|
||||
Use -DFORCE_INTERNAL_SOUNDTOUCH=FALSE at your own risk")
|
||||
# set(FORCE_INTERNAL_SOUNDTOUCH FALSE)
|
||||
set(FORCE_INTERNAL_SOUNDTOUCH FALSE)
|
||||
endif(NOT DEFINED FORCE_INTERNAL_SOUNDTOUCH)
|
||||
|
||||
if(NOT DEFINED FORCE_INTERNAL_ZLIB)
|
||||
|
|
@ -79,6 +76,10 @@ if (FORCE_INTERNAL_SDL)
|
|||
Crashes can be expected and no support will be provided")
|
||||
endif (FORCE_INTERNAL_SDL)
|
||||
|
||||
if (NOT DEFINED XDG_STD)
|
||||
set(XDG_STD FALSE)
|
||||
endif (NOT DEFINED XDG_STD)
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Control GCC flags
|
||||
#-------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -6,20 +6,4 @@
|
|||
* need to add copyrigh info in Cmake file
|
||||
|
||||
## 64 bit
|
||||
nvidia-cg-toolkit: replace it with GLSL
|
||||
ia32-libs: add libportaudio, libglew
|
||||
ia32-libs: add .so symlink for compilation
|
||||
ia32-libs-gtk: add libwxbase2.8 and libwxgtk2.8 (warning a architecture dependant include file (in -dev package) is also needed)
|
||||
ia32-libs-gtk: add .so symlink for compilation
|
||||
|
||||
|
||||
== Multi-Arch support in APT ==
|
||||
by David Kalnischkies, mentored by Michael Vogt
|
||||
|
||||
Hardware like 64bit processors are perfectly able to execute 32bit
|
||||
opcode but until now this potentiality is disregard as the
|
||||
infrastructure tools like dpkg and APT are not able to install and/or
|
||||
solve dependencies across multiple architectures. The project
|
||||
therefore focuses on enabling APT to work out good solutions in a
|
||||
MultiArch aware environments without the need of hacky and partly
|
||||
working biarch packages currently in use.
|
||||
=> see multiarch
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
Source: pcsx2-unstable
|
||||
Source: pcsx2.snapshot
|
||||
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 (multiarch issue)
|
||||
Build-Depends: cmake (>= 2.8),
|
||||
debhelper (>= 7.0.50),
|
||||
dpkg-dev (>= 1.15.5.6),
|
||||
dpkg-dev (>= 1.15.7),
|
||||
gcc-multilib [amd64],
|
||||
g++-multilib [amd64],
|
||||
ia32-libs-dev [amd64],
|
||||
|
|
@ -16,6 +15,8 @@ Build-Depends: cmake (>= 2.8),
|
|||
libasound2-dev,
|
||||
libbz2-dev,
|
||||
libgl1-mesa-dev,
|
||||
# Future GSdx version will need glew1.6. Only Oneiric have it...
|
||||
# libglew1.6-dev,
|
||||
libglew1.5-dev,
|
||||
libglu1-mesa-dev,
|
||||
libgtk2.0-dev (>= 2.16),
|
||||
|
|
@ -27,8 +28,7 @@ Build-Depends: cmake (>= 2.8),
|
|||
libwxgtk2.8-dev,
|
||||
libx11-dev,
|
||||
locales | locales-all,
|
||||
# Note lucid need nvidia-cg-toolkit-pcsx2 to be compatible with ppa
|
||||
nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 3),
|
||||
nvidia-cg-toolkit (>= 3),
|
||||
portaudio19-dev,
|
||||
zlib1g-dev (>= 1:1.2.3.3)
|
||||
Standards-Version: 3.9.2
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
By default, move all users datas into XDG_CONFIG_DIR
|
||||
Index: pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp
|
||||
===================================================================
|
||||
--- pcsx2.snapshot-3369.orig/pcsx2/gui/AppConfig.cpp
|
||||
+++ pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp
|
||||
@@ -125,7 +125,12 @@
|
||||
{
|
||||
switch( mode )
|
||||
{
|
||||
+#ifdef __LINUX__
|
||||
+ // By default on linux move all user data file into central configuration directory
|
||||
+ case DocsFolder_User: return GetUserLocalDataDir();
|
||||
+#else
|
||||
case DocsFolder_User: return (wxDirName)Path::Combine( wxStandardPaths::Get().GetDocumentsDir(), pxGetAppName() );
|
||||
+#endif
|
||||
//case DocsFolder_CWD: return (wxDirName)wxGetCwd();
|
||||
case DocsFolder_Custom: return CustomDocumentsFolder;
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
05_move_data_to_config.patch
|
||||
|
|
@ -14,17 +14,14 @@ override_dh_auto_configure:
|
|||
dh_auto_configure -- \
|
||||
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
|
||||
-DCMAKE_BUILD_STRIP=FALSE \
|
||||
-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
|
||||
-DXDG_STD=TRUE \
|
||||
-DFORCE_INTERNAL_SDL=TRUE \
|
||||
-DPACKAGE_MODE=TRUE
|
||||
|
||||
clean:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
|
||||
dh_auto_clean
|
||||
rm -fr obj-* # cmake stuff is not always removed (fixed in debhelper 8.9.4)
|
||||
|
||||
dh_clean
|
||||
|
||||
override_dh_strip:
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
pcsx2 for debian
|
||||
=========================
|
||||
|
||||
* This version has some major modifications against the default upstream version.
|
||||
-> documents are stored in $XDG_CONFIG_HOME instead of $HOME/pcsx2
|
||||
-> some features were removed so it could compile against libsound 1.3.
|
||||
Pcsx2 needs at least soundtouch 1.5.
|
||||
|
||||
* This package is highly experimental.
|
||||
|
||||
* Documentation needs some love. Feel free to help.
|
||||
|
||||
* -fPIC option was removed for multiple reason.
|
||||
- Code only support x86 architecture.
|
||||
- Upstream code uses the ebx register so it's not compliant with PIC.
|
||||
- Impacts the performance too much.
|
||||
- Only plugins. No package will link to them.
|
||||
|
||||
-- Gregory Hainaut <gregory.hainaut@gmail.com> Sat, 24 Apr 2010 23:11:10 +0200
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
need libsoundtouch v1.5
|
||||
|
||||
* policy bin2cpp tool ??
|
||||
May be we could pregenerate the file in the upstream tar ball!!
|
||||
|
||||
* copyright and doc stuff
|
||||
Lots of work to do here....
|
||||
|
||||
# only a stub
|
||||
plugins/zzogl-pg/opengl/memcpy_amd.cpp: UNKNOWN
|
||||
|
||||
# need zerofrog confirmation of gpl v2
|
||||
plugins/zzogl-pg/opengl/zpipe.h: *No copyright* UNKNOWN
|
||||
plugins/zzogl-pg/opengl/shaders.sh: *No copyright* UNKNOWN
|
||||
plugins/zzogl-pg/opengl/common.h: *No copyright* UNKNOWN
|
||||
plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.h: *No copyright* UNKNOWN
|
||||
plugins/zzogl-pg/opengl/ZeroGSShaders/zerogsshaders.cpp: *No copyright* UNKNOWN
|
||||
plugins/zzogl-pg/opengl/ZeroGSShaders/zerogsshaders.h: *No copyright* UNKNOWN
|
||||
plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.cpp: *No copyright* UNKNOWN
|
||||
plugins/zzogl-pg/opengl/zerogsmath.h: *No copyright* UNKNOWN
|
||||
plugins/zzogl-pg/opengl/zpipe.cpp: *No copyright* UNKNOWN
|
||||
|
||||
## 64 bit
|
||||
nvidia-cg-toolkit: propably need a special package for 32 bits version
|
||||
ia32-libs: add libportaudio, libsoundtouch, libglew
|
||||
ia32-libs: add .so symlink for compilation
|
||||
ia32-libs-gtk: add libwxbase2.8 and libwxgtk2.8 (warning a architecture dependant include file (in -dev package) is also needed)
|
||||
ia32-libs-gtk: add .so symlink for compilation
|
||||
|
||||
|
||||
== Multi-Arch support in APT ==
|
||||
by David Kalnischkies, mentored by Michael Vogt
|
||||
|
||||
Hardware like 64bit processors are perfectly able to execute 32bit
|
||||
opcode but until now this potentiality is disregard as the
|
||||
infrastructure tools like dpkg and APT are not able to install and/or
|
||||
solve dependencies across multiple architectures. The project
|
||||
therefore focuses on enabling APT to work out good solutions in a
|
||||
MultiArch aware environments without the need of hacky and partly
|
||||
working biarch packages currently in use.
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
pcsx2 (3351-1) unstable; urgency=low
|
||||
|
||||
* Initial release
|
||||
|
||||
-- Gregory Hainaut <gregory.hainaut@gmail.com> Thu, 13 May 2010 14:27:56 +0200
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
pcsx2 (3351-0ubuntu1) lucid; urgency=low
|
||||
|
||||
* Initial release
|
||||
|
||||
-- Gregory Hainaut <gregory.hainaut@gmail.com> Thu, 13 May 2010 14:27:56 +0200
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
7
|
||||
|
|
@ -1,117 +0,0 @@
|
|||
Source: pcsx2
|
||||
Section: 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...
|
||||
Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
|
||||
gcc-multilib [amd64], g++-multilib [amd64],
|
||||
zlib1g-dev (>= 1:1.2.3.3) | lib32z1-dev (>= 1.2.3.3) [amd64],
|
||||
libbz2-dev (>= 1.0.4),
|
||||
libsdl1.2-dev,
|
||||
libjpeg-dev,
|
||||
libwxbase2.8-dev (>= 2.8.10), libwxbase2.8-dev (<< 2.8.11),
|
||||
libwxgtk2.8-dev (>= 2.8.10), libwxgtk2.8-dev (<< 2.8.11),
|
||||
libgtk2.0-dev (>= 2.16),
|
||||
libasound2-dev | lib32asound2-dev [amd64],
|
||||
portaudio19-dev,
|
||||
# version not yet in debian
|
||||
# libsoundtouch1-dev (>= 1.5),
|
||||
# I patch the source (remove feature) to compile with version 1.3
|
||||
libsoundtouch1-dev (>= 1.3),
|
||||
libsparsehash-dev (>= 1.6),
|
||||
libx11-dev,
|
||||
libglew1.5-dev (>= 1.5.1),
|
||||
libgl1-mesa-dev,
|
||||
libglu1-mesa-dev,
|
||||
# my nmu: add 32bits packages
|
||||
# nvidia-cg-toolkit (>= 2.1.0017.deb1) | nvidia-cg-toolkit (>= 2.1.0017.deb1+nmu2) [amd64],
|
||||
nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1), ia32-nvidia-cg-toolkit-pcsx2 [amd64],
|
||||
ia32-libs (>= 20090808+nmu7) [amd64], ia32-libs-gtk (= 20100503+local1) [amd64]
|
||||
Standards-Version: 3.9.1
|
||||
Homepage: http://pcsx2.net/
|
||||
|
||||
Package: pcsx2
|
||||
# Warning amd64 need additional ia32libs
|
||||
Architecture: i386 amd64
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||
pcsx2-data (>= ${binary:Version}),
|
||||
pcsx2-plugins (>= ${binary:Version})
|
||||
Conflicts: pcsx2-unstable
|
||||
Description: Playstation 2 emulator
|
||||
PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same
|
||||
team that brought you PCSX (a Sony PlayStation 1 emulator).
|
||||
.
|
||||
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 the main binary file.
|
||||
|
||||
|
||||
Package: pcsx2-data
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}
|
||||
Recommends: pcsx2 (>= ${binary:Version}), pcsx2-plugins (>= ${binary:Version})
|
||||
Conflicts: pcsx2-data-unstable
|
||||
Description: data for pcsx2
|
||||
PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same
|
||||
team that brought you PCSX (a Sony PlayStation 1 emulator).
|
||||
.
|
||||
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
|
||||
# Warning amd64 need additional ia32libs
|
||||
Architecture: i386 amd64
|
||||
# manually add nvidia-cg-toolkit for zzogl. Do not why is not found by shlibs !!!
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||
nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1), ia32-nvidia-cg-toolkit-pcsx2 [amd64]
|
||||
Recommends: pcsx2 (>= ${binary:Version}),
|
||||
pcsx2-data (>= ${binary:Version})
|
||||
Conflicts: pcsx2-plugins-unstable
|
||||
Description: Various plugins for pcsx2
|
||||
PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same
|
||||
team that brought you PCSX (a Sony PlayStation 1 emulator).
|
||||
.
|
||||
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 the plugins for PCSX2.
|
||||
|
||||
Package: pcsx2-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
# Warning amd64 need additional ia32libs
|
||||
Architecture: i386 amd64
|
||||
Depends: ${misc:Depends}, pcsx2 (= ${binary:Version})
|
||||
Conflicts: pcsx2-unstable-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 (a Sony PlayStation 1 emulator).
|
||||
.
|
||||
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 contains the debug symbol of pcsx2.
|
||||
|
||||
Package: pcsx2-plugins-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
# Warning amd64 need additional ia32libs
|
||||
Architecture: i386 amd64
|
||||
Depends: ${misc:Depends}, pcsx2-plugins (= ${binary:Version})
|
||||
Conflicts: pcsx2-plugins-unstable-dbg
|
||||
Description: Debug symbols of the pcsx2-plugins
|
||||
PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same
|
||||
team that brought you PCSX (a Sony PlayStation 1 emulator).
|
||||
.
|
||||
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 contains the debug symbols of the pcsx2 plugins.
|
||||
|
|
@ -1,108 +0,0 @@
|
|||
Source: pcsx2
|
||||
Section: games
|
||||
Priority: optional
|
||||
Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
|
||||
Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
|
||||
zlib1g-dev (>= 1:1.2.3.3),
|
||||
libbz2-dev (>= 1.0.4),
|
||||
libsdl1.2-dev,
|
||||
libjpeg-dev,
|
||||
libwxbase2.8-dev (>= 2.8.10), libwxbase2.8-dev (<< 2.8.11),
|
||||
libwxgtk2.8-dev (>= 2.8.10), libwxgtk2.8-dev (<< 2.8.11),
|
||||
libgtk2.0-dev (>= 2.16),
|
||||
libasound2-dev,
|
||||
portaudio19-dev,
|
||||
# version not yet in debian
|
||||
# libsoundtouch1-dev (>= 1.5),
|
||||
# I patch the source (remove feature) to compile with version 1.3
|
||||
libsoundtouch1-dev (>= 1.3),
|
||||
libsparsehash-dev (>= 1.6),
|
||||
libx11-dev,
|
||||
libglew1.5-dev (>= 1.5.1),
|
||||
libgl1-mesa-dev,
|
||||
libglu1-mesa-dev,
|
||||
nvidia-cg-toolkit-pcsx2
|
||||
Standards-Version: 3.9.1
|
||||
Homepage: http://pcsx2.net/
|
||||
|
||||
Package: pcsx2
|
||||
Architecture: i386
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||
pcsx2-data (>= ${binary:Version}),
|
||||
pcsx2-plugins (>= ${binary:Version})
|
||||
Conflicts: pcsx2-unstable
|
||||
Description: Playstation 2 emulator
|
||||
PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same
|
||||
team that brought you PCSX (a Sony PlayStation 1 emulator).
|
||||
.
|
||||
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 the main binary file.
|
||||
|
||||
|
||||
Package: pcsx2-data
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}
|
||||
Recommends: pcsx2 (>= ${binary:Version}), pcsx2-plugins (>= ${binary:Version})
|
||||
Conflicts: pcsx2-data-unstable
|
||||
Description: data for pcsx2
|
||||
PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same
|
||||
team that brought you PCSX (a Sony PlayStation 1 emulator).
|
||||
.
|
||||
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
|
||||
Architecture: i386
|
||||
# manually add nvidia-cg-toolkit for zzogl. Do not why is not found by shlibs !!!
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||
nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1)
|
||||
Recommends: pcsx2 (>= ${binary:Version}),
|
||||
pcsx2-data (>= ${binary:Version})
|
||||
Conflicts: pcsx2-plugins-unstable
|
||||
Description: Various plugins for pcsx2
|
||||
PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same
|
||||
team that brought you PCSX (a Sony PlayStation 1 emulator).
|
||||
.
|
||||
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 the plugins for PCSX2.
|
||||
|
||||
Package: pcsx2-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Architecture: i386
|
||||
Depends: ${misc:Depends}, pcsx2 (= ${binary:Version})
|
||||
Conflicts: pcsx2-unstable-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 (a Sony PlayStation 1 emulator).
|
||||
.
|
||||
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 contains the debug symbol of pcsx2.
|
||||
|
||||
Package: pcsx2-plugins-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Architecture: i386
|
||||
Depends: ${misc:Depends}, pcsx2-plugins (= ${binary:Version})
|
||||
Conflicts: pcsx2-plugins-unstable-dbg
|
||||
Description: Debug symbols of the pcsx2-plugins
|
||||
PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same
|
||||
team that brought you PCSX (a Sony PlayStation 1 emulator).
|
||||
.
|
||||
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 contains the debug symbols of the pcsx2 plugins.
|
||||
|
|
@ -1,168 +0,0 @@
|
|||
This work was packaged for Debian by:
|
||||
|
||||
Gregory Hainaut <gregory.hainaut@gmail.com> on Sat, 24 Apr 2010 23:11:10 +0200
|
||||
|
||||
It was downloaded from:
|
||||
|
||||
http://pcsx2.googlecode.com/svn/
|
||||
|
||||
Upstream Author(s):
|
||||
|
||||
PCSX2 Dev Team
|
||||
|
||||
Copyright:
|
||||
|
||||
Copyright (C) 2002-2010 PCSX2 Dev Team
|
||||
|
||||
Files: pcsx2/*, common/*, plugins/spu2-x/*, plugins/PadNull/Pad*, plugins/USBnull/*, plugins/FWnull/*, plugins/CDVDnull/CDVD*, plugins/GSnull/*, plugins/dev9null/DEV9.cpp
|
||||
License: LGPL-3+
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This package is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
On Debian systems, the complete text of the GNU Lesser General
|
||||
Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
|
||||
|
||||
|
||||
Files: pcsx2/Mdec.cpp, pcsx2/Mdec.h, pcsx2/RDebug/deci2_drfp.cpp, pcsx2/IPU/mpeg2lib/*, pcsx2/cheatscpp.h, common/include/api/*, plugins/onepad/*, plugins/PadNull/Linux/*, plugins/SPU2null/*, plugins/FWnull/FW.cpp, plugins/zerospu2/*, plugins/zzogl-pg/*, plugins/GSnull/Registers.h, plugins/GSnull/Linux/Linux*, plugins/GSnull/Linux/Config*, plugins/dev9null/DEV9.h, plugins/dev9null/Config.*
|
||||
License: GPL-2+
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This package is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
On Debian systems, the complete text of the GNU General
|
||||
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
|
||||
|
||||
|
||||
Files: plugins/spu2-x/src/Spu2replay.*, plugins/spu2-x/src/Decode*, plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp, plugins/spu2-x/src/spdif.h, plugins/spu2-x/src/Debug.h
|
||||
|
||||
License: LGPL-2.1+
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation, either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This package is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
On Debian systems, the complete text of the GNU Lesser General
|
||||
Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
|
||||
|
||||
Files: plugins/zzogl-pg/opengl/glprocs.*
|
||||
Copyright: 1991-2000, Silicon Graphics, Inc
|
||||
License: MIT/X11 (BSD like)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without limitation
|
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice including the dates of first publication and
|
||||
either this permission notice or a reference to
|
||||
http://oss.sgi.com/projects/FreeB/
|
||||
shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
|
||||
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of Silicon Graphics, Inc.
|
||||
shall not be used in advertising or otherwise to promote the sale, use or
|
||||
other dealings in this Software without prior written authorization from
|
||||
Silicon Graphics, Inc.
|
||||
|
||||
|
||||
Files: common/include/intrin_x86.h
|
||||
Copyright: 2006, KJK::Hyperion <hackbunny@reactos.com>
|
||||
License: MIT/X11 (BSD like)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without limitation
|
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
||||
Files: common/src/Utilities/vssprintf.cpp
|
||||
Copyright: 2002, Michael Ringgaard
|
||||
License: BSD (3 clause)
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
3. Neither the name of the project nor the names of its contributors
|
||||
may be used to endorse or promote products derived from this software
|
||||
without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
|
||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGE.
|
||||
|
||||
Files: plugins/zzogl-pg/opengl/zpipe.cpp
|
||||
Copyright: public domain
|
||||
|
||||
Files: plugins/zzogl-pg/opengl/ZeroGSShaders/zerogsshaders*
|
||||
Copyright: Unknown
|
||||
|
||||
The Debian packaging is:
|
||||
|
||||
Copyright (C) 2010 Gregory Hainaut <gregory.hainaut@gmail.com>
|
||||
|
||||
and is licensed under the Lesser GPL version 3, see above.
|
||||
|
|
@ -1,145 +0,0 @@
|
|||
#!/bin/sh
|
||||
# copyright (c) 2010 Gregory Hainaut
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This package is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
|
||||
######################################################################
|
||||
# Global Parameters
|
||||
######################################################################
|
||||
# Svn parameter
|
||||
if [ -n "$1" ] ; then
|
||||
SVN_CO_VERSION=$1;
|
||||
else
|
||||
echo "Please provide the subversion revision number as the first parameter"
|
||||
exit 1;
|
||||
fi
|
||||
if [ -n "$2" ] ; then
|
||||
# Use branch argument
|
||||
SVN_TRUNK="http://pcsx2.googlecode.com/svn/branches/$2"
|
||||
else
|
||||
# by default take the trunk
|
||||
SVN_TRUNK="http://pcsx2.googlecode.com/svn/trunk"
|
||||
fi
|
||||
|
||||
# Debian name of package and tarball
|
||||
PKG_NAME="pcsx2-${SVN_CO_VERSION}"
|
||||
TAR_NAME="pcsx2_${SVN_CO_VERSION}.orig.tar"
|
||||
|
||||
# Directory
|
||||
TMP_DIR=/tmp
|
||||
ROOT_DIR=${TMP_DIR}/subversion_pcsx2_${SVN_CO_VERSION}
|
||||
NEW_DIR=${TMP_DIR}/$PKG_NAME
|
||||
|
||||
|
||||
######################################################################
|
||||
# Basic functions
|
||||
######################################################################
|
||||
get_svn_dir()
|
||||
{
|
||||
for directory in $* ; do
|
||||
# Print the directory without /
|
||||
echo " $directory" | sed -e 's/\//\ /g'
|
||||
if [ -e `basename ${directory}` ] ; then
|
||||
# Directory already exist so only update
|
||||
svn up --quiet ${SVN_TRUNK}/${directory} -r $SVN_CO_VERSION;
|
||||
else
|
||||
svn co --quiet ${SVN_TRUNK}/${directory} -r $SVN_CO_VERSION;
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
get_svn_file()
|
||||
{
|
||||
for file in $* ; do
|
||||
if [ ! -e `basename ${file}` ] ; then
|
||||
# Versioning information is not supported for a single file
|
||||
# therefore you can't use svn co
|
||||
svn export --quiet ${SVN_TRUNK}/${file} -r $SVN_CO_VERSION;
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
######################################################################
|
||||
# Main script
|
||||
######################################################################
|
||||
|
||||
## Download the svn repository (only the useful things)
|
||||
echo "Downloading pcsx2 source revision ${SVN_CO_VERSION}"
|
||||
mkdir -p $ROOT_DIR;
|
||||
(cd $ROOT_DIR;
|
||||
get_svn_file CMakeLists.txt;
|
||||
get_svn_dir bin common cmake pcsx2 tools;
|
||||
get_svn_dir debian-upstream;
|
||||
echo "Done")
|
||||
|
||||
echo "Downloading Linux compatible plugins for revision ${SVN_CO_VERSION}"
|
||||
# Note: Other plugins exist but they are not 100% copyright free.
|
||||
mkdir -p $ROOT_DIR/plugins
|
||||
(cd $ROOT_DIR/plugins;
|
||||
get_svn_file plugins/CMakeLists.txt;
|
||||
# DVD
|
||||
get_svn_dir plugins/CDVDnull;
|
||||
# Copyright issue
|
||||
# get_svn_dir plugins/CDVDnull plugins/CDVDiso;
|
||||
# PAD
|
||||
get_svn_dir plugins/PadNull plugins/onepad;
|
||||
# AUDIO
|
||||
get_svn_dir plugins/SPU2null plugins/spu2-x plugins/zerospu2;
|
||||
# Graphics
|
||||
get_svn_dir plugins/GSnull plugins/zzogl-pg;
|
||||
# Misc
|
||||
get_svn_dir plugins/dev9null plugins/FWnull plugins/USBnull;
|
||||
echo "Note: some plugins are more or less deprecated CDVDisoEFP, CDVDlinuz, Zerogs, Zeropad ...";
|
||||
echo "Done")
|
||||
|
||||
## Installation
|
||||
echo "Copy the subversion repository to a temporary directory"
|
||||
# Copy the dir
|
||||
rm -fr $NEW_DIR
|
||||
cp -r $ROOT_DIR $NEW_DIR
|
||||
|
||||
echo "Remove .svn directories"
|
||||
find $NEW_DIR -name ".svn" -type d -exec rm -fr {} \; 2> /dev/null
|
||||
echo "Remove old build system (scripts and autotools)"
|
||||
find $NEW_DIR -name "build.sh" -exec rm -f {} \;
|
||||
find $NEW_DIR -name "install-sh" -exec rm -f {} \;
|
||||
find $NEW_DIR -name "depcomp" -exec rm -f {} \;
|
||||
find $NEW_DIR -name "missing" -exec rm -f {} \;
|
||||
find $NEW_DIR -name "aclocal.m4" -exec rm -f {} \;
|
||||
find $NEW_DIR -name "configure.ac" -exec rm -f {} \;
|
||||
find $NEW_DIR -name "Makefile.am" -exec rm -f {} \;
|
||||
echo "Remove 3rd party directories"
|
||||
find $NEW_DIR -name "3rdparty" -exec rm -fr {} \; 2> /dev/null
|
||||
# I really need to clean this mess one day
|
||||
# echo "Remove plugins/zzogl-pg/opengl/ZeroGSShaders (some zlib source in the middle)"
|
||||
# rm -fr $NEW_DIR/plugins/zzogl-pg/opengl/ZeroGSShaders
|
||||
echo "Remove windows file (useless & copyright issue)"
|
||||
find $NEW_DIR -iname "windows" -type d -exec rm -fr {} \; 2> /dev/null
|
||||
find $NEW_DIR -name "Win32" -type d -exec rm -fr {} \; 2> /dev/null
|
||||
rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/Win32"
|
||||
rm -fr "${NEW_DIR}/tools/GSDumpGUI"
|
||||
rm -fr "${NEW_DIR}/common/vsprops"
|
||||
echo "Remove useless files (copyright issues)"
|
||||
rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/ZeroGSShaders"
|
||||
rm -fr "${NEW_DIR}/common/src/Utilities/x86/MemcpyFast.cpp"
|
||||
rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/memcpy_amd.cpp"
|
||||
|
||||
## BUILD
|
||||
echo "Build the tar.gz file"
|
||||
tar -C $TMP_DIR -czf ${TAR_NAME}.gz $PKG_NAME
|
||||
|
||||
## Clean
|
||||
rm -fr $NEW_DIR
|
||||
rm -fr $ROOT_DIR
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
Debian specific
|
||||
Always uses the same executable name for the build. Easier for the install script
|
||||
Index: pcsx2-3567/pcsx2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- pcsx2-3567.orig/pcsx2/CMakeLists.txt
|
||||
+++ pcsx2-3567/pcsx2/CMakeLists.txt
|
||||
@@ -72,7 +72,7 @@
|
||||
if(CMAKE_BUILD_TYPE STREQUAL Debug)
|
||||
|
||||
# executable name
|
||||
- set(Output pcsx2-dbg)
|
||||
+ set(Output pcsx2)
|
||||
|
||||
# add defines
|
||||
add_definitions(${CommonFlags} ${DebugFlags} -DPCSX2_DEVBUILD -DPCSX2_DEBUG -DWX_PRECOMP)
|
||||
@@ -82,7 +82,7 @@
|
||||
if(CMAKE_BUILD_TYPE STREQUAL Devel)
|
||||
|
||||
# executable name
|
||||
- set(Output pcsx2-dev)
|
||||
+ set(Output pcsx2)
|
||||
|
||||
# add defines
|
||||
add_definitions(${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD -DWX_PRECOMP -DNDEBUG)
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
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
|
||||
===================================================================
|
||||
--- pcsx2-3369.orig/pcsx2/gui/AppConfig.cpp
|
||||
+++ pcsx2-3369/pcsx2/gui/AppConfig.cpp
|
||||
@@ -162,7 +162,8 @@
|
||||
|
||||
wxDirName GetPlugins()
|
||||
{
|
||||
- return AppRoot() + Base::Plugins();
|
||||
+ // return AppRoot() + Base::Plugins();
|
||||
+ return wxDirName( L"/usr/lib/games/pcsx2" ) + Base::Plugins();
|
||||
}
|
||||
|
||||
wxDirName GetSettings()
|
||||
Index: pcsx2-3369/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");
|
||||
|
||||
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;
|
||||
- }
|
||||
+ 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
|
||||
===================================================================
|
||||
--- pcsx2-3369.orig/pcsx2/gui/AppGameDatabase.h
|
||||
+++ pcsx2-3369/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,17 +0,0 @@
|
|||
Index: pcsx2-3369/pcsx2/gui/AppConfig.cpp
|
||||
===================================================================
|
||||
--- pcsx2-3369.orig/pcsx2/gui/AppConfig.cpp
|
||||
+++ pcsx2-3369/pcsx2/gui/AppConfig.cpp
|
||||
@@ -125,7 +125,12 @@
|
||||
{
|
||||
switch( mode )
|
||||
{
|
||||
+#ifdef __LINUX__
|
||||
+ // By default on linux move all user data file into central configuration directory
|
||||
+ case DocsFolder_User: return GetUserLocalDataDir();
|
||||
+#else
|
||||
case DocsFolder_User: return (wxDirName)Path::Combine( wxStandardPaths::Get().GetDocumentsDir(), pxGetAppName() );
|
||||
+#endif
|
||||
//case DocsFolder_CWD: return (wxDirName)wxGetCwd();
|
||||
case DocsFolder_Custom: return CustomDocumentsFolder;
|
||||
|
||||
|
|
@ -1,176 +0,0 @@
|
|||
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-3369/plugins/spu2-x/src/Wavedump_wav.cpp
|
||||
===================================================================
|
||||
--- pcsx2-3369.orig/plugins/spu2-x/src/Wavedump_wav.cpp
|
||||
+++ pcsx2-3369/plugins/spu2-x/src/Wavedump_wav.cpp
|
||||
@@ -16,16 +16,22 @@
|
||||
*/
|
||||
|
||||
#include "Global.h"
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
#include "soundtouch/WavFile.h"
|
||||
+#endif
|
||||
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
static WavOutFile* _new_WavOutFile( const char* destfile )
|
||||
{
|
||||
return new WavOutFile( destfile, 48000, 16, 2 );
|
||||
}
|
||||
+#endif
|
||||
|
||||
namespace WaveDump
|
||||
{
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
static WavOutFile* m_CoreWav[2][CoreSrc_Count] = { NULL };
|
||||
+#endif
|
||||
|
||||
static const char* m_tbl_CoreOutputTypeNames[CoreSrc_Count] =
|
||||
{
|
||||
@@ -42,6 +48,7 @@
|
||||
if( !IsDevBuild ) return;
|
||||
if( !WaveLog() ) return;
|
||||
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
char wavfilename[256];
|
||||
|
||||
for( uint cidx=0; cidx<2; cidx++ )
|
||||
@@ -68,11 +75,13 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void Close()
|
||||
{
|
||||
if( !IsDevBuild ) return;
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
for( uint cidx=0; cidx<2; cidx++ )
|
||||
{
|
||||
for( int srcidx=0; srcidx<CoreSrc_Count; srcidx++ )
|
||||
@@ -80,13 +89,16 @@
|
||||
safe_delete( m_CoreWav[cidx][srcidx] );
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void WriteCore( uint coreidx, CoreSourceType src, const StereoOut16& sample )
|
||||
{
|
||||
if( !IsDevBuild ) return;
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
if( m_CoreWav[coreidx][src] != NULL )
|
||||
m_CoreWav[coreidx][src]->write( (s16*)&sample, 2 );
|
||||
+#endif
|
||||
}
|
||||
|
||||
void WriteCore( uint coreidx, CoreSourceType src, s16 left, s16 right )
|
||||
@@ -101,11 +113,14 @@
|
||||
|
||||
bool WavRecordEnabled = false;
|
||||
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
static WavOutFile* m_wavrecord = NULL;
|
||||
+#endif
|
||||
static Mutex WavRecordMutex;
|
||||
|
||||
void RecordStart()
|
||||
{
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
WavRecordEnabled = false;
|
||||
|
||||
try
|
||||
@@ -120,18 +135,23 @@
|
||||
m_wavrecord = NULL; // not needed, but what the heck. :)
|
||||
SysMessage("SPU2-X couldn't open file for recording: %s.\nRecording to wavfile disabled.", "recording.wav");
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void RecordStop()
|
||||
{
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
WavRecordEnabled = false;
|
||||
ScopedLock lock( WavRecordMutex );
|
||||
safe_delete( m_wavrecord );
|
||||
+#endif
|
||||
}
|
||||
|
||||
void RecordWrite( const StereoOut16& sample )
|
||||
{
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
ScopedLock lock( WavRecordMutex );
|
||||
if( m_wavrecord == NULL ) return;
|
||||
m_wavrecord->write( (s16*)&sample, 2 );
|
||||
+#endif
|
||||
}
|
||||
Index: pcsx2-3369/plugins/zerospu2/zerospu2.cpp
|
||||
===================================================================
|
||||
--- pcsx2-3369.orig/plugins/zerospu2/zerospu2.cpp
|
||||
+++ pcsx2-3369/plugins/zerospu2/zerospu2.cpp
|
||||
@@ -28,7 +28,9 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "soundtouch/SoundTouch.h"
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
#include "soundtouch/WavFile.h"
|
||||
+#endif
|
||||
|
||||
char libraryName[256];
|
||||
|
||||
@@ -74,7 +76,9 @@
|
||||
|
||||
// time stretch variables
|
||||
soundtouch::SoundTouch* pSoundTouch=NULL;
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
extern WavOutFile* g_pWavRecord; // used for recording
|
||||
+#endif
|
||||
|
||||
u64 s_GlobalTimeStamp = 0;
|
||||
s32 s_nDurations[64]={0};
|
||||
@@ -361,7 +365,9 @@
|
||||
|
||||
RemoveSound();
|
||||
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
delete g_pWavRecord; g_pWavRecord = NULL;
|
||||
+#endif
|
||||
delete pSoundTouch; pSoundTouch = NULL;
|
||||
|
||||
for (u32 i = 0; i < ArraySize(s_pAudioBuffers); ++i)
|
||||
Index: pcsx2-3369/plugins/zerospu2/zeroworker.cpp
|
||||
===================================================================
|
||||
--- pcsx2-3369.orig/plugins/zerospu2/zeroworker.cpp
|
||||
+++ pcsx2-3369/plugins/zerospu2/zeroworker.cpp
|
||||
@@ -19,10 +19,14 @@
|
||||
#include "zerospu2.h"
|
||||
#include "zeroworker.h"
|
||||
#include "soundtouch/SoundTouch.h"
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
#include "soundtouch/WavFile.h"
|
||||
+#endif
|
||||
|
||||
s32 g_logsound = 0;
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
WavOutFile* g_pWavRecord=NULL; // used for recording
|
||||
+#endif
|
||||
|
||||
const s32 f[5][2] = {
|
||||
{ 0, 0 },
|
||||
@@ -302,6 +306,7 @@
|
||||
|
||||
void LogRawSound(void* pleft, s32 leftstride, void* pright, s32 rightstride, s32 numsamples)
|
||||
{
|
||||
+#if defined(SOUNDTOUCH_VERSION_ID) & (SOUNDTOUCH_VERSION_ID >= 10400)
|
||||
if (g_pWavRecord == NULL )
|
||||
g_pWavRecord = new WavOutFile(RECORD_FILENAME, SAMPLE_RATE, 16, 2);
|
||||
|
||||
@@ -320,4 +325,5 @@
|
||||
}
|
||||
|
||||
g_pWavRecord->write(&tempbuf[0], numsamples*2);
|
||||
+#endif
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
01_rename_binary_generated.patch
|
||||
02_update_default_path.patch
|
||||
05_move_data_to_config.patch
|
||||
21_use_legacy_soundtouch_13.patch
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
usr/share/games/pcsx2/shaders
|
||||
var/games/pcsx2/
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
bin/plugins/ps2hw.dat usr/share/games/pcsx2/shaders/
|
||||
bin/GameIndex.dbf var/games/pcsx2/
|
||||
|
|
@ -1 +0,0 @@
|
|||
usr/lib/games/pcsx2/plugins
|
||||
|
|
@ -1 +0,0 @@
|
|||
bin/plugins/lib* usr/lib/games/pcsx2/plugins
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#* -fPIC option was removed for multiple reason.
|
||||
# - Code only support x86 architecture.
|
||||
# - Upstream code uses the ebx register so it's not compliant with PIC.
|
||||
# - Impacts the performance too much.
|
||||
# - Only plugins. No package will link to them.
|
||||
pcsx2-plugins-unstable: shlib-with-non-pic-code
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Type=Application
|
||||
Name=PCSX2
|
||||
GenericName=Playstation 2 Emulator
|
||||
Comment=Sony Playstation 2 emulator
|
||||
Exec=pcsx2
|
||||
Icon=pcsx2
|
||||
Categories=Game;Emulator;GTK;
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
usr/games
|
||||
usr/share/pixmaps
|
||||
usr/share/applications
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
bin/pcsx2 usr/games
|
||||
debian/pcsx2.desktop usr/share/applications
|
||||
debian/pcsx2.xpm usr/share/pixmaps
|
||||
|
|
@ -1 +0,0 @@
|
|||
bin/docs/pcsx2.man
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
?package(pcsx2): \
|
||||
needs="X11" \
|
||||
section="Applications/Emulators" \
|
||||
title="pcsx2" \
|
||||
longtitle="A playstation 2 emulators" \
|
||||
command="/usr/games/pcsx2"
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,87 +0,0 @@
|
|||
#!/usr/bin/make -f
|
||||
# -*- makefile -*-
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
# export DH_VERBOSE=1
|
||||
|
||||
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
|
||||
CMAKE_BUILD_TYPE=Debug
|
||||
else
|
||||
CMAKE_BUILD_TYPE=Release
|
||||
endif
|
||||
|
||||
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
|
||||
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
|
||||
MAKEFLAGS += -j$(NUMJOBS)
|
||||
endif
|
||||
|
||||
USER_CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
|
||||
USER_CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
|
||||
|
||||
build: build-stamp
|
||||
build-stamp:
|
||||
dh_testdir
|
||||
|
||||
# backup orig makefile
|
||||
for makefile in `find ./ -name "Makefile"` ; do [ -f $${makefile}.orig ] || mv $${makefile} $${makefile}.orig ; done
|
||||
|
||||
# Cmake based makefile
|
||||
cmake CMakeLists.txt \
|
||||
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
|
||||
-DCMAKE_BUILD_STRIP=FALSE \
|
||||
-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
|
||||
-DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \
|
||||
-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)"
|
||||
$(MAKE) $(MAKEFLAGS)
|
||||
|
||||
touch build-stamp
|
||||
|
||||
clean:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
rm -f build-stamp
|
||||
|
||||
# Backup some orig makefile if it's not already done.
|
||||
# I hope that some will be delete by upstream when the cmake port is over.
|
||||
# Note: In case that we do not dl all the plugins, the test [ -f $${makefile} ] ensures it works
|
||||
for makefile in plugins/CDVDlinuz/Src/Linux/Makefile \
|
||||
plugins/CDVDiso/src/Linux/Makefile \
|
||||
plugins/CDVDiso/src/Windows/Makefile \
|
||||
plugins/USBnull/Windows/Makefile \
|
||||
plugins/FWnull/Windows/Makefile \
|
||||
plugins/PeopsSPU2/Makefile \
|
||||
plugins/CDVDisoEFP/src/Linux/Makefile ; do \
|
||||
[ -f $${makefile}.orig ] || ( [ -f $${makefile} ] && mv $${makefile} $${makefile}.orig ) || true ; done
|
||||
|
||||
# Add here the commands to clean up after the build process.
|
||||
[ -f Makefile ] && $(MAKE) clean || true
|
||||
# Remove cmake stuff
|
||||
rm -fr $$(find . -type d -name CMakeFiles)
|
||||
rm -f $$(find . -type f -name CMakeCache.txt) $$(find . -type f -name cmake_install.cmake)
|
||||
rm -f $$(find . -type f -name Makefile)
|
||||
# Files generated by bin2cpp
|
||||
cd pcsx2/gui/Resources/ && rm -f App*.h Config*.h BackgroundLogo.h ButtonIcon_Camera.h Dualshock.h
|
||||
# leftover of cmake
|
||||
rm -f bin/plugins/ps2hw.dat
|
||||
rm -f pcsx2/svnrev.h
|
||||
# Restore orig makefile
|
||||
for makefile_orig in `find ./ -name "Makefile.orig"` ; do [ -f $${makefile_orig} ] && mv $${makefile_orig} `echo $${makefile_orig} | sed -e 's/.orig//'` ; done
|
||||
|
||||
dh_clean
|
||||
|
||||
## Uncomment this, if fglrx driver is installed
|
||||
#override_dh_shlibdeps:
|
||||
# dh_shlibdeps -- --ignore-missing-info
|
||||
|
||||
override_dh_strip:
|
||||
dh_strip --package=pcsx2 --dbg-package=pcsx2-dbg
|
||||
dh_strip --package=pcsx2-plugins --dbg-package=pcsx2-plugins-dbg
|
||||
|
||||
# Avoid to relaunch the compilation twice. (build and dh_auto_build target)
|
||||
override_dh_auto_build:
|
||||
# Do nothing
|
||||
|
||||
%:
|
||||
dh $@ --parallel
|
||||
|
||||
.PHONY: build clean install
|
||||
|
|
@ -1,87 +0,0 @@
|
|||
#!/usr/bin/make -f
|
||||
# -*- makefile -*-
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
# export DH_VERBOSE=1
|
||||
|
||||
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
|
||||
CMAKE_BUILD_TYPE=Debug
|
||||
else
|
||||
CMAKE_BUILD_TYPE=Release
|
||||
endif
|
||||
|
||||
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
|
||||
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
|
||||
MAKEFLAGS += -j$(NUMJOBS)
|
||||
endif
|
||||
|
||||
USER_CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
|
||||
USER_CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
|
||||
|
||||
build: build-stamp
|
||||
build-stamp:
|
||||
dh_testdir
|
||||
|
||||
# backup orig makefile
|
||||
for makefile in `find ./ -name "Makefile"` ; do [ -f $${makefile}.orig ] || mv $${makefile} $${makefile}.orig ; done
|
||||
|
||||
# Cmake based makefile
|
||||
cmake CMakeLists.txt \
|
||||
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
|
||||
-DCMAKE_BUILD_STRIP=FALSE \
|
||||
-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
|
||||
-DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \
|
||||
-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)"
|
||||
$(MAKE) $(MAKEFLAGS)
|
||||
|
||||
touch build-stamp
|
||||
|
||||
clean:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
rm -f build-stamp
|
||||
|
||||
# Backup some orig makefile if it's not already done.
|
||||
# I hope that some will be delete by upstream when the cmake port is over.
|
||||
# Note: In case that we do not dl all the plugins, the test [ -f $${makefile} ] ensures it works
|
||||
for makefile in plugins/CDVDlinuz/Src/Linux/Makefile \
|
||||
plugins/CDVDiso/src/Linux/Makefile \
|
||||
plugins/CDVDiso/src/Windows/Makefile \
|
||||
plugins/USBnull/Windows/Makefile \
|
||||
plugins/FWnull/Windows/Makefile \
|
||||
plugins/PeopsSPU2/Makefile \
|
||||
plugins/CDVDisoEFP/src/Linux/Makefile ; do \
|
||||
[ -f $${makefile}.orig ] || ( [ -f $${makefile} ] && mv $${makefile} $${makefile}.orig ) || true ; done
|
||||
|
||||
# Add here the commands to clean up after the build process.
|
||||
[ -f Makefile ] && $(MAKE) clean || true
|
||||
# Remove cmake stuff
|
||||
rm -fr $$(find . -type d -name CMakeFiles)
|
||||
rm -f $$(find . -type f -name CMakeCache.txt) $$(find . -type f -name cmake_install.cmake)
|
||||
rm -f $$(find . -type f -name Makefile)
|
||||
# Files generated by bin2cpp
|
||||
cd pcsx2/gui/Resources/ && rm -f App*.h Config*.h BackgroundLogo.h ButtonIcon_Camera.h Dualshock.h
|
||||
# leftover of cmake
|
||||
rm -f bin/plugins/ps2hw.dat
|
||||
rm -f pcsx2/svnrev.h
|
||||
# Restore orig makefile
|
||||
for makefile_orig in `find ./ -name "Makefile.orig"` ; do [ -f $${makefile_orig} ] && mv $${makefile_orig} `echo $${makefile_orig} | sed -e 's/.orig//'` ; done
|
||||
|
||||
dh_clean
|
||||
|
||||
# Allow compilation when fglrx is installed
|
||||
override_dh_shlibdeps:
|
||||
dh_shlibdeps -- --ignore-missing-info
|
||||
|
||||
override_dh_strip:
|
||||
dh_strip --package=pcsx2 --dbg-package=pcsx2-dbg
|
||||
dh_strip --package=pcsx2-plugins --dbg-package=pcsx2-plugins-dbg
|
||||
|
||||
# Avoid to relaunch the compilation twice. (build and dh_auto_build target)
|
||||
override_dh_auto_build:
|
||||
# Do nothing
|
||||
|
||||
%:
|
||||
dh $@ --parallel
|
||||
|
||||
.PHONY: build clean install
|
||||
|
|
@ -1 +0,0 @@
|
|||
3.0 (quilt)
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Example watch control file for uscan
|
||||
# Rename this file to "watch" and then you can run the "uscan" command
|
||||
# to check for upstream updates and more.
|
||||
# See uscan(1) for format
|
||||
|
||||
# Compulsory line, this is a version 3 file
|
||||
version=3
|
||||
|
||||
# Note: Upstream does not release prepackaged source files.
|
||||
# It's adviced to get them from their subversion repository.
|
||||
# http://pcsx2.googlecode.com/files/Pcsx2-linux-beta-(.*).tar.gz
|
||||
|
|
@ -89,6 +89,10 @@ if(CMAKE_BUILD_TYPE STREQUAL Release)
|
|||
add_definitions(${CommonFlags} ${OptimizationFlags} -DWX_PRECOMP -DNDEBUG)
|
||||
endif(CMAKE_BUILD_TYPE STREQUAL Release)
|
||||
|
||||
if(XDG_STD)
|
||||
add_definitions(-DXDG_STD)
|
||||
endif(XDG_STD)
|
||||
|
||||
# In package mode always use pcsx2
|
||||
if(PACKAGE_MODE)
|
||||
set(Output pcsx2)
|
||||
|
|
|
|||
|
|
@ -133,7 +133,12 @@ namespace PathDefs
|
|||
{
|
||||
switch( mode )
|
||||
{
|
||||
#ifdef XDG_STD
|
||||
// Move all user data file into central configuration directory (XDG_CONFIG_DIR)
|
||||
case DocsFolder_User: return GetUserLocalDataDir();
|
||||
#else
|
||||
case DocsFolder_User: return (wxDirName)Path::Combine( wxStandardPaths::Get().GetDocumentsDir(), pxGetAppName() );
|
||||
#endif
|
||||
case DocsFolder_Custom: return CustomDocumentsFolder;
|
||||
|
||||
jNO_DEFAULT
|
||||
|
|
|
|||
|
|
@ -165,16 +165,22 @@ static wxLanguage i18n_FallbackToAnotherLang( wxLanguage wxLangId )
|
|||
{
|
||||
case wxLANGUAGE_CHINESE_HONGKONG :
|
||||
case wxLANGUAGE_CHINESE_MACAU : return wxLANGUAGE_CHINESE_TRADITIONAL;
|
||||
|
||||
case wxLANGUAGE_CHINESE_SINGAPORE : return wxLANGUAGE_CHINESE_SIMPLIFIED;
|
||||
|
||||
case wxLANGUAGE_SAMI :
|
||||
case wxLANGUAGE_SWEDISH_FINLAND : return wxLANGUAGE_SWEDISH;
|
||||
|
||||
case wxLANGUAGE_PORTUGUESE : return wxLANGUAGE_PORTUGUESE_BRAZILIAN;
|
||||
|
||||
// Overkill 9000?
|
||||
case wxLANGUAGE_GERMAN_AUSTRIAN :
|
||||
case wxLANGUAGE_GERMAN_BELGIUM :
|
||||
case wxLANGUAGE_GERMAN_LIECHTENSTEIN :
|
||||
case wxLANGUAGE_GERMAN_LUXEMBOURG :
|
||||
case wxLANGUAGE_GERMAN_SWISS :
|
||||
return wxLANGUAGE_GERMAN;
|
||||
case wxLANGUAGE_GERMAN_SWISS : return wxLANGUAGE_GERMAN;
|
||||
|
||||
case wxLANGUAGE_ITALIAN_SWISS : return wxLANGUAGE_ITALIAN;
|
||||
|
||||
default : break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue