[Midnightbsd-cvs] mports: net/rdesktop: Update to 1.6.0, add ipv6 support
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 17 17:17:41 EDT 2008
Log Message:
-----------
Update to 1.6.0, add ipv6 support
Modified Files:
--------------
mports/net/rdesktop:
Makefile (r1.4 -> r1.5)
distinfo (r1.1 -> r1.2)
Removed Files:
-------------
mports/net/rdesktop/files:
patch-rdpsnd_oss.c
patch-xwin.c
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/rdesktop/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L net/rdesktop/Makefile -L net/rdesktop/Makefile -u -r1.4 -r1.5
--- net/rdesktop/Makefile
+++ net/rdesktop/Makefile
@@ -7,9 +7,8 @@
#
PORTNAME= rdesktop
-PORTVERSION= 1.5.0
-PORTREVISION= 1
-CATEGORIES= net comms
+PORTVERSION= 1.6.0
+CATEGORIES= net comms ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,6 +23,23 @@
DOCS= doc/AUTHORS doc/TODO doc/*.txt
MAN1= rdesktop.1
+.if !defined(WITHOUT_RDESKTOP_IPV6) && !defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+= --with-ipv6
+.endif
+
+.if defined(WITH_RDESKTOP_DEBUG)
+CONFIGURE_ARGS+= --with-debug\
+ --with-debug-kbd\
+ --with-debug-rdp5\
+ --with-debug-clipboard\
+ --with-debug-sound\
+ --with-debug-channel\
+ --with-debug-seamless
+
+post-configure:
+ ${ECHO} "#define WITH_DEBUG_SERIAL 1" >> ${WRKSRC}/rdesktop.h
+.endif
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${MAN1PREFIX}/man/man1
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net/rdesktop/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net/rdesktop/distinfo -L net/rdesktop/distinfo -u -r1.1 -r1.2
--- net/rdesktop/distinfo
+++ net/rdesktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (rdesktop-1.5.0.tar.gz) = 433546f60fc0f201e99307ba188369ed
-SHA256 (rdesktop-1.5.0.tar.gz) = 5ead17c3d29cb1028aeca485ee7a8c65694c1b02a1b7014c3da920b265a438aa
-SIZE (rdesktop-1.5.0.tar.gz) = 245137
+MD5 (rdesktop-1.6.0.tar.gz) = c6fcbed7f0ad7e60ac5fcb2d324d8b16
+SHA256 (rdesktop-1.6.0.tar.gz) = 35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979
+SIZE (rdesktop-1.6.0.tar.gz) = 284728
--- net/rdesktop/files/patch-xwin.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xwin.c.orig Fri Jun 1 10:27:15 2007
-+++ xwin.c Fri Jun 1 10:28:26 2007
-@@ -3219,7 +3219,7 @@
- return;
-
- image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
-- (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);
-+ (char *) data, cx, cy, g_bpp, 0);
-
- if (g_ownbackstore)
- {
--- net/rdesktop/files/patch-rdpsnd_oss.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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
More information about the Midnightbsd-cvs
mailing list