From b891be49ff45d8b4302bde12862fbbe54ded4b92 Mon Sep 17 00:00:00 2001 From: mycroft Date: Sat, 8 Mar 2003 18:01:40 +0000 Subject: Update to ogle 0.9.0. --- graphics/ogle/Makefile | 6 +++--- graphics/ogle/PLIST | 11 ++++++----- graphics/ogle/distinfo | 12 ++++-------- graphics/ogle/patches/patch-aa | 40 ---------------------------------------- graphics/ogle/patches/patch-ab | 34 ---------------------------------- graphics/ogle/patches/patch-ac | 31 ------------------------------- graphics/ogle/patches/patch-ae | 13 ------------- graphics/ogle/patches/patch-ag | 10 +++++----- 8 files changed, 18 insertions(+), 139 deletions(-) delete mode 100644 graphics/ogle/patches/patch-aa delete mode 100644 graphics/ogle/patches/patch-ab delete mode 100644 graphics/ogle/patches/patch-ac delete mode 100644 graphics/ogle/patches/patch-ae (limited to 'graphics') diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile index 208a3ab625b..7c83faac5a9 100644 --- a/graphics/ogle/Makefile +++ b/graphics/ogle/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2003/02/26 10:13:15 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2003/03/08 18:01:40 mycroft Exp $ -DISTNAME= ogle-0.8.5 -PKGREVISION= 2 +DISTNAME= ogle-0.9.0 +#PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ diff --git a/graphics/ogle/PLIST b/graphics/ogle/PLIST index 2930d742a19..5d99c1d0ac7 100644 --- a/graphics/ogle/PLIST +++ b/graphics/ogle/PLIST @@ -1,17 +1,18 @@ -@comment $NetBSD: PLIST,v 1.4 2002/08/19 18:57:57 mycroft Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/03/08 18:01:40 mycroft Exp $ bin/ifo_dump bin/ogle include/ogle/dvd.h +include/ogle/dvdbookmarks.h include/ogle/dvdcontrol.h include/ogle/msgevents.h include/ogle/dvdevents.h -lib/ogle/libmsgevents.so.5.0 -lib/ogle/libmsgevents.so.5 +lib/ogle/libmsgevents.so.6.0 +lib/ogle/libmsgevents.so.6 lib/ogle/libmsgevents.so lib/ogle/libmsgevents.la lib/ogle/libmsgevents.a -lib/ogle/libdvdcontrol.so.8.0 -lib/ogle/libdvdcontrol.so.8 +lib/ogle/libdvdcontrol.so.9.0 +lib/ogle/libdvdcontrol.so.9 lib/ogle/libdvdcontrol.so lib/ogle/libdvdcontrol.la lib/ogle/libdvdcontrol.a diff --git a/graphics/ogle/distinfo b/graphics/ogle/distinfo index dd1e78b4003..7696ad32bc5 100644 --- a/graphics/ogle/distinfo +++ b/graphics/ogle/distinfo @@ -1,12 +1,8 @@ -$NetBSD: distinfo,v 1.7 2002/08/19 18:57:58 mycroft Exp $ +$NetBSD: distinfo,v 1.8 2003/03/08 18:01:40 mycroft Exp $ -SHA1 (ogle-0.8.5.tar.gz) = b1853f49fa8847a3079f32ca4487845a9fbb549d -Size (ogle-0.8.5.tar.gz) = 449086 bytes -SHA1 (patch-aa) = c7ed5f7b957c0303c451650df2e4b1044d7430ef -SHA1 (patch-ab) = 30907590717a329cb7d2456647971055bf038f7d -SHA1 (patch-ac) = 0443cd0493039150c79b54f876349ab2c7601fcf -SHA1 (patch-ae) = a37d75d4c15ab60060df5339680ce863488c2f26 +SHA1 (ogle-0.9.0.tar.gz) = b015587dc2634d97d2f83cf194c409efa036b03d +Size (ogle-0.9.0.tar.gz) = 475523 bytes SHA1 (patch-af) = 66a5c30aaf455e794a4c8940dc2a98815c62ae58 -SHA1 (patch-ag) = 67fad5e4962ace6dfc65492361f29fed029babc2 +SHA1 (patch-ag) = c6b5f73a0c2878b3d72cf373e7291f77378f557f SHA1 (patch-ah) = 1fb41606f1fc0593597afb54cb2839f7c87221dc SHA1 (patch-ai) = 32ca5020e831cabc978c31c4d853cc94ed994a1d diff --git a/graphics/ogle/patches/patch-aa b/graphics/ogle/patches/patch-aa deleted file mode 100644 index d78e2eef888..00000000000 --- a/graphics/ogle/patches/patch-aa +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2002/06/16 18:12:58 wiz Exp $ - ---- include/debug_print.h.orig Tue Apr 2 21:06:03 2002 -+++ include/debug_print.h Thu Jun 13 10:49:39 2002 -@@ -24,20 +24,25 @@ - - #if defined(__GNUC__) && ( __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 95)) - --#define FATAL(str, args...) \ --fprintf(stderr, "FATAL[%s]: " str, program_name , ## args) -+#define FATAL(str...) _FATAL( , ##str) -+#define _FATAL(str, args...) \ -+fprintf(stderr, "FATAL[%s]: " str, program_name, ##args) - --#define ERROR(str, args...) \ --fprintf(stderr, "ERROR[%s]: " str, program_name , ## args) -+#define ERROR(str...) _ERROR( , ##str) -+#define _ERROR(str, args...) \ -+fprintf(stderr, "ERROR[%s]: " str, program_name, ##args) - --#define WARNING(str, args...) \ --fprintf(stderr, "WARNING[%s]: " str, program_name , ## args) -+#define WARNING(str...) _WARNING( , ##str) -+#define _WARNING(str, args...) \ -+fprintf(stderr, "WARNING[%s]: " str, program_name, ##args) - --#define NOTE(str, args...) \ --fprintf(stderr, "Note[%s]: " str, program_name , ## args) -+#define NOTE(str...) _NOTE(, ##str) -+#define _NOTE(str, args...) \ -+fprintf(stderr, "Note[%s]: " str, program_name, ##args) - --#define DNOTE(str, args...) \ --fprintf(stderr, "Debug[%s]: " str, program_name , ## args) -+#define DNOTE(str...) _DNOTE( , ##str) -+#define _DNOTE(str, args...) \ -+fprintf(stderr, "Debug[%s]: " str, program_name, ##args) - - #ifdef DEBUG - diff --git a/graphics/ogle/patches/patch-ab b/graphics/ogle/patches/patch-ab deleted file mode 100644 index d02f30952d1..00000000000 --- a/graphics/ogle/patches/patch-ab +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2002/08/19 18:57:59 mycroft Exp $ - ---- 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 - --dnl check for openbsd audio -+dnl check for netbsd/openbsd audio - AC_ARG_ENABLE([obsdaudio], -- [ --disable-obsdaudio make a version not using OpenBSD audio]) -+ [ --disable-obsdaudio make a version not using NetBSD/OpenBSD audio]) - if test "x$enable_obsdaudio" != xno; then - case "$host" in -- *-openbsd*) -+ *-netbsd*|*-openbsd*) - - dnl only define LIBOGLEAO_OBSD headers found - 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" -@@ -425,7 +425,7 @@ - [ --disable-sunaudio make a version not using Sun audio]) - if test "x$enable_sunaudio" != xno; then - case "$host" in -- *-sun-solaris*|*-netbsd*) -+ *-sun-solaris*) - - dnl check for headers.. only define LIBOGLEAO_SOLARIS if headers are found. - AC_DEFINE([LIBOGLEAO_SOLARIS],,[libogleao solaris audio support]) diff --git a/graphics/ogle/patches/patch-ac b/graphics/ogle/patches/patch-ac deleted file mode 100644 index d76ba406a76..00000000000 --- a/graphics/ogle/patches/patch-ac +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2002/07/12 18:29:29 mycroft Exp $ - ---- configure.orig Sun Jun 30 00:54:14 2002 -+++ configure Thu Jul 11 02:22:13 2002 -@@ -1004,7 +1004,7 @@ - --disable-libtool-lock avoid locking (might break parallel builds) - --disable-xv disable the use of Xv - --disable-oss make a version not using oss -- --disable-obsdaudio make a version not using OpenBSD audio -+ --disable-obsdaudio make a version not using NetBSD/OpenBSD audio - --disable-sunaudio make a version not using Sun audio - --disable-alsa make a version not using alsa - --disable-xmltest Do not try to compile and run a test LIBXML program -@@ -10989,7 +10989,7 @@ - fi; - if test "x$enable_obsdaudio" != xno; then - case "$host" in -- *-openbsd*) -+ *-netbsd*|*-openbsd*) - - - cat >>confdefs.h <<\_ACEOF -@@ -11009,7 +11009,7 @@ - fi; - if test "x$enable_sunaudio" != xno; then - case "$host" in -- *-sun-solaris*|*-netbsd*) -+ *-sun-solaris*) - - - cat >>confdefs.h <<\_ACEOF diff --git a/graphics/ogle/patches/patch-ae b/graphics/ogle/patches/patch-ae deleted file mode 100644 index 26f8a09421a..00000000000 --- a/graphics/ogle/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2002/06/16 18:12:58 wiz Exp $ - ---- libogleao/obsd_audio.c.orig Wed Jun 5 20:34:58 2002 -+++ libogleao/obsd_audio.c Thu Jun 13 12:54:38 2002 -@@ -158,7 +158,7 @@ - odelay = instance->samples_written - info.play.samples; - */ - odelay = seek / instance->sample_frame_size; -- fprintf(stderr, "odelay: %d\n", odelay); -+/* fprintf(stderr, "odelay: %d\n", odelay); */ - - *samples_return = odelay; - diff --git a/graphics/ogle/patches/patch-ag b/graphics/ogle/patches/patch-ag index 8af3b5a5fd9..5b617d9fd95 100644 --- a/graphics/ogle/patches/patch-ag +++ b/graphics/ogle/patches/patch-ag @@ -1,10 +1,10 @@ -$NetBSD: patch-ag,v 1.2 2002/08/19 18:57:59 mycroft Exp $ +$NetBSD: patch-ag,v 1.3 2003/03/08 18:01:41 mycroft Exp $ ---- 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/dvdcontrol.h.orig 2003-02-23 11:31:07.000000000 +0000 ++++ ogle/dvdcontrol.h 2003-03-08 17:36:12.000000000 +0000 +@@ -23,7 +23,7 @@ #include /* Only for the hack with DVDNextEvent !! */ + #include -#if (defined(__unix__) || defined(unix)) && !defined(USG) +#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG) -- cgit v1.2.3