pkg/30314: DragonFly support multimedia/libdvdread

[joerg%leaf.dragonflybsd.org@localhost]

>Number:         30314
>Category:       pkg
>Synopsis:       DragonFly support multimedia/libdvdread
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon May 23 16:09:00 +0000 2005
>Originator:     Jörg Sonnenberger
>Release:        pkgsrc-HEAD
>Organization:
>Environment:
DragonFly britannica.bec.de 1.3.1-DEVELOPMENT DragonFly 1.3.1-DEVELOPMENT #15: 
Tue May 17 13:31:47 2005     
joerg%britannica.bec.de@localhost:/home/joerg/wd/DragonFly/world/src/sys/compile/TURTLE
  i386

>Description:
DragonFly should be threated like the other BSDs. It also provides functions 
for byte-swapping. Without the patch it doesn't build or is slower than it has 
to be.
>How-To-Repeat:
build on DragonFly.
>Fix:
Index: distinfo
===================================================================
RCS file: 
/home/joerg/wd/repository/netbsd/pkgsrc/multimedia/libdvdread/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo    10 Mar 2005 14:21:44 -0000      1.5
+++ distinfo    23 May 2005 15:59:52 -0000
@@ -3,6 +3,6 @@
 SHA1 (libdvdread-0.9.4.tar.gz) = a4b626e49ba8bd33857693c3abe8b34196bc3360
 RMD160 (libdvdread-0.9.4.tar.gz) = 9f7f82e14fb5d458686e5cb2e5f364bad19dd08e
 Size (libdvdread-0.9.4.tar.gz) = 256858 bytes
-SHA1 (patch-aa) = d97d18c6e1ad445ed7d8e1cdb990ca58ed2d3ef9
-SHA1 (patch-ab) = a86a639adf22fe17c98db059e3fa542d0424d468
+SHA1 (patch-aa) = 8fed4faa157c1e0aabc27a462162191b44b52b64
+SHA1 (patch-ab) = 52416442f5988b28c109d623d2ac4ee61a802db2
 SHA1 (patch-ac) = 971dc8802bf8f815821e8ad5f279a5148fcf26f7
Index: patches/patch-aa
===================================================================
RCS file: 
/home/joerg/wd/repository/netbsd/pkgsrc/multimedia/libdvdread/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patches/patch-aa    10 Mar 2005 14:21:45 -0000      1.2
+++ patches/patch-aa    23 May 2005 15:58:37 -0000
@@ -1,12 +1,22 @@
-$NetBSD: pkgsrc/multimedia/libdvdread/patches/patch-aa,v 1.2 2005/03/10 
14:21:45 tv Exp $
+$NetBSD$
 
---- dvdread/bswap.h.orig       2002-12-14 19:09:12.000000000 -0500
+--- dvdread/bswap.h.orig       2002-12-15 01:09:12.000000000 +0100
 +++ dvdread/bswap.h
-@@ -57,7 +57,15 @@
+@@ -53,19 +53,33 @@
+ #define B2N_32(x) x = swap32(x)
+ #define B2N_64(x) x = swap64(x)
+ 
+-#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
++#elif defined(__DragonFly__)
  #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)
+ #define B2N_64(x) x = be64toh(x)
+ 
++#elif (defined(__FreeBSD__) && __FreeBSD_version >= 470000)
++#include <sys/endian.h>
++#define B2N_16(x) x = be16toh(x)
++#define B2N_32(x) x = be32toh(x)
 +#define B2N_64(x) x = \
 +     ((((x) & 0x@@ -16,10 +26,10 @@
 +      (((x) & 0x0000000000ff0000) << 24) | \
 +      (((x) & 0x000000000000ff00) << 40) | \
 +      (((x) & 0x00000000000000ff) << 56))
- 
++
  /* This is a slow but portable implementation, it has multiple evaluation 
   * problems so beware.
-@@ -65,7 +73,7 @@
+  * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such 
   * functionality! 
   */
  
Index: patches/patch-ab
===================================================================
RCS file: 
/home/joerg/wd/repository/netbsd/pkgsrc/multimedia/libdvdread/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patches/patch-ab    21 Jun 2004 16:14:14 -0000      1.2
+++ patches/patch-ab    23 May 2005 15:58:56 -0000
@@ -1,7 +1,16 @@
-$NetBSD: pkgsrc/multimedia/libdvdread/patches/patch-ab,v 1.2 2004/06/21 
16:14:14 drochner Exp $
+$NetBSD$
 
 --- dvdread/dvd_reader.c.orig  2003-02-13 23:31:21.000000000 +0100
 +++ dvdread/dvd_reader.c
+@@ -32,7 +32,7 @@
+ #include <limits.h>
+ #include <dirent.h>
+  
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || 
defined(__bsdi__)|| defined(__DARWIN__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || 
defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__)
+ #define SYS_BSD 1
+ #endif
+ 
 @@ -282,7 +282,7 @@ static char *bsd_block2char( const char 
      char *new_path;
  
ff00000000000000) >> 56) | \
 +      (((x) & 0x00ff000000000000) >> 40) | \