From owner-freebsd-current@FreeBSD.ORG  Tue May 17 21:51:57 2005
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id AFE1A16A4CE; Tue, 17 May 2005 21:51:57 +0000 (GMT)
Received: from horse.iptelecom.net.ua (horse.iptelecom.net.ua [212.9.224.8])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7AF3543D95; Tue, 17 May 2005 21:51:56 +0000 (GMT)
	(envelope-from vkushnir@i.kiev.ua)
Received: from h129.243.159.dialup.iptcom.net ([213.159.243.129]:4801 "EHLO
	kushnir1.kiev.ua" ident: "SOCKFAULT1" whoson: "vkushnir")
	by horse.iptelecom.net.ua with ESMTP id S1219529AbVEQVvt (ORCPT
	<rfc822;current@FreeBSD.org> + 1 other);
	Wed, 18 May 2005 00:51:49 +0300
Received: from kushnir1.kiev.ua (kushnir1.kiev.ua [10.0.0.1])
	by kushnir1.kiev.ua (8.13.3/8.13.3) with ESMTP id j4HLpkJj008618;
	Wed, 18 May 2005 00:51:46 +0300 (EEST)
	(envelope-from vkushnir@i.kiev.ua)
Date: Wed, 18 May 2005 00:51:46 +0300 (EEST)
From: Vladimir Kushnir <vkushnir@i.kiev.ua>
X-X-Sender: vkushnir@kushnir1.kiev.ua
To: current@FreeBSD.org
In-Reply-To: <200505171801.j4HI1eei040584@repoman.freebsd.org>
Message-ID: <20050518003225.I7590@kushnir1.kiev.ua>
References: <200505171801.j4HI1eei040584@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
cc: Pav Lucistnik <pav@FreeBSD.org>
Subject: Re: cvs commit: ports/multimedia/mplayer Makefile
 ports/multimedia/mplayer/files         patch-libmpdvdkit2-bswap.h
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 May 2005 21:51:57 -0000

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@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@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