remove, bug 258042

4 files changed, 0 insertions, 103 deletions

diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7-avutil.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7-avutil.patch
deleted file mode 100644
index ab66cd00a057..000000000000
--- a/x11-misc/xvidcap/files/xvidcap-1.1.7-avutil.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Dont use pixel formats that have been deprecated for years. This fixes the build
-against libavutil 50.0.0
-
-
-Index: xvidcap-1.1.7/src/xtoffmpeg.c
-===================================================================
---- xvidcap-1.1.7.orig/src/xtoffmpeg.c
-+++ xvidcap-1.1.7/src/xtoffmpeg.c
-@@ -96,7 +96,7 @@
-                         || (x)==PIX_FMT_YUVJ420P || (x)==PIX_FMT_YUVJ422P \
-                         || (x)==PIX_FMT_YUVJ444P)
- 
--#define PIX_FMT_ARGB32 PIX_FMT_RGBA32  /* this is just my personal
-+#define PIX_FMT_ARGB32 PIX_FMT_RGB32   /* this is just my personal
-                                         * convenience */
- 
- /*
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch
deleted file mode 100644
index 1a9aeb5ea572..000000000000
--- a/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -wru /home/fsousa/tmp/xvidcap-1.1.7/src/codecs.c xvidcap-1.1.7/src/codecs.c
---- src/codecs.c	2008-05-25 23:01:53.000000000 +0100
-+++ src/codecs.c	2008-08-10 15:58:40.000000000 +0100
-@@ -43,8 +43,8 @@
- #include <locale.h>
- 
- #ifdef USE_FFMPEG
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
- #endif     // USE_FFMPEG
- 
- #include "app_data.h"
-diff -wru /home/fsousa/tmp/xvidcap-1.1.7/src/main.c xvidcap-1.1.7/src/main.c
---- src/main.c	2008-05-25 23:01:54.000000000 +0100
-+++ src/main.c	2008-08-10 15:59:07.000000000 +0100
-@@ -45,7 +45,7 @@
- #include <locale.h>
- 
- #ifdef USE_FFMPEG
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- #endif     // USE_FFMPEG
- 
- #include "control.h"
-diff -wru /home/fsousa/tmp/xvidcap-1.1.7/src/xtoffmpeg.c xvidcap-1.1.7/src/xtoffmpeg.c
---- src/xtoffmpeg.c	2008-05-25 23:01:54.000000000 +0100
-+++ src/xtoffmpeg.c	2008-08-10 16:01:08.000000000 +0100
-@@ -56,13 +56,13 @@
- #include "xvidcap-intl.h"
- 
- // ffmpeg stuff
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avdevice.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libavdevice/avdevice.h>
- //#include <ffmpeg/dsputil.h>
--#include <ffmpeg/swscale.h>
--#include <ffmpeg/rgb2rgb.h>
--#include <ffmpeg/fifo.h>
-+#include <libswscale/swscale.h>
-+//#include <libswscale/rgb2rgb.h>
-+#include <libavutil/fifo.h>
- #define swscale_isRGB(x) ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24 \
-                         || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \
-                         || (x)==PIX_FMT_RGB8 || (x)==PIX_FMT_RGB4 \
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-trellis.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-trellis.patch
deleted file mode 100644
index 10f800593c49..000000000000
--- a/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-trellis.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- xvidcap-1.1.7-orig/src/main.c	2008-10-21 00:27:54.000000000 +0200
-+++ xvidcap-1.1.7/src/main.c	2008-10-21 00:28:17.000000000 +0200
-@@ -217,9 +217,6 @@
- 
-     if (app)
-         xvc_appdata_free (app);
--#ifdef USE_FFMPEG
--    av_free_static ();
--#endif
- }
- 
- /**
---- xvidcap-1.1.7-orig/src/xtoffmpeg.c	2008-10-21 00:08:19.000000000 +0200
-+++ xvidcap-1.1.7/src/xtoffmpeg.c	2008-10-21 00:11:00.000000000 +0200
-@@ -1248,7 +1248,11 @@
-     st->codec->flags |= CODEC_FLAG2_FAST;
-     // there is no trellis quantiser in libav* for mjpeg
-     if (st->codec->codec_id != CODEC_ID_MJPEG)
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-         st->codec->flags |= CODEC_FLAG_TRELLIS_QUANT;
-+#else
-+		st->codec->trellis = 1;
-+#endif
-     st->codec->flags &= ~CODEC_FLAG_OBMC;
-     // some formats want stream headers to be seperate
-     if (oc->oformat->flags & AVFMT_GLOBALHEADER)
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7-shmproto.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7-shmproto.patch
deleted file mode 100644
index b65da0ee7ce1..000000000000
--- a/x11-misc/xvidcap/files/xvidcap-1.1.7-shmproto.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xvidcap-1.1.7/src/capture.c.orig	2008-05-26 02:01:53.000000000 +0400
-+++ xvidcap-1.1.7/src/capture.c	2009-12-12 00:12:31.368260518 +0300
-@@ -65,7 +65,7 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <X11/extensions/XShm.h>
--#include <X11/extensions/shmstr.h>
-+#include <X11/extensions/shmproto.h>
- #ifndef SOLARIS
- #include <X11/extensions/extutil.h>
- #endif     // SOLARIS