Stephan Kleine 2010-07-24 06:21:54 +00:00 committed by Git OBS Bridge
parent 729199fe3e
commit 68350b5546
7 changed files with 51 additions and 6 deletions

35
0ad-cs7791.patch Normal file
View File

@ -0,0 +1,35 @@
Index: source/ps/VideoMode.cpp
===================================================================
--- source/ps/VideoMode.cpp (revision 7790)
+++ source/ps/VideoMode.cpp (revision 7791)
@@ -96,9 +96,6 @@
// (command line params may override these)
gfx_get_video_mode(&m_PreferredW, &m_PreferredH, &m_PreferredBPP, &m_PreferredFreq);
- SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-
int w = m_ConfigW;
int h = m_ConfigH;
@@ -121,9 +118,19 @@
int bpp = GetBestBPP();
+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
if (!SetVideoMode(w, h, bpp, m_ConfigFullscreen))
- return false;
+ {
+ // Fall back to a smaller depth buffer
+ // (The rendering may be ugly but this helps when running in VMware)
+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+ if (!SetVideoMode(w, h, bpp, m_ConfigFullscreen))
+ return false;
+ }
+
// Work around a bug in the proprietary Linux ATI driver (at least versions 8.16.20 and 8.14.13).
// The driver appears to register its own atexit hook on context creation.
// If this atexit hook is called before SDL_Quit destroys the OpenGL context,

View File

@ -6,7 +6,7 @@ Version: r7732-1
Maintainer: Stephan Kleine <bitshuffler@opensuse.org>
Homepage: http://wildfiregames.com/0ad/
Standards-Version: 3.8.0
Build-Depends: debhelper, libsdl1.2-dev, zlib1g-dev, libpng12-dev, libjpeg62-dev, libgamin-dev, nasm, libwxgtk2.8-dev, libboost1.35-dev, libboost-signals1.35-dev, libopenal-dev, libalut-dev, libvorbis-dev, libogg-dev, libcrypto++-dev, binutils-dev, libdevil-dev, libenet-dev, libxml2-dev, pkg-config, libboost-filesystem1.35-dev, zip, libstdc++6-4.3-dev, libsvga1, python-dev
Build-Depends: debhelper, libsdl1.2-dev, zlib1g-dev, libpng12-dev, libjpeg62-dev, libgamin-dev, nasm, libwxgtk2.8-dev, libboost1.35-dev, libboost-signals1.35-dev, libopenal-dev, libalut-dev, libvorbis-dev, libogg-dev, binutils-dev, libdevil-dev, libenet-dev, libxml2-dev, pkg-config, libboost-filesystem1.35-dev, zip, libstdc++6-4.3-dev, libsvga1, python
Files:
d8d3379b96b0c39e61c0d460d11bf06a 4366618 0ad-r7732.tar.gz
de993e4b2fd8191252c3a65b72eba516 9203 0ad-r7732.diff.gz

View File

@ -11,6 +11,7 @@ Patch0: 0ad-cs7755.patch
Patch1: 0ad-cs7757.patch
Patch2: 0ad-cs7758.patch
Patch3: 0ad-cs7759.patch
Patch4: 0ad-cs7791.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: binutils-devel
BuildRequires: boost-devel
@ -22,7 +23,7 @@ BuildRequires: libpng-devel
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: nasm
BuildRequires: python-devel
BuildRequires: python
BuildRequires: subversion
BuildRequires: zip
@ -93,6 +94,7 @@ history.
%patch1
%patch2
%patch3
%patch4
%build
export CFLAGS="%{optflags}"
@ -117,6 +119,8 @@ popd
#__install -Dm 0755 binaries/system/ActorEditor_dbg %{buildroot}/%{_libexecdir}/%{name}/bin/ActorEditor_dbg
#__install -Dm 0755 binaries/system/ColourTester_dbg %{buildroot}/%{_libexecdir}/%{name}/bin/ColourTester_dbg
%__ln_s %{_bindir}/pyrogenesis_dbg %{buildroot}%{_bindir}/0ad
%__mkdir_p %{buildroot}%{_datadir}/%{name}
%clean
@ -125,8 +129,9 @@ test "%{buildroot}" != "/" && %__rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc README.txt
%{_bindir}/0ad
%{_bindir}/pyrogenesis_dbg
%{_libdir}/libCollada_dbg.so
%{_libdir}/libAtlasUI_dbg.so
%{_libdir}/libmozjs-ps-debug.so
%{_datadir}/%{name}
%dir %{_datadir}/%{name}

View File

@ -8,16 +8,16 @@ Build-Depends: debhelper,
libwxgtk2.8-dev, libboost1.35-dev,
libboost-signals1.35-dev, libopenal-dev,
libalut-dev, libvorbis-dev, libogg-dev,
libcrypto++-dev, binutils-dev,
binutils-dev,
libdevil-dev, libenet-dev, libxml2-dev,
pkg-config, libboost-filesystem1.35-dev,
zip, libstdc++6-4.3-dev, libsvga1, python-dev
zip, libstdc++6-4.3-dev, libsvga1, python
Standards-Version: 3.8.0
Homepage: http://wildfiregames.com/0ad/
Package: 0ad
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, 0ad-data
Depends: ${shlibs:Depends}, ${misc:Depends}, gamin, 0ad-data
Description: Free, Open-Source, Cross-Platform RTS Game of Ancient Warfare
0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform real-time
strategy (RTS) game of ancient warfare. In short, it is a historically-based

View File

@ -1,3 +1,4 @@
usr/bin/0ad
usr/bin/pyrogenesis_dbg
usr/lib/libAtlasUI_dbg.so
usr/lib/libCollada_dbg.so

View File

@ -59,6 +59,9 @@ install: build
install -Dm 0755 binaries/system/libAtlasUI_dbg.so $(CURDIR)/debian/tmp/usr/lib/libAtlasUI_dbg.so
install -Dm 0755 binaries/system/libmozjs-ps-debug.so $(CURDIR)/debian/tmp/usr/lib/libmozjs-ps-debug.so
ln -s /usr/bin/pyrogenesis_dbg $(CURDIR)/debian/tmp/usr/bin/0ad
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.

View File

@ -2,3 +2,4 @@
0ad-cs7757.patch -p0
0ad-cs7758.patch -p0
0ad-cs7759.patch -p0
0ad-cs7791.patch -p0