Wed Jan 28 17:11:28 2015 UTC ()
use SDL for input and audio


(jmcneill)
diff -r1.1 -r1.2 pkgsrc/games/ioquake3-raspberrypi/distinfo
diff -r1.1 -r1.2 pkgsrc/games/ioquake3-raspberrypi/patches/patch-Makefile
cvs diff -r1.1 -r1.2 pkgsrc/games/ioquake3-raspberrypi/distinfo (expand / switch to unified diff)

--- pkgsrc/games/ioquake3-raspberrypi/distinfo 2015/01/22 12:51:00 1.1
+++ pkgsrc/games/ioquake3-raspberrypi/distinfo 2015/01/28 17:11:28 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1 2015/01/22 12:51:00 jmcneill Exp $ 1$NetBSD: distinfo,v 1.2 2015/01/28 17:11:28 jmcneill Exp $
2 2
3SHA1 (ioquake3-raspberrypi-20150118.zip) = 4d41a7d4290d99ce20179d5f693e327831392436 3SHA1 (ioquake3-raspberrypi-20150118.zip) = 4d41a7d4290d99ce20179d5f693e327831392436
4RMD160 (ioquake3-raspberrypi-20150118.zip) = 4baba47cddba21e25a0e9986b50c9bb6ba22b4e0 4RMD160 (ioquake3-raspberrypi-20150118.zip) = 4baba47cddba21e25a0e9986b50c9bb6ba22b4e0
5Size (ioquake3-raspberrypi-20150118.zip) = 4062816 bytes 5Size (ioquake3-raspberrypi-20150118.zip) = 4062816 bytes
6SHA1 (patch-Makefile) = ea0d64b9be3647c0771ea018fd06500b521e3864 6SHA1 (patch-Makefile) = 19735fe17e07e9f565f1cfa28c2faf8a41d5fca9
7SHA1 (patch-code_qcommon_q__platform.h) = d0a080004c40b8daebc9e5de24d6a31a6940beca 7SHA1 (patch-code_qcommon_q__platform.h) = d0a080004c40b8daebc9e5de24d6a31a6940beca
cvs diff -r1.1 -r1.2 pkgsrc/games/ioquake3-raspberrypi/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/games/ioquake3-raspberrypi/patches/patch-Makefile 2015/01/22 12:51:00 1.1
+++ pkgsrc/games/ioquake3-raspberrypi/patches/patch-Makefile 2015/01/28 17:11:28 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile,v 1.1 2015/01/22 12:51:00 jmcneill Exp $ 1$NetBSD: patch-Makefile,v 1.2 2015/01/28 17:11:28 jmcneill Exp $
2 2
3--- Makefile.orig 2014-11-03 15:11:07.000000000 +0000 3--- Makefile.orig 2014-11-03 15:11:07.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -676,9 +676,6 @@ ifeq ($(PLATFORM),netbsd) 5@@ -676,9 +676,6 @@ ifeq ($(PLATFORM),netbsd)
6  6
7 DEBUG_CFLAGS=$(BASE_CFLAGS) -g 7 DEBUG_CFLAGS=$(BASE_CFLAGS) -g
8  8
9- BUILD_CLIENT = 0 9- BUILD_CLIENT = 0
10- BUILD_GAME_QVM = 0 10- BUILD_GAME_QVM = 0
11- 11-
12 else # ifeq netbsd 12 else # ifeq netbsd
13  13
14 ############################################################################# 14 #############################################################################
@@ -16,73 +16,44 @@ $NetBSD: patch-Makefile,v 1.1 2015/01/22 @@ -16,73 +16,44 @@ $NetBSD: patch-Makefile,v 1.1 2015/01/22
16 all: debug release 16 all: debug release
17  17
18 debug: 18 debug:
19- @$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \ 19- @$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \
20+ @$(MAKE) targets B=$(BD) CFLAGS="$(BASE_CFLAGS) $(CFLAGS) $(DEPEND_CFLAGS) \ 20+ @$(MAKE) targets B=$(BD) CFLAGS="$(BASE_CFLAGS) $(CFLAGS) $(DEPEND_CFLAGS) \
21 $(DEBUG_CFLAGS)" V=$(V) 21 $(DEBUG_CFLAGS)" V=$(V)
22  22
23 release: 23 release:
24- @$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \ 24- @$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \
25+ @$(MAKE) targets B=$(BR) CFLAGS="$(BASE_CFLAGS) $(CFLAGS) $(DEPEND_CFLAGS) \ 25+ @$(MAKE) targets B=$(BR) CFLAGS="$(BASE_CFLAGS) $(CFLAGS) $(DEPEND_CFLAGS) \
26 $(RELEASE_CFLAGS)" V=$(V) 26 $(RELEASE_CFLAGS)" V=$(V)
27  27
28 # Create the build directories, check libraries and print out 28 # Create the build directories, check libraries and print out
29@@ -1379,26 +1376,26 @@ Q3OBJ = \ 29@@ -1379,7 +1376,7 @@ Q3OBJ = \
30 $(B)/client/sys_main.o 30 $(B)/client/sys_main.o
31  31
32  32
33- Q3OBJ += $(if $(or $(findstring arm,$(ARCH)), $(USBDK)), \ 33- Q3OBJ += $(if $(or $(findstring arm,$(ARCH)), $(USBDK)), \
34- $(B)/client/es_gamma.o $(B)/client/sdl_snd.o, \ 34+ Q3OBJ += $(if $(or $(findstring rpi,$(ARCH)), $(USBDK)), \
35- $(B)/client/sdl_gamma.o $(B)/client/sdl_snd.o) 35 $(B)/client/es_gamma.o $(B)/client/sdl_snd.o, \
36- 36 $(B)/client/sdl_gamma.o $(B)/client/sdl_snd.o)
37- Q3OBJ += $(if $(USBDK), \ 
38- $(B)/client/es_input.o, \ 
39- $(B)/client/sdl_input.o) 
40- 
41-# 
42-#ifeq ($(ARCH),arm) 
43-# Q3OBJ += \ 
44-# $(B)/client/es_gamma.o \ 
45-# $(B)/client/es_input.o \ 
46-# $(B)/client/es_snd.o  
47-#else 
48-# Q3OBJ += \ 
49-# $(B)/client/sdl_gamma.o \ 
50-# $(B)/client/sdl_input.o \ 
51-# $(B)/client/sdl_snd.o  
52-#endif 
53+# Q3OBJ += $(if $(or $(findstring rpi,$(ARCH)), $(USBDK)), \ 
54+# $(B)/client/es_gamma.o $(B)/client/es_snd.o, \ 
55+# $(B)/client/sdl_gamma.o $(B)/client/sdl_snd.o) 
56+ 
57+# Q3OBJ += $(if $(USBDK), \ 
58+# $(B)/client/es_input.o, \ 
59+# $(B)/client/sdl_input.o) 
60+ 
61+ 
62+ifeq ($(ARCH),rpi) 
63+ Q3OBJ += \ 
64+ $(B)/client/es_gamma.o \ 
65+ $(B)/client/es_input.o \ 
66+ $(B)/client/es_snd.o  
67+else 
68+ Q3OBJ += \ 
69+ $(B)/client/sdl_gamma.o \ 
70+ $(B)/client/sdl_input.o \ 
71+ $(B)/client/sdl_snd.o  
72+endif 
73  37
74 ifeq ($(ARCH),i386) 38@@ -1388,7 +1385,7 @@ Q3OBJ = \
75 Q3OBJ += \ 39 $(B)/client/sdl_input.o)
 40
 41 #
 42-#ifeq ($(ARCH),arm)
 43+#ifeq ($(ARCH),rpi)
 44 # Q3OBJ += \
 45 # $(B)/client/es_gamma.o \
 46 # $(B)/client/es_input.o \
76@@ -1497,11 +1494,11 @@ ifeq ($(USE_MUMBLE),1) 47@@ -1497,11 +1494,11 @@ ifeq ($(USE_MUMBLE),1)
77 $(B)/client/libmumblelink.o 48 $(B)/client/libmumblelink.o
78 endif 49 endif
79  50
80- Q3POBJ += $(if $(or $(findstring arm,$(ARCH)), $(USBDK)), \ 51- Q3POBJ += $(if $(or $(findstring arm,$(ARCH)), $(USBDK)), \
81+ Q3POBJ += $(if $(or $(findstring rpi,$(ARCH)), $(USBDK)), \ 52+ Q3POBJ += $(if $(or $(findstring rpi,$(ARCH)), $(USBDK)), \
82 $(B)/client/es_glimp.o $(B)/client/etc1encode.o, \ 53 $(B)/client/es_glimp.o $(B)/client/etc1encode.o, \
83 $(B)/client/sdl_glimp.o) 54 $(B)/client/sdl_glimp.o)
84  55
85-#ifeq ($(ARCH),arm) 56-#ifeq ($(ARCH),arm)
86+#ifeq ($(ARCH),rpi) 57+#ifeq ($(ARCH),rpi)
87 # Q3POBJ += \ 58 # Q3POBJ += \
88 # $(B)/client/es_glimp.o \ 59 # $(B)/client/es_glimp.o \