From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D172C1381F3 for ; Tue, 9 Jul 2013 23:32:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DB25E0CC6; Tue, 9 Jul 2013 23:32:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 925DFE0CC6 for ; Tue, 9 Jul 2013 23:32:18 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75C7333E8DE for ; Tue, 9 Jul 2013 23:32:17 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2322) id 3F2FA2171C; Tue, 9 Jul 2013 23:32:16 +0000 (UTC) From: "Julian Ospald (hasufell)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, hasufell@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in games-fps/urbanterror/files: urbanterror-4.2.013-build.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: urbanterror-4.2.013-build.patch X-VCS-Directories: games-fps/urbanterror/files X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130709233216.3F2FA2171C@flycatcher.gentoo.org> Date: Tue, 9 Jul 2013 23:32:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a3f01517-4488-4fce-8d80-d4838cff9dbb X-Archives-Hash: 4628bf5460f9615a25fe7019ef3fdd30 hasufell 13/07/09 23:32:16 Modified: urbanterror-4.2.013-build.patch Log: revbump to update the game engine (Portage version: 2.2.0_alpha187/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) Revision Changes Path 1.2 games-fps/urbanterror/files/urbanterror-4.2.013-build.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch?r1=1.1&r2=1.2 Index: urbanterror-4.2.013-build.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- urbanterror-4.2.013-build.patch 4 Jul 2013 13:54:46 -0000 1.1 +++ urbanterror-4.2.013-build.patch 9 Jul 2013 23:32:16 -0000 1.2 @@ -1,47 +1,55 @@ ---- Makefile -+++ Makefile -@@ -213,7 +213,7 @@ +commit dc89402ef3305202a2ec51e6c2c073bb1f65fb54 +Author: hasufell +Date: Wed Jul 10 01:25:27 2013 +0200 + + respect CFLAGS/LDFLAGS + +diff --git a/Makefile b/Makefile +index 3c134d5..54989f3 100644 +--- a/Makefile ++++ b/Makefile +@@ -213,7 +213,7 @@ ifeq ($(PLATFORM),linux) endif endif -- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe -+ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes +- BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -pipe ++ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes ifeq ($(USE_OPENAL),1) BASE_CFLAGS += -DUSE_OPENAL=1 -@@ -239,19 +239,15 @@ +@@ -238,18 +238,17 @@ ifeq ($(PLATFORM),linux) + else BASE_CFLAGS += -I/usr/X11R6/include endif - -- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer -+ OPTIMIZE = -ffast-math -funroll-loops - - ifeq ($(ARCH),x86_64) -- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \ -- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ -- -fstrength-reduce -+ OPTIMIZE = -ffast-math -funroll-loops +- #Anything more then -O2 and *mmx *msse/2/ causes hitching with urbanterror\ +-#also -march is illrelavent unless you know your target cpu +- OPTIMIZE = -O2 -mmmx -msse -msse2 -msse3 ++ # what an idiotic comment ++ OPTIMIZE = + #having x86_x64 implys having full SSE support up to SSE3 so we will use it,\ + #for old cpus we don't care because anything pre Pentium 4/Althlon 1600+ won't run UrbanTerror + ifeq ($(ARCH),x86_64) +- OPTIMIZE = -O2 -msse -msse2 -msse3 ++ OPTIMIZE = # experimental x86_64 jit compiler! you need GNU as HAVE_VM_COMPILED = true else ifeq ($(ARCH),i386) -- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \ -- -funroll-loops -falign-loops=2 -falign-jumps=2 \ -- -falign-functions=2 -fstrength-reduce -+ OPTIMIZE = -ffast-math -funroll-loops +- OPTIMIZE = -O2 -mmmx ++ OPTIMIZE = + HAVE_VM_COMPILED=true else - ifeq ($(ARCH),ppc) -@@ -265,7 +261,7 @@ +@@ -264,7 +263,7 @@ ifeq ($(PLATFORM),linux) BASE_CFLAGS += -DNO_VM_COMPILED endif -- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 +- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -wall + DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE) RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) -@@ -274,7 +270,7 @@ +@@ -273,7 +272,7 @@ ifeq ($(PLATFORM),linux) SHLIBLDFLAGS=-shared $(LDFLAGS) THREAD_LDFLAGS=-lpthread @@ -50,20 +58,20 @@ ifeq ($(USE_SDL),1) CLIENT_LDFLAGS=$(shell sdl-config --libs) -@@ -1157,13 +1153,13 @@ +@@ -1157,13 +1156,13 @@ endif $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) $(echo_cmd) "LD $@" - $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ - $(LDFLAGS) $(LIBSDLMAIN) -+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) \ ++ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \ + $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) $(echo_cmd) "LD $@" - $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ - $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) -+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ ++ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ + $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) ifneq ($(strip $(LIBSDLMAIN)),)