From 348a579b17371b9cda94c5cb3b362cca0ef21a28 Mon Sep 17 00:00:00 2001 From: Rosa Date: Thu, 2 Feb 2012 00:12:10 +0400 Subject: [PATCH] Automatic import for version r10803 --- .abf.yml | 2 +- 0ad-r10803-gamin.patch | 23 ++++++ 0ad.spec | 181 +++++++++++++++++++++++++---------------- 3 files changed, 134 insertions(+), 72 deletions(-) create mode 100644 0ad-r10803-gamin.patch diff --git a/.abf.yml b/.abf.yml index 759c48c..4364c78 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "0ad-r8899.tar.xz": 65a748cf4cef77372d7ff73f63db04815f7e0fff + "0ad-r10803-alpha-unix-build.tar.xz": 9c9ee04bf1327bfd9161f51b18180ec8d3c6547b diff --git a/0ad-r10803-gamin.patch b/0ad-r10803-gamin.patch new file mode 100644 index 0000000..16d17bd --- /dev/null +++ b/0ad-r10803-gamin.patch @@ -0,0 +1,23 @@ +--- 0ad-r10803-alpha/source/lib/sysdep/os/linux/dir_watch_fam.cpp.orig 2012-01-12 03:19:47.575647830 -0200 ++++ 0ad-r10803-alpha/source/lib/sysdep/os/linux/dir_watch_fam.cpp 2012-01-12 03:48:38.893574156 -0200 +@@ -156,6 +156,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 +@@ -188,7 +190,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? diff --git a/0ad.spec b/0ad.spec index 454a8ad..0a8cf7a 100644 --- a/0ad.spec +++ b/0ad.spec @@ -1,43 +1,61 @@ -%define revision 8899 +# http://trac.wildfiregames.com/wiki/BuildInstructions#Linux -# The source for this package was pulled from upstream's subversion (svn). -# Use the following commands to generate the tarball: -# svn export -r 8899 http://svn.wildfiregames.com/public/ps/trunk/ 0ad-r8899 -# find 0ad-r8899 \( -name "*.dll" -or -name "*.exe" -or -name "*.lib" -or -name "*.bat" \) -delete -# tar -cJvf 0ad-r8899.tar.xz 0ad-r8899 +%bcond_with debug +%if %{with debug} +%define config debug +%define dbg _dbg +%undefine _enable_debug_packages +%undefine debug_package +%else +%define config release +%define dbg %{nil} +# 0ad-debug is useless if 0ad is stripped +# install gamin-debug to verify reason of patch0 +%define _enable_debug_packages %{nil} +%define debug_package %{nil} +%endif Name: 0ad -Version: 1.0 -Release: %mkrel 0.%{revision}.2 -License: GNU GPL v2 or later +Epoch: 1 +Version: r10803 +Release: 0.2 +License: GPLv2+ Group: Games/Strategy Summary: Cross-Platform RTS Game of Ancient Warfare Url: http://wildfiregames.com/0ad/ -Source: 0ad-r%{revision}.tar.xz +Source: http://releases.wildfiregames.com/0ad-%{version}-alpha-unix-build.tar.xz Requires: 0ad-data BuildRequires: boost-devel +BuildRequires: cmake +BuildRequires: desktop-file-utils BuildRequires: devil-devel -BuildRequires: fam-devel +BuildRequires: gamin-devel BuildRequires: gcc-c++ +BuildRequires: jpeg-devel +BuildRequires: libdnet-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libvorbis-devel BuildRequires: libxml2-devel -BuildRequires: wxGTK-devel -BuildRequires: wxgtku-devel BuildRequires: nasm -BuildRequires: python -BuildRequires: subversion -BuildRequires: zip -BuildRequires: cmake -BuildRequires: desktop-file-utils BuildRequires: pkgconfig +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libenet) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libzip) +BuildRequires: pkgconfig(mozjs185) +BuildRequires: pkgconfig(openal) +BuildRequires: python BuildRequires: SDL-devel -BuildRequires: wxGTK-devel -BuildRequires: enet1.2-devel -BuildRequires: openal-devel -BuildRoot: %{_tmppath}/%{name}-%{version} +BuildRequires: subversion +#BuildRequires: wxGTK-devel +BuildRequires: wxgtku-devel +BuildRequires: X11-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: 0ad-r10803-gamin.patch %description 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform @@ -51,78 +69,99 @@ game engine. The game has been in development by Wildfire Games (WFG), a group of volunteer, hobbyist game developers, since 2001. -%package data -Summary: Data files for 0 A.D the RTS games -Group: Games/Strategy -License: GPLv2+ and CC-BY-SA -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description data -Data files for 0 A.D the RTS games such as sound, movies and images. - +#----------------------------------------------------------------------- %prep -%setup -q -n %{name}-r%{revision} +%setup -q -n %{name}-%{version}-alpha +%patch0 -p1 + +#----------------------------------------------------------------------- %build export CFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" -build/workspaces/update-workspaces.sh \ - --verbose \ - --bindir %{_bindir} \ - --datadir %{_datadir}/%{name} \ - --libdir %{_libdir}/%{name} -pushd build/workspaces/gcc -%make CONFIG=Release -popd +build/workspaces/update-workspaces.sh \ + --bindir %{_gamesbindir} \ + --datadir %{_gamesdatadir}/%{name} \ + --libdir %{_libdir}/%{name} \ + --with-system-enet \ + --with-system-mozjs185 \ + %{_smp_mflags} +%make -C build/workspaces/gcc config=%{config} verbose=1 + +#----------------------------------------------------------------------- %check -export LD_LIBRARY_PATH=%{buildroot}%{_libdir}/%{name} -./binaries/system/test -libdir binaries/system +LD_LIBRARY_PATH=binaries/system binaries/system/test%{dbg} -libdir binaries/system +#----------------------------------------------------------------------- %install -install -d -m 755 %{buildroot}%{_bindir} -install -m 755 binaries/system/pyrogenesis %{buildroot}%{_bindir}/pyrogenesis -install -m 755 build/resources/0ad.sh %{buildroot}%{_bindir}/0ad +install -d -m 755 %{buildroot}%{_gamesbindir} +install -m 755 binaries/system/pyrogenesis%{dbg} %{buildroot}%{_gamesbindir}/pyrogenesis%{dbg} install -d -m 755 %{buildroot}%{_libdir}/%{name} -install -m 755 binaries/system/libCollada.so %{buildroot}%{_libdir}/%{name}/libCollada.so -install -m 755 binaries/system/libAtlasUI.so %{buildroot}%{_libdir}/%{name}/libAtlasUI.so -install -m 755 binaries/system/libmozjs-ps-release.so %{buildroot}%{_libdir}/%{name}/libmozjs-ps-release.so -install -m 755 binaries/system/libnvcore.so %{buildroot}%{_libdir}/%{name}/libnvcore.so -install -m 755 binaries/system/libnvimage.so %{buildroot}%{_libdir}/%{name}/libnvimage.so -install -m 755 binaries/system/libnvmath.so %{buildroot}%{_libdir}/%{name}/libnvmath.so -install -m 755 binaries/system/libnvtt.so %{buildroot}%{_libdir}/%{name}/libnvtt.so +for name in AtlasUI%{dbg} Collada%{dbg} nvcore nvimage nvmath nvtt; do + install -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so +done -install -d -m 755 %{buildroot}%{_datadir}/applications -install -m 644 build/resources/0ad.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +install -d -m 755 %{buildroot}%{_gamesdatadir}/applications +install -m 644 build/resources/0ad.desktop %{buildroot}%{_gamesdatadir}/applications/%{name}.desktop -install -d -m 755 %{buildroot}%{_datadir}/pixmaps -install -m 644 build/resources/0ad.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -d -m 755 %{buildroot}%{_gamesdatadir}/pixmaps +install -m 644 build/resources/0ad.png %{buildroot}%{_gamesdatadir}/pixmaps/%{name}.png -install -d -m 755 %{buildroot}%{_datadir}/%{name} -cp -a binaries/data/* %{buildroot}%{_datadir}/%{name} +install -d -m 755 %{buildroot}%{_gamesdatadir}/%{name} +cp -a binaries/data/* %{buildroot}%{_gamesdatadir}/%{name} -%clean -rm -rf %{buildroot} +cat > %{buildroot}%{_gamesbindir}/0ad < 1.0-0.8899.2mdv2011.0 +* Sat Jan 14 2012 Paulo Andrade 1:r10803-0.2 ++ Revision: 760793 +- Assume latest 0ad-data is installed in _gamesdatadir. +- Do not add 0ad libraries to ld library path. + +* Thu Jan 12 2012 Paulo Andrade 1:r10803-0.1 ++ Revision: 760257 +- Install binaries in gamesbindir. +- Install data files in gamesdatadir. +- Use upstream suggested versioning schema. +- Use system libraries (but nvtt). +- Add build mode to make it easier to debug failures. + + + Sergey Zhemoitel + - add new revision 10803 + - new revision 10288 + - fix x86_64 requires lib + - fix x86_64 requires lib + - add new requires + - fix enet + - fix requires + - imported package 0ad + - update revesion to 09786 + +* Mon Mar 14 2011 Funda Wang 1.0-0.8899.2 + Revision: 644467 - rebuild for new boost