Fixup fromcvs/togit conversion

diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae
deleted file mode 100644 (file)
index bbc2700..0000000
--- a/multimedia/ffmpeg/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.10 2010/03/14 23:07:30 tron Exp $
-
-Really turn AMD 3DNow (and MMX, etc.) because the shared library
-will otherwise not build (Mac OS X) or work (Solaris) on Intel CPUs.
-
---- libswscale/rgb2rgb.c.orig  Thu Mar 19 04:45:29 2009
-+++ libswscale/rgb2rgb.c       Sun Mar 14 23:55:39 2010
-@@ -101,7 +101,7 @@
-                                       long lumStride, long chromStride, long srcStride);
- 
- 
--#if ARCH_X86 && CONFIG_GPL
-+#if ARCH_X86 && CONFIG_GPL && !defined(sun)
- DECLARE_ASM_CONST(8, uint64_t, mmx_null)     = 0x0000000000000000ULL;
- DECLARE_ASM_CONST(8, uint64_t, mmx_one)      = 0xFFFFFFFFFFFFFFFFULL;
- DECLARE_ASM_CONST(8, uint64_t, mask32b)      = 0x000000FF000000FFULL;
-@@ -162,7 +162,7 @@
- #define RENAME(a) a ## _C
- #include "rgb2rgb_template.c"
- 
--#if ARCH_X86 && CONFIG_GPL
-+#if ARCH_X86 && CONFIG_GPL && !defined(sun) && !defined(__APPLE__)
- 
- //MMX versions
- #undef RENAME

diff --git a/multimedia/ffmpeg/patches/patch-af b/multimedia/ffmpeg/patches/patch-af
deleted file mode 100644 (file)
index 4d930bd..0000000
--- a/multimedia/ffmpeg/patches/patch-af
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD$
-
-1.) Fixes pkg/42000, not necessary after the next upgrade.
-2.) Really turn AMD 3DNow (and MMX, etc.) because the shared library
-    will otherwise not work on Intel CPUs.
-
---- libswscale/swscale.c.orig  Thu Jun  4 23:55:52 2009
-+++ libswscale/swscale.c       Sun Mar 14 23:53:08 2010
-@@ -221,7 +221,7 @@
- write special BGR->BGR scaler
- */
- 
--#if ARCH_X86 && CONFIG_GPL
-+#if ARCH_X86 && CONFIG_GPL && !defined(sun)
- DECLARE_ASM_CONST(8, uint64_t, bF8)=       0xF8F8F8F8F8F8F8F8LL;
- DECLARE_ASM_CONST(8, uint64_t, bFC)=       0xFCFCFCFCFCFCFCFCLL;
- DECLARE_ASM_CONST(8, uint64_t, w10)=       0x0010001000100010LL;
-@@ -1307,12 +1307,14 @@
- 
- #if ARCH_PPC
- #if (HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL
-+#if !CONFIG_RUNTIME_CPUDETECT
- #undef COMPILE_C
-+#endif
- #define COMPILE_ALTIVEC
- #endif
- #endif //ARCH_PPC
- 
--#if ARCH_X86
-+#if ARCH_X86 && !defined(sun)
- 
- #if ((HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL
- #define COMPILE_MMX
-@@ -1349,7 +1351,7 @@
- #include "swscale_template.c"
- #endif
- 
--#if ARCH_X86
-+#if ARCH_X86 && !defined(sun)
- 
- //MMX versions
- #ifdef COMPILE_MMX
-@@ -1417,7 +1419,7 @@
-     int64_t *filter2=NULL;
-     const int64_t fone= 1LL<<54;
-     int ret= -1;
--#if ARCH_X86
-+#if ARCH_X86 && !defined(sun)
-     if (flags & SWS_CPU_CAPS_MMX)
-         __asm__ volatile("emms\n\t"::: "memory"); //FIXME this should not be required but it IS (even for non-MMX versions)
- #endif
-@@ -1976,7 +1978,7 @@
- #if CONFIG_RUNTIME_CPUDETECT && CONFIG_GPL
-     int flags = c->flags;
- 
--#if ARCH_X86
-+#if ARCH_X86 && !defined(sun)
-     // ordered per speed fastest first
-     if (flags & SWS_CPU_CAPS_MMX2) {
-         sws_init_swScale_MMX2(c);
-@@ -2561,7 +2563,7 @@
-     int unscaled, needsDither;
-     int srcRange, dstRange;
-     SwsFilter dummyFilter= {NULL, NULL, NULL, NULL};
--#if ARCH_X86
-+#if ARCH_X86 && !defined(sun)
-     if (flags & SWS_CPU_CAPS_MMX)
-         __asm__ volatile("emms\n\t"::: "memory");
- #endif
-@@ -3046,7 +3048,7 @@
-         }
-         else
-         {
--#if ARCH_X86
-+#if ARCH_X86 && !defined(sun)
-             av_log(c, AV_LOG_VERBOSE, "using x86 asm scaler for horizontal scaling\n");
- #else
-             if (flags & SWS_FAST_BILINEAR)
-@@ -3555,7 +3557,7 @@
-     av_freep(&c->hLumFilterPos);
-     av_freep(&c->hChrFilterPos);
- 
--#if ARCH_X86 && CONFIG_GPL
-+#if ARCH_X86 && CONFIG_GPL && !defined(sun)
- #ifdef MAP_ANONYMOUS
-     if (c->funnyYCode ) munmap(c->funnyYCode , MAX_FUNNY_CODE_SIZE);
-     if (c->funnyUVCode) munmap(c->funnyUVCode, MAX_FUNNY_CODE_SIZE);

diff --git a/multimedia/ffmpeg/patches/patch-bktr b/multimedia/ffmpeg/patches/patch-bktr
deleted file mode 100644 (file)
index 132c62f..0000000
--- a/multimedia/ffmpeg/patches/patch-bktr
+++ /dev/null
@@ -1,23 +0,0 @@
---- libavdevice/bktr.c.orig    2009-01-19 15:46:40 +0000
-+++ libavdevice/bktr.c 2009-09-21 11:29:29 +0000
-@@ -24,7 +24,11 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  */
- 
-+/* u_short, u_int */
- #define _BSD_SOURCE 1
-+#ifdef __NetBSD__
-+# define _NETBSD_SOURCE 1
-+#endif
- #include "libavformat/avformat.h"
- #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H
- # include <dev/bktr/ioctl_meteor.h>
-@@ -32,7 +36,7 @@
- #elif HAVE_MACHINE_IOCTL_METEOR_H && HAVE_MACHINE_IOCTL_BT848_H
- # include <machine/ioctl_meteor.h>
- # include <machine/ioctl_bt848.h>
--#elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_METEOR_IOCTL_BT848_H
-+#elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H
- # include <dev/video/meteor/ioctl_meteor.h>
- # include <dev/video/bktr/ioctl_bt848.h>
- #elif HAVE_DEV_IC_BT8XX_H

diff --git a/multimedia/xvidcore/patches/patch-ac b/multimedia/xvidcore/patches/patch-ac
deleted file mode 100644 (file)
index 9bba5f2..0000000
--- a/multimedia/xvidcore/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2009/01/24 05:34:42 jmcneill Exp $
-
---- ../../src/xvid.c.orig      2009-01-24 00:33:11.000000000 -0500
-+++ ../../src/xvid.c   2009-01-24 00:33:42.000000000 -0500
-@@ -679,7 +679,11 @@ xvid_gbl_info(xvid_gbl_info_t * info)
- 
- #else
- 
-+#if defined(_SC_NPROCESSORS_CONF)
-   info->num_threads = sysconf(_SC_NPROCESSORS_CONF);  
-+#else
-+  info->num_threads = 1;
-+#endif
- 
- #endif
-