From 20bffed54939a92ff227c39b3d7649fc96e7c122 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 24 Feb 2003 22:56:35 +0000 Subject: [PATCH] ogle 0.9.0: - most OpenBSD patches folded in, including simpler audio support, - much less verbose console output, - bookmark support, - actual skip forward/backward, - better dvdnav code. --- x11/ogle/Makefile | 7 +- x11/ogle/distinfo | 6 +- x11/ogle/patches/patch-libogleao_obsd_audio_c | 13 -- .../patches/patch-mpeg2_video_spu_mixer_c | 26 ++-- .../patch-mpeg2_video_video_output_x11_c | 18 +-- .../patches/patch-mpeg2_video_yuv2rgb_mmx_c | 119 ------------------ x11/ogle/pkg/PFRAG.shared | 6 +- x11/ogle/pkg/PLIST | 3 +- 8 files changed, 34 insertions(+), 164 deletions(-) delete mode 100644 x11/ogle/patches/patch-libogleao_obsd_audio_c delete mode 100644 x11/ogle/patches/patch-mpeg2_video_yuv2rgb_mmx_c diff --git a/x11/ogle/Makefile b/x11/ogle/Makefile index 0626593b98a..2af06d2cca9 100644 --- a/x11/ogle/Makefile +++ b/x11/ogle/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.18 2002/10/22 23:24:06 fgsch Exp $ +# $OpenBSD: Makefile,v 1.19 2003/02/24 22:56:35 espie Exp $ ONLY_FOR_ARCHS= alpha i386 powerpc sparc64 CATEGORIES= x11 COMMENT= "DVD player" -DISTNAME= ogle-0.8.5 +DISTNAME= ogle-0.9.0 HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ # Authors can be reached at dvd@dtek.chalmers.se MASTER_SITES= ${HOMEPAGE}dist/ @@ -22,7 +22,7 @@ PERMIT_PACKAGE_FTP=Yes BUILD_DEPENDS= ::audio/liba52 -LIB_DEPENDS= dvdread::devel/libdvdread \ +LIB_DEPENDS= dvdread.3.0::devel/libdvdread \ xml2.6.19:libxml>=2.4.19:textproc/libxml \ jpeg.62::graphics/jpeg \ mad::audio/mad @@ -31,6 +31,7 @@ FLAVORS= altivec FLAVOR?= CONFIGURE_ARGS=--disable-oss --disable-sunaudio --enable-obsdaudio +#CONFIGURE_ARGS=--disable-oss --disable-sunaudio --disable-obsdaudio .if ${FLAVOR:L} == "altivec" ONLY_FOR_ARCHS= powerpc diff --git a/x11/ogle/distinfo b/x11/ogle/distinfo index 2d89f30c251..0d7efeabd48 100644 --- a/x11/ogle/distinfo +++ b/x11/ogle/distinfo @@ -1,3 +1,3 @@ -MD5 (ogle-0.8.5.tar.gz) = fcf34f2e2880bf5e66016b4107e814d5 -RMD160 (ogle-0.8.5.tar.gz) = 36637514bee184a88ebf1d18257a5dce346062b9 -SHA1 (ogle-0.8.5.tar.gz) = b1853f49fa8847a3079f32ca4487845a9fbb549d +MD5 (ogle-0.9.0.tar.gz) = 84276fbe6a3ed2de5ce13589f19b7fc3 +RMD160 (ogle-0.9.0.tar.gz) = 19e5a6bfd517d1ee3a694ac1cef9526ad9f6ea26 +SHA1 (ogle-0.9.0.tar.gz) = b015587dc2634d97d2f83cf194c409efa036b03d diff --git a/x11/ogle/patches/patch-libogleao_obsd_audio_c b/x11/ogle/patches/patch-libogleao_obsd_audio_c deleted file mode 100644 index 4e911ac072b..00000000000 --- a/x11/ogle/patches/patch-libogleao_obsd_audio_c +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-libogleao_obsd_audio_c,v 1.1 2002/06/15 23:09:34 espie Exp $ ---- libogleao/obsd_audio.c.orig Sun Jun 16 00:59:20 2002 -+++ libogleao/obsd_audio.c Sun Jun 16 00:59:43 2002 -@@ -158,7 +158,9 @@ int obsd_odelay(ogle_ao_instance_t *_ins - odelay = instance->samples_written - info.play.samples; - */ - odelay = seek / instance->sample_frame_size; -+#if 0 - fprintf(stderr, "odelay: %d\n", odelay); -+#endif - - *samples_return = odelay; - diff --git a/x11/ogle/patches/patch-mpeg2_video_spu_mixer_c b/x11/ogle/patches/patch-mpeg2_video_spu_mixer_c index 1bdfc1176dd..c8fb41a1391 100644 --- a/x11/ogle/patches/patch-mpeg2_video_spu_mixer_c +++ b/x11/ogle/patches/patch-mpeg2_video_spu_mixer_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-mpeg2_video_spu_mixer_c,v 1.2 2002/06/15 23:09:34 espie Exp $ ---- mpeg2_video/spu_mixer.c.orig Sun May 26 21:32:19 2002 -+++ mpeg2_video/spu_mixer.c Sun Jun 16 00:48:18 2002 -@@ -43,6 +43,8 @@ +$OpenBSD: patch-mpeg2_video_spu_mixer_c,v 1.3 2003/02/24 22:56:35 espie Exp $ +--- mpeg2_video/spu_mixer.c.orig Mon Feb 17 16:17:55 2003 ++++ mpeg2_video/spu_mixer.c Wed Feb 19 17:59:16 2003 +@@ -44,6 +44,8 @@ @@ -10,7 +10,7 @@ $OpenBSD: patch-mpeg2_video_spu_mixer_c,v 1.2 2002/06/15 23:09:34 espie Exp $ #ifdef DEBUG #define GETBYTES(a,b) getbytes(a,b) -@@ -910,6 +912,7 @@ static void decode_display_data(spu_t *s +@@ -934,6 +936,7 @@ static void decode_display_data(spu_hand y = 0; DPRINTF(5, "vlc decoding\n"); @@ -18,12 +18,12 @@ $OpenBSD: patch-mpeg2_video_spu_mixer_c,v 1.2 2002/06/15 23:09:34 espie Exp $ while((fieldoffset[1] < spu_info->DCSQT_offset) && (y < spu_info->height)) { unsigned int vlc; unsigned int length; -@@ -985,7 +988,7 @@ static void decode_display_data(spu_t *s - unsigned int line_y; - char *addr; - -- line_y = (y + spu_info->y_start) * line_stride; -+ line_y = (y + spu_info->y_start+subtitle_pos[subtitle_index]) * line_stride; +@@ -999,7 +1002,7 @@ static void decode_display_data(spu_hand + #define MIN(x,y) (((x) < (y)) ? (x) : (y)) + #endif + { +- const unsigned int line_y = (y + spu_info->y_start) * line_stride; ++ const unsigned int line_y = (y + spu_info->y_start+subtitle_pos[subtitle_index]) * line_stride; // (width * bpp) == line_stride (for rgb or yuv) - addr = data + line_y + (x + spu_info->x_start) * pixel_stride; - + + // bpp == 1 diff --git a/x11/ogle/patches/patch-mpeg2_video_video_output_x11_c b/x11/ogle/patches/patch-mpeg2_video_video_output_x11_c index d2c35f07455..6a77ca7923d 100644 --- a/x11/ogle/patches/patch-mpeg2_video_video_output_x11_c +++ b/x11/ogle/patches/patch-mpeg2_video_video_output_x11_c @@ -1,20 +1,20 @@ -$OpenBSD: patch-mpeg2_video_video_output_x11_c,v 1.6 2002/07/16 13:38:04 espie Exp $ ---- mpeg2_video/video_output_x11.c.orig Sun Jun 30 00:04:31 2002 -+++ mpeg2_video/video_output_x11.c Tue Jul 16 15:17:38 2002 -@@ -1225,6 +1225,12 @@ void check_x_events(yuv_image_t *current +$OpenBSD: patch-mpeg2_video_video_output_x11_c,v 1.7 2003/02/24 22:56:35 espie Exp $ +--- mpeg2_video/video_output_x11.c.orig Thu Feb 13 23:37:51 2003 ++++ mpeg2_video/video_output_x11.c Wed Feb 19 17:58:11 2003 +@@ -1335,6 +1335,12 @@ void check_x_events(yuv_image_t *current if(keysym == XK_I) { screenshot_spu = 1; } -+ if (keysym == XK_1) { ++ if (keysym == XK_Z) { + subtitle_pos[subtitle_index]++; + } -+ if (keysym == XK_2) { ++ if (keysym == XK_X) { + subtitle_pos[subtitle_index]--; + } } break; - case ButtonPress: -@@ -1771,6 +1777,8 @@ static void draw_win_x11(window_info *dw + case KeyRelease: +@@ -2028,6 +2034,8 @@ static void draw_win_x11(window_info *dw window.video_area.height); XSync(mydisplay, False); } @@ -23,7 +23,7 @@ $OpenBSD: patch-mpeg2_video_video_output_x11_c,v 1.6 2002/07/16 13:38:04 espie E } -@@ -1854,6 +1862,8 @@ static void draw_win_xv(window_info *dwi +@@ -2111,6 +2119,8 @@ static void draw_win_xv(window_info *dwi It waits for an XShmCompletionEvent */ XIfEvent(mydisplay, &ev, predicate, NULL); } diff --git a/x11/ogle/patches/patch-mpeg2_video_yuv2rgb_mmx_c b/x11/ogle/patches/patch-mpeg2_video_yuv2rgb_mmx_c deleted file mode 100644 index 4811d11b283..00000000000 --- a/x11/ogle/patches/patch-mpeg2_video_yuv2rgb_mmx_c +++ /dev/null @@ -1,119 +0,0 @@ -$OpenBSD: patch-mpeg2_video_yuv2rgb_mmx_c,v 1.2 2002/10/22 23:24:06 fgsch Exp $ ---- mpeg2_video/yuv2rgb_mmx.c.orig Fri Nov 23 22:23:58 2001 -+++ mpeg2_video/yuv2rgb_mmx.c Mon Jul 22 22:34:55 2002 -@@ -73,23 +73,23 @@ void YUV2RGB420_MMX_16(uint8_t *out, - "movd (%0), %%mm1\n" // 4 Cr 0 0 0 0 v3 v2 v1 v0 - "punpcklbw %%mm7, %%mm0\n" // 4 W cb 0 u3 0 u2 0 u1 0 u0 - "punpcklbw %%mm7, %%mm1\n" // 4 W cr 0 v3 0 v2 0 v1 0 v0 -- "psubw MMX_80w, %%mm0\n" -- "psubw MMX_80w, %%mm1\n" -+ "psubw _MMX_80w, %%mm0\n" -+ "psubw _MMX_80w, %%mm1\n" - "movq %%mm0, %%mm2\n" // Cb 0 u3 0 u2 0 u1 0 u0 - "movq %%mm1, %%mm3\n" // Cr -- "pmullw MMX_Ugrncoeff, %%mm2\n" // Cb2green 0 R3 0 R2 0 R1 0 R0 -+ "pmullw _MMX_Ugrncoeff, %%mm2\n" // Cb2green 0 R3 0 R2 0 R1 0 R0 - "movq (%2), %%mm6\n" // L1 l7 L6 L5 L4 L3 L2 L1 L0 -- "pmullw MMX_Ublucoeff, %%mm0\n" // Cb2blue -- "pand MMX_00FFw, %%mm6\n" // L1 00 L6 00 L4 00 L2 00 L0 -- "pmullw MMX_Vgrncoeff, %%mm3\n" // Cr2green -+ "pmullw _MMX_Ublucoeff, %%mm0\n" // Cb2blue -+ "pand _MMX_00FFw, %%mm6\n" // L1 00 L6 00 L4 00 L2 00 L0 -+ "pmullw _MMX_Vgrncoeff, %%mm3\n" // Cr2green - "movq (%2), %%mm7\n" // L2 -- "pmullw MMX_Vredcoeff, %%mm1\n" // Cr2red -+ "pmullw _MMX_Vredcoeff, %%mm1\n" // Cr2red - // "psubw MMX_10w, %%mm6\n" - "psrlw $8, %%mm7\n" // L2 00 L7 00 L5 00 L3 00 L1 -- "pmullw MMX_Ycoeff, %%mm6\n" // lum1 -+ "pmullw _MMX_Ycoeff, %%mm6\n" // lum1 - // "psubw MMX_10w, %%mm7\n" // L2 - "paddw %%mm3, %%mm2\n" // Cb2green + Cr2green == green -- "pmullw MMX_Ycoeff, %%mm7\n" // lum2 -+ "pmullw _MMX_Ycoeff, %%mm7\n" // lum2 - - "movq %%mm6, %%mm4\n" // lum1 - "paddw %%mm0, %%mm6\n" // lum1 +blue 00 B6 00 B4 00 B2 00 B0 -@@ -107,11 +107,11 @@ void YUV2RGB420_MMX_16(uint8_t *out, - "punpcklbw %%mm4, %%mm4\n" - "punpcklbw %%mm5, %%mm5\n" - -- "pand MMX_redmask, %%mm4\n" -+ "pand _MMX_redmask, %%mm4\n" - "psllw $3, %%mm5\n" // GREEN 1 - "punpcklbw %%mm6, %%mm6\n" -- "pand MMX_grnmask, %%mm5\n" -- "pand MMX_redmask, %%mm6\n" -+ "pand _MMX_grnmask, %%mm5\n" -+ "pand _MMX_redmask, %%mm6\n" - "por %%mm5, %%mm4\n" // - "psrlw $11, %%mm6\n" // BLUE 1 - "movq %%mm3, %%mm5\n" // lum2 -@@ -120,22 +120,22 @@ void YUV2RGB420_MMX_16(uint8_t *out, - "psraw $6, %%mm3\n" // R2 - "por %%mm6, %%mm4\n" // MM4 - "psraw $6, %%mm5\n" // G2 -- "movq (%2, %3), %%mm6\n" // L3 -+ "movq (%2,%3), %%mm6\n" // L3 - "psraw $6, %%mm7\n" - "packuswb %%mm3, %%mm3\n" - "packuswb %%mm5, %%mm5\n" - "packuswb %%mm7, %%mm7\n" -- "pand MMX_00FFw, %%mm6\n" // L3 -+ "pand _MMX_00FFw, %%mm6\n" // L3 - "punpcklbw %%mm3, %%mm3\n" - // "psubw MMX_10w, %%mm6\n" // L3 - "punpcklbw %%mm5, %%mm5\n" -- "pmullw MMX_Ycoeff, %%mm6\n" // lum3 -+ "pmullw _MMX_Ycoeff, %%mm6\n" // lum3 - "punpcklbw %%mm7, %%mm7\n" - "psllw $3, %%mm5\n" // GREEN 2 -- "pand MMX_redmask, %%mm7\n" -- "pand MMX_redmask, %%mm3\n" -+ "pand _MMX_redmask, %%mm7\n" -+ "pand _MMX_redmask, %%mm3\n" - "psrlw $11, %%mm7\n" // BLUE 2 -- "pand MMX_grnmask, %%mm5\n" -+ "pand _MMX_grnmask, %%mm5\n" - "por %%mm7, %%mm3\n" - "movq (%2,%3), %%mm7\n" // L4 - "por %%mm5, %%mm3\n" // -@@ -143,7 +143,7 @@ void YUV2RGB420_MMX_16(uint8_t *out, - "movq %%mm4, %%mm5\n" - // "psubw MMX_10w, %%mm7\n" // L4 - "punpcklwd %%mm3, %%mm4\n" -- "pmullw MMX_Ycoeff, %%mm7\n" // lum4 -+ "pmullw _MMX_Ycoeff, %%mm7\n" // lum4 - "punpckhwd %%mm3, %%mm5\n" - - "movq %%mm4, (%4)\n" -@@ -170,11 +170,11 @@ void YUV2RGB420_MMX_16(uint8_t *out, - "punpcklbw %%mm5, %%mm5\n" - "punpcklbw %%mm6, %%mm6\n" - "psllw $3, %%mm5\n" // GREEN 3 -- "pand MMX_redmask, %%mm4\n" -+ "pand _MMX_redmask, %%mm4\n" - "psraw $6, %%mm3\n" // psr 6 - "psraw $6, %%mm0\n" -- "pand MMX_redmask, %%mm6\n" // BLUE -- "pand MMX_grnmask, %%mm5\n" -+ "pand _MMX_redmask, %%mm6\n" // BLUE -+ "pand _MMX_grnmask, %%mm5\n" - "psrlw $11, %%mm6\n" // BLUE 3 - "por %%mm5, %%mm4\n" - "psraw $6, %%mm7\n" -@@ -185,11 +185,11 @@ void YUV2RGB420_MMX_16(uint8_t *out, - "punpcklbw %%mm3, %%mm3\n" - "punpcklbw %%mm0, %%mm0\n" - "punpcklbw %%mm7, %%mm7\n" -- "pand MMX_redmask, %%mm3\n" -- "pand MMX_redmask, %%mm7\n" // BLUE -+ "pand _MMX_redmask, %%mm3\n" -+ "pand _MMX_redmask, %%mm7\n" // BLUE - "psllw $3, %%mm0\n" // GREEN 4 - "psrlw $11, %%mm7\n" -- "pand MMX_grnmask, %%mm0\n" -+ "pand _MMX_grnmask, %%mm0\n" - "por %%mm7, %%mm3\n" - "addl $8, %6\n" - "por %%mm0, %%mm3\n" diff --git a/x11/ogle/pkg/PFRAG.shared b/x11/ogle/pkg/PFRAG.shared index d74613428b5..e1c0206ea29 100644 --- a/x11/ogle/pkg/PFRAG.shared +++ b/x11/ogle/pkg/PFRAG.shared @@ -1,8 +1,8 @@ -@comment $OpenBSD: PFRAG.shared,v 1.7 2002/08/18 09:28:19 espie Exp $ -lib/ogle/libdvdcontrol.so.8.0 +@comment $OpenBSD: PFRAG.shared,v 1.8 2003/02/24 22:56:35 espie Exp $ +lib/ogle/libdvdcontrol.so.9.0 @exec ln -s %D/%F %D/lib # link libdvdcontrol @unexec rm %D/lib/%f # unlink libdvdcontrol -lib/ogle/libmsgevents.so.5.0 +lib/ogle/libmsgevents.so.6.0 @exec ln -s %D/%F %D/lib # link libmsgevents @unexec rm %D/lib/%f # unlink libmsgevents DYNLIBDIR(%D/lib) diff --git a/x11/ogle/pkg/PLIST b/x11/ogle/pkg/PLIST index d94c3931fea..9a2144abe82 100644 --- a/x11/ogle/pkg/PLIST +++ b/x11/ogle/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.7 2003/02/08 12:46:33 espie Exp $ +@comment $OpenBSD: PLIST,v 1.8 2003/02/24 22:56:35 espie Exp $ bin/ifo_dump bin/ogle include/ogle/dvd.h +include/ogle/dvdbookmarks.h include/ogle/dvdcontrol.h include/ogle/dvdevents.h include/ogle/msgevents.h