114 lines
4.0 KiB
Diff
114 lines
4.0 KiB
Diff
Index: client/CVideoHandler.h
|
|
===================================================================
|
|
--- client/CVideoHandler.h (Revision 3221)
|
|
+++ client/CVideoHandler.h (Arbeitskopie)
|
|
@@ -236,6 +236,7 @@
|
|
#include <libswscale/swscale.h>
|
|
}
|
|
|
|
+
|
|
class CVideoPlayer : public IMainVideoPlayer
|
|
{
|
|
private:
|
|
@@ -247,7 +248,7 @@
|
|
struct SwsContext *sws;
|
|
|
|
unsigned char* buffer;
|
|
- AVIOContext * context;
|
|
+ ByteIOContext * context;
|
|
|
|
// Destination. Either overlay or dest.
|
|
SDL_Overlay *overlay;
|
|
Index: rpm/vcmi.spec
|
|
===================================================================
|
|
--- rpm/vcmi.spec (Revision 3221)
|
|
+++ rpm/vcmi.spec (Arbeitskopie)
|
|
@@ -1,19 +1,19 @@
|
|
-Summary: VCMI is an open-source project aiming to reimplement the entire H3:WoG game engine, giving it new and extended possibilities
|
|
+Summary: VCMI is an open-source project aiming to reimplement HMM3:WoG game engine, giving it new and extended possibilities.
|
|
Name: vcmi
|
|
-Version: 0.9.1
|
|
+Version: 0.9
|
|
Release: 2%{?dist}
|
|
License: GPLv2+
|
|
+Group: Amusements/Games
|
|
|
|
# The source for this package was pulled from upstream's vcs. Use the
|
|
# following commands to generate the tarball:
|
|
-# svn export -r HEAD https://vcmi.svn.sourceforge.net/svnroot/vcmi/tags/0.91 vcmi-0.9.1-2
|
|
-# tar -cJf vcmi-0.9.1-2.tar.xz vcmi-0.9.1-2
|
|
-Source: vcmi-0.9.1-2.tar.xz
|
|
+# svn export -r HEAD https://vcmi.svn.sourceforge.net/svnroot/vcmi/tags/0.9 vcmi-0.9-2
|
|
+# tar -cJf vcmi-0.9-2.tar.xz vcmi-0.9-2
|
|
+Source: vcmi-0.9-2.tar.xz
|
|
|
|
URL: http://forum.vcmi.eu/portal.php
|
|
-BuildRequires: cmake
|
|
BuildRequires: gcc-c++ >= 4.7.2
|
|
-BuildRequires: SDL-devel
|
|
+BuildRequires: SDL-devel
|
|
BuildRequires: SDL_image-devel
|
|
BuildRequires: SDL_ttf-devel
|
|
BuildRequires: SDL_mixer-devel >= 1.2.8
|
|
@@ -29,15 +29,11 @@
|
|
BuildRequires: ffmpeg-libs
|
|
|
|
%description
|
|
-The purpose of VCMI project is to rewrite the entire H3:WoG engine from scratch,
|
|
-giving it new and extended possibilities.
|
|
+The purpose of VCMI project is to rewrite entire HOMM 3: WoG engine from scratch, giving it new and extended possibilities. We hope to support mods and new towns already made by fans but abandoned because of game code limitations.
|
|
|
|
-VCMI is fan-made open-source project in progress. We already allow support for
|
|
-maps of any sizes, higher resolutions, extended engine limits, modding support
|
|
-for custom towns, artifacts, heroes, etc...
|
|
+VCMI is fan-made open-source project in progress. We already allow support for maps of any sizes, higher resolutions and extended engine limits. However, although working, the game is not finished. There are still many features and functionalities to add, both old and brand new.
|
|
|
|
-As yet VCMI is not a standalone program, it uses Wake of Gods files and
|
|
-graphics. You need to install WoG before running VCMI.
|
|
+As yet VCMI is not standalone program, it uses Wake of Gods files and graphics. You need to install WoG before running VCMI.
|
|
|
|
%prep
|
|
%setup -q -n %{name}-%{version}-2
|
|
@@ -47,13 +43,13 @@
|
|
make %{?_smp_mflags}
|
|
|
|
%install
|
|
+rm -rf %{buildroot}
|
|
make DESTDIR=%{buildroot} install
|
|
|
|
%files
|
|
-%doc README COPYING AUTHORS ChangeLog
|
|
+%doc README README.linux COPYING AUTHORS ChangeLog
|
|
%{_bindir}/vcmiclient
|
|
%{_bindir}/vcmiserver
|
|
-%{_bindir}/vcmibuilder
|
|
%{_libdir}/%{name}/*
|
|
|
|
%{_datadir}/%{name}/*
|
|
@@ -61,12 +57,6 @@
|
|
%{_datadir}/icons/*
|
|
|
|
%changelog
|
|
-* Fri Feb 01 2013 VCMI - 0.9.1-2
|
|
-- New upstream release
|
|
-
|
|
-* Wed Jan 30 2013 VCMI - 0.9.1-1
|
|
-- Development release
|
|
-
|
|
* Sun Oct 21 2012 VCMI - 0.9-2
|
|
- Second release of 0.9, Fixed battles crash
|
|
|
|
Index: lib/VCMIDirs.h
|
|
===================================================================
|
|
--- lib/VCMIDirs.h (Revision 3221)
|
|
+++ lib/VCMIDirs.h (Arbeitskopie)
|
|
@@ -30,7 +30,7 @@
|
|
#else
|
|
try {
|
|
#ifdef ANDROID
|
|
- UserPath = DATA_DIR;
|
|
+ UserPath = GameConstants::DATA_DIR;
|
|
#else
|
|
// Find vcmi user directory and create it if necessary
|
|
std::string home_dir = ".";
|