Date: Sun, 20 Jan 2008 00:20:43 GMT From: Nerius Landys <nlandys@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/119813: port games/iourbanterror auto-download broken on -current Message-ID: <200801200020.m0K0Kh0E063972@www.freebsd.org> Resent-Message-ID: <200801200030.m0K0U1k2071724@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119813
>Category: ports
>Synopsis: port games/iourbanterror auto-download broken on -current
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 20 00:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Nerius Landys
>Release: 7.0-RC1
>Organization:
>Environment:
FreeBSD sylvester.i 7.0-RC1 FreeBSD 7.0-RC1 #0: Fri Jan 18 21:10:34 PST 2008 root@sylvester.i:/usr/obj/usr/src/sys/SYLVESTER i386
>Description:
USE_CURL is never set by the Makefile when building on FreeBSD. Have a look at [the patched or unpatched] file ioUrbanTerrorClientSource/Makefile within the distfile ioUrbanTerrorSource_2007_12_20.zip. For the FreeBSD build in that file, USE_CURL is never set as a build variable. It _is_ set for Linux and other OS's.
When installing the iourbanterror port, one is presented with a config menu when beginning the build of the port. Two of the options in that build config menu are "Enable curl support" and "Enable dynamic loading of curl". However because of the Makefile mentioned above these settings never have any effect on the build.
I have a couple of patches that honor the "Enable curl support" config option. I am able to build UrbanTerror with curl support, and the auto-download now works flawlessly. However, I was not able to get the "Enable dynamic loading of curl" to work, and so I've set this to be disabled by default, and I've added a text "(broken?)" as a description to this option. I'm not familiar enough with build processes to fix this problem. Perhaps this option might be taken out of the config options altogether.
P.S. This is a really great game and I recommend it to everyone. Large player base.
>How-To-Repeat:
Build and install games/iourbanterror. Choose whatever build options (won't make a difference). Go to a server with a map that does not exist in the default install. (An example of a map that does not exist in the default install is ut4_uberjumps_beta3.) Attempt the auto-download of this map. It will fail with the message "Unknown error in auto-download". If one examines the source code in cl_main.c, one sees that the USE_CURL preprocessor variable was probably not set. USE_CURL is NEVER set because of the Makefile problem.
>Fix:
I'm attaching patches to two revised files:
/usr/ports/games/iourbanterror/Makefile
/usr/ports/games/iourbanterror/files/patch-Makefile
I don't take diffs often, so if I made a mistake in the diff I can try again. Contact me. I also have the modified files "Makefile" and "patch-Makefile"
Patch attached with submission follows:
diff -u --recursive ../orig/Makefile ./Makefile
--- ../orig/Makefile 2008-01-19 16:17:57.000000000 -0800
+++ ./Makefile 2008-01-19 15:56:00.000000000 -0800
@@ -25,7 +25,7 @@
OPTIONS= CLIENT "Build client" on \
CELLSHADING "Enable Cell Shading effect" off \
CURL "Enable curl support" on \
- CURL_DLOPEN "Enable dynamic loading of curl" on \
+ CURL_DLOPEN "Enable dynamic loading of curl (broken?)" off \
GAMELIBS "Build game libraries (when not mandatory)" off \
DEDICATED "Build dedicated server" on \
MP3 "Enable MP3 support" off \
diff -u --recursive ../orig/files/patch-Makefile ./files/patch-Makefile
--- ../orig/files/patch-Makefile 2008-01-19 16:18:04.000000000 -0800
+++ ./files/patch-Makefile 2008-01-19 15:15:58.000000000 -0800
@@ -1,5 +1,5 @@
---- Makefile.orig Sun Dec 16 18:09:18 2007
-+++ Makefile Fri Jan 4 10:40:41 2008
+--- Makefile.orig 2008-01-19 15:13:14.000000000 -0800
++++ Makefile 2008-01-19 15:13:28.000000000 -0800
@@ -27,16 +27,22 @@
endif
endif
@@ -128,7 +128,18 @@
ifeq ($(USE_OPENAL),1)
BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -520,45 +504,61 @@
+@@ -516,49 +500,78 @@
+ endif
+ endif
+
++ ifeq ($(USE_CURL),1)
++ BASE_CFLAGS += -DUSE_CURL=1
++ ifeq ($(USE_CURL_DLOPEN),1)
++ BASE_CFLAGS += -DUSE_CURL_DLOPEN=1
++ endif
++ endif
++
+ ifeq ($(USE_CODEC_VORBIS),1)
BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
endif
@@ -208,10 +219,16 @@
ifneq ($(USE_OPENAL_DLOPEN),1)
- CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lopenal
+ CLIENT_LDFLAGS += -lopenal
++ endif
++ endif
++
++ ifeq ($(USE_CURL),1)
++ ifneq ($(USE_CURL_DLOPEN),1)
++ CLIENT_LDFLAGS += -lcurl
endif
endif
-@@ -566,7 +566,6 @@
+@@ -566,7 +579,6 @@
CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
endif
@@ -219,7 +236,7 @@
else # ifeq freebsd
#############################################################################
-@@ -717,24 +716,25 @@
+@@ -717,24 +729,25 @@
TARGETS =
ifneq ($(BUILD_SERVER),0)
@@ -256,7 +273,7 @@
endif
ifneq ($(BUILD_GAME_QVM),0)
-@@ -824,10 +824,10 @@
+@@ -824,10 +837,10 @@
all: debug release
debug:
@@ -269,7 +286,7 @@
# Create the build directories and tools, print out
# an informational message, then start building
-@@ -880,7 +880,7 @@
+@@ -880,7 +893,7 @@
Q3LCC=$(TOOLSDIR)/q3lcc$(BINEXT)
Q3ASM=$(TOOLSDIR)/q3asm$(BINEXT)
@@ -278,7 +295,7 @@
tools:
@echo QVM tools not built when cross-compiling
else
-@@ -943,8 +943,13 @@
+@@ -943,8 +956,13 @@
$(B)/client/snd_main.o \
$(B)/client/snd_codec.o \
$(B)/client/snd_codec_wav.o \
@@ -294,7 +311,7 @@
$(B)/client/qal.o \
$(B)/client/snd_openal.o \
\
-@@ -1078,9 +1083,15 @@
+@@ -1078,9 +1096,15 @@
ifeq ($(ARCH),x86)
Q3OBJ += $(B)/client/vm_x86.o
endif
@@ -310,7 +327,7 @@
ifeq ($(ARCH),ppc)
Q3OBJ += $(B)/client/vm_ppc.o
endif
-@@ -1113,7 +1124,7 @@
+@@ -1113,7 +1137,7 @@
ifeq ($(USE_SDL),1)
ifneq ($(PLATFORM),darwin)
@@ -319,7 +336,7 @@
endif
endif
-@@ -1126,12 +1137,12 @@
+@@ -1126,12 +1150,12 @@
$(B)/clientsmp/sdl_glimp.o
endif
@@ -334,7 +351,7 @@
$(echo_cmd) "LD $@"
$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
-@@ -1248,7 +1259,7 @@
+@@ -1248,7 +1272,7 @@
endif
endif
@@ -343,7 +360,7 @@
$(echo_cmd) "LD $@"
$(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
-@@ -1287,7 +1298,7 @@
+@@ -1287,7 +1311,7 @@
Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o
Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
@@ -352,7 +369,7 @@
$(echo_cmd) "LD $@"
$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
-@@ -1330,7 +1341,7 @@
+@@ -1330,7 +1354,7 @@
MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o
MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
@@ -361,7 +378,7 @@
$(echo_cmd) "LD $@"
$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
-@@ -1382,7 +1393,7 @@
+@@ -1382,7 +1406,7 @@
Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o
Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
@@ -370,7 +387,7 @@
$(echo_cmd) "LD $@"
$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
-@@ -1432,7 +1443,7 @@
+@@ -1432,7 +1456,7 @@
MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o
MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
@@ -379,7 +396,7 @@
$(echo_cmd) "LD $@"
$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
-@@ -1494,7 +1505,7 @@
+@@ -1494,7 +1518,7 @@
Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
@@ -388,7 +405,7 @@
$(echo_cmd) "LD $@"
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
-@@ -1521,7 +1532,7 @@
+@@ -1521,7 +1545,7 @@
MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801200020.m0K0Kh0E063972>