From 4cb318017b5bccba3e8d34e96079e4dd8151582c Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Wed, 4 Jun 2003 17:53:11 +0000
Subject: Correctly escape newlines in strings, to pacify gcc-3.3. No change to
 generated package, so no version bump.

---
 devel/SDL/distinfo         |  5 ++--
 devel/SDL/patches/patch-ac | 15 +++++++++++
 devel/SDL/patches/patch-al | 62 +++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 devel/SDL/patches/patch-ac

(limited to 'devel')

diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 16a76042bc9..ebb5cedcc42 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.17 2002/11/06 19:02:56 atatat Exp $
+$NetBSD: distinfo,v 1.18 2003/06/04 17:53:11 abs Exp $
 
 SHA1 (SDL-1.2.5.tar.gz) = c1bdc68d390d421158778f68f3498f5b9d63a9e4
 Size (SDL-1.2.5.tar.gz) = 1854550 bytes
 SHA1 (patch-aa) = 02438ad6409081a9fbcb542fcc414277f2aa61f7
 SHA1 (patch-ab) = 7effcc7f7f1856372692c147521888843810fed5
+SHA1 (patch-ac) = 45b7ae9e962661f0ef334a4669b1cde8c09e452f
 SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
 SHA1 (patch-ag) = 989c3464686a3158c538034ad7ea012a4e4b4b9e
 SHA1 (patch-aj) = 2f4dd90c85bc822c049820b5f027c984d015555b
-SHA1 (patch-al) = 0fe579ae0358d59f87a78fe4b5b006ef991d44f0
+SHA1 (patch-al) = 852877c85dd43782dfcf855d43ed6250449aa9fd
 SHA1 (patch-am) = 625b10cdc035200af044cb283f806f6d0d46f4ba
 SHA1 (patch-ap) = ca979b24a57a8f115f5e1bdf6b1e5672a60d20a9
 SHA1 (patch-ar) = 1a78f0bcb6a8f65f71af23accb2a9780331f275b
diff --git a/devel/SDL/patches/patch-ac b/devel/SDL/patches/patch-ac
new file mode 100644
index 00000000000..904e711f619
--- /dev/null
+++ b/devel/SDL/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.7 2003/06/04 17:53:13 abs Exp $
+
+--- src/video/SDL_stretch.c.orig	Wed Jun  4 17:20:04 2003
++++ src/video/SDL_stretch.c	Wed Jun  4 17:22:59 2003
+@@ -261,8 +261,8 @@
+ 			break;
+ 		    default:
+ #ifdef __GNUC__
+-			__asm__ __volatile__ ("
+-				call _copy_row
++			__asm__ __volatile__ ("	\
++				call _copy_row	\
+ 			"
+ 			: "=&D" (u1), "=&S" (u2)
+ 			: "0" (dstp), "1" (srcp)
diff --git a/devel/SDL/patches/patch-al b/devel/SDL/patches/patch-al
index 522e336033c..d3cfd7a42ba 100644
--- a/devel/SDL/patches/patch-al
+++ b/devel/SDL/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.4 2001/09/24 14:29:39 rh Exp $
+$NetBSD: patch-al,v 1.5 2003/06/04 17:53:13 abs Exp $
 
---- src/audio/openbsd/SDL_openbsdaudio.c.orig	Mon Jul 23 04:58:42 2001
-+++ src/audio/openbsd/SDL_openbsdaudio.c
+--- src/audio/openbsd/SDL_openbsdaudio.c.orig	Wed Mar  6 11:23:02 2002
++++ src/audio/openbsd/SDL_openbsdaudio.c	Wed Jun  4 17:09:16 2003
 @@ -37,6 +37,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -52,3 +52,59 @@ $NetBSD: patch-al,v 1.4 2001/09/24 14:29:39 rh Exp $
  
  #ifndef USE_BLOCKING_WRITES /* Not necessary when using blocking writes */
  	/* See if we need to use timed audio synchronization */
+@@ -262,20 +273,20 @@
+ 	return;
+     }
+ 
+-    fprintf(stderr,"
+-[play/record info]
+-buffer size	:   %d bytes
+-sample rate	:   %i Hz
+-channels	:   %i
+-precision	:   %i-bit
+-encoding	:   0x%x
+-seek		:   %i
+-sample count	:   %i
+-EOF count	:   %i
+-paused		:   %s
+-error occured	:   %s
+-waiting		:   %s
+-active		:   %s
++    fprintf(stderr,"\n\
++[play/record info]\n\
++buffer size	:   %d bytes\n\
++sample rate	:   %i Hz\n\
++channels	:   %i\n\
++precision	:   %i-bit\n\
++encoding	:   0x%x\n\
++seek		:   %i\n\
++sample count	:   %i\n\
++EOF count	:   %i\n\
++paused		:   %s\n\
++error occured	:   %s\n\
++waiting		:   %s\n\
++active		:   %s\n\
+ ",
+     info.play.buffer_size,
+     info.play.sample_rate,
+@@ -290,13 +301,13 @@
+     info.play.waiting ? "yes" : "no",
+     info.play.active ? "yes": "no");
+ 
+-    fprintf(stderr,"
+-[audio info]
+-monitor_gain	:   %i
+-hw block size	:   %d bytes
+-hi watermark	:   %i
+-lo watermark	:   %i
+-audio mode	:   %s
++    fprintf(stderr,"\n\
++[audio info]\n\
++monitor_gain	:   %i\n\
++hw block size	:   %d bytes\n\
++hi watermark	:   %i\n\
++lo watermark	:   %i\n\
++audio mode	:   %s\n\
+ ",  
+     info.monitor_gain,
+     info.blocksize,
-- 
cgit v1.2.3