[Midnightbsd-cvs] mports: net/rdesktop: Update xorg depends for x.org 7.3.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update xorg depends for x.org 7.3.

Modified Files:
--------------
    mports/net/rdesktop:
        Makefile (r1.1 -> r1.2)

Added Files:
-----------
    mports/net/rdesktop/files:
        patch-rdpsnd_oss.c (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/rdesktop/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net/rdesktop/Makefile -L net/rdesktop/Makefile -u -r1.1 -r1.2
--- net/rdesktop/Makefile
+++ net/rdesktop/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	rdesktop
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	net comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	RDP client for Windows NT/2000/2003 Terminal Server
 
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
--- /dev/null
+++ net/rdesktop/files/patch-rdpsnd_oss.c
@@ -0,0 +1,57 @@
+--- rdpsnd_oss.c.orig	2007-08-20 23:20:40.000000000 -0700
++++ rdpsnd_oss.c	2007-08-20 23:21:51.000000000 -0700
+@@ -51,6 +51,35 @@
+ } packet_queue[MAX_QUEUE];
+ static unsigned int queue_hi, queue_lo;
+ 
++/** Frees the first audio packet in the queue (that is, packet_queue[queue_lo]),
++ * sending a completion notification back to the server.
++ *
++ * @return True if the packet queue has become empty; False otherwise. 
++ *
++ * If the packet queue is not empty, queue_lo will point at the next packet to
++ * play.
++ */
++static BOOL
++packet_done(void)
++{
++	struct audio_packet *packet = &packet_queue[queue_lo++];
++	queue_lo %= MAX_QUEUE;
++	rdpsnd_send_completion(packet->tick, packet->index);
++	free(packet->s.data);
++	return (queue_lo == queue_hi);
++}
++
++/** Discards all audio packets queued, sending completion notifications back to
++ * the server as necessary.
++ */
++static void
++clear_queue(void)
++{
++	while (queue_lo != queue_hi)
++		packet_done();
++	g_dsp_busy = False;
++}
++
+ BOOL
+ wave_out_open(void)
+ {
+@@ -74,6 +103,7 @@
+ wave_out_close(void)
+ {
+ 	close(g_dsp_fd);
++	clear_queue();
+ }
+ 
+ BOOL
+@@ -277,9 +307,7 @@
+ 
+ 		if (elapsed >= (duration * 85) / 100)
+ 		{
+-			rdpsnd_send_completion(packet->tick, packet->index);
+-			free(out->data);
+-			queue_lo = (queue_lo + 1) % MAX_QUEUE;
++			packet_done();
+ 			started = False;
+ 		}
+ 		else