[pkgsrc/trunk]: pkgsrc/audio/libac3 Add DragonFly support. Fix lvalue cast to...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cfeb92caeff
branches:  trunk
changeset: 502953:6cfeb92caeff
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Nov 11 17:48:25 2005 +0000

description:
Add DragonFly support. Fix lvalue cast to allow build with GCC 3.4+.

diffstat:

 audio/libac3/distinfo         |   6 +++---
 audio/libac3/patches/patch-aa |  25 +++++++++++++++----------
 audio/libac3/patches/patch-ab |  14 ++++++++++++--
 3 files changed, 30 insertions(+), 15 deletions(-)

diffs (82 lines):

diff -r 19ff9de091f7 -r 6cfeb92caeff audio/libac3/distinfo
--- a/audio/libac3/distinfo     Fri Nov 11 17:22:53 2005 +0000
+++ b/audio/libac3/distinfo     Fri Nov 11 17:48:25 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:47 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/11/11 17:48:25 joerg Exp $
 
 SHA1 (ac3dec-0.6.1.tar.gz) = 5c3315a58425be508bfbf076054e636451b685fd
 RMD160 (ac3dec-0.6.1.tar.gz) = 1c61ab0f203a86bdf885d7a1dcfb43a224c84400
 Size (ac3dec-0.6.1.tar.gz) = 84978 bytes
-SHA1 (patch-aa) = 57c06d31e672a69d72cbb02f4998aa5ed9d58c28
-SHA1 (patch-ab) = 2f0997ad1e9135d213c3f882b55be59e86b05325
+SHA1 (patch-aa) = 957a19c7437205dfb901d22734d19e564f4375b9
+SHA1 (patch-ab) = f436a56f91d3aa67e0e3a4b8df1d3745e92da14f
diff -r 19ff9de091f7 -r 6cfeb92caeff audio/libac3/patches/patch-aa
--- a/audio/libac3/patches/patch-aa     Fri Nov 11 17:22:53 2005 +0000
+++ b/audio/libac3/patches/patch-aa     Fri Nov 11 17:48:25 2005 +0000
@@ -1,17 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/10/15 17:49:47 rh Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/11 17:48:25 joerg Exp $
 
---- configure.orig     Wed Mar 29 19:51:49 2000
-+++ configure  Tue May  9 09:32:16 2000
-@@ -1255,27 +1255,7 @@
+--- configure.orig     2000-03-30 00:51:49.000000000 +0000
++++ configure
+@@ -1254,32 +1254,12 @@ fi
+ 
  case "$host" in
  *-linux*) rm -f output.c; ln -s output_linux.c output.c;;
 -*-openbsd*|*-freebsd*) rm -f output.c; ln -s output_linux.c output.c;;
-+*-openbsd*|*-freebsd*|*-netbsd*) rm -f output.c; ln -s output_linux.c output.c;;
++*-openbsd*|*-freebsd*|*-netbsd*|*-dragonfly*) rm -f output.c; ln -s output_linux.c output.c;;
  *-irix*) rm -f output.c; ln -s output_irix.c output.c;;
  *-solaris*) rm -f output.c; ln -s output_solaris.c output.c;;
--*) echo "$host is not currently supported by ac3dec"; exit 1;;
--esac
--
+ *) echo "$host is not currently supported by ac3dec"; exit 1;;
+ esac
+ 
 -case "$host" in
 -i?86-*) cat >> confdefs.h <<\EOF
 -#define __i386__ 1
@@ -29,5 +30,9 @@
 -#define __ppc__ 1
 -EOF
 -;;
- *) echo "$host is not currently supported by ac3dec"; exit 1;;
- esac
+-*) echo "$host is not currently supported by ac3dec"; exit 1;;
+-esac
+-
+ trap '' 1 2 15
+ cat > confcache <<\EOF
+ # This file is a shell script that caches the results of configure
diff -r 19ff9de091f7 -r 6cfeb92caeff audio/libac3/patches/patch-ab
--- a/audio/libac3/patches/patch-ab     Fri Nov 11 17:22:53 2005 +0000
+++ b/audio/libac3/patches/patch-ab     Fri Nov 11 17:48:25 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/10/15 17:49:47 rh Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/11 17:48:25 joerg Exp $
 
---- libac3/bitstream.c.orig    Mon Sep 25 23:05:02 2000
+--- libac3/bitstream.c.orig    2000-03-30 00:51:24.000000000 +0000
 +++ libac3/bitstream.c
 @@ -23,6 +23,7 @@
  
@@ -10,3 +10,13 @@
  
  #include "ac3.h"
  #include "ac3_internal.h"
+@@ -90,7 +91,8 @@ bitstream_buffer_frame(uint_32 frame_siz
+ static inline void
+ bitstream_fill_current()
+ {
+-      current_word = *((uint_32*)buffer_start)++;
++      current_word = *(uint_32*)buffer_start;
++      buffer_start += sizeof(uint_32);
+       current_word = swab32(current_word);
+ }
+