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

gsdx linux: uses OGL device by default instead of GSnull. Issue arise when renderer is 0 -> device is GSnull but GSRenderer is ogl 

debian: fix some typo


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5213 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2012-05-17 14:18:37 +00:00
parent 05fc11daf5
commit f47168568b
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian-unstable-upstream/control
View File

@ -2,15 +2,14 @@ Source: pcsx2.snapshot
Section: contrib/games Section: contrib/games
Priority: optional Priority: optional
Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com> Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
# WARNING Natty need at least cmake 2.8.5 (multiarch issue)
Build-Depends: cmake (>= 2.8.5), Build-Depends: cmake (>= 2.8.5),
debhelper (>= 9), debhelper (>= 8.9),
dpkg-dev (>= 1.15.7), dpkg-dev (>= 1.15.7),
libasound2-dev, libasound2-dev,
libbz2-dev, libbz2-dev,
libgl1-mesa-dev, libgl1-mesa-dev,
# Future GSdx version will need glew1.6. Only Oneiric have it... # GSdx need glew1.6 and would love glew1.7
libglew-dev (>= 1.6)| libglew1.5-dev, libglew-dev (>= 1.6)| libglew1.6-dev,
libglu1-mesa-dev, libglu1-mesa-dev,
libgtk2.0-dev (>= 2.16), libgtk2.0-dev (>= 2.16),
libjpeg-dev, libjpeg-dev,
@ -33,7 +32,7 @@ Architecture: i386
# manually add nvidia-cg-toolkit for zzogl (cg pacakge does not provide symbol or shlibs files) # manually add nvidia-cg-toolkit for zzogl (cg pacakge does not provide symbol or shlibs files)
# recommand libasound for alsa plugin for pulseaudio # recommand libasound for alsa plugin for pulseaudio
Depends: ${shlibs:Depends}, ${misc:Depends}, Depends: ${shlibs:Depends}, ${misc:Depends},
libcg | nvidia-cg-toolkit (>= 2.1), libcg | nvidia-cg-toolkit (>= 2.1)
Recommends: libasound2-plugins Recommends: libasound2-plugins
Conflicts: pcsx2, Conflicts: pcsx2,
pcsx2-data-unstable, pcsx2-data-unstable,
@ -48,8 +47,6 @@ Description: Playstation 2 emulator
WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support 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 this instruction set, it does not have enough horse power to run this emulator
anyway. anyway.
.
This package includes the main binary file.
Package: pcsx2-unstable-dbg Package: pcsx2-unstable-dbg
Section: contrib/debug Section: contrib/debug

2
debian-unstable-upstream/menu
View File

@ -2,5 +2,5 @@
needs="X11" \ needs="X11" \
section="Applications/Emulators" \ section="Applications/Emulators" \
title="pcsx2" \ title="pcsx2" \
longtitle="A playstation 2 emulators" \ longtitle="A playstation 2 emulator" \
command="/usr/games/pcsx2" command="/usr/games/pcsx2"

2
plugins/GSdx/GS.cpp
View File

@ -245,10 +245,10 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
#ifdef ENABLE_SDL_DEV #ifdef ENABLE_SDL_DEV
case 2: dev = new GSDeviceSDL(); break; case 2: dev = new GSDeviceSDL(); break;
#endif #endif
case 3: dev = new GSDeviceNull(); break;
#ifdef _LINUX #ifdef _LINUX
case 4: dev = new GSDeviceOGL(); break; case 4: dev = new GSDeviceOGL(); break;
#endif #endif
case 3: dev = new GSDeviceNull(); break;
} }
if(dev == NULL) if(dev == NULL)