From 52844642b5bdf003f044b78969320af315569480 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Tue, 17 May 2005 18:01:39 +0000 Subject: - Backout part of bswap changes which completely broke playback of encrypted DVD discs PR: ports/80952, ports/80984 Diagnosed by: Jose M Rodriguez --- multimedia/mplayer/Makefile | 2 +- .../mplayer/files/patch-libmpdvdkit2-bswap.h | 26 ---------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 multimedia/mplayer/files/patch-libmpdvdkit2-bswap.h (limited to 'multimedia') diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 725e224605c9..e0fac6c5e68d 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -264,7 +264,7 @@ PORTNAME= mplayer PORTVERSION= 0.99.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ http://www2.mplayerhq.hu/MPlayer/releases/ \ diff --git a/multimedia/mplayer/files/patch-libmpdvdkit2-bswap.h b/multimedia/mplayer/files/patch-libmpdvdkit2-bswap.h deleted file mode 100644 index 64054aa650eb..000000000000 --- a/multimedia/mplayer/files/patch-libmpdvdkit2-bswap.h +++ /dev/null @@ -1,26 +0,0 @@ ---- libmpdvdkit2/bswap.h.orig Thu Mar 10 23:40:06 2005 -+++ libmpdvdkit2/bswap.h Mon May 9 12:31:34 2005 -@@ -24,6 +24,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include -+#endif -+ - #if defined(WORDS_BIGENDIAN) - /* All bigendian systems are fine, just ignore the swaps. */ - #define B2N_16(x) (void)(x) -@@ -37,6 +41,12 @@ - #define B2N_16(x) x = bswap_16(x) - #define B2N_32(x) x = bswap_32(x) - #define B2N_64(x) x = bswap_64(x) -+ -+#elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000) -+#include -+#define B2N_16(x) be16toh(x) -+#define B2N_32(x) be32toh(x) -+#define B2N_64(x) be64toh(x) - - #elif defined(__NetBSD__) - #include -- cgit v1.2.3