update source to latest release
This commit is contained in:
Jonathan MERCIER
commit
29ea52d798
|
|
@ -1,24 +0,0 @@
|
|||
diff -up 0ad-0.0.11-alpha/source/lib/sysdep/os/linux/dir_watch_fam.cpp.orig 0ad-0.0.11-alpha/source/lib/sysdep/os/linux/dir_watch_fam.cpp
|
||||
--- 0ad-0.0.11-alpha/source/lib/sysdep/os/linux/dir_watch_fam.cpp.orig 2012-09-08 09:44:27.676395177 -0300
|
||||
+++ 0ad-0.0.11-alpha/source/lib/sysdep/os/linux/dir_watch_fam.cpp 2012-09-08 09:45:10.303439436 -0300
|
||||
@@ -173,6 +173,8 @@ static void* fam_event_loop(void*)
|
||||
|
||||
Status dir_watch_Add(const OsPath& path, PDirWatch& dirWatch)
|
||||
{
|
||||
+ char resolved[PATH_MAX + 1];
|
||||
+
|
||||
// init already failed; don't try again or complain
|
||||
if(initialized == -1)
|
||||
return ERR::FAIL; // NOWARN
|
||||
@@ -205,7 +207,10 @@ Status dir_watch_Add(const OsPath& path,
|
||||
// not worthwhile
|
||||
|
||||
FAMRequest req;
|
||||
- if(FAMMonitorDirectory(&fc, OsString(path).c_str(), &req, tmpDirWatch.get()) < 0)
|
||||
+
|
||||
+ FAMNoExists(&fc);
|
||||
+
|
||||
+ if(FAMMonitorDirectory(&fc, realpath(OsString(path).c_str(), resolved), &req, tmpDirWatch.get()) < 0)
|
||||
{
|
||||
debug_warn(L"res_watch_dir failed!");
|
||||
WARN_RETURN(ERR::FAIL); // no way of getting error code?
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
diff -up 0ad-0.0.11-alpha/libraries/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp.orig 0ad-0.0.11-alpha/libraries/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp
|
||||
--- 0ad-0.0.11-alpha/libraries/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp.orig 2012-09-08 09:56:56.532955316 -0300
|
||||
+++ 0ad-0.0.11-alpha/libraries/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp 2012-09-08 09:57:27.200987159 -0300
|
||||
@@ -523,8 +523,13 @@ bool FArchiveXML::EndExport(fm::vector<u
|
||||
xmlOutputBufferPtr buf = xmlAllocOutputBuffer(NULL);
|
||||
xmlNodeDumpOutput(buf, rootNode->doc, rootNode, 0, 0, NULL);
|
||||
|
||||
- outData.resize(buf->buffer->use * sizeof(xmlChar));
|
||||
- memcpy(outData.begin(), buf->buffer->content, outData.size());
|
||||
+#ifdef LIBXML2_NEW_BUFFER
|
||||
+ outData.resize(xmlOutputBufferGetSize(buf) * sizeof(xmlChar));
|
||||
+ memcpy(outData.begin(), xmlOutputBufferGetContent(buf), outData.size());
|
||||
+#else
|
||||
+ outData.resize(buf->buffer->use * sizeof(xmlChar));
|
||||
+ memcpy(outData.begin(), buf->buffer->content, outData.size());
|
||||
+#endif
|
||||
|
||||
xmlOutputBufferClose(buf);
|
||||
daeDocument.ReleaseXmlData();
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,7 +1,7 @@
|
|||
diff -up 0ad-0.0.11-alpha/build/premake/premake4.lua.orig 0ad-0.0.11-alpha/build/premake/premake4.lua
|
||||
--- 0ad-0.0.11-alpha/build/premake/premake4.lua.orig 2012-09-08 10:11:31.662784857 -0300
|
||||
+++ 0ad-0.0.11-alpha/build/premake/premake4.lua 2012-09-08 10:11:41.465795036 -0300
|
||||
@@ -308,26 +308,6 @@ function project_set_build_flags()
|
||||
diff -up 0ad-0.0.12-alpha/build/premake/premake4.lua.orig 0ad-0.0.12-alpha/build/premake/premake4.lua
|
||||
--- 0ad-0.0.12-alpha/build/premake/premake4.lua.orig 2012-10-29 22:56:24.000000000 -0200
|
||||
+++ 0ad-0.0.12-alpha/build/premake/premake4.lua 2012-12-18 20:30:20.851551919 -0200
|
||||
@@ -303,26 +303,6 @@ function project_set_build_flags()
|
||||
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
|
||||
end
|
||||
|
||||
|
|
|
|||
26
0ad.6
26
0ad.6
|
|
@ -1,7 +1,7 @@
|
|||
.TH 0AD "1" "Sep 8 2012" "0ad 0.0.11" "User Commands"
|
||||
.TH 0AD "1" "Dec 17 2012" "0ad 0.0.12" "User Commands"
|
||||
|
||||
.SH NAME
|
||||
0ad \- manual page for 0ad 0.0.11
|
||||
0ad \- manual page for 0ad 0.0.12
|
||||
.SH SYNOPSIS
|
||||
.B 0ad
|
||||
[\fIoptions\fR]
|
||||
|
|
@ -107,6 +107,15 @@ Advanced / diagnostic:
|
|||
creates a file entity.rng in the working directory, containing
|
||||
complete entity XML schema, used by various analysis tools
|
||||
.TP
|
||||
\fB\-entgraph\fR
|
||||
(disabled)
|
||||
.TP
|
||||
\fB\-listfiles\fR
|
||||
(disabled)
|
||||
.TP
|
||||
\fB\-profile\fR=\fINAME\fR
|
||||
(disabled)
|
||||
.TP
|
||||
\fB\-replay\fR=\fIPATH\fR
|
||||
non-visual replay of a previous game, used for analysis purposes
|
||||
\fIPATH\fR is system path to commands.txt containing simulation log
|
||||
|
|
@ -114,6 +123,16 @@ non-visual replay of a previous game, used for analysis purposes
|
|||
\fB\-writableRoot\fR
|
||||
store runtime game data in root data directory
|
||||
(only use if you have write permissions on that directory)
|
||||
.TP
|
||||
\fB\-ooslog\fR
|
||||
dumps simulation state in binary and ASCII representations each turn,
|
||||
files created in sim_log within the game's log folder. NOTE: game will
|
||||
run much slower with this option!
|
||||
.TP
|
||||
\fB-serializationtest\fR
|
||||
checks simulation state each turn for serialization errors; on test
|
||||
failure, error is displayed and logs created in oos_log within the
|
||||
game's log folder. \fBNOTE\fR: game will run much slower with this option!
|
||||
|
||||
.PP
|
||||
Archive builder:
|
||||
|
|
@ -127,6 +146,9 @@ system \fIPATH\fR to output of the resulting .zip archive (use with archivebuild
|
|||
\fB\-archivebuild-compress\fR
|
||||
enable deflate compression in the .zip
|
||||
(no zip compression by default since it hurts compression of release packages)
|
||||
.TP
|
||||
\fB-buildarchive\fR
|
||||
(disabled)
|
||||
|
||||
.SH "REPORTING BUGS"
|
||||
Bugs should be reported on Trac: http://trac.wildfiregames.com/
|
||||
|
|
|
|||
47
0ad.spec
47
0ad.spec
|
|
@ -26,8 +26,8 @@
|
|||
%endif
|
||||
|
||||
Name: 0ad
|
||||
Version: 0.0.11
|
||||
Release: 4%{?dist}
|
||||
Version: 0.0.12
|
||||
Release: 1%{?dist}
|
||||
# BSD License:
|
||||
# build/premake/*
|
||||
# libraries/valgrind/* (not built/used)
|
||||
|
|
@ -59,12 +59,19 @@ Source0: %{name}-%{version}-alpha-unix-build.tar.xz
|
|||
Source0: http://releases.wildfiregames.com/%{name}-%{version}-alpha-unix-build.tar.xz
|
||||
%endif
|
||||
|
||||
# Simplify checking differences when updating the package
|
||||
# (also to validate one did not forget to remake the tarball if
|
||||
# %{without_nvtt} is enabled) Create it with:
|
||||
# cd BUILD/%{name}-%{version}-alpha
|
||||
# licensecheck -r . > ../../SOURCES/%{name}-licensecheck.txt
|
||||
Source1: %{name}-licensecheck.txt
|
||||
|
||||
# adapted from binaries/system/readme.txt
|
||||
# It is advisable to review this file at on newer versions, to update the
|
||||
# version field and check for extra options. Note that windows specific,
|
||||
# and disabled options were not added to the manual page.
|
||||
Source1: %{name}.6
|
||||
Requires: %{name}-data
|
||||
Source2: %{name}.6
|
||||
Requires: %{name}-data = %{version}
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: desktop-file-utils
|
||||
|
|
@ -93,16 +100,8 @@ BuildRequires: SDL-devel
|
|||
BuildRequires: subversion
|
||||
BuildRequires: wxGTK-devel
|
||||
|
||||
# FAMMonitorDirectory fails if passing a relative directory
|
||||
# Use FAMNoExists (gamin specific to speed up a little bit initialization
|
||||
# as commented in the source)
|
||||
Patch0: %{name}-gamin.patch
|
||||
|
||||
# http://trac.wildfiregames.com/ticket/1421
|
||||
Patch1: %{name}-rpath.patch
|
||||
|
||||
# Build with newer libxml2
|
||||
Patch2: %{name}-libxml2.patch
|
||||
Patch0: %{name}-rpath.patch
|
||||
|
||||
# Display more clear error messages when creating custom scenarios
|
||||
# The suggested usage is:
|
||||
|
|
@ -111,11 +110,11 @@ Patch2: %{name}-libxml2.patch
|
|||
# $ 0ad -editor
|
||||
# Supposing saved the map as mymap, can test it with:
|
||||
# $ 0ad -autostart=mymap
|
||||
Patch3: %{name}-saveas.patch
|
||||
Patch1: %{name}-saveas.patch
|
||||
|
||||
# Only do fcollada debug build with enabling debug maintainer mode
|
||||
# It also prevents assumption there that it is building in x86
|
||||
Patch4: %{name}-debug.patch
|
||||
Patch2: %{name}-debug.patch
|
||||
|
||||
%description
|
||||
0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
|
||||
|
|
@ -134,14 +133,9 @@ hobbyist game developers, since 2001.
|
|||
%setup -q -n %{name}-%{version}-alpha
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%if 0%{?fedora} >= 18
|
||||
# 0ad <= 0.0.11 && libxml2 >= 2.9
|
||||
%patch2 -p1
|
||||
%endif
|
||||
%patch3 -p1
|
||||
%if !%{with_debug}
|
||||
# disable debug build, and "int 0x3" to trap to debugger (x86 only)
|
||||
%patch4 -p1
|
||||
%patch2 -p1
|
||||
%endif
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
|
|
@ -204,7 +198,7 @@ install -d -m 755 %{buildroot}%{_datadir}/%{name}
|
|||
cp -a binaries/data/* %{buildroot}%{_datadir}/%{name}
|
||||
|
||||
install -d -m 755 %{buildroot}%{_mandir}/man6
|
||||
install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man6/%{name}.6
|
||||
install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man6/%{name}.6
|
||||
ln -sf %{name}.6 %{buildroot}%{_mandir}/man6/pyrogenesis.6
|
||||
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||
|
|
@ -234,6 +228,15 @@ export STRIP=/bin/true
|
|||
%{_mandir}/man6/*.6*
|
||||
|
||||
%changelog
|
||||
* Tue Dec 18 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 0.0.11-1
|
||||
- Update to latest upstream release
|
||||
- Remove no longer required gamin patch
|
||||
- Rediff rpath patch
|
||||
- Remove libxml2 patch already applied upstream
|
||||
- Update 0ad manpage for newer options and release information
|
||||
- Add versioned requires to data files
|
||||
- Add 0ad licensecheck text file to simplify checking changes
|
||||
|
||||
* Sat Nov 3 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 0.0.11-4
|
||||
- Add %%with_debug maintainer mode build
|
||||
- Disable fcollada debug build if %%with_debug is false
|
||||
|
|
|
|||
Loading…
Reference in New Issue