Author: glen Date: Sun Mar 13 21:22:58 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to svn 817, enable x86_64 arch
---- Files affected:
packages/doomlegacy:
doomlegacy-Makefile.patch (1.9 -> 1.10) , doomlegacy.spec (1.45 -> 1.46) ,
doomlegacy-nocmap.patch (1.3 -> NONE) (REMOVED), doomlegacy-vidmodes.patch
(1.3 -> NONE) (REMOVED), i_sound-pow.patch (1.2 -> NONE) (REMOVED),
keytable.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/doomlegacy/doomlegacy-Makefile.patch
diff -u packages/doomlegacy/doomlegacy-Makefile.patch:1.9
packages/doomlegacy/doomlegacy-Makefile.patch:1.10
--- packages/doomlegacy/doomlegacy-Makefile.patch:1.9 Tue Feb 22 20:50:10 2011
+++ packages/doomlegacy/doomlegacy-Makefile.patch Sun Mar 13 22:22:53 2011
@@ -54,8 +54,8 @@
- gcc -O6 -mpentium -Wall -s convert.c -o convert.exe
+ $(CC) $(OPTFLAGS) -Wall convert.c -o convert.exe
---- doomlegacy-1.44/src/Makefile 2011-01-20 12:36:18.696704389 +0200
-+++ doomlegacy-1.44/src/Makefile 2011-01-20 12:39:25.345251712 +0200
+--- doomlegacy-1.44/src/Makefile~ 2011-03-13 22:41:25.000000000 +0200
++++ doomlegacy-1.44/src/Makefile 2011-03-13 22:41:56.523480247 +0200
@@ -57,6 +57,9 @@
OPTLEV = -O3
#OPTLEV = -O5
@@ -74,14 +74,14 @@
# End of User tunable settings
-@@ -147,8 +151,7 @@
+@@ -157,8 +157,7 @@
X=1
ifdef X
- OPTS := $(OPTS) $(POLL_POINTER) -I. -I/usr/X11R6/include
- LDFLAGS=-L/usr/X11R6/lib
+ OPTS := $(OPTS) $(POLL_POINTER) -I.
- LIBS=-lXext -lX11 -lm -ldl -lXxf86vm
+ LIBS=-lGL -lGLU -lXext -lX11 -lm -ldl -lXxf86vm
#WITH_DGA=1
@@ -202,8 +205,7 @@
================================================================
Index: packages/doomlegacy/doomlegacy.spec
diff -u packages/doomlegacy/doomlegacy.spec:1.45
packages/doomlegacy/doomlegacy.spec:1.46
--- packages/doomlegacy/doomlegacy.spec:1.45 Thu Mar 3 12:31:57 2011
+++ packages/doomlegacy/doomlegacy.spec Sun Mar 13 22:22:53 2011
@@ -1,26 +1,25 @@
# $Revision$, $Date$
-# TODO
-# - 64bit version
-# - (some) patches tracker:
https://sourceforge.net/tracker/?func=detail&aid=3198347&group_id=2479&atid=102479
#
# Conditional build:
%bcond_with x11 # build with System Media Interface (broken,
seems unsupported)
%bcond_without sdl # build with SDL System Media Interface
-%define rel 1
+%define rel 2
+%define svnrev 817
Summary: DOOM Legacy for Linux
Summary(pl.UTF-8): DOOM Legacy dla Linuksa
Name: doomlegacy
Version: 1.44
-Release: 0.alpha2.%{rel}
+Release: 0.alpha2.r%{svnrev}.%{rel}
License: GPL, perhaps except for legacy.wad
Group: Applications/Games
#Source0:
http://doomlegacy.sourceforge.net/releases/%{name}_144_alpha2_src_r777.zip
# no upstream source, so create our own
-# svn export
https://doomlegacy.svn.sourceforge.net/svnroot/doomlegacy/legacy_one/trunk@778
doomlegacy_144_alpha2
-# zip -r doomlegacy_144_alpha2_src_r778.zip doomlegacy_144_alpha2
-Source0: %{name}_144_alpha2_src_r778.zip
-# Source0-md5: ab732fe33f1e2dcb8f79f6025544895a
+# svn co
https://doomlegacy.svn.sourceforge.net/svnroot/doomlegacy/legacy_one/trunk
legacy_one
+# rm -rf doomlegacy_144_alpha2 && svn export legacy_one doomlegacy_144_alpha2
+# zip -r doomlegacy_144_alpha2_src_r$(svnversion legacy_one).zip
doomlegacy_144_alpha2
+Source0: %{name}_144_alpha2_src_r817.zip
+# Source0-md5: 28b564983eec5106f6cc3b39bd793dca
# legacy wad extracted from binary archive:
doomlegacy_144_alpha2_linux2.4_32bit.zip
Source1: http://carme.pld-linux.org/~glen/legacy.wad
# Source1-md5: 2c29a4d7cedcf95d09dec71c41025aa5
@@ -31,10 +30,7 @@
Patch1: %{name}-Makefile.patch
Patch2: %{name}-nosndstat.patch
Patch3: %{name}-sound.patch
-Patch5: %{name}-nocmap.patch
-Patch6: %{name}-vidmodes.patch
-Patch7: i_sound-pow.patch
-Patch8: keytable.patch
+Patch4: svnversion.patch
URL: http://doomlegacy.sourceforge.net/
BuildRequires: OpenGL-GLU-devel
%{?with_sdl:BuildRequires: SDL_mixer-devel}
@@ -42,7 +38,7 @@
BuildRequires: rpmbuild(macros) >= 1.595
BuildRequires: unzip
BuildRequires: xorg-lib-libXext-devel
-ExclusiveArch: %{ix86}
+ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define debugcflags -O1 -g
@@ -99,10 +95,6 @@
%patch1 -p2
%patch2 -p1
%patch3 -p1
-%patch5 -p2
-%patch6 -p2
-%patch7 -p2
-%patch8 -p2
%build
install -d objs bin src/linux_x/{mus,snd}serv/linux
@@ -199,6 +191,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.46 2011/03/13 21:22:53 glen
+- up to svn 817, enable x86_64 arch
+
Revision 1.45 2011/03/03 11:31:57 glen
- tracker for patches upstream pushing
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/doomlegacy/doomlegacy-Makefile.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/doomlegacy/doomlegacy.spec?r1=1.45&r2=1.46&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
