From 474e26d391038a1e3edb92abfc5849a458a21f1e Mon Sep 17 00:00:00 2001
From: fgsch <fgsch@openbsd.org>
Date: Tue, 22 Oct 2002 23:24:06 +0000
Subject: [PATCH] remove binutils dependency on i386; maintainer ok.

---
 x11/ogle/Makefile                                |  7 +------
 x11/ogle/patches/patch-mpeg2_video_Makefile_in   | 10 ----------
 x11/ogle/patches/patch-mpeg2_video_yuv2rgb_mmx_c | 14 ++++++++++----
 3 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 x11/ogle/patches/patch-mpeg2_video_Makefile_in

diff --git a/x11/ogle/Makefile b/x11/ogle/Makefile
index bdf9825564d..0626593b98a 100644
--- a/x11/ogle/Makefile
+++ b/x11/ogle/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2002/08/28 01:34:37 drahn Exp $
+# $OpenBSD: Makefile,v 1.18 2002/10/22 23:24:06 fgsch Exp $
 
 ONLY_FOR_ARCHS=	alpha i386 powerpc sparc64
 
@@ -32,11 +32,6 @@ FLAVOR?=
 
 CONFIGURE_ARGS=--disable-oss --disable-sunaudio --enable-obsdaudio
 
-.if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+=	::devel/binutils/stable
-MAKE_ENV=GAS_DIR=${TRUEPREFIX}/${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}/bin
-.endif
-
 .if ${FLAVOR:L} == "altivec"
 ONLY_FOR_ARCHS=	powerpc
 CONFIGURE_ARGS+=--enable-altivec
diff --git a/x11/ogle/patches/patch-mpeg2_video_Makefile_in b/x11/ogle/patches/patch-mpeg2_video_Makefile_in
deleted file mode 100644
index 54145420ab0..00000000000
--- a/x11/ogle/patches/patch-mpeg2_video_Makefile_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- mpeg2_video/Makefile.in.orig	Sun Jun 30 02:54:03 2002
-+++ mpeg2_video/Makefile.in	Tue Jul 16 15:22:37 2002
-@@ -338,6 +338,7 @@ distclean-depend:
- 	-rm -rf ./$(DEPDIR)
- 
- .c.o:
-+@AMDEP_TRUE@	PATH=${GAS_DIR}:$$PATH @AMDEPBACKSLASH@
- @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
diff --git a/x11/ogle/patches/patch-mpeg2_video_yuv2rgb_mmx_c b/x11/ogle/patches/patch-mpeg2_video_yuv2rgb_mmx_c
index f755cd60624..4811d11b283 100644
--- a/x11/ogle/patches/patch-mpeg2_video_yuv2rgb_mmx_c
+++ b/x11/ogle/patches/patch-mpeg2_video_yuv2rgb_mmx_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-mpeg2_video_yuv2rgb_mmx_c,v 1.1.1.1 2001/10/14 15:35:04 espie Exp $
---- mpeg2_video/yuv2rgb_mmx.c.orig	Sat Oct 13 14:57:08 2001
-+++ mpeg2_video/yuv2rgb_mmx.c	Sat Oct 13 14:58:00 2001
+$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
@@ -49,7 +49,13 @@ $OpenBSD: patch-mpeg2_video_yuv2rgb_mmx_c,v 1.1.1.1 2001/10/14 15:35:04 espie Ex
           "por            %%mm5,                  %%mm4\n" //
           "psrlw          $11,                    %%mm6\n"                // BLUE        1
           "movq           %%mm3,                  %%mm5\n" // lum2
-@@ -125,17 +125,17 @@ void  YUV2RGB420_MMX_16(uint8_t *out,
+@@ -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"