Update to 0.8.5. Several navigation bugs fixed, MPEG and LPCM audio support

added.

5 files changed, 23 insertions, 22 deletions

diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile
index f81a950480f..a2f6d0da4a2 100644
--- a/graphics/ogle/Makefile
+++ b/graphics/ogle/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2002/07/12 18:29:29 mycroft Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/19 18:57:57 mycroft Exp $
 
-DISTNAME=	ogle-0.8.4
+DISTNAME=	ogle-0.8.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -29,5 +29,6 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../misc/libdvdread/buildlink.mk"
 .include "../../textproc/libxml2/buildlink.mk"
+.include "../../audio/mad/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ogle/PLIST b/graphics/ogle/PLIST
index 291fa7ccafd..2930d742a19 100644
--- a/graphics/ogle/PLIST
+++ b/graphics/ogle/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/12 18:29:29 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/19 18:57:57 mycroft Exp $
 bin/ifo_dump
 bin/ogle
 include/ogle/dvd.h
 include/ogle/dvdcontrol.h
 include/ogle/msgevents.h
 include/ogle/dvdevents.h
-lib/ogle/libmsgevents.so.4.0
-lib/ogle/libmsgevents.so.4
+lib/ogle/libmsgevents.so.5.0
+lib/ogle/libmsgevents.so.5
 lib/ogle/libmsgevents.so
 lib/ogle/libmsgevents.la
 lib/ogle/libmsgevents.a
-lib/ogle/libdvdcontrol.so.7.0
-lib/ogle/libdvdcontrol.so.7
+lib/ogle/libdvdcontrol.so.8.0
+lib/ogle/libdvdcontrol.so.8
 lib/ogle/libdvdcontrol.so
 lib/ogle/libdvdcontrol.la
 lib/ogle/libdvdcontrol.a
diff --git a/graphics/ogle/distinfo b/graphics/ogle/distinfo
index e3d724a4529..dd1e78b4003 100644
--- a/graphics/ogle/distinfo
+++ b/graphics/ogle/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.6 2002/07/12 18:29:29 mycroft Exp $
+$NetBSD: distinfo,v 1.7 2002/08/19 18:57:58 mycroft Exp $
 
-SHA1 (ogle-0.8.4.tar.gz) = 15ab65b6ec9cd7631b1c4341896072fa308fc15c
-Size (ogle-0.8.4.tar.gz) = 437475 bytes
+SHA1 (ogle-0.8.5.tar.gz) = b1853f49fa8847a3079f32ca4487845a9fbb549d
+Size (ogle-0.8.5.tar.gz) = 449086 bytes
 SHA1 (patch-aa) = c7ed5f7b957c0303c451650df2e4b1044d7430ef
-SHA1 (patch-ab) = 4f921f7c65de8bc0f9b1ef54442ae6f9462bb8d3
+SHA1 (patch-ab) = 30907590717a329cb7d2456647971055bf038f7d
 SHA1 (patch-ac) = 0443cd0493039150c79b54f876349ab2c7601fcf
 SHA1 (patch-ae) = a37d75d4c15ab60060df5339680ce863488c2f26
 SHA1 (patch-af) = 66a5c30aaf455e794a4c8940dc2a98815c62ae58
-SHA1 (patch-ag) = 386f8be5ce347f150b6b836a3d9c9b3db12cfbc7
+SHA1 (patch-ag) = 67fad5e4962ace6dfc65492361f29fed029babc2
 SHA1 (patch-ah) = 1fb41606f1fc0593597afb54cb2839f7c87221dc
 SHA1 (patch-ai) = 32ca5020e831cabc978c31c4d853cc94ed994a1d
diff --git a/graphics/ogle/patches/patch-ab b/graphics/ogle/patches/patch-ab
index a4775be0d4d..d02f30952d1 100644
--- a/graphics/ogle/patches/patch-ab
+++ b/graphics/ogle/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2002/07/12 18:29:29 mycroft Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/19 18:57:59 mycroft Exp $
 
---- configure.in.orig	Sat Jun 29 22:49:43 2002
-+++ configure.in	Thu Jul 11 02:18:38 2002
-@@ -351,16 +351,16 @@
+--- configure.in.orig	Mon Aug  5 18:30:55 2002
++++ configure.in	Mon Aug 12 18:35:45 2002
+@@ -403,16 +403,16 @@
      esac
  fi
  
@@ -20,10 +20,10 @@ $NetBSD: patch-ab,v 1.3 2002/07/12 18:29:29 mycroft Exp $
  dnl sys/audioio.h
 -        AC_DEFINE([LIBOGLEAO_OBSD],,[libogleao OpenBSD audio support])
 +        AC_DEFINE([LIBOGLEAO_OBSD],,[libogleao NetBSD/OpenBSD audio support])
+ 	BUILD_AUDIO_OBSD=1
  	DEFAULT_AUDIO_DRIVER="obsd"
  	DEFAULT_AUDIO_DEVICE="/dev/audio"
-     ;;
-@@ -372,7 +372,7 @@
+@@ -425,7 +425,7 @@
      [  --disable-sunaudio      make a version not using Sun audio])
  if test "x$enable_sunaudio" != xno; then
      case "$host" in
diff --git a/graphics/ogle/patches/patch-ag b/graphics/ogle/patches/patch-ag
index 14b7ff172a4..8af3b5a5fd9 100644
--- a/graphics/ogle/patches/patch-ag
+++ b/graphics/ogle/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.1 2002/06/16 18:12:59 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/19 18:57:59 mycroft Exp $
 
---- ogle/dvdcontrol.h.orig	Tue Apr  2 21:06:05 2002
-+++ ogle/dvdcontrol.h	Thu Jun 13 13:57:32 2002
+--- ogle/dvdcontrol.h.orig	Sat Aug  3 17:34:50 2002
++++ ogle/dvdcontrol.h	Mon Aug 12 18:37:09 2002
 @@ -22,7 +22,7 @@
  #include <ogle/dvd.h>
- #include <ogle/msgevents.h> // Only for the hack with DVDNextEvent !!
+ #include <ogle/msgevents.h> /* Only for the hack with DVDNextEvent !! */
  
 -#if (defined(__unix__) || defined(unix)) && !defined(USG)
 +#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG)