Re: cvs commit: ports/multimedia/mplayer Makefile ports/multimedia/mplayer/files patch-libmpdvdkit2-bswap.h

Hi

On Tue, 17 May 2005, Pav Lucistnik wrote:

> pav         2005-05-17 18:01:40 UTC
>
>  FreeBSD ports repository
>
>  Modified files:
>    multimedia/mplayer   Makefile
>  Removed files:
>    multimedia/mplayer/files patch-libmpdvdkit2-bswap.h
>  Log:
>  - Backout part of bswap changes which completely broke playback
>    of encrypted DVD discs
>
>  PR:             ports/80952, ports/80984
>  Diagnosed by:   Jose M Rodriguez <josemi_at_freebsd.jazztel.es>
>
>  Revision  Changes    Path
>  1.117     +1 -1      ports/multimedia/mplayer/Makefile
>  1.3       +0 -26     ports/multimedia/mplayer/files/patch-libmpdvdkit2-bswap.h (dead)
> _______________________________________________
> cvs-all_at_freebsd.org mailing list

Sorry but it seems that patch did not need to be removed - only corrected; 
it worked with this diff:

*** patch-libmpdvdkit2-bswap.h.orig	Wed May 18 00:31:05 2005
--- patch-libmpdvdkit2-bswap.h	Wed May 18 00:31:34 2005
***************
*** 18,26 ****
   +
   +#elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
   +#include <sys/endian.h>
! +#define B2N_16(x) be16toh(x)
! +#define B2N_32(x) be32toh(x)
! +#define B2N_64(x) be64toh(x)

    #elif defined(__NetBSD__)
    #include <sys/endian.h>
--- 18,26 ----
   +
   +#elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
   +#include <sys/endian.h>
! +#define B2N_16(x) x = be16toh(x)
! +#define B2N_32(x) x = be32toh(x)
! +#define B2N_64(x) x = be64toh(x)

    #elif defined(__NetBSD__)
    #include <sys/endian.h>


Regards,
Vladimir