From 011e0c96bb3944390d6eef4770d865f0d1f50de6 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill@pkgsrc.org>
Date: Wed, 28 Jan 2015 17:11:28 +0000
Subject: use SDL for input and audio

---
 games/ioquake3-raspberrypi/distinfo               |  4 +-
 games/ioquake3-raspberrypi/patches/patch-Makefile | 57 ++++++-----------------
 2 files changed, 16 insertions(+), 45 deletions(-)

(limited to 'games')

diff --git a/games/ioquake3-raspberrypi/distinfo b/games/ioquake3-raspberrypi/distinfo
index cfbdb3cda4c..2a6fedd1bbf 100644
--- a/games/ioquake3-raspberrypi/distinfo
+++ b/games/ioquake3-raspberrypi/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2015/01/22 12:51:00 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2015/01/28 17:11:28 jmcneill Exp $
 
 SHA1 (ioquake3-raspberrypi-20150118.zip) = 4d41a7d4290d99ce20179d5f693e327831392436
 RMD160 (ioquake3-raspberrypi-20150118.zip) = 4baba47cddba21e25a0e9986b50c9bb6ba22b4e0
 Size (ioquake3-raspberrypi-20150118.zip) = 4062816 bytes
-SHA1 (patch-Makefile) = ea0d64b9be3647c0771ea018fd06500b521e3864
+SHA1 (patch-Makefile) = 19735fe17e07e9f565f1cfa28c2faf8a41d5fca9
 SHA1 (patch-code_qcommon_q__platform.h) = d0a080004c40b8daebc9e5de24d6a31a6940beca
diff --git a/games/ioquake3-raspberrypi/patches/patch-Makefile b/games/ioquake3-raspberrypi/patches/patch-Makefile
index cc8f6b6d73d..7ccde150b27 100644
--- a/games/ioquake3-raspberrypi/patches/patch-Makefile
+++ b/games/ioquake3-raspberrypi/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2015/01/22 12:51:00 jmcneill Exp $
+$NetBSD: patch-Makefile,v 1.2 2015/01/28 17:11:28 jmcneill Exp $
 
 --- Makefile.orig	2014-11-03 15:11:07.000000000 +0000
 +++ Makefile
@@ -26,53 +26,24 @@ $NetBSD: patch-Makefile,v 1.1 2015/01/22 12:51:00 jmcneill Exp $
  		$(RELEASE_CFLAGS)" V=$(V)
  
  # Create the build directories, check libraries and print out
-@@ -1379,26 +1376,26 @@ Q3OBJ = \
+@@ -1379,7 +1376,7 @@ Q3OBJ = \
    $(B)/client/sys_main.o
  
  
 -  Q3OBJ += $(if $(or $(findstring arm,$(ARCH)), $(USBDK)), \
--             $(B)/client/es_gamma.o $(B)/client/sdl_snd.o, \
--             $(B)/client/sdl_gamma.o $(B)/client/sdl_snd.o)
--
--  Q3OBJ += $(if $(USBDK), \
--             $(B)/client/es_input.o, \
--             $(B)/client/sdl_input.o)
--
--#
--#ifeq ($(ARCH),arm)
--#  Q3OBJ += \
--#    $(B)/client/es_gamma.o \
--#    $(B)/client/es_input.o \
--#    $(B)/client/es_snd.o 
--#else
--#  Q3OBJ += \
--#    $(B)/client/sdl_gamma.o \
--#    $(B)/client/sdl_input.o \
--#    $(B)/client/sdl_snd.o 
--#endif
-+#  Q3OBJ += $(if $(or $(findstring rpi,$(ARCH)), $(USBDK)), \
-+#             $(B)/client/es_gamma.o $(B)/client/es_snd.o, \
-+#             $(B)/client/sdl_gamma.o $(B)/client/sdl_snd.o)
-+
-+#  Q3OBJ += $(if $(USBDK), \
-+#             $(B)/client/es_input.o, \
-+#             $(B)/client/sdl_input.o)
-+
-+
-+ifeq ($(ARCH),rpi)
-+  Q3OBJ += \
-+    $(B)/client/es_gamma.o \
-+    $(B)/client/es_input.o \
-+    $(B)/client/es_snd.o 
-+else
-+  Q3OBJ += \
-+    $(B)/client/sdl_gamma.o \
-+    $(B)/client/sdl_input.o \
-+    $(B)/client/sdl_snd.o 
-+endif
++  Q3OBJ += $(if $(or $(findstring rpi,$(ARCH)), $(USBDK)), \
+              $(B)/client/es_gamma.o $(B)/client/sdl_snd.o, \
+              $(B)/client/sdl_gamma.o $(B)/client/sdl_snd.o)
  
- ifeq ($(ARCH),i386)
-   Q3OBJ += \
+@@ -1388,7 +1385,7 @@ Q3OBJ = \
+              $(B)/client/sdl_input.o)
+ 
+ #
+-#ifeq ($(ARCH),arm)
++#ifeq ($(ARCH),rpi)
+ #  Q3OBJ += \
+ #    $(B)/client/es_gamma.o \
+ #    $(B)/client/es_input.o \
 @@ -1497,11 +1494,11 @@ ifeq ($(USE_MUMBLE),1)
      $(B)/client/libmumblelink.o
  endif
-- 
cgit v1.2.3