Author: evil Date: Wed May 5 00:53:47 2010 GMT Module: packages Tag: HEAD ---- Log message: - splitted into warsow and warsow-data subpackages/specs - commented out PLD and added gentoo patches - added patch for building with new libjpeg - packaged wrapper into data allowing 32/64 coexistence - finally works!
---- Files affected: packages/warsow: warsow.spec (1.7 -> 1.8) , warsow-gentoo_fixes.patch (NONE -> 1.1) (NEW), warsow-libjpeg.patch (NONE -> 1.1) (NEW), warsow-pic.patch (NONE -> 1.1) (NEW), warsow-xincludes.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/warsow/warsow.spec diff -u packages/warsow/warsow.spec:1.7 packages/warsow/warsow.spec:1.8 --- packages/warsow/warsow.spec:1.7 Tue Oct 6 23:11:25 2009 +++ packages/warsow/warsow.spec Wed May 5 02:53:41 2010 @@ -12,15 +12,17 @@ Summary(pl.UTF-8): Szybko tocząca się gra FPS Name: warsow Version: 0.5 -Release: 0.1 +Release: 0.2 License: GPL v2+ Group: X11/Applications/Games Source0: http://data.rodix.free.fr/warsow/files/%{name}_%{version}_sdk.zip # Source0-md5: acd0244435cc63967b0eb3468c21c454 -Source1: http://data.rodix.free.fr/warsow/files/%{name}_%{version}_unified.zip -# Source1-md5: d0cb961256bbc1b93bf240b8bcf8eff5 Patch0: %{name}-flags.patch Patch1: %{name}-dirs.patch +Patch2: %{name}-gentoo_fixes.patch +Patch3: %{name}-libjpeg.patch +Patch4: %{name}-xincludes.patch +Patch5: %{name}-pic.patch URL: http://www.warsow.net/ %{?with_openal:BuildRequires: OpenAL-devel} %{?with_qf:BuildRequires: SDL-devel} @@ -34,6 +36,7 @@ BuildRequires: xorg-lib-libXxf86dga-devel BuildRequires: xorg-lib-libXxf86vm-devel BuildRequires: zlib-devel +Requires: %{name}-data = %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -62,13 +65,15 @@ %prep %setup -q -c -# conflicting license file -%{__unzip} -qq -n %{SOURCE1} -%patch0 -p1 -%patch1 -p1 +#%%patch0 -p1 +#%%patch1 -p1 +%patch2 -p0 +%patch3 -p1 +%patch4 -p1 +%patch5 -p0 %build -%{__make} -C source/ \ +%{__make} -C source/ -j1 CC="%{__cc}" \ CXX="%{__cc}" \ LD="%{__cc}" \ @@ -86,7 +91,6 @@ install source/release/warsow* $RPM_BUILD_ROOT%{_bindir} cp -r source/release/libs $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -r basewsw $RPM_BUILD_ROOT%{_datadir}/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -95,7 +99,7 @@ %defattr(644,root,root,755) %doc docs/* %attr(755,root,root) %{_bindir}/warsow* -%{_datadir}/%{name} +%attr(755,root,root) %{_datadir}/%{name}/libs %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -103,6 +107,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2010/05/05 00:53:41 evil +- splitted into warsow and warsow-data subpackages/specs +- commented out PLD and added gentoo patches +- added patch for building with new libjpeg +- packaged wrapper into data allowing 32/64 coexistence +- finally works! + Revision 1.7 2009/10/06 21:11:25 qboosh - workaround for zips file conflict - specify all explicitly used libs in BRs ================================================================ Index: packages/warsow/warsow-gentoo_fixes.patch diff -u /dev/null packages/warsow/warsow-gentoo_fixes.patch:1.1 --- /dev/null Wed May 5 02:53:47 2010 +++ packages/warsow/warsow-gentoo_fixes.patch Wed May 5 02:53:41 2010 @@ -0,0 +1,62 @@ +--- source/Makefile ++++ source/Makefile +@@ -52,7 +52,7 @@ + #LD=gcc + else + CC?=gcc +-LD=gcc ++LD=$(CC) + + # this nice line comes from the linux kernel makefile + BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/) +@@ -134,9 +134,9 @@ + LOCALBASE?=/usr/local + X11BASE?=/usr/X11R6 + +-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall +-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG +-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG ++CFLAGS_COMMON=$(CFLAGS) -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -fno-strict-aliasing ++CFLAGS_RELEASE=-DNDEBUG ++CFLAGS_DEBUG=-D_DEBUG + ifeq ($(DEBUG_BUILD),YES) + CFLAGS_COMMON+=$(CFLAGS_DEBUG) + else +@@ -152,7 +152,7 @@ + ifeq ($(OS),FreeBSD) + LDFLAGS_COMMON=-L/usr/local/lib -lm -pthread + else +-LDFLAGS_COMMON=-L/usr/local/lib -ldl -lm -Wl -O1 --as-needed ++LDFLAGS_COMMON=$(LDFLAGS) -ldl -lm + endif + + ifeq ($(ARCH),x86_64) +@@ -168,7 +168,7 @@ + + # openal + ifeq ($(BUILD_SND_OPENAL),YES) +-OPENAL_CONFIG?=openal-config ++OPENAL_CONFIG?=pkg-config openal + + CFLAGS_OPENAL=$(shell $(OPENAL_CONFIG) --cflags) + LDFLAGS_OPENAL=-lvorbisfile +@@ -400,16 +400,16 @@ + + all: client openal qf ded cgame game ui irc angelwrap tv_server + +-client: $(BUILDDIRS) message-client compile-client link-client start-script-client ++client: $(BUILDDIRS) message-client compile-client link-client + openal: $(BUILDDIRS) message-openal compile-openal link-openal + qf: $(BUILDDIRS) message-qf compile-qf link-qf +-ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded ++ded: $(BUILDDIRS) message-ded compile-ded link-ded + cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame + game: $(BUILDDIRS) message-game compile-game link-game + ui: $(BUILDDIRS) message-ui compile-ui link-ui + irc: $(BUILDDIRS) message-irc compile-irc link-irc + angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap +-tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server ++tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server + + clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-cgame clean-game clean-ui clean-irc clean-angelwrap clean-tv_server + ================================================================ Index: packages/warsow/warsow-libjpeg.patch diff -u /dev/null packages/warsow/warsow-libjpeg.patch:1.1 --- /dev/null Wed May 5 02:53:47 2010 +++ packages/warsow/warsow-libjpeg.patch Wed May 5 02:53:41 2010 @@ -0,0 +1,21 @@ +--- warsow-0.5.orig/source/ref_gl/r_image.c 2009-06-03 21:52:13.000000000 +0200 ++++ warsow-0.5/source/ref_gl/r_image.c 2010-05-04 18:32:55.176936391 +0200 +@@ -17,6 +17,9 @@ + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++// for jpeglib ++#define HAVE_PROTOTYPES ++ + #include "r_local.h" + + #if defined ( __MACOSX__ ) +@@ -924,7 +927,7 @@ + cinfo->src->bytes_in_buffer -= (size_t) num_bytes; + } + +-static void jpeg_mem_src( j_decompress_ptr cinfo, qbyte *mem, int len ) ++static void crjpeg_mem_src( j_decompress_ptr cinfo, qbyte *mem, int len ) + { + cinfo->src = (struct jpeg_source_mgr *) + ( *cinfo->mem->alloc_small )( (j_common_ptr) cinfo, ================================================================ Index: packages/warsow/warsow-pic.patch diff -u /dev/null packages/warsow/warsow-pic.patch:1.1 --- /dev/null Wed May 5 02:53:47 2010 +++ packages/warsow/warsow-pic.patch Wed May 5 02:53:41 2010 @@ -0,0 +1,11 @@ +--- source/snd_qf/snd_mix.c ++++ source/snd_qf/snd_mix.c +@@ -27,7 +27,7 @@ + int *snd_p, snd_linear_count, snd_vol, music_vol; + short *snd_out; + +-#if !defined ( id386 ) || defined ( __MACOSX__ ) ++#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ ) + #ifdef _WIN32 + #pragma warning( push ) + #pragma warning( disable : 4310 ) // cast truncates constant value ================================================================ Index: packages/warsow/warsow-xincludes.patch diff -u /dev/null packages/warsow/warsow-xincludes.patch:1.1 --- /dev/null Wed May 5 02:53:47 2010 +++ packages/warsow/warsow-xincludes.patch Wed May 5 02:53:41 2010 @@ -0,0 +1,11 @@ +--- warsow-0.5.orig/source/unix/x11.h 2008-01-09 20:19:03.000000000 +0100 ++++ warsow-0.5/source/unix/x11.h 2010-05-04 18:20:15.154512387 +0200 +@@ -3,7 +3,7 @@ + #include <X11/keysym.h> + #include <X11/cursorfont.h> + +-#include <X11/extensions/xf86dga.h> ++#include <X11/extensions/Xxf86dga.h> + #include <X11/extensions/xf86vmode.h> + #include <X11/extensions/Xinerama.h> + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/warsow/warsow.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
