Giovanni Bechis [2008-06-18, 12:53:39]:
> It works well @i386, PLIST updated and PKGNAME removed.
seems to work on amd64 too.
however, it picks up libsamplerate if it's installed. others reported that
it does not make a difference, so maybe the configure script needs some
tweaking to avoid picking it up.
and don't forget lib-depends-check.
> Cheers
> Giovanni
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/rdesktop/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile 15 Sep 2007 20:04:24 -0000 1.25
> +++ Makefile 18 Jun 2008 10:46:36 -0000
> @@ -1,8 +1,7 @@
> # $OpenBSD: Makefile,v 1.25 2007/09/15 20:04:24 merdely Exp $
>
> COMMENT= open source client for Windows Terminal Server
> -DISTNAME= rdesktop-1.5.0
> -PKGNAME= ${DISTNAME}p1
> +DISTNAME= rdesktop-1.6.0
> CATEGORIES= x11 net
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rdesktop/}
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/rdesktop/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 5 Apr 2007 17:36:24 -0000 1.13
> +++ distinfo 18 Jun 2008 10:46:36 -0000
> @@ -1,5 +1,5 @@
> -MD5 (rdesktop-1.5.0.tar.gz) = QzVG9g/A8gHpkwe6GINp7Q==
> -RMD160 (rdesktop-1.5.0.tar.gz) = NQ4IFm0LdiC07ZxllK3a5+xT0Vo=
> -SHA1 (rdesktop-1.5.0.tar.gz) = 4whr+GUZHu1BYxgTEl9ILiecfz0=
> -SHA256 (rdesktop-1.5.0.tar.gz) = Xq0Xw9KcsQKK7KSF7nqMZWlMGwKhtwFMPakgsmWkOKo=
> -SIZE (rdesktop-1.5.0.tar.gz) = 245137
> +MD5 (rdesktop-1.6.0.tar.gz) = xvy+1/CtfmCsX8stMk2LFg==
> +RMD160 (rdesktop-1.6.0.tar.gz) = z2BM0bwHB7SF3rZT76PkfiH6vEw=
> +SHA1 (rdesktop-1.6.0.tar.gz) = uL/QPUZA0oWgruWz+xmaR8tCJfI=
> +SHA256 (rdesktop-1.6.0.tar.gz) = NQJuqo4UyovQujcwkm8UIi+EUvKsZiYju/GQnYsGCXk=
> +SIZE (rdesktop-1.6.0.tar.gz) = 284728
> Index: patches/patch-rdpsnd_sun_c
> ===================================================================
> RCS file: patches/patch-rdpsnd_sun_c
> diff -N patches/patch-rdpsnd_sun_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-rdpsnd_sun_c 18 Jun 2008 10:46:36 -0000
> @@ -0,0 +1,40 @@
> +$OpenBSD$
> +
> +2 changes are here:
> +- Change all uint_t to unsigned int. On Linux a uint_t is just a typedef
> + to unsigned int. We don't have a uint_t.
> +
> +- In sun_open rdesktop will also check that a device is in full duplex
> + mode before opening the device successfully. I didn't add code to check
> + if a device is in full duplex mode, I just removed the check.
> +
> +--- rdpsnd_sun.c.orig Sat May 10 23:14:38 2008
> ++++ rdpsnd_sun.c Tue Jun 17 16:08:59 2008
> +@@ -54,7 +54,7 @@ static uint32 snd_rate;
> + static short samplewidth;
> + static char *dsp_dev;
> +
> +-static uint_t written_samples;
> ++static unsigned int written_samples;
> +
> + void sun_play(void);
> + void sun_record(void);
> +@@ -147,8 +147,7 @@ sun_open(int mode)
> + {
> + AUDIO_INITINFO(&info);
> +
> +- if ((ioctl(dsp_fd, AUDIO_GETINFO, &info) == -1)
> +- || !(info.hw_features & AUDIO_HWFEATURE_DUPLEX))
> ++ if (ioctl(dsp_fd, AUDIO_GETINFO, &info) == -1)
> + {
> + close(dsp_fd);
> + dsp_fd = -1;
> +@@ -440,7 +439,7 @@ sun_play(void)
> + if (out->p == out->end)
> + {
> + audio_info_t info;
> +- uint_t delay_samples;
> ++ unsigned int delay_samples;
> + unsigned long delay_us;
> +
> + if (ioctl(dsp_fd, AUDIO_GETINFO, &info) != -1)
> Index: patches/patch-xwin_c
> ===================================================================
> RCS file: patches/patch-xwin_c
> diff -N patches/patch-xwin_c
> --- patches/patch-xwin_c 17 May 2007 17:31:33 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-xwin_c,v 1.4 2007/05/17 17:31:33 ckuethe Exp $
> ---- xwin.c.orig Wed Apr 25 12:03:29 2007
> -+++ xwin.c Wed Apr 25 12:04:54 2007
> -@@ -3221,6 +3221,10 @@ ui_desktop_restore(uint32 offset, int x, int y, int cx
> - image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
> - (char *) data, cx, cy, BitmapPad(g_display), cx *
> g_bpp / 8);
> -
> -+ if (image == NULL)
> -+ image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
> -+ (char *) data, cx, cy, BitmapPad(g_display), 0);
> -+
> - if (g_ownbackstore)
> - {
> - XPutImage(g_display, g_backstore, g_gc, image, 0, 0, x, y, cx,
> cy);
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/rdesktop/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST
> --- pkg/PLIST 25 Mar 2007 19:38:39 -0000 1.6
> +++ pkg/PLIST 18 Jun 2008 10:46:36 -0000
> @@ -1,5 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.6 2007/03/25 19:38:39 aanriot Exp $
> -bin/rdesktop
> [EMAIL PROTECTED] bin/rdesktop
> @man man/man1/rdesktop.1
> share/rdesktop/
> share/rdesktop/keymaps/
