osc copypac from project:home:bitshuffler:0ad package:0ad revision:9

OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=1
This commit is contained in:
Stephan Kleine 2010-07-22 09:28:09 +00:00 committed by Git OBS Bridge
commit 52ac677cca
16 changed files with 529 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

26
0ad-cs7755.patch Normal file
View File

@ -0,0 +1,26 @@
Index: build/premake/src/Src/path.c
===================================================================
--- build/premake/src/Src/path.c 2006-04-20 03:28:20.000000000 +0200
+++ build/premake/src/Src/path.c 2010-07-14 18:09:27.364697234 +0200
@@ -240,7 +240,7 @@
path_translateInPlace(forpart, "posix");
ptr = strrchr(forpart, '/');
- ptr = (ptr != NULL) ? ++ptr : forpart;
+ ptr = (ptr != NULL) ? ptr+1 : forpart;
return ptr;
}
Index: build/premake/src/Src/vs.c
===================================================================
--- build/premake/src/Src/vs.c 2010-06-10 21:15:33.000000000 +0200
+++ build/premake/src/Src/vs.c 2010-07-14 18:09:46.373697698 +0200
@@ -173,7 +173,7 @@
io_print("=\"");
}
-static tag_attr_close()
+static void tag_attr_close()
{
io_print("\"");
attrib++;

16
0ad-cs7757.patch Normal file
View File

@ -0,0 +1,16 @@
Index: libraries/fcollada/src/FCollada/FUtils/FUDebug.cpp
===================================================================
--- libraries/fcollada/src/FCollada/FUtils/FUDebug.cpp 2008-09-08 00:13:25.000000000 +0200
+++ libraries/fcollada/src/FCollada/FUtils/FUDebug.cpp 2010-07-14 19:27:11.850136645 +0200
@@ -20,9 +20,9 @@
#if defined(LINUX) || defined(__APPLE__)
#if defined(UNICODE)
-#define STRING_OUT(sz) fprintf(stderr, TO_STRING(sz).c_str()); fflush(stderr);
+#define STRING_OUT(sz) fprintf(stderr, "%s", TO_STRING(sz).c_str()); fflush(stderr);
#else
-#define STRING_OUT(sz) fprintf(stderr, sz); fflush(stderr);
+#define STRING_OUT(sz) fprintf(stderr, "%s", sz); fflush(stderr);
#endif // UNICODE
#elif defined(WIN32)
#define STRING_OUT(sz) OutputDebugString(sz); OutputDebugString(FC("\n"))

118
0ad-cs7758.patch Normal file
View File

@ -0,0 +1,118 @@
Index: build/premake/premake.lua
===================================================================
--- build/premake/premake.lua (revision 7757)
+++ build/premake/premake.lua (revision 7758)
@@ -6,6 +6,9 @@
addoption("outpath", "Location for generated project files")
addoption("without-tests", "Disable generation of test projects")
addoption("without-pch", "Disable generation and usage of precompiled headers")
+addoption("bindir", "Directory for executables (typically '/usr/games/bin'); default is to be relocatable")
+addoption("datadir", "Directory for data files (typically '/usr/share/games/0ad'); default is ../data/ relative to executable")
+addoption("libdir", "Directory for libraries (typically '/usr/games/lib'); default is ./ relative to executable")
dofile("functions.lua")
dofile("extern_libs.lua")
@@ -206,13 +209,6 @@
end
end
- if OS == "linux" then
- -- To use our local SpiderMonkey library, it needs to be part of the runtime dynamic linker
- -- path. So add the executable path with -rpath:
- -- (TODO: is this a sane way to do it?)
- tinsert(package.linkoptions, {"-Wl,-rpath='$$ORIGIN'"}) -- use Makefile escaping of '$'
- end
-
tinsert(package.buildoptions, {
-- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
-- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
@@ -233,10 +229,28 @@
if OS == "linux" and options["icc"] then
tinsert(package.libpaths, "/usr/i686-pc-linux-gnu/lib") -- needed for ICC to find libbfd
end
-
- package.defines = {
- -- "CONFIG_USE_MMGR",
- }
+
+ if options["bindir"] then
+ tinsert(package.defines, "INSTALLED_BINDIR=" .. options["bindir"])
+ end
+ if options["datadir"] then
+ tinsert(package.defines, "INSTALLED_DATADIR=" .. options["datadir"])
+ end
+ if options["libdir"] then
+ tinsert(package.defines, "INSTALLED_LIBDIR=" .. options["libdir"])
+ end
+
+ if OS == "linux" then
+ -- To use our local SpiderMonkey library, it needs to be part of the
+ -- runtime dynamic linker path. Add it with -rpath to make sure it gets found.
+ if options["libdir"] then
+ tinsert(package.linkoptions, {"-Wl,-rpath=" .. options["libdir"]})
+ else
+ -- Add the executable path:
+ tinsert(package.linkoptions, {"-Wl,-rpath='$$ORIGIN'"}) -- use Makefile escaping of '$'
+ end
+ end
+
end
end
Index: source/ps/GameSetup/Paths.cpp
===================================================================
--- source/ps/GameSetup/Paths.cpp (revision 7757)
+++ source/ps/GameSetup/Paths.cpp (revision 7758)
@@ -30,7 +30,13 @@
Paths::Paths(const CmdLineArgs& args)
{
m_root = Root(wstring_from_utf8(args.GetArg0()));
+
+#ifdef INSTALLED_DATADIR
+ m_rdata = WIDEN(STRINGIZE(INSTALLED_DATADIR)) L"/";
+#else
m_rdata = m_root/L"data/";
+#endif
+
const wchar_t* subdirectoryName = args.Has("writableRoot")? 0 : L"0ad";
// everything is a subdirectory of the root
Index: source/ps/DllLoader.cpp
===================================================================
--- source/ps/DllLoader.cpp (revision 7757)
+++ source/ps/DllLoader.cpp (revision 7758)
@@ -19,6 +19,7 @@
#include "DllLoader.h"
+#include "lib/timer.h"
#include "lib/posix/posix_dlfcn.h"
#include "ps/CStr.h"
#include "ps/CLogger.h"
@@ -30,10 +31,15 @@
// the library name.
// note: on Linux, lib is prepended to the SO file name;
-// we don't use a path with '/' so the linker will look in DT_RUNPATH
+// if we don't have an explicit libdir then we don't use
+// a path with '/' so the linker will look in DT_RUNPATH
// (which we set to $ORIGIN) to find it in the executable's directory
#if OS_UNIX
-static const char* prefix = "lib";
+ #ifdef INSTALLED_LIBDIR
+ static const char* prefix = STRINGIZE(INSTALLED_LIBDIR) "/lib";
+ #else
+ static const char* prefix = "lib";
+ #endif
#else
static const char* prefix = "";
#endif
@@ -72,6 +78,8 @@
// postcondition: m_Handle valid or == HANDLE_UNAVAILABLE.
if (m_Handle == 0)
{
+ TIMER(L"LoadDLL");
+
CStr filename = CStr(prefix) + m_Name + suffix;
// we don't really care when relocations take place, but one of

41
0ad-cs7759.patch Normal file
View File

@ -0,0 +1,41 @@
Index: libraries/fcollada/src/Makefile
===================================================================
--- libraries/fcollada/src/Makefile 2010-04-03 13:27:24.000000000 +0200
+++ libraries/fcollada/src/Makefile 2010-07-14 18:17:57.672697429 +0200
@@ -8,7 +8,7 @@
endif
CXX := g++
-CXXFLAGS := -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS)
+CXXFLAGS := -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
# (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1)
@@ -243,7 +243,7 @@
@ar -cr $@ $(OBJECTS_RELEASE); ranlib $@
output/FColladaTest: $(OBJECTS_TEST)
- @$(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
+ $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
install: output/libFColladaSD.a output/libFColladaSR.a
cp output/libFColladaSD.a ../lib/libFColladaSD.a
@@ -258,15 +258,15 @@
rm -f $(dfile)
output/debug/%.o: %.cpp
@echo "$<"
- @$(CXX) $(CXXFLAGS) $(CXXFLAGS_DEBUG) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@
+ $(CXX) $(CXXFLAGS) $(CXXFLAGS_DEBUG) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@
$(gendep)
output/release/%.o: %.cpp
@echo "$<"
- @$(CXX) $(CXXFLAGS) $(CXXFLAGS_RELEASE) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@
+ $(CXX) $(CXXFLAGS) $(CXXFLAGS_RELEASE) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@
$(gendep)
output/test/%.o: %.cpp
@echo "$<"
- @$(CXX) $(CXXFLAGS) $(CXXFLAGS_TEST) $(INCLUDES_TEST) -MD -MF $(dfile) -c $< -o $@
+ $(CXX) $(CXXFLAGS) $(CXXFLAGS_TEST) $(INCLUDES_TEST) -MD -MF $(dfile) -c $< -o $@
$(gendep)
clean:

3
0ad-r7732.tar.gz Normal file
View File

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

5
0ad.changes Normal file
View File

@ -0,0 +1,5 @@
-------------------------------------------------------------------
Mon Jul 12 21:10:44 UTC 2010 - bitshuffler@opensuse.org
- Initial package

12
0ad.dsc Normal file
View File

@ -0,0 +1,12 @@
Format: 1.0
Source: 0ad
Binary: 0ad
Architecture: any
Version: r7732-1
Maintainer: Stephan Kleine <bitshuffler@opensuse.org>
Homepage: http://wildfiregames.com/0ad/
Standards-Version: 3.8.0
Build-Depends: debhelper, libsdl1.2-dev, zlib1g-dev, libpng12-dev, libjpeg62-dev, libgamin-dev, nasm, libwxgtk2.8-dev, libboost1.35-dev, libboost-signals1.35-dev, libopenal-dev, libalut-dev, libvorbis-dev, libogg-dev, libcrypto++-dev, binutils-dev, libdevil-dev, libenet-dev, libxml2-dev, pkg-config, libboost-filesystem1.35-dev, zip, libstdc++6-4.3-dev, libsvga1, python-dev
Files:
d8d3379b96b0c39e61c0d460d11bf06a 4366618 0ad-r7732.tar.gz
de993e4b2fd8191252c3a65b72eba516 9203 0ad-r7732.diff.gz

128
0ad.spec Normal file
View File

@ -0,0 +1,128 @@
# norootforbuild
Name: 0ad
Version: r7732
Release: 1.0
License: GNU GPL v2 or later
Group: Amusements/Games/Strategy/Real Time
Url: http://wildfiregames.com/0ad/
Source: 0ad-%{version}.tar.gz
Patch0: 0ad-cs7755.patch
Patch1: 0ad-cs7757.patch
Patch2: 0ad-cs7758.patch
Patch3: 0ad-cs7759.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: binutils-devel
BuildRequires: boost-devel
BuildRequires: DevIL-devel
BuildRequires: fam-devel
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: nasm
BuildRequires: python-devel
BuildRequires: subversion
BuildRequires: zip
%if 0%{?suse_version}
BuildRequires: libenet-devel
BuildRequires: openal-soft-devel
BuildRequires: pkg-config
BuildRequires: wxGTK-devel
%if 0%{?suse_version} == 1110
BuildRequires: SDL-devel
%else
BuildRequires: libSDL-devel
%endif
%endif
%if 0%{?fedora_version}
BuildRequires: enet-devel
BuildRequires: openal-soft-devel
BuildRequires: pkgconfig
BuildRequires: SDL-devel
BuildRequires: wxGTK-devel
%if 0%{?fedora_version} == 13
BuildRequires: binutils-static
%endif
%endif
%if 0%{?mandriva_version}
BuildRequires: libenet-devel
BuildRequires: libwxgtku2.8-devel
%if 0%{?mandriva_version} < 201000
BuildRequires: libopenal-devel
%else:
BuildRequires: openal-soft-devel
%endif
%endif
Requires: 0ad-data
Summary: Free, Open-Source, Cross-Platform RTS Game of Ancient Warfare
%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 historically-based
war/economy game that allows players to relive or rewrite the history of Western
civilizations, focusing on the years between 500 B.C. and 500 A.D. The project is
highly ambitious, involving state-of-the-art 3D graphics, detailed artwork, sound,
and a flexible and powerful custom-built game engine.
The game has been in development by Wildfire Games (WFG), a group of volunteer,
hobbyist game developers, since 2001. The code and data are available under the GPL
license, and the art, sound and documentation are available under CC-BY-SA. In short,
we consider 0 A.D. an an educational celebration of game development and ancient
history.
%prep
%setup -q
%patch0
%patch1
%patch2
%patch3
%build
export CFLAGS="%{optflags}"
export CPPFLAGS="%{optflags}"
build/workspaces/update-workspaces.sh --verbose --bindir %{_bindir} --datadir %{_datadir}/%{name} --libdir %{_libdir}
pushd build/workspaces/gcc
%__make %{?_smp_mflags}
popd
%check
#__make check
#binaries/system/test_dbg
%install
#makeinstall
%__install -Dm 0755 binaries/system/pyrogenesis_dbg %{buildroot}%{_bindir}/pyrogenesis_dbg
%__install -Dm 0755 binaries/system/libCollada_dbg.so %{buildroot}%{_libdir}/libCollada_dbg.so
%__install -Dm 0755 binaries/system/libAtlasUI_dbg.so %{buildroot}%{_libdir}/libAtlasUI_dbg.so
%__install -Dm 0755 binaries/system/libmozjs-ps-debug.so %{buildroot}%{_libdir}/libmozjs-ps-debug.so
#__install -Dm 0755 binaries/system/ActorEditor_dbg %{buildroot}/%{_libexecdir}/%{name}/bin/ActorEditor_dbg
#__install -Dm 0755 binaries/system/ColourTester_dbg %{buildroot}/%{_libexecdir}/%{name}/bin/ColourTester_dbg
%__mkdir_p %{buildroot}%{_datadir}/%{name}
%clean
test "%{buildroot}" != "/" && %__rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc README.txt
%{_bindir}/pyrogenesis_dbg
%{_libdir}/libCollada_dbg.so
%{_libdir}/libAtlasUI_dbg.so
%{_libdir}/libmozjs-ps-debug.so
%{_datadir}/%{name}

5
debian.changelog Normal file
View File

@ -0,0 +1,5 @@
0ad (r7732-1) unstable; urgency=low
* Initial package.
-- Stephan Kleine <bitshuffler@opensuse.org> Thu, 15 Jul 2010 00:13:30 +0200

1
debian.compat Normal file
View File

@ -0,0 +1 @@
7

54
debian.control Normal file
View File

@ -0,0 +1,54 @@
Source: 0ad
Section: games
Priority: optional
Maintainer: Stephan Kleine <bitshuffler@opensuse.org>
Build-Depends: debhelper,
libsdl1.2-dev, zlib1g-dev, libpng12-dev,
libjpeg62-dev, libgamin-dev, nasm,
libwxgtk2.8-dev, libboost1.35-dev,
libboost-signals1.35-dev, libopenal-dev,
libalut-dev, libvorbis-dev, libogg-dev,
libcrypto++-dev, binutils-dev,
libdevil-dev, libenet-dev, libxml2-dev,
pkg-config, libboost-filesystem1.35-dev,
zip, libstdc++6-4.3-dev, libsvga1, python-dev
Standards-Version: 3.8.0
Homepage: http://wildfiregames.com/0ad/
Package: 0ad
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, 0ad-data
Description: Free, Open-Source, Cross-Platform RTS Game of Ancient Warfare
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 historically-based
war/economy game that allows players to relive or rewrite the history of Western
civilizations, focusing on the years between 500 B.C. and 500 A.D. The project is
highly ambitious, involving state-of-the-art 3D graphics, detailed artwork, sound,
and a flexible and powerful custom-built game engine.
.
The game has been in development by Wildfire Games (WFG), a group of volunteer,
hobbyist game developers, since 2001. The code and data are available under the GPL
license, and the art, sound and documentation are available under CC-BY-SA. In short,
we consider 0 A.D. an an educational celebration of game development and ancient
history.
Package: 0ad-dbg
Section: debug
Priority: extra
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, 0ad (= ${binary:Version})
Description: Free, Open-Source, Cross-Platform RTS Game of Ancient Warfare
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 historically-based
war/economy game that allows players to relive or rewrite the history of Western
civilizations, focusing on the years between 500 B.C. and 500 A.D. The project is
highly ambitious, involving state-of-the-art 3D graphics, detailed artwork, sound,
and a flexible and powerful custom-built game engine.
.
The game has been in development by Wildfire Games (WFG), a group of volunteer,
hobbyist game developers, since 2001. The code and data are available under the GPL
license, and the art, sound and documentation are available under CC-BY-SA. In short,
we consider 0 A.D. an an educational celebration of game development and ancient
history.
.
This package contains the debugging symbols.

4
debian.install Normal file
View File

@ -0,0 +1,4 @@
usr/bin/pyrogenesis_dbg
usr/lib/libAtlasUI_dbg.so
usr/lib/libCollada_dbg.so
usr/lib/libmozjs-ps-debug.so

88
debian.rules Normal file
View File

@ -0,0 +1,88 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
config: config-stamp
config-stamp:
dh_testdir
# Add here commands to configure the package.
# cmake -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DLOCALSTATEDIR=/var .
touch $@
build: build-stamp
build-stamp: config-stamp
dh_testdir
# Add here commands to compile the package.
build/workspaces/update-workspaces.sh --verbose --bindir /usr/bin --datadir /usr/share/0ad --libdir /usr/lib
# NUMJOBS=1
# ifneq ("",$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
# NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
# endif
# $(MAKE) -j$(NUMJOBS) -C build/workspaces/gcc
$(MAKE) -j2 -C build/workspaces/gcc
touch $@
clean:
dh_testdir
dh_testroot
rm -f build-stamp config.stamp
# Add here commands to clean up after the build process.
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Add here commands to install the package into debian/tmp
# $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
install -Dm 0755 binaries/system/pyrogenesis_dbg $(CURDIR)/debian/tmp/usr/bin/pyrogenesis_dbg
install -Dm 0755 binaries/system/libCollada_dbg.so $(CURDIR)/debian/tmp/usr/lib/libCollada_dbg.so
install -Dm 0755 binaries/system/libAtlasUI_dbg.so $(CURDIR)/debian/tmp/usr/lib/libAtlasUI_dbg.so
install -Dm 0755 binaries/system/libmozjs-ps-debug.so $(CURDIR)/debian/tmp/usr/lib/libmozjs-ps-debug.so
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
# dh_installchangelogs CHANGES
dh_installdocs
dh_install --sourcedir=debian/tmp
dh_installdebconf
dh_installlogrotate
dh_installinit -n -r -u stop 20 0 6 .
dh_installman --sourcedir=debian/tmp
dh_link
dh_strip --dbg-package=0ad-dbg
dh_compress
dh_fixperms
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install

4
debian.series Normal file
View File

@ -0,0 +1,4 @@
0ad-cs7755.patch -p0
0ad-cs7757.patch -p0
0ad-cs7758.patch -p0
0ad-cs7759.patch -p0