From b52f120990632d1071eaa6060c3226f820de746c Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 16 Jun 2002 18:12:58 +0000 Subject: Update to 0.8.3, provided by veego. Changes since 0.8.2: New audio code now supports OSS, ALSA, Sun audio, and OpenBSD audio. There is improved audio/video synchronization and a much more reasonable volume level. There are updates to the navigation code, which now plays more DVDs. It's Xinerama aware and the User Interfaces control functions have been extended. This release will disable Xscreensaver while playing video, and has many small bugfixes. --- graphics/ogle/Makefile | 15 ++++++------ graphics/ogle/PLIST | 8 +++---- graphics/ogle/distinfo | 18 +++++++++----- graphics/ogle/patches/patch-aa | 20 ++++++++-------- graphics/ogle/patches/patch-ab | 45 +++++++++++++++++++++++++---------- graphics/ogle/patches/patch-ac | 54 ++++++++++++++++-------------------------- graphics/ogle/patches/patch-ad | 13 ++++++++++ graphics/ogle/patches/patch-ae | 13 ++++++++++ graphics/ogle/patches/patch-af | 13 ++++++++++ graphics/ogle/patches/patch-ag | 13 ++++++++++ graphics/ogle/patches/patch-ah | 13 ++++++++++ graphics/ogle/patches/patch-ai | 13 ++++++++++ 12 files changed, 166 insertions(+), 72 deletions(-) create mode 100644 graphics/ogle/patches/patch-ad create mode 100644 graphics/ogle/patches/patch-ae create mode 100644 graphics/ogle/patches/patch-af create mode 100644 graphics/ogle/patches/patch-ag create mode 100644 graphics/ogle/patches/patch-ah create mode 100644 graphics/ogle/patches/patch-ai (limited to 'graphics/ogle') diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile index c0fd1b94fdd..d508b9d8706 100644 --- a/graphics/ogle/Makefile +++ b/graphics/ogle/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2002/05/20 23:05:00 veego Exp $ +# $NetBSD: Makefile,v 1.8 2002/06/16 18:12:58 wiz Exp $ -DISTNAME= ogle-0.8.2 -PKGREVISION= 1 +DISTNAME= ogle-0.8.3 CATEGORIES= graphics MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -9,15 +8,15 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ COMMENT= DVD player with menus -DEPENDS+= jpeg-6b:../../graphics/jpeg -DEPENDS+= liba52>=0.7.1.2:../../audio/liba52 -DEPENDS+= libdvdread>=0.9.2:../../misc/libdvdread +DEPENDS+= liba52>=0.7.3:../../audio/liba52 -BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.5 +BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.19 ONLY_FOR_PLATFORM= NetBSD-1.5[Y-Z]*-i386 NetBSD-1.[6-9]*-i386 CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +#CONFIGURE_ARGS+=--enable-obsdaudio +#CONFIGURE_ARGS+=--disable-sunaudio GNU_CONFIGURE= yes USE_GMAKE= yes @@ -26,6 +25,8 @@ USE_CONFIG_WRAPPER= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/gettext-lib/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" +.include "../../misc/libdvdread/buildlink.mk" .include "../../textproc/libxml2/buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ogle/PLIST b/graphics/ogle/PLIST index 3858e1938a4..e2f3d0d4f85 100644 --- a/graphics/ogle/PLIST +++ b/graphics/ogle/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/10 20:48:17 veego Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/06/16 18:12:58 wiz Exp $ bin/ifo_dump bin/ogle include/ogle/dvd.h @@ -10,8 +10,8 @@ lib/ogle/libmsgevents.so.4 lib/ogle/libmsgevents.so lib/ogle/libmsgevents.la lib/ogle/libmsgevents.a -lib/ogle/libdvdcontrol.so.5.0 -lib/ogle/libdvdcontrol.so.5 +lib/ogle/libdvdcontrol.so.6.0 +lib/ogle/libdvdcontrol.so.6 lib/ogle/libdvdcontrol.so lib/ogle/libdvdcontrol.la lib/ogle/libdvdcontrol.a @@ -20,7 +20,7 @@ lib/ogle/ogle_mpeg_vs lib/ogle/ogle_vout lib/ogle/ogle_mpeg_ps lib/ogle/ogle_ac3_p -lib/ogle/ogle_a52 +lib/ogle/ogle_audio lib/ogle/ogle_nav lib/ogle/ogle_cli man/man1/ogle.1 diff --git a/graphics/ogle/distinfo b/graphics/ogle/distinfo index 4750e133a75..5c0f72c8005 100644 --- a/graphics/ogle/distinfo +++ b/graphics/ogle/distinfo @@ -1,7 +1,13 @@ -$NetBSD: distinfo,v 1.4 2002/05/20 23:05:00 veego Exp $ +$NetBSD: distinfo,v 1.5 2002/06/16 18:12:58 wiz Exp $ -SHA1 (ogle-0.8.2.tar.gz) = 84f3505eaa8f6d002f663bfe036c533a4a83f714 -Size (ogle-0.8.2.tar.gz) = 480190 bytes -SHA1 (patch-aa) = 2b3953c7d724bc7ce486233b24623ed492d11e8f -SHA1 (patch-ab) = aba5adc696ba96916bb4123bb75aca0852e102f9 -SHA1 (patch-ac) = e258a91d992fb3bf5d68029613227873f75b24bc +SHA1 (ogle-0.8.3.tar.gz) = 80517f375b13b637ee15069368ff703b5d1b7e52 +Size (ogle-0.8.3.tar.gz) = 405249 bytes +SHA1 (patch-aa) = c7ed5f7b957c0303c451650df2e4b1044d7430ef +SHA1 (patch-ab) = 63aae484dbbb4e0746807f208f3fadb84a16341a +SHA1 (patch-ac) = 85d5664419706bce042e564acadff75e0d5def58 +SHA1 (patch-ad) = da39bea384f78a63b94dec2c47a2c39750858bc2 +SHA1 (patch-ae) = a37d75d4c15ab60060df5339680ce863488c2f26 +SHA1 (patch-af) = 66a5c30aaf455e794a4c8940dc2a98815c62ae58 +SHA1 (patch-ag) = 386f8be5ce347f150b6b836a3d9c9b3db12cfbc7 +SHA1 (patch-ah) = 1fb41606f1fc0593597afb54cb2839f7c87221dc +SHA1 (patch-ai) = 32ca5020e831cabc978c31c4d853cc94ed994a1d diff --git a/graphics/ogle/patches/patch-aa b/graphics/ogle/patches/patch-aa index 85381762b4e..d78e2eef888 100644 --- a/graphics/ogle/patches/patch-aa +++ b/graphics/ogle/patches/patch-aa @@ -1,37 +1,37 @@ -$NetBSD: patch-aa,v 1.2 2001/12/25 23:45:54 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2002/06/16 18:12:58 wiz Exp $ ---- include/debug_print.h.orig Sun Nov 25 03:42:29 2001 -+++ include/debug_print.h -@@ -20,20 +20,25 @@ +--- 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) +-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) +-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, ...) \ --fprintf(stderr, "WARNING[%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) +-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) +-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) diff --git a/graphics/ogle/patches/patch-ab b/graphics/ogle/patches/patch-ab index 353b31130d1..a1240803a62 100644 --- a/graphics/ogle/patches/patch-ab +++ b/graphics/ogle/patches/patch-ab @@ -1,13 +1,34 @@ -$NetBSD: patch-ab,v 1.1 2002/05/20 23:00:02 veego Exp $ +$NetBSD: patch-ab,v 1.2 2002/06/16 18:12:58 wiz Exp $ ---- ctrl/ctrl.c.orig Sun Dec 2 22:37:59 2001 -+++ ctrl/ctrl.c Sun May 19 22:55:37 2002 -@@ -1137,7 +1137,7 @@ - - if((shmid = shmget(IPC_PRIVATE, - size, -- IPC_CREAT | 0600)) == -1) { -+ IPC_CREAT | 0644)) == -1) { - perror("*ctrl: get_buffer, shmget failed"); - return -1; - } +--- configure.in.orig Wed Jun 12 00:00:28 2002 ++++ configure.in Thu Jun 13 12:03:11 2002 +@@ -351,16 +351,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]) + DEFAULT_AUDIO_DRIVER="obsd" + ;; + esac +@@ -371,7 +371,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_OSS 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 index 4dc0389ff6d..9e75ec2b9b8 100644 --- a/graphics/ogle/patches/patch-ac +++ b/graphics/ogle/patches/patch-ac @@ -1,34 +1,22 @@ -$NetBSD: patch-ac,v 1.1 2002/05/20 23:03:37 veego Exp $ +$NetBSD: patch-ac,v 1.2 2002/06/16 18:12:58 wiz Exp $ ---- mpeg2_video/video_output_x11.c.orig Sun Dec 2 22:38:00 2001 -+++ mpeg2_video/video_output_x11.c Tue May 21 00:47:58 2002 -@@ -1751,7 +1751,7 @@ - window.video_area.width) / 2; - window.video_area.y = (int)(window.window_area.height - - window.video_area.height) / 2; -- -+ if(use_xshm) { - XvShmPutImage(mydisplay, xv_port, dwin->win, mygc, xv_image, - 0, 0, - dwin->image->info->picture.horizontal_size, -@@ -1761,9 +1761,18 @@ - window.video_area.width, - window.video_area.height, - True); -- -+ } else { -+ XvPutImage(mydisplay, xv_port, dwin->win, mygc, xv_image, -+ 0, 0, -+ dwin->image->info->picture.horizontal_size, -+ dwin->image->info->picture.vertical_size, -+ window.video_area.x, -+ window.video_area.y, -+ window.video_area.width, -+ window.video_area.height); -+ } - //XFlush(mydisplay); ?? -- { -+ if(use_xshm) { - XEvent ev; - XEvent *e; - e = &ev; +--- configure.orig Wed Jun 12 00:11:32 2002 ++++ configure Thu Jun 13 12:02:17 2002 +@@ -7367,7 +7367,7 @@ + + if test "x$enable_obsdaudio" != xno; then + case "$host" in +- *-openbsd*) ++ *-netbsd*|*-openbsd*) + + cat >> confdefs.h <<\EOF + #define LIBOGLEAO_OBSD +@@ -7386,7 +7386,7 @@ + + if test "x$enable_sunaudio" != xno; then + case "$host" in +- *-sun-solaris*|*-netbsd*) ++ *-sun-solaris*) + + cat >> confdefs.h <<\EOF + #define LIBOGLEAO_SOLARIS diff --git a/graphics/ogle/patches/patch-ad b/graphics/ogle/patches/patch-ad new file mode 100644 index 00000000000..906a8021f68 --- /dev/null +++ b/graphics/ogle/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2002/06/16 18:12:58 wiz Exp $ + +--- libogleao/oss_audio.c.orig Wed Jun 5 20:34:58 2002 ++++ libogleao/oss_audio.c Thu Jun 13 12:12:17 2002 +@@ -26,7 +26,7 @@ + #endif + #include + +-#if defined(__OpenBSD__) ++#if defined(__OpenBSD__) || defined(__NetBSD__) + #include + #elif defined(__FreeBSD__) + #include diff --git a/graphics/ogle/patches/patch-ae b/graphics/ogle/patches/patch-ae new file mode 100644 index 00000000000..26f8a09421a --- /dev/null +++ b/graphics/ogle/patches/patch-ae @@ -0,0 +1,13 @@ +$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-af b/graphics/ogle/patches/patch-af new file mode 100644 index 00000000000..1f46d437cb9 --- /dev/null +++ b/graphics/ogle/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2002/06/16 18:12:59 wiz Exp $ + +--- ogle/dvdcontrol.c.orig Tue Apr 2 21:06:05 2002 ++++ ogle/dvdcontrol.c Thu Jun 13 13:57:25 2002 +@@ -24,7 +24,7 @@ + #include + #include + +-#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG) + #include + #endif + diff --git a/graphics/ogle/patches/patch-ag b/graphics/ogle/patches/patch-ag new file mode 100644 index 00000000000..14b7ff172a4 --- /dev/null +++ b/graphics/ogle/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2002/06/16 18:12:59 wiz Exp $ + +--- ogle/dvdcontrol.h.orig Tue Apr 2 21:06:05 2002 ++++ ogle/dvdcontrol.h Thu Jun 13 13:57:32 2002 +@@ -22,7 +22,7 @@ + #include + #include // Only for the hack with DVDNextEvent !! + +-#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG) + #include + #endif + diff --git a/graphics/ogle/patches/patch-ah b/graphics/ogle/patches/patch-ah new file mode 100644 index 00000000000..e0aec8796d5 --- /dev/null +++ b/graphics/ogle/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2002/06/16 18:12:59 wiz Exp $ + +--- ogle/msgevents.c.orig Sun Nov 25 19:04:04 2001 ++++ ogle/msgevents.c Thu Jun 13 13:58:17 2002 +@@ -25,7 +25,7 @@ + #include + #include + +-#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG) + #include + #endif + diff --git a/graphics/ogle/patches/patch-ai b/graphics/ogle/patches/patch-ai new file mode 100644 index 00000000000..adcacf33553 --- /dev/null +++ b/graphics/ogle/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2002/06/16 18:12:59 wiz Exp $ + +--- ogle/msgevents.h.orig Sun Jun 9 21:05:50 2002 ++++ ogle/msgevents.h Thu Jun 13 13:58:23 2002 +@@ -25,7 +25,7 @@ + #include + #include + +-#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG) + #include + #endif + -- cgit v1.2.3