Move patches in a separate patchset out of ${FILESDIR}.

Package-Manager: portage-2.1_pre4-r1

10 files changed, 5 insertions, 199 deletions

diff --git a/media-tv/xawtv/files/alevtd-style-mozilla.diff b/media-tv/xawtv/files/alevtd-style-mozilla.diff
deleted file mode 100644
index 824b5034e631..000000000000
--- a/media-tv/xawtv/files/alevtd-style-mozilla.diff
+++ /dev/null
@@ -1,5 +0,0 @@
---- vbistuff/alevt.css.in.orig	2004-04-25 18:44:42.895125328 +0200
-+++ vbistuff/alevt.css.in	2004-04-25 18:45:14.098381712 +0200
-@@ -6 +6 @@
--pre.vt		{ font-family: "teletext, monospace"; font-size: 20px; line-height: 20px }
-+pre.vt		{ font-family: teletext, monospace; font-size: 20px; line-height: 20px }
diff --git a/media-tv/xawtv/files/digest-xawtv-3.86-r2 b/media-tv/xawtv/files/digest-xawtv-3.86-r2
deleted file mode 100644
index 1f1594482bd5..000000000000
--- a/media-tv/xawtv/files/digest-xawtv-3.86-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a87beb0f7c9ccf06b54a6a5d0c003cc xawtv_3.86.tar.gz 549653
-MD5 46c68df4976306e25a1526a762371770 tv-fonts-1.0.tar.bz2 140781
-MD5 80a7a2779c4c521f5e9a28583d27c736 xaw-deinterlace-3.76-0.1.1.diff.bz2 3858
diff --git a/media-tv/xawtv/files/digest-xawtv-3.94-r2 b/media-tv/xawtv/files/digest-xawtv-3.94-r2
deleted file mode 100644
index 9c0c2f6265d4..000000000000
--- a/media-tv/xawtv/files/digest-xawtv-3.94-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 df768711930605918106c1477327d348 xawtv-3.94.tar.gz 553118
-MD5 46c68df4976306e25a1526a762371770 tv-fonts-1.0.tar.bz2 140781
-MD5 80a7a2779c4c521f5e9a28583d27c736 xaw-deinterlace-3.76-0.1.1.diff.bz2 3858
diff --git a/media-tv/xawtv/files/digest-xawtv-3.95 b/media-tv/xawtv/files/digest-xawtv-3.95
index 29d66bdeb104..e53c77df575e 100644
--- a/media-tv/xawtv/files/digest-xawtv-3.95
+++ b/media-tv/xawtv/files/digest-xawtv-3.95
@@ -1,2 +1,7 @@
 MD5 ae73fc0efd53e53dca7077383cc22b5a tv-fonts-1.1.tar.bz2 80177
 MD5 ad25e03f7e128b318e392cb09f52207d xawtv-3.95.tar.gz 555731
+RMD160 1dc7b564bec0515cc409c723904ec9c6f8dae998 xawtv-3.95.tar.gz 555731
+SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f xawtv-3.95.tar.gz 555731
+MD5 4a12f205633f2a0958c225cfc6e8d731 xawtv-patches-1.tar.bz2 2330
+RMD160 fa86e04f074424ed90111b51892a702d5c04d198 xawtv-patches-1.tar.bz2 2330
+SHA256 0599a87ad8434469988b79892e5ff83209fc58d5f231f972a32c68363e3cfa59 xawtv-patches-1.tar.bz2 2330
diff --git a/media-tv/xawtv/files/tv-fonts-1.0-gentoo.diff b/media-tv/xawtv/files/tv-fonts-1.0-gentoo.diff
deleted file mode 100644
index 25b49a609499..000000000000
--- a/media-tv/xawtv/files/tv-fonts-1.0-gentoo.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.orig	2002-11-04 15:51:42.000000000 -0800
-+++ Makefile	2002-11-04 15:51:56.000000000 -0800
-@@ -23,12 +23,7 @@
- ##################################################################
- 
- all: $(LED_PCF) $(TT_PCF) $(LED_BDF) $(TT_BDF)
--	mkfontdir
--ifneq ($(DISPLAY),)
--	-xset fp- "`pwd`:unscaled"
--	xset fp+ "`pwd`:unscaled"
--	xset fp rehash
--endif
-+	echo "fonts created"
- 
- clean distclean:
- 	rm -f $(LED_PCF) $(TT_PCF)
diff --git a/media-tv/xawtv/files/tv-fonts-1.1-nox.patch b/media-tv/xawtv/files/tv-fonts-1.1-nox.patch
deleted file mode 100644
index 57872394f8af..000000000000
--- a/media-tv/xawtv/files/tv-fonts-1.1-nox.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile	2003-04-15 08:16:09.000000000 +0000
-+++ Makefile_new	2005-11-12 22:22:23.000000000 +0000
-@@ -24,11 +24,7 @@
- 
- all: $(LED_PCF) $(TT_PCF) $(LED_BDF) $(TT_BDF)
- 	mkfontdir
--ifneq ($(DISPLAY),)
--	-xset fp- "`pwd`:unscaled"
--	xset +fp "`pwd`:unscaled"
--	xset fp rehash
--endif
-+	echo "fonts created"
- 
- clean distclean:
- 	rm -f $(LED_PCF) $(TT_PCF) $(TT_BDF)
diff --git a/media-tv/xawtv/files/xawtv-3.94-gcc4.patch b/media-tv/xawtv/files/xawtv-3.94-gcc4.patch
deleted file mode 100644
index 50e4387292eb..000000000000
--- a/media-tv/xawtv/files/xawtv-3.94-gcc4.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -x '*~' -ur xawtv-3.94/console/fbtv.c xawtv-3.94-gcc4/console/fbtv.c
---- xawtv-3.94/console/fbtv.c	2004-06-30 14:26:52.000000000 +0200
-+++ xawtv-3.94-gcc4/console/fbtv.c	2005-05-30 02:09:30.516434608 +0200
-@@ -187,7 +187,7 @@
- 
- #define NKEYTAB (sizeof(keytab)/sizeof(struct KEYTAB))
- 
--static char              *snapbase;
-+char              *snapbase;
- static char              default_title[128] = "???";
- static char              message[128] = "";
- 
-diff -x '*~' -ur xawtv-3.94/console/ftp.c xawtv-3.94-gcc4/console/ftp.c
---- xawtv-3.94/console/ftp.c	2003-02-14 15:14:04.000000000 +0100
-+++ xawtv-3.94-gcc4/console/ftp.c	2005-05-30 02:07:26.185335808 +0200
-@@ -186,7 +186,7 @@
- 		s->connected = 0;
- 	    }
- 	    if (NULL != strstr(p,"Not connected")) {
--		if (ftp_connected)
-+		if (ftp_connected(s))
- 		    fprintf(stderr,"ftp: lost connection\n");
- 		s->connected = 0;
- 	    }
-@@ -236,7 +236,7 @@
- 	/* login */
- 	ftp_send(s,3,"user",user,pass);
- 	if (230 != ftp_recv(s)) {
--	    if (!ftp_connected)
-+	    if (!ftp_connected(s))
- 		continue;
- 	    fprintf(stderr,"ftp: login incorrect\n");
- 	    exit(1);
-diff -x '*~' -ur xawtv-3.94/libng/grab-ng.h xawtv-3.94-gcc4/libng/grab-ng.h
---- xawtv-3.94/libng/grab-ng.h	2003-02-14 15:14:07.000000000 +0100
-+++ xawtv-3.94-gcc4/libng/grab-ng.h	2005-05-30 02:08:39.157242392 +0200
-@@ -25,7 +25,9 @@
- 
- #if __STDC_VERSION__ < 199901
- # define restrict
--# define bool int
-+# ifndef bool
-+#  define bool int
-+# endif
- #endif
- 
- #define UNSET          (-1U)
-diff -x '*~' -ur xawtv-3.94/libng/plugins/read-avi.c xawtv-3.94-gcc4/libng/plugins/read-avi.c
---- xawtv-3.94/libng/plugins/read-avi.c	2003-02-14 15:14:05.000000000 +0100
-+++ xawtv-3.94-gcc4/libng/plugins/read-avi.c	2005-05-30 02:12:25.081896624 +0200
-@@ -7,6 +7,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/uio.h>
-+#include <inttypes.h>
- 
- #include "riff.h"
- #include "list.h"
-@@ -64,7 +65,7 @@
-     h->movi[h->movi_cnt].size  = size;
-     h->movi_cnt++;
-     if (ng_debug)
--	fprintf(stderr,"%*s[movie data list: 0x%llx+0x%llx]\n",
-+	fprintf(stderr,"%*s[movie data list: 0x%" PRIx64 "+0x%" PRIx64 "]\n",
- 		level, "", start, size);
- }
- 
-@@ -213,7 +214,7 @@
- 	*pos += (chunk.size + 3) & ~0x03; /* 32-bit align */
- 	if (FCCS(chunk.id) == id) {
- 	    if (ng_debug)
--		fprintf(stderr,"avi: chunk %4.4s: 0x%llx+0x%x\n",
-+		fprintf(stderr,"avi: chunk %4.4s: 0x%" PRIx64 "+0x%x\n",
- 			chunk.id,*pos,chunk.size);
- 	    return chunk.size;
- 	}
diff --git a/media-tv/xawtv/files/xawtv-3.95-autocolor.patch b/media-tv/xawtv/files/xawtv-3.95-autocolor.patch
deleted file mode 100644
index 84072f1acf48..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-autocolor.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur xawtv-3.94.org/x11/xv.c xawtv-3.94/x11/xv.c
---- xawtv-3.94.org/x11/xv.c	2005-06-26 21:18:04.121335230 -0500
-+++ xawtv-3.94/x11/xv.c	2005-06-26 21:31:03.416804893 -0500
-@@ -315,6 +315,7 @@
-     struct STRTAB *inputs = NULL;
-     char *h;
-     int n, i, vi_port = -1, vi_adaptor = -1;
-+    Atom xv_atom;
- 
-     if (Success != XvQueryExtension(dpy,&ver,&rel,&req,&ev,&err)) {
- 	if (debug)
-@@ -424,6 +425,11 @@
-                 handle->xv_encoding = XV_ENCODING;
-             if (0 == strcmp("XV_FREQ",at[i].name))
-                 handle->xv_freq     = XV_FREQ;
-+	    if (0 == strcmp("XV_AUTOPAINT_COLORKEY",at[i].name))
-+	    {
-+		xv_atom = XInternAtom(dpy,"XV_AUTOPAINT_COLORKEY",False);
-+		XvSetPortAttribute(dpy,vi_port,xv_atom,1);
-+	    }
- #if 0
-             if (0 == strcmp("XV_COLORKEY",at[i].name))
-                 handle->xv_colorkey = XV_COLORKEY;
diff --git a/media-tv/xawtv/files/xawtv-3.95-bindnow.patch b/media-tv/xawtv/files/xawtv-3.95-bindnow.patch
deleted file mode 100644
index 36033e7be3d3..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-bindnow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xawtv-3.95/console/Subdir.mk
-===================================================================
---- xawtv-3.95.orig/console/Subdir.mk
-+++ xawtv-3.95/console/Subdir.mk
-@@ -89,6 +89,7 @@ console/ttv      : LDFLAGS := $(DLFLAGS)
- console/scantv   : LDFLAGS := $(DLFLAGS)
- console/streamer : LDFLAGS := $(DLFLAGS)
- console/webcam   : LDFLAGS := $(DLFLAGS)
-+console/v4l-conf : LDFLAGS := $(BINDNOW_FLAGS)
- 
- # global targets
- all:: $(TARGETS-console) $(TARGETS-v4l-conf)
diff --git a/media-tv/xawtv/files/xawtv-3.95-sparc.patch b/media-tv/xawtv/files/xawtv-3.95-sparc.patch
deleted file mode 100644
index 908f99010741..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-sparc.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- structs/struct-dump.c.orig	2006-01-09 10:59:31.000000000 +0100
-+++ structs/struct-dump.c	2006-01-09 11:12:01.000000000 +0100
-@@ -4,6 +4,7 @@
- #include <inttypes.h>
- #include <ctype.h>
- #include <sys/ioctl.h>
-+#include <asm/types.h>
- 
- #include "struct-dump.h"
- 
-@@ -43,7 +44,9 @@
- 	int16_t  s16;
- 	uint8_t  u8;
- 	int8_t   s8;
--	int al = sizeof(long)-1; /* struct + union + 64bit alignment */
-+	struct al64_t { char c; __u64 t; } al64_t;
-+	int al = sizeof(long)-1; /* struct + union */
-+	int al64 = (unsigned)&al64_t.t - (unsigned)&al64_t.c - 1; /* 64 bit alignement */
- 	void *p;
- 	unsigned int i,j,first;
- 
-@@ -149,7 +152,7 @@
- 			ptr += 4;
- 			break;
- 		case BITS64:
--			ptr = (void*)(((intptr_t)ptr + al) & ~al);
-+			ptr = (void*)(((intptr_t)ptr + al64) & ~al64);
- 			u64 = *((uint64_t*)ptr);
- 			first = 1;
- 			fprintf(fp,"0x%" PRIx64 " [",u64);
-@@ -166,13 +169,13 @@
- 			break;
- 
- 		case UINT64:
--			ptr = (void*)(((intptr_t)ptr + al) & ~al);
-+			ptr = (void*)(((intptr_t)ptr + al64) & ~al64);
- 			u64 = *((uint64_t*)ptr);
- 			fprintf(fp,"%" PRIu64,u64);
- 			ptr += 8;
- 			break;
- 		case SINT64:
--			ptr = (void*)(((intptr_t)ptr + al) & ~al);
-+			ptr = (void*)(((intptr_t)ptr + al64) & ~al64);
- 			s64 = *((int64_t*)ptr);
- 			fprintf(fp,"%" PRId64,s64);
- 			ptr += 8;