Date: Fri, 22 Dec 2000 18:15:45 -0500 (EST) From: dmaddox@sc.rr.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/23777: Timidity++ ports are broken on -current Message-ID: <200012222315.eBMNFjd10555@sc.rr.com> Resent-Message-ID: <200012222320.eBMNK1S65896@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 23777 >Category: ports >Synopsis: Timidity++ does not compile on -current >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Dec 22 15:20:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Donald J. Maddox >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD cae88-102-101.sc.rr.com 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Mon Dec 18 16:19:01 EST 2000 dmaddox@cae88-102-101.sc.rr.com:/usr/src/sys/compile/RHIANNON i386 >Description: The timidity++ ports all fail on -current, becuase they use __byte_swap_word and __byte_swap_long which have been renamed on -current to __uint8_swap_uint16 and __uint8_swap_uint32 respectively. >How-To-Repeat: Boot up a -current machine with ports tree installed. # cd /usr/ports/audio/timidity++ # make >Fix: This patch-ac should be replaced with this patch: --- timidity/timidity.h.orig Fri Dec 22 17:55:40 2000 +++ timidity/timidity.h Fri Dec 22 17:57:41 2000 @@ -447,8 +447,14 @@ #define LE_SHORT(x) (x) #define LE_LONG(x) (x) #ifdef __FreeBSD__ -#define BE_SHORT(x) __byte_swap_word(x) -#define BE_LONG(x) __byte_swap_long(x) +# include <osreldate.h> +# if __FreeBSD_version <= 500000 +# define BE_SHORT(x) __byte_swap_word(x) +# define BE_LONG(x) __byte_swap_long(x) +# else +# define BE_SHORT(x) __uint8_swap_uint16(x) +# define BE_LONG(x) __uint8_swap_uint32(x) +# endif #else #define BE_SHORT(x) XCHG_SHORT(x) #define BE_LONG(x) XCHG_LONG(x) @@ -457,8 +463,14 @@ #define BE_SHORT(x) (x) #define BE_LONG(x) (x) #ifdef __FreeBSD__ -#define LE_SHORT(x) __byte_swap_word(x) -#define LE_LONG(x) __byte_swap_long(x) +# include <osreldate.h> +# if __FreeBSD_version <= 500000 +# define LE_SHORT(x) __byte_swap_word(x) +# define LE_LONG(x) __byte_swap_long(x) +# else +# define LE_SHORT(x) __uint8_swap_uint16(x) +# define LE_LONG(x) __uint8_swap_uint32(x) +# endif #else #define LE_SHORT(x) XCHG_SHORT(x) #define LE_LONG(x) XCHG_LONG(x) >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200012222315.eBMNFjd10555>