diff options
| -rw-r--r-- | games/worldofpadman/Makefile | 42 | ||||
| -rw-r--r-- | games/worldofpadman/distinfo | 6 | ||||
| -rw-r--r-- | games/worldofpadman/files/patch-Makefile | 329 | ||||
| -rw-r--r-- | games/worldofpadman/files/patch-code__qcommon__net_ip.c | 19 | ||||
| -rw-r--r-- | games/worldofpadman/files/patch-code__unix__linux_glimp.c | 19 |
5 files changed, 176 insertions, 239 deletions
diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile index 29131c5d70c0..3f182e920e6e 100644 --- a/games/worldofpadman/Makefile +++ b/games/worldofpadman/Makefile @@ -6,20 +6,18 @@ # PORTNAME= worldofpadman -PORTVERSION= 1.2 -PORTREVISION= 3 +PORTVERSION= 1.2.20080621 CATEGORIES= games MASTER_SITES= http://thilo.kickchat.com/download/:full \ http://btc3x6.che.uni-bayreuth.de/~tl/wop_final/:full \ ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/:full,update \ ftp://ftp.kickchat.com/wop/:update \ http://www.hessenfragger.de/uploads/:update \ - http://padworld.myexp.de/downloads/:source \ - http://thilo.kickchat.com/download/:source -DISTNAME= wopengine_src-1.1 + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= alepulver DISTFILES= worldofpadman.run:full \ wop_patch_1_2.run:update \ - ${DISTNAME}.tar.bz2:source + ${SRC_FILE}.tar.bz2:source EXTRACT_ONLY= worldofpadman.run \ wop_patch_1_2.run @@ -41,17 +39,13 @@ OPTIONS= CLIENT "Build client" on \ OPENAL "Enable OpenAL (3D sound) support" off \ OPENAL_DLOPEN "Enable dynamic loading of OpenAL" off \ OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - SDL_AUDIO "Use SDL for audio" off \ - SDL_VIDEO "Use SDL for video" off \ SMP "Build SMP (threaded) client" on \ VORBIS "Enable Ogg Vorbis codec support" on MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="${PTHREAD_LIBS}" VM_ARCHS= amd64 i386 powerpc - -# Should be in bsd.commands.mk. Remove when ports/118749 is committed. -UNMAKESELF_CMD?= ${LOCALBASE}/bin/unmakeself +SRC_FILE= ${PORTNAME}-${PORTVERSION} .include <bsd.port.pre.mk> @@ -92,17 +86,7 @@ MAKE_ENV+= USE_OPENAL_DLOPEN=1 . endif . endif # SDL -. if defined(WITH_SDL_AUDIO) -USE_SDL= sdl -MAKE_ENV+= USE_SDL_AUDIO=1 -. endif -. if defined(WITH_SDL_VIDEO) USE_SDL= sdl -MAKE_ENV+= USE_SDL_VIDEO=1 -. else -USE_GL= yes -USE_XORG= xxf86dga -. endif # Vorbis . if defined(WITH_VORBIS) LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis @@ -151,15 +135,18 @@ PLIST_SUB+= SMP="@comment " .endif post-extract: - @${TAR} jxf ${DISTDIR}/${DISTNAME}.tar.bz2 -C ${WRKDIR} + @${TAR} jxf ${DISTDIR}/${SRC_FILE}.tar.bz2 -C ${WRKDIR} @${MKDIR} ${WRKDIR}/wop .for f in wop-data wop-data-1.2 extras @cd ${WRKDIR} && ${TAR} xf ${f}.tar -C wop .endfor @cd ${WRKDIR} && ${TAR} xf readme.tar -.if defined(WITH_CURL_DLOPEN) post-patch: +# Do not log debug output of bots (can be enabled with "homedir"/"gamedir"). + @${REINPLACE_CMD} -e 's|"botlib\.log"|"/dev/null"|' \ + ${WRKSRC}/code/botlib/be_interface.c +.if defined(WITH_CURL_DLOPEN) # Fix wrong library version (use general case as only one is installed). @${REINPLACE_CMD} -e 's|libcurl\.so\.[[:digit:]]|libcurl.so|' \ ${WRKSRC}/code/client/cl_curl.h @@ -192,4 +179,13 @@ do-install: .endif @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} +maint-gen-distfile: + @if [ -f ${DISTDIR}/${SRC_FILE}.tar.bz2 ]; then \ + ${ECHO_CMD} "ERROR: the distfile already exists."; \ + ${FALSE}; \ + fi + svn export https://wop-engine.svn.sourceforge.net/svnroot/wop-engine/trunk ${SRC_FILE} + tar cjf ${DISTDIR}/${SRC_FILE}.tar.bz2 ${SRC_FILE} + ${RM} -rf ${SRC_FILE} + .include <bsd.port.post.mk> diff --git a/games/worldofpadman/distinfo b/games/worldofpadman/distinfo index 04184f69b169..74a3c5e61688 100644 --- a/games/worldofpadman/distinfo +++ b/games/worldofpadman/distinfo @@ -4,6 +4,6 @@ SIZE (worldofpadman.run) = 576952895 MD5 (wop_patch_1_2.run) = 3468fc91889795471bc68e35ea334614 SHA256 (wop_patch_1_2.run) = 6aa682063a36177f1c5d663259c2516bc555cc976e3caaeaa30f8a77b3954930 SIZE (wop_patch_1_2.run) = 72187892 -MD5 (wopengine_src-1.1.tar.bz2) = 9aff4a2077f77e787ba0e3f113f9d6d8 -SHA256 (wopengine_src-1.1.tar.bz2) = 604ab89af32b7e6507b77c9926a24dbaba25bd415020f6dc8ec372d03178c776 -SIZE (wopengine_src-1.1.tar.bz2) = 6282799 +MD5 (worldofpadman-1.2.20080621.tar.bz2) = 92426e09ce15ac47044c8e1ce0857b8e +SHA256 (worldofpadman-1.2.20080621.tar.bz2) = 9c07949abcf8a965531b8fd0858995698f231edc20665e8f644c5e786d25c09b +SIZE (worldofpadman-1.2.20080621.tar.bz2) = 3192805 diff --git a/games/worldofpadman/files/patch-Makefile b/games/worldofpadman/files/patch-Makefile index bbaf2397236c..379805f2a222 100644 --- a/games/worldofpadman/files/patch-Makefile +++ b/games/worldofpadman/files/patch-Makefile @@ -1,45 +1,45 @@ ---- Makefile.orig Tue Apr 17 17:17:01 2007 -+++ Makefile Tue Jan 29 02:00:59 2008 -@@ -27,11 +27,20 @@ - endif +--- Makefile.orig 2008-05-10 10:05:55.000000000 -0300 ++++ Makefile 2008-06-21 15:31:37.000000000 -0300 +@@ -26,25 +26,6 @@ + ifndef BUILD_STANDALONE + BUILD_STANDALONE = 1 endif - --BUILD_CLIENT = --BUILD_CLIENT_SMP =0 --BUILD_SERVER = --BUILD_GAME_SO =0 --BUILD_GAME_QVM =0 -+BUILD_CLIENT?=0 -+BUILD_CLIENT_SMP?=0 -+BUILD_GAME_QVM?=0 -+BUILD_GAME_SO?=0 -+BUILD_SERVER?=0 -+HAVE_VM_COMPILED?=false -+USE_CODEC_MP3?=0 -+USE_CODEC_VORBIS?=0 -+USE_LOCAL_HEADERS?=0 -+USE_OPENAL?=0 -+USE_OPENAL_DLOPEN?=0 -+USE_OPTIMIZED_CFLAGS?=0 -+USE_SDL_AUDIO?=0 -+USE_SDL_VIDEO?=0 +-ifndef BUILD_CLIENT +- BUILD_CLIENT = +-endif +-ifndef BUILD_CLIENT_SMP +- BUILD_CLIENT_SMP = 0 +-endif +-ifndef BUILD_SERVER +- BUILD_SERVER = +-endif +-ifndef BUILD_GAME_SO +- BUILD_GAME_SO = 0 +-endif +-ifndef BUILD_GAME_QVM +- BUILD_GAME_QVM = 0 +-endif +- +-ifneq ($(PLATFORM),darwin) +- BUILD_CLIENT_SMP = 0 +-endif ############################################################################# # -@@ -89,46 +98,10 @@ +@@ -97,46 +78,23 @@ + GENERATE_DEPENDENCIES=1 endif - export USE_CCACHE --ifndef USE_SDL --USE_SDL=1 --endif -- -ifndef USE_OPENAL -USE_OPENAL=1 -endif - -ifndef USE_OPENAL_DLOPEN --USE_OPENAL_DLOPEN=1 +- ifeq ($(PLATFORM),mingw32) +- USE_OPENAL_DLOPEN=1 +- else +- USE_OPENAL_DLOPEN=0 +- endif -endif - -ifndef USE_CURL @@ -65,7 +65,19 @@ -ifndef USE_LOCAL_HEADERS -USE_LOCAL_HEADERS=1 -endif -- ++BUILD_CLIENT?=0 ++BUILD_CLIENT_SMP?=0 ++BUILD_GAME_QVM?=0 ++BUILD_GAME_SO?=0 ++BUILD_SERVER?=0 ++HAVE_VM_COMPILED?=false ++USE_CODEC_MP3?=0 ++USE_CODEC_VORBIS?=0 ++USE_LOCAL_HEADERS?=0 ++USE_OPENAL?=0 ++USE_OPENAL_DLOPEN?=0 ++USE_OPTIMIZED_CFLAGS?=0 + ############################################################################# -BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH) @@ -75,7 +87,7 @@ CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server RDIR=$(MOUNT_DIR)/renderer -@@ -285,14 +258,14 @@ +@@ -286,14 +244,14 @@ endif endif @@ -94,29 +106,7 @@ ifeq ($(ARCH),i386) # linux32 make ... BASE_CFLAGS += -m32 -@@ -397,16 +370,16 @@ - endif - endif - -- ifeq ($(USE_CODEC_VORBIS),1) -- BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -- endif -- - ifeq ($(USE_CODEC_MP3),1) - BASE_CFLAGS += -DUSE_CODEC_MP3=1 - CLIENT_LDFLAGS += -lmad - endif - -+ ifeq ($(USE_CODEC_VORBIS),1) -+ BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 -+ CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ endif -+ - ifeq ($(USE_SDL),1) - BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 -D_THREAD_SAFE=1 \ - -I$(SDLHDIR)/include -@@ -525,18 +498,12 @@ +@@ -499,16 +457,12 @@ ifeq ($(PLATFORM),freebsd) @@ -127,55 +117,26 @@ - endif #alpha test - - -- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -+ BASE_CFLAGS = -DARCH='\"$(ARCH)\"' -I$(LOCALBASE)/include -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes - -- GL_CFLAGS = -I/usr/X11R6/include -+ GL_CFLAGS = -I$(LOCALBASE)/include +- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ ++ BASE_CFLAGS = -DARCH='\"$(ARCH)\"' -I$(LOCALBASE)/include -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ + -DUSE_ICON $(shell sdl-config --cflags) - DEBUG_CFLAGS=$(BASE_CFLAGS) -g ++ DEBUG_CFLAGS=$(BASE_CFLAGS) -g + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe - - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL=1 -@@ -545,6 +512,15 @@ - endif - endif - -+ ifeq ($(USE_CURL),1) -+ BASE_CFLAGS += -DUSE_CURL=1 -+ ifneq ($(USE_CURL_DLOPEN),1) -+ CLIENT_LDFLAGS += -lcurl -+ else -+ BASE_CFLAGS += -DUSE_CURL_DLOPEN=1 -+ endif -+ endif + - ifeq ($(USE_CODEC_VORBIS),1) - BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 - endif -@@ -553,47 +529,67 @@ - BASE_CFLAGS += -DUSE_CODEC_MP3=1 - endif - -- ifeq ($(USE_SDL),1) -- BASE_CFLAGS += $(shell sdl-config --cflags) -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 -+ ifeq ($(USE_SDL_AUDIO),1) -+ BASE_CFLAGS += $(shell $(SDL_CONFIG) --cflags) -+ else -+ ifeq ($(USE_SDL_VIDEO),1) -+ BASE_CFLAGS += $(shell $(SDL_CONFIG) --cflags) -+ endif + ifeq ($(USE_OPENAL),1) + BASE_CFLAGS += -DUSE_OPENAL + ifeq ($(USE_OPENAL_DLOPEN),1) +@@ -524,23 +478,18 @@ + BASE_CFLAGS += -DUSE_CODEC_MP3 endif - ifeq ($(ARCH),axp) -- CC=gcc - BASE_CFLAGS += -DNO_VM_COMPILED - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations - else - ifeq ($(ARCH),i386) -- CC=gcc - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \ - -march=pentium -fomit-frame-pointer -pipe -ffast-math \ - -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ @@ -183,14 +144,7 @@ - HAVE_VM_COMPILED=true - else - BASE_CFLAGS += -DNO_VM_COMPILED -+ ifeq ($(USE_SDL_AUDIO),1) -+ BASE_CFLAGS += -DUSE_SDL_SOUND=1 -+ endif -+ -+ ifeq ($(USE_SDL_VIDEO),1) -+ BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -+ endif -+ +- endif + ifeq ($(USE_OPTIMIZED_CFLAGS),1) + RELEASE_CFLAGS+=-O3 -ffast-math -funroll-loops -fomit-frame-pointer \ + -fexpensive-optimizations @@ -199,37 +153,22 @@ + -fstrength-reduce + endif endif -+ + +- DEBUG_CFLAGS=$(BASE_CFLAGS) -g + ifneq ($(HAVE_VM_COMPILED),true) + BASE_CFLAGS += -DNO_VM_COMPILED - endif ++ endif SHLIBEXT=so SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) - -- THREAD_LDFLAGS=-lpthread -+ THREAD_LDFLAGS=$(PTHREAD_LIBS) +@@ -550,13 +499,23 @@ # don't need -ldl (FreeBSD) LDFLAGS=-lm - CLIENT_LDFLAGS = + CLIENT_LDFLAGS = -L$(LOCALBASE)/lib -- ifeq ($(USE_SDL),1) -- CLIENT_LDFLAGS += $(shell sdl-config --libs) -+ ifeq ($(USE_SDL_AUDIO),1) -+ CLIENT_LDFLAGS += $(shell $(SDL_CONFIG) --libs) - else -- CLIENT_LDFLAGS += -L/usr/X11R6/$(LIB) -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -+ ifeq ($(USE_SDL_VIDEO),1) -+ CLIENT_LDFLAGS += $(shell $(SDL_CONFIG) --libs) -+ endif -+ endif -+ -+ ifneq ($(USE_SDL_VIDEO),1) -+ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm - endif + CLIENT_LDFLAGS += $(shell sdl-config --libs) -lGL ifeq ($(USE_OPENAL),1) + CLIENT_LDFLAGS += $(THREAD_LDFLAGS) @@ -240,12 +179,15 @@ + endif + + ifeq ($(USE_CURL),1) ++ BASE_CFLAGS += -DUSE_CURL=1 + ifneq ($(USE_CURL_DLOPEN),1) + CLIENT_LDFLAGS += -lcurl ++ else ++ BASE_CFLAGS += -DUSE_CURL_DLOPEN=1 endif endif -@@ -759,24 +755,25 @@ +@@ -781,24 +740,25 @@ TARGETS = ifneq ($(BUILD_SERVER),0) @@ -282,123 +224,122 @@ endif ifneq ($(BUILD_GAME_QVM),0) -@@ -838,11 +835,11 @@ - $(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEND_CFLAGS)" - - build_release: B=$(BR) --build_release: makedirs tools -+build_release: makedirs - $(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS) $(DEPEND_CFLAGS)" - - #Build both debug and release builds --all:build_debug build_release -+all:build_release +@@ -929,7 +889,7 @@ + ############################################################################# - targets: $(TARGETS) + default: release +-all: debug release ++all: release -@@ -1056,13 +1053,10 @@ - ifeq ($(ARCH),i386) + debug: + @$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \ +@@ -1360,9 +1320,15 @@ + ifeq ($(ARCH),x86) Q3OBJ += $(B)/client/vm_x86.o endif -- ifeq ($(ARCH),x86) -- Q3OBJ += $(B)/client/vm_x86.o -- endif -- ifeq ($(ARCH),x86_64) + ifeq ($(ARCH),amd64) - Q3OBJ += $(B)/client/vm_x86_64.o ++ Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o ++ endif + ifeq ($(ARCH),x86_64) + Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o endif -- ifeq ($(ARCH),ppc) + ifeq ($(ARCH),powerpc) - Q3OBJ += $(B)/client/$(VM_PPC).o ++ Q3OBJ += $(B)/client/vm_ppc.o ++ endif + ifeq ($(ARCH),ppc) + Q3OBJ += $(B)/client/vm_ppc.o endif - endif -@@ -1109,10 +1103,10 @@ - $(B)/client/sdl_glimp_smp.o - endif +@@ -1383,12 +1349,12 @@ + Q3POBJ_SMP += \ + $(B)/clientsmp/sdl_glimp.o -$(B)/wop-engine.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) +$(B)/wop$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) - $(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) + $(echo_cmd) "LD $@" + $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ + $(LDFLAGS) $(LIBSDLMAIN) -$(B)/wop-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) +$(B)/wop-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) - $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ + $(echo_cmd) "LD $@" + $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) - -@@ -1415,15 +1409,21 @@ +@@ -1497,9 +1463,15 @@ ifeq ($(ARCH),x86) Q3DOBJ += $(B)/ded/vm_x86.o endif + ifeq ($(ARCH),amd64) -+ Q3DOBJ += $(B)/ded/vm_x86_64.o ++ Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o + endif ifeq ($(ARCH),x86_64) - Q3DOBJ += $(B)/ded/vm_x86_64.o + Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o endif + ifeq ($(ARCH),powerpc) -+ Q3DOBJ += $(B)/ded/$(VM_PPC).o ++ Q3DOBJ += $(B)/ded/vm_ppc.o + endif ifeq ($(ARCH),ppc) - Q3DOBJ += $(B)/ded/$(VM_PPC).o + Q3DOBJ += $(B)/ded/vm_ppc.o endif +@@ -1516,7 +1488,7 @@ + $(B)/ded/con_tty.o endif -$(B)/wopded.$(ARCH)$(BINEXT): $(Q3DOBJ) +$(B)/wopded$(BINEXT): $(Q3DOBJ) - $(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) + $(echo_cmd) "LD $@" + $(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) - $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) -@@ -1540,7 +1540,7 @@ +@@ -1556,7 +1528,7 @@ Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o - Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm + Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) --$(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) : $(Q3CGOBJ) -+$(B)/baseq3/cgame.$(SHLIBEXT) : $(Q3CGOBJ) - $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) +-$(B)/baseq3/cgame$(ARCH).$(SHLIBEXT): $(Q3CGOBJ) ++$(B)/baseq3/cgame.$(SHLIBEXT): $(Q3CGOBJ) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) - $(B)/baseq3/vm/cgame.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm -@@ -1581,7 +1581,7 @@ +@@ -1600,7 +1572,7 @@ MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o - MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm + MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) --$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) : $(MPCGOBJ) -+$(B)/missionpack/cgame.$(SHLIBEXT) : $(MPCGOBJ) - $(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ) +-$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT): $(MPCGOBJ) ++$(B)/missionpack/cgame.$(SHLIBEXT): $(MPCGOBJ) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ) - $(B)/missionpack/vm/cgame.qvm: $(MPCGVMOBJ) $(CGDIR)/cg_syscalls.asm -@@ -1631,7 +1631,7 @@ +@@ -1653,7 +1625,7 @@ Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o - Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm + Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) --$(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) : $(Q3GOBJ) -+$(B)/baseq3/qagame.$(SHLIBEXT) : $(Q3GOBJ) - $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) +-$(B)/baseq3/qagame$(ARCH).$(SHLIBEXT): $(Q3GOBJ) ++$(B)/baseq3/qagame.$(SHLIBEXT): $(Q3GOBJ) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) - $(B)/baseq3/vm/qagame.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm -@@ -1679,7 +1679,7 @@ +@@ -1704,7 +1676,7 @@ MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o - MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm + MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) --$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) : $(MPGOBJ) -+$(B)/missionpack/qagame.$(SHLIBEXT) : $(MPGOBJ) - $(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ) +-$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT): $(MPGOBJ) ++$(B)/missionpack/qagame.$(SHLIBEXT): $(MPGOBJ) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ) - $(B)/missionpack/vm/qagame.qvm: $(MPGVMOBJ) $(GDIR)/g_syscalls.asm -@@ -1739,7 +1739,7 @@ +@@ -1767,7 +1739,7 @@ Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o - Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm + Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) --$(B)/baseq3/ui$(ARCH).$(SHLIBEXT) : $(Q3UIOBJ) -+$(B)/baseq3/ui.$(SHLIBEXT) : $(Q3UIOBJ) - $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) +-$(B)/baseq3/ui$(ARCH).$(SHLIBEXT): $(Q3UIOBJ) ++$(B)/baseq3/ui.$(SHLIBEXT): $(Q3UIOBJ) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) - $(B)/baseq3/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm -@@ -1764,7 +1764,7 @@ +@@ -1795,7 +1767,7 @@ MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o - MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm + MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) --$(B)/missionpack/ui$(ARCH).$(SHLIBEXT) : $(MPUIOBJ) -+$(B)/missionpack/ui.$(SHLIBEXT) : $(MPUIOBJ) - $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ) +-$(B)/missionpack/ui$(ARCH).$(SHLIBEXT): $(MPUIOBJ) ++$(B)/missionpack/ui.$(SHLIBEXT): $(MPUIOBJ) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ) - $(B)/missionpack/vm/ui.qvm: $(MPUIVMOBJ) $(UIDIR)/ui_syscalls.asm diff --git a/games/worldofpadman/files/patch-code__qcommon__net_ip.c b/games/worldofpadman/files/patch-code__qcommon__net_ip.c new file mode 100644 index 000000000000..001c55fe0df7 --- /dev/null +++ b/games/worldofpadman/files/patch-code__qcommon__net_ip.c @@ -0,0 +1,19 @@ +--- code/qcommon/net_ip.c.orig 2008-06-21 15:22:13.000000000 -0300 ++++ code/qcommon/net_ip.c 2008-06-21 15:22:26.000000000 -0300 +@@ -55,14 +55,14 @@ + # define _BSD_SOCKLEN_T_ + #endif + ++#include <sys/types.h> ++#include <sys/socket.h> + #include <arpa/inet.h> + #include <errno.h> + #include <netdb.h> + #include <netinet/in.h> + #include <net/if.h> + #include <sys/ioctl.h> +-#include <sys/socket.h> +-#include <sys/types.h> + #include <sys/time.h> + #include <unistd.h> + #if !defined(__sun) && !defined(__sgi) diff --git a/games/worldofpadman/files/patch-code__unix__linux_glimp.c b/games/worldofpadman/files/patch-code__unix__linux_glimp.c deleted file mode 100644 index 00304f2b5be1..000000000000 --- a/games/worldofpadman/files/patch-code__unix__linux_glimp.c +++ /dev/null @@ -1,19 +0,0 @@ ---- ./code/unix/linux_glimp.c.orig Sun Apr 30 11:32:56 2006 -+++ ./code/unix/linux_glimp.c Sun Jun 11 17:26:26 2006 -@@ -631,8 +631,14 @@ - - dx = ((int)event.xmotion.x - mwx); - dy = ((int)event.xmotion.y - mwy); -- mx += dx; -- my += dy; -+ if (abs(dx) > 1) -+ mx += dx * 2; -+ else -+ mx += dx; -+ if (abs(dy) > 1) -+ my += dy * 2; -+ else -+ my += dy; - - mwx = event.xmotion.x; - mwy = event.xmotion.y; |