From dde77bb137294e02bf6424d80b7830f266055ae2 Mon Sep 17 00:00:00 2001
From: jakemsr <jakemsr@openbsd.org>
Date: Wed, 30 Jan 2008 03:58:52 +0000
Subject: [PATCH] no need to disable these SSE2 functions on i386 ater the
 recent libpthread changes

---
 graphics/ffmpeg/Makefile                        |  4 ++--
 .../patches/patch-libavcodec_i386_dsputil_mmx_c | 17 -----------------
 .../patch-libavcodec_i386_mpegvideo_mmx_c       | 17 -----------------
 3 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 graphics/ffmpeg/patches/patch-libavcodec_i386_dsputil_mmx_c
 delete mode 100644 graphics/ffmpeg/patches/patch-libavcodec_i386_mpegvideo_mmx_c

diff --git a/graphics/ffmpeg/Makefile b/graphics/ffmpeg/Makefile
index bbaa5247901..6eb643c3000 100644
--- a/graphics/ffmpeg/Makefile
+++ b/graphics/ffmpeg/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.34 2008/01/26 01:56:02 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.35 2008/01/30 03:58:52 jakemsr Exp $
 
 COMMENT=	audio/video converter and streamer with bktr(4) support
 
 V=			20080118
 DISTNAME=		ffmpeg-svn-${V}
-PKGNAME=		ffmpeg-${V}
+PKGNAME=		ffmpeg-${V}p0
 SHARED_LIBS=		avutil		5.0 \
 			avcodec		11.0 \
 			avformat	11.0 \
diff --git a/graphics/ffmpeg/patches/patch-libavcodec_i386_dsputil_mmx_c b/graphics/ffmpeg/patches/patch-libavcodec_i386_dsputil_mmx_c
deleted file mode 100644
index 7a7bdcda396..00000000000
--- a/graphics/ffmpeg/patches/patch-libavcodec_i386_dsputil_mmx_c
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-libavcodec_i386_dsputil_mmx_c,v 1.1 2008/01/26 01:56:02 jakemsr Exp $
---- libavcodec/i386/dsputil_mmx.c.orig	Mon Jan 21 01:28:41 2008
-+++ libavcodec/i386/dsputil_mmx.c	Mon Jan 21 01:30:33 2008
-@@ -3175,9 +3175,12 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *a
- #ifdef CONFIG_ENCODERS
-         const int dct_algo = avctx->dct_algo;
-         if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){
-+#ifdef ARCH_X86_64
-             if(mm_flags & MM_SSE2){
-                 c->fdct = ff_fdct_sse2;
--            }else if(mm_flags & MM_MMXEXT){
-+            }else
-+#endif
-+            if(mm_flags & MM_MMXEXT){
-                 c->fdct = ff_fdct_mmx2;
-             }else{
-                 c->fdct = ff_fdct_mmx;
diff --git a/graphics/ffmpeg/patches/patch-libavcodec_i386_mpegvideo_mmx_c b/graphics/ffmpeg/patches/patch-libavcodec_i386_mpegvideo_mmx_c
deleted file mode 100644
index 6ce2b5afb84..00000000000
--- a/graphics/ffmpeg/patches/patch-libavcodec_i386_mpegvideo_mmx_c
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-libavcodec_i386_mpegvideo_mmx_c,v 1.1 2008/01/26 01:56:02 jakemsr Exp $
---- libavcodec/i386/mpegvideo_mmx.c.orig	Fri Dec 14 23:56:43 2007
-+++ libavcodec/i386/mpegvideo_mmx.c	Mon Jan 21 11:00:22 2008
-@@ -732,9 +732,12 @@ void MPV_common_init_mmx(MpegEncContext *s)
-                 s->dct_quantize= dct_quantize_SSSE3;
-             } else
- #endif
-+#ifdef ARCH_X86_64
-             if(mm_flags & MM_SSE2){
-                 s->dct_quantize= dct_quantize_SSE2;
--            } else if(mm_flags & MM_MMXEXT){
-+            } else
-+#endif
-+            if(mm_flags & MM_MMXEXT){
-                 s->dct_quantize= dct_quantize_MMX2;
-             } else {
-                 s->dct_quantize= dct_quantize_MMX;