pool/0ad
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 444643 from home:ecsos

Browse Source 
update to 0.0.21-alpha

OBS-URL: https://build.opensuse.org/request/show/444643
OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=63
This commit is contained in:
Matthias Mailänder 2016-12-08 20:45:59 +00:00 committed by Git OBS Bridge
parent aacfd5d10b
commit ba761107e7
7 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
0ad-0.0.20-alpha-unix-build.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a396d5cb37057ddd3cd523434f70c56be21588a2228443e7508d2b2d610fc68e
size 25610932

3
0ad-0.0.21-alpha-unix-build.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:96be23e4284a3931ef9536f988f2517040bde1f8700ee048bff18c932d8683cf
size 29196476

11
0ad-desktop.patch Normal file
View File

@ -0,0 +1,11 @@
diff -Pdpru 0ad-0.0.21-alpha.orig/build/resources/0ad.desktop 0ad-0.0.21-alpha/build/resources/0ad.desktop
--- 0ad-0.0.21-alpha.orig/build/resources/0ad.desktop 2016-11-01 19:07:21.000000000 +0100
+++ 0ad-0.0.21-alpha/build/resources/0ad.desktop 2016-12-07 12:37:05.222683737 +0100
@@ -6,7 +6,6 @@ Icon=0ad
Terminal=false
Type=Application
Categories=Game;StrategyGame;
-URL=https://play0ad.com/
Comment=A real-time strategy game of ancient warfare
Comment[de]=Ein Echtzeitstrategiespiel, das die Kriegsführung der Antike behandelt
Comment[es]=Un juego de estrategia en tiempo real de guerra antigua

10
0ad.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Dec 7 00:05:47 UTC 2016 - ecsos@opensuse.org
- Update to version 0.0.21
See: https://play0ad.com/new-release-0-a-d-alpha-21-ulysses/
- Add patch 0ad-desktop.patch because of rpmlint-error invalid-
dekstopfile invalid key URL
- Drop patch fix-c++14-compat.patch because now in upstream
- Rebase patch system-tinygettext.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 30 14:13:52 UTC 2016 - rpm@fthiessen.de Tue Aug 30 14:13:52 UTC 2016 - rpm@fthiessen.de

14
0ad.spec
View File

@ -17,7 +17,7 @@
Name: 0ad Name: 0ad
Version: 0.0.20 Version: 0.0.21
Release: 0 Release: 0
Summary: A real-time strategy game of ancient warfare Summary: A real-time strategy game of ancient warfare
License: GPL-2.0+ and LGPL-3.0+ and CC-BY-SA-3.0 and MIT and ISC and MPL-2.0 and BSD-3-Clause License: GPL-2.0+ and LGPL-3.0+ and CC-BY-SA-3.0 and MIT and ISC and MPL-2.0 and BSD-3-Clause
@ -25,10 +25,10 @@ Group: Amusements/Games/Strategy/Real Time
Url: http://play0ad.com/ Url: http://play0ad.com/
Source: http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz Source: http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz
Source99: %{name}.changes Source99: %{name}.changes
# PATCH-FIX-UPSTREAM fix-c++14-compat.patch - http://trac.wildfiregames.com/ticket/4073
Patch0: fix-c++14-compat.patch
# PATCH-FEATURE-UPSTREAM system-tinygettext.patch -- http://trac.wildfiregames.com/ticket/4192 # PATCH-FEATURE-UPSTREAM system-tinygettext.patch -- http://trac.wildfiregames.com/ticket/4192
Patch1: system-tinygettext.patch Patch1: system-tinygettext.patch
# PATCH-RPMLINT-ERROR 0ad-desktopt.patch -- invalid key URL
Patch2: %{name}-desktop.patch
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -66,8 +66,8 @@ flexible game engine.
%prep %prep
%setup -q -n %{name}-%{version}-alpha %setup -q -n %{name}-%{version}-alpha
%patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
# Fix usage of __DATE__ and __TIME__ macros # Fix usage of __DATE__ and __TIME__ macros
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")" modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")"
@ -90,10 +90,11 @@ make verbose=1 %{?_smp_mflags}
popd popd
%install %install
install -Dm 0755 binaries/system/ActorEditor %{buildroot}%{_bindir}/ActorEditor
install -Dm 0755 binaries/system/pyrogenesis %{buildroot}%{_bindir}/pyrogenesis install -Dm 0755 binaries/system/pyrogenesis %{buildroot}%{_bindir}/pyrogenesis
install -Dm 0755 binaries/system/libCollada.so %{buildroot}%{_libdir}/%{name}/libCollada.so install -Dm 0755 binaries/system/libCollada.so %{buildroot}%{_libdir}/%{name}/libCollada.so
install -Dm 0755 binaries/system/libAtlasUI.so %{buildroot}%{_libdir}/%{name}/libAtlasUI.so install -Dm 0755 binaries/system/libAtlasUI.so %{buildroot}%{_libdir}/%{name}/libAtlasUI.so
install -Dm 0755 binaries/system/libmozjs31-ps-release.so %{buildroot}%{_libdir}/%{name}/libmozjs31-ps-release.so install -Dm 0755 binaries/system/libmozjs38-ps-release.so %{buildroot}%{_libdir}/%{name}/libmozjs38-ps-release.so
install -Dm 0755 binaries/system/libnvcore.so %{buildroot}%{_libdir}/%{name}/libnvcore.so install -Dm 0755 binaries/system/libnvcore.so %{buildroot}%{_libdir}/%{name}/libnvcore.so
install -Dm 0755 binaries/system/libnvimage.so %{buildroot}%{_libdir}/%{name}/libnvimage.so install -Dm 0755 binaries/system/libnvimage.so %{buildroot}%{_libdir}/%{name}/libnvimage.so
install -Dm 0755 binaries/system/libnvmath.so %{buildroot}%{_libdir}/%{name}/libnvmath.so install -Dm 0755 binaries/system/libnvmath.so %{buildroot}%{_libdir}/%{name}/libnvmath.so
@ -119,9 +120,10 @@ mkdir -p %{buildroot}%{_datadir}/%{name}
%endif %endif
%{_bindir}/0ad %{_bindir}/0ad
%{_bindir}/pyrogenesis %{_bindir}/pyrogenesis
%{_bindir}/ActorEditor
%{_libdir}/%{name}/libCollada.so %{_libdir}/%{name}/libCollada.so
%{_libdir}/%{name}/libAtlasUI.so %{_libdir}/%{name}/libAtlasUI.so
%{_libdir}/%{name}/libmozjs31-ps-release.so %{_libdir}/%{name}/libmozjs38-ps-release.so
%{_libdir}/%{name}/libnvcore.so %{_libdir}/%{name}/libnvcore.so
%{_libdir}/%{name}/libnvimage.so %{_libdir}/%{name}/libnvimage.so
%{_libdir}/%{name}/libnvmath.so %{_libdir}/%{name}/libnvmath.so

29
fix-c++14-compat.patch
View File

@ -1,29 +0,0 @@
diff -Nur 0ad-0.0.20-alpha/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp new/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp
--- 0ad-0.0.20-alpha/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp 2015-02-22 00:58:01.000000000 +0100
+++ new/libraries/source/nvtt/src/src/nvimage/ImageIO.cpp 2016-06-27 01:30:36.049140952 +0200
@@ -621,7 +621,7 @@
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (png_ptr == NULL) {
// nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name );
- return false;
+ return NULL;
}
// Allocate/initialize a memory block for the image information
@@ -629,14 +629,14 @@
if (info_ptr == NULL) {
png_destroy_read_struct(&png_ptr, NULL, NULL);
// nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name );
- return false;
+ return NULL;
}
// Set up the error handling
if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
// nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name );
- return false;
+ return NULL;
}
// Set up the I/O functions.

29
system-tinygettext.patch
View File

@ -1,7 +1,7 @@
diff -Nur 0ad-0.0.20-alpha/build/premake/extern_libs4.lua new/build/premake/extern_libs4.lua diff -Pdpru 0ad-0.0.21-alpha.orig/build/premake/extern_libs4.lua 0ad-0.0.21-alpha/build/premake/extern_libs4.lua
--- 0ad-0.0.20-alpha/build/premake/extern_libs4.lua 2016-03-12 19:15:04.000000000 +0100 --- 0ad-0.0.21-alpha.orig/build/premake/extern_libs4.lua 2016-09-02 18:18:57.000000000 +0200
+++ new/build/premake/extern_libs4.lua 2016-08-30 16:09:37.759431993 +0200 +++ 0ad-0.0.21-alpha/build/premake/extern_libs4.lua 2016-12-07 11:21:54.000000000 +0100
@@ -634,7 +634,16 @@ @@ -634,7 +634,16 @@ extern_lib_defs = {
}, },
tinygettext = { tinygettext = {
compile_settings = function() compile_settings = function()
@ -19,10 +19,10 @@ diff -Nur 0ad-0.0.20-alpha/build/premake/extern_libs4.lua new/build/premake/exte
end, end,
}, },
valgrind = { valgrind = {
diff -Nur 0ad-0.0.20-alpha/build/premake/premake4.lua new/build/premake/premake4.lua diff -Pdpru 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 0ad-0.0.21-alpha/build/premake/premake4.lua
--- 0ad-0.0.20-alpha/build/premake/premake4.lua 2016-03-12 19:15:04.000000000 +0100 --- 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 2016-09-18 10:54:27.000000000 +0200
+++ new/build/premake/premake4.lua 2016-08-30 16:08:19.490889266 +0200 +++ 0ad-0.0.21-alpha/build/premake/premake4.lua 2016-12-07 11:25:01.000000000 +0100
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@ newoption { trigger = "without-miniupnpc
newoption { trigger = "without-nvtt", description = "Disable use of NVTT" } newoption { trigger = "without-nvtt", description = "Disable use of NVTT" }
newoption { trigger = "without-pch", description = "Disable generation and usage of precompiled headers" } newoption { trigger = "without-pch", description = "Disable generation and usage of precompiled headers" }
newoption { trigger = "without-tests", description = "Disable generation of test projects" } newoption { trigger = "without-tests", description = "Disable generation of test projects" }
@ -30,7 +30,7 @@ diff -Nur 0ad-0.0.20-alpha/build/premake/premake4.lua new/build/premake/premake4
-- OS X specific options -- OS X specific options
newoption { trigger = "macosx-bundle", description = "Enable OSX bundle, the argument is the bundle identifier string (e.g. com.wildfiregames.0ad)" } newoption { trigger = "macosx-bundle", description = "Enable OSX bundle, the argument is the bundle identifier string (e.g. com.wildfiregames.0ad)" }
@@ -599,28 +600,31 @@ @@ -601,29 +602,32 @@ function setup_all_libs ()
end end
setup_static_lib_project("network", source_dirs, extern_libs, {}) setup_static_lib_project("network", source_dirs, extern_libs, {})
@ -42,10 +42,10 @@ diff -Nur 0ad-0.0.20-alpha/build/premake/premake4.lua new/build/premake/premake4
- "boost", - "boost",
- } - }
- setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { } ) - setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { } )
- -
- -- it's an external library and we don't want to modify its source to fix warnings, so we just disable them to avoid noise in the compile output - -- it's an external library and we don't want to modify its source to fix warnings, so we just disable them to avoid noise in the compile output
- if _ACTION == "vs2013" then - if _ACTION == "vs2013" then
- buildoptions { - buildoptions {
- "/wd4127", - "/wd4127",
- "/wd4309", - "/wd4309",
- "/wd4800", - "/wd4800",
@ -59,13 +59,12 @@ diff -Nur 0ad-0.0.20-alpha/build/premake/premake4.lua new/build/premake/premake4
+ source_dirs = { + source_dirs = {
+ "third_party/tinygettext/src", + "third_party/tinygettext/src",
} }
- end
+ extern_libs = { + extern_libs = {
+ "iconv", + "iconv",
+ "boost", + "boost",
+ } + }
+ setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { } ) + setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { } )
+
+ -- it's an external library and we don't want to modify its source to fix warnings, so we just disable them to avoid noise in the compile output + -- it's an external library and we don't want to modify its source to fix warnings, so we just disable them to avoid noise in the compile output
+ if _ACTION == "vs2013" then + if _ACTION == "vs2013" then
+ buildoptions { + buildoptions {
@ -78,7 +77,9 @@ diff -Nur 0ad-0.0.20-alpha/build/premake/premake4.lua new/build/premake/premake4
+ "/wd4503" + "/wd4503"
+ } + }
+ end + end
+ end end
-
if not _OPTIONS["without-lobby"] then if not _OPTIONS["without-lobby"] then
source_dirs = { source_dirs = {
"lobby",