Compare commits

..

6 Commits
master ... f21

Author SHA1 Message Date
pcpa 9a4ddbddcc Merge branch 'master' into f21 2015-03-16 13:43:27 -03:00
pcpa ec16c7bdae Merge branch 'master' into f21 2014-10-12 17:22:53 -03:00
pcpa 0e5555bd3c Merge branch 'master' into f21 2014-10-12 16:22:43 -03:00
pcpa eadf3acd2a Merge branch 'master' into f21 2014-09-14 12:42:42 -03:00
Peter Robinson 9147231b42 fix merge 2014-08-15 18:09:17 +00:00
Peter Robinson 571282aa42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-15 18:01:10 +00:00
7 changed files with 1825 additions and 2469 deletions

5
.gitignore vendored
View File

@ -1,7 +1,2 @@
/0ad-0.0.17-alpha-unix-build.tar.xz
/0ad-0.0.18-alpha-unix-build.tar.xz
/0ad-0.0.19-alpha-unix-build.tar.xz
/0ad-0.0.20-alpha-unix-build.tar.xz
/0ad-0.0.21-alpha-unix-build.tar.xz
/0ad-0.0.22-alpha-unix-build.tar.xz
/0ad-0.0.23-alpha-unix-build.tar.xz

File diff suppressed because it is too large Load Diff

View File

@ -1,38 +0,0 @@
diff -uNr 0ad-0.0.21-alpha.orig/source/scriptinterface/ScriptTypes.h 0ad-0.0.21-alpha/source/scriptinterface/ScriptTypes.h
--- 0ad-0.0.21-alpha.orig/source/scriptinterface/ScriptTypes.h 2016-09-02 18:19:31.000000000 +0200
+++ 0ad-0.0.21-alpha/source/scriptinterface/ScriptTypes.h 2016-11-09 07:14:16.227277422 +0100
@@ -79,19 +79,6 @@
include paths.
#endif
-#if MOZJS_MINOR_VERSION != 3
-#error Your compiler is trying to use an untested minor version of the \
-SpiderMonkey library. If you are a package maintainer, please make sure \
-to check very carefully that this version does not change the behaviour \
-of the code executed by SpiderMonkey. Different parts of the game (e.g. \
-the multiplayer mode) rely on deterministic behaviour of the JavaScript \
-engine. A simple way for testing this would be playing a network game \
-with one player using the old version and one player using the new \
-version. Another way for testing is running replays and comparing the \
-final hash (check trac.wildfiregames.com/wiki/Debugging#Replaymode). \
-For more information check this link: trac.wildfiregames.com/wiki/Debugging#Outofsync
-#endif
-
class ScriptInterface;
#endif // INCLUDED_SCRIPTTYPES
diff -uNr 0ad-0.0.21-alpha.orig/source/simulation2/serialization/BinarySerializer.cpp 0ad-0.0.21-alpha/source/simulation2/serialization/BinarySerializer.cpp
--- 0ad-0.0.21-alpha.orig/source/simulation2/serialization/BinarySerializer.cpp 2016-09-18 11:34:45.000000000 +0200
+++ 0ad-0.0.21-alpha/source/simulation2/serialization/BinarySerializer.cpp 2016-11-09 07:29:10.293824242 +0100
@@ -145,11 +145,7 @@
const JSClass* jsclass = JS_GetClass(obj);
if (!jsclass)
throw PSERROR_Serialize_ScriptError("JS_GetClass failed");
-// TODO: Remove this workaround for upstream API breakage when updating SpiderMonkey
-// See https://bugzilla.mozilla.org/show_bug.cgi?id=1236373
-#define JSCLASS_CACHED_PROTO_WIDTH js::JSCLASS_CACHED_PROTO_WIDTH
JSProtoKey protokey = JSCLASS_CACHED_PROTO_KEY(jsclass);
-#undef JSCLASS_CACHED_PROTO_WIDTH
if (protokey == JSProto_Object)
{

View File

@ -1,10 +1,11 @@
diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 0ad-0.0.23-alpha/build/premake/premake4.lua
--- 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 2018-04-29 17:44:48.000000000 +0200
+++ 0ad-0.0.23-alpha/build/premake/premake4.lua 2018-05-22 13:23:25.238894337 +0200
@@ -356,26 +356,6 @@
diff -up build/premake/premake4.lua.orig build/premake/premake4.lua
--- build/premake/premake4.lua.orig 2015-03-14 13:29:39.458872061 -0300
+++ build/premake/premake4.lua 2015-03-14 13:30:04.556873022 -0300
@@ -365,27 +365,6 @@ function project_set_build_flags()
if _OPTIONS["libdir"] then
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
end
-
- if os.is("linux") or os.is("bsd") then
- -- To use our local shared libraries, they need to be found in the
- -- runtime dynamic linker path. Add their path to -rpath.
@ -18,37 +19,7 @@ diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 0ad-0.0.23-alpha/buil
-
- -- Adding the executable path and taking care of correct escaping
- if _ACTION == "gmake" then
- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
- elseif _ACTION == "codeblocks" then
- linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
- end
- end
- end
-
end
end
diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake5.lua 0ad-0.0.23-alpha/build/premake/premake5.lua
--- 0ad-0.0.23-alpha.orig/build/premake/premake5.lua 2018-04-22 20:14:45.000000000 +0200
+++ 0ad-0.0.23-alpha/build/premake/premake5.lua 2018-05-22 13:23:29.022903711 +0200
@@ -344,26 +344,6 @@
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
end
- if os.istarget("linux") or os.istarget("bsd") then
- -- To use our local shared libraries, they need to be found in the
- -- runtime dynamic linker path. Add their path to -rpath.
- if _OPTIONS["libdir"] then
- linkoptions {"-Wl,-rpath," .. _OPTIONS["libdir"] }
- else
- -- On FreeBSD we need to allow use of $ORIGIN
- if os.istarget("bsd") then
- linkoptions { "-Wl,-z,origin" }
- end
-
- -- Adding the executable path and taking care of correct escaping
- if _ACTION == "gmake" then
- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
- elseif _ACTION == "codeblocks" then
- linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
- end

View File

@ -1,7 +1,7 @@
diff -uNr 0ad-0.0.23-alpha.orig/build/premake/extern_libs4.lua 0ad-0.0.23-alpha/build/premake/extern_libs4.lua
--- 0ad-0.0.23-alpha.orig/build/premake/extern_libs4.lua 2018-04-08 23:41:31.000000000 +0200
+++ 0ad-0.0.23-alpha/build/premake/extern_libs4.lua 2018-05-22 13:24:21.468033629 +0200
@@ -655,7 +655,7 @@
diff -up build/premake/extern_libs4.lua.orig build/premake/extern_libs4.lua
--- build/premake/extern_libs4.lua.orig 2015-03-14 13:30:48.483874704 -0300
+++ build/premake/extern_libs4.lua 2015-03-14 13:31:20.540875931 -0300
@@ -668,7 +668,7 @@ extern_lib_defs = {
},
valgrind = {
compile_settings = function()
@ -10,15 +10,3 @@ diff -uNr 0ad-0.0.23-alpha.orig/build/premake/extern_libs4.lua 0ad-0.0.23-alpha/
end,
},
vorbis = {
diff -uNr 0ad-0.0.23-alpha.orig/build/premake/extern_libs5.lua 0ad-0.0.23-alpha/build/premake/extern_libs5.lua
--- 0ad-0.0.23-alpha.orig/build/premake/extern_libs5.lua 2018-04-29 17:44:48.000000000 +0200
+++ 0ad-0.0.23-alpha/build/premake/extern_libs5.lua 2018-05-22 13:24:21.468033629 +0200
@@ -620,7 +620,7 @@
},
valgrind = {
compile_settings = function()
- add_source_include_paths("valgrind")
+ pkgconfig.add_includes("valgrind")
end,
},
vorbis = {

172
0ad.spec
View File

@ -1,25 +1,25 @@
# http://trac.wildfiregames.com/wiki/BuildInstructions#Linux
# enable special maintainer debug build ?
%bcond_with debug
%if %{with debug}
%global config debug
%global dbg _dbg
%define with_debug 0
%if %{with_debug}
%define config debug
%define dbg _dbg
%else
%global config release
%global dbg %{nil}
%define config release
%define dbg %{nil}
%endif
# Remember to rerun licensecheck after every update:
# https://bugzilla.redhat.com/show_bug.cgi?id=818401#c46
# http://trac.wildfiregames.com/ticket/1682
%bcond_without system_nvtt
%bcond_without nvtt
%global with_system_nvtt 1
%global without_nvtt 0
Name: 0ad
Version: 0.0.23
Release: 3%{?dist}
Version: 0.0.18
Release: 1%{?dist}
# BSD License:
# build/premake/*
# libraries/source/miniupnpc/* (not built/used)
@ -41,7 +41,7 @@ Group: Amusements/Games
Summary: Cross-Platform RTS Game of Ancient Warfare
Url: http://play0ad.com
%if ! %{with nvtt}
%if %{without_nvtt}
# wget http://releases.wildfiregames.com/%%{name}-%%{version}-alpha-unix-build.tar.xz
# tar Jxf %%{name}-%%{version}-alpha-unix-build.tar.xz
# rm -fr %%{name}-%%{version}-alpha/libraries/nvtt
@ -71,7 +71,6 @@ BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: enet-devel
BuildRequires: gamin-devel
BuildRequires: gcc-c++
BuildRequires: gloox-devel
BuildRequires: libcurl-devel
BuildRequires: libdnet-devel
@ -82,22 +81,20 @@ BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: libzip-devel
BuildRequires: miniupnpc-devel
BuildRequires: mozjs38-devel
BuildRequires: libsodium-devel
%if %{with system_nvtt}
BuildRequires: mozjs31-devel
%if %{with_system_nvtt}
BuildRequires: nvidia-texture-tools-devel
%endif
BuildRequires: openal-soft-devel
BuildRequires: openjpeg-devel
BuildRequires: pkgconfig
BuildRequires: python2
BuildRequires: SDL2-devel
BuildRequires: python
BuildRequires: SDL-devel
BuildRequires: subversion
BuildRequires: valgrind-devel
BuildRequires: wxGTK3-devel
BuildRequires: /usr/bin/python
BuildRequires: wxGTK-devel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: %{ix86} x86_64 %{arm}
# http://trac.wildfiregames.com/ticket/1421
Patch0: %{name}-rpath.patch
@ -109,10 +106,6 @@ Patch1: %{name}-debug.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1141464
Patch3: %{name}-valgrind.patch
# We have don't want to ensure that we have 38.3.x of mozjs (we just don't have it)
# And other fixes
Patch4: %{name}-mozjs-incompatible.patch
%description
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
@ -128,23 +121,19 @@ hobbyist game developers, since 2001.
#-----------------------------------------------------------------------
%prep
%setup -q -n %{name}-%{version}-alpha
%patch0 -p1
%if ! %{with debug}
%patch0 -p0
%if !%{with_debug}
# disable debug build, and "int 0x3" to trap to debugger (x86 only)
%patch1 -p0
%endif
%patch3 -p1
%patch4 -p1
%patch3 -p0
%if %{with system_nvtt}
%if %{with_system_nvtt}
rm -fr libraries/source/nvtt
%endif
rm -fr libraries/source/valgrind
# TODO: drop once fixed in upstream: http://trac.wildfiregames.com/ticket/4319#ticket
sed -i -e "/^URL=/d" build/resources/0ad.desktop
#-----------------------------------------------------------------------
%build
export CFLAGS="%{optflags}"
@ -154,11 +143,12 @@ build/workspaces/update-workspaces.sh \
--bindir %{_bindir} \
--datadir %{_datadir}/%{name} \
--libdir %{_libdir}/%{name} \
--with-system-mozjs38 \
%if %{with system_nvtt}
--with-system-mozjs31 \
--with-system-miniupnpc \
%if %{with_system_nvtt}
--with-system-nvtt \
%endif
%if ! %{with nvtt}
%if %{without_nvtt}
--without-nvtt \
%endif
%{?_smp_mflags}
@ -167,12 +157,10 @@ make %{?_smp_mflags} -C build/workspaces/gcc config=%{config} verbose=1
#-----------------------------------------------------------------------
# Depends on availablity of nvtt
%ifnarch aarch64
%if %{with nvtt}
%if !%{without_nvtt}
%check
LD_LIBRARY_PATH=binaries/system binaries/system/test%{dbg} -libdir binaries/system
%endif
%endif
#-----------------------------------------------------------------------
%install
@ -184,7 +172,7 @@ for name in AtlasUI%{dbg} Collada%{dbg}; do
install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so
done
%if %{with nvtt} && ! %{with system_nvtt}
%if !%{without_nvtt} && !%{with_system_nvtt}
for name in nvcore nvimage nvmath nvtt; do
install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so
done
@ -216,15 +204,14 @@ LD_LIBRARY_PATH=%{_libdir}/0ad %{_bindir}/pyrogenesis%{dbg} "\$@"
EOF
chmod +x %{buildroot}%{_bindir}/0ad
%if %{with debug}
%if %{with_debug}
export STRIP=/bin/true
%endif
#-----------------------------------------------------------------------
%files
%doc README.txt
%license LICENSE.txt
%license license_gpl-2.0.txt license_lgpl-2.1.txt license_mit.txt
%doc README.txt LICENSE.txt
%doc license_gpl-2.0.txt license_lgpl-2.1.txt
%{_bindir}/0ad
%{_bindir}/pyrogenesis%{dbg}
%{_libdir}/%{name}
@ -235,105 +222,6 @@ export STRIP=/bin/true
%{_mandir}/man6/*.6*
%changelog
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.23-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 0.0.23-2
- Rebuild for ICU 62
* Thu May 17 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.0.23-1
- Update to 0.0.23
* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 0.0.22-8
- Rebuild for ICU 61.1
* Wed Mar 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.0.22-7
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 0.0.22-6
- Rebuild to fix GCC 8 mis-compilation
See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.22-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 22 2018 Jonathan Wakely <jwakely@redhat.com> - 0.0.22-4
- Rebuilt for Boost 1.66
* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 0.0.22-3
- Rebuild for ICU 60.1
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.0.22-1
- Update to 0.0.22
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.21-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Jul 17 2017 Jonathan Wakely <jwakely@redhat.com> - 0.0.21-5
- Patched for new GCC and rebuilt for Boost 1.64
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.21-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 0.0.21-3
- Rebuilt for Boost 1.63
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 0.0.21-2
- Rebuilt for Boost 1.63
* Wed Nov 09 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.0.21-1
- Update to 0.0.21
* Fri Jun 24 2016 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 0.0.20-4
- Rebuild for miniupnpc 2.0
* Fri Apr 15 2016 David Tardon <dtardon@redhat.com> - 0.0.20-3
- rebuild for ICU 57.1
* Sat Apr 9 2016 Peter Robinson <pbrobinson@fedoraproject.org> 0.0.20-2
- Upstream now supports aarch64 (tests currently fail)
* Sat Apr 02 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.0.20-1
- Update to 0.0.20
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.19-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jan 14 2016 Jonathan Wakely <jwakely@redhat.com> - 0.0.19-2
- Rebuilt for Boost 1.60
* Sat Nov 28 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.0.19
- 0.0.19
* Sun Nov 22 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.0.19-0.1.rc2
- 0.0.19-rc2
* Wed Oct 28 2015 David Tardon <dtardon@redhat.com> - 0.0.18-8
- rebuild for ICU 56.1
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 0.0.18-7
- Rebuilt for Boost 1.59
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.18-6
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 0.0.18-5
- rebuild for Boost 1.58
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.18-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.0.18-3
- Rebuilt for GCC 5 C++11 ABI change
* Tue Mar 17 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 0.0.18-2
- Use bcond for rpm conditional macros
- Add rpm conditional to build with sdl2
* Sat Mar 14 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 0.0.18-1
- Update to latest upstream release
- Change to -p0 patches

View File

@ -1 +1 @@
SHA512 (0ad-0.0.23-alpha-unix-build.tar.xz) = 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
84aedae3ab86955f87c55607600daa12 0ad-0.0.18-alpha-unix-build.tar.xz