From 807afe676f9d0621575b75fd335ad780e81a8e39 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Sat, 4 Feb 2006 17:23:49 +0000 Subject: Move patches in a separate patchset out of ${FILESDIR}. Package-Manager: portage-2.1_pre4-r1 --- media-tv/xawtv/ChangeLog | 10 +- media-tv/xawtv/Manifest | 41 ++++---- media-tv/xawtv/files/alevtd-style-mozilla.diff | 5 - media-tv/xawtv/files/digest-xawtv-3.86-r2 | 3 - media-tv/xawtv/files/digest-xawtv-3.94-r2 | 3 - media-tv/xawtv/files/digest-xawtv-3.95 | 5 + media-tv/xawtv/files/tv-fonts-1.0-gentoo.diff | 16 --- media-tv/xawtv/files/tv-fonts-1.1-nox.patch | 15 --- media-tv/xawtv/files/xawtv-3.94-gcc4.patch | 76 -------------- media-tv/xawtv/files/xawtv-3.95-autocolor.patch | 23 ----- media-tv/xawtv/files/xawtv-3.95-bindnow.patch | 12 --- media-tv/xawtv/files/xawtv-3.95-sparc.patch | 46 --------- media-tv/xawtv/xawtv-3.86-r2.ebuild | 98 ------------------- media-tv/xawtv/xawtv-3.94-r2.ebuild | 125 ------------------------ media-tv/xawtv/xawtv-3.95.ebuild | 16 +-- 15 files changed, 46 insertions(+), 448 deletions(-) delete mode 100644 media-tv/xawtv/files/alevtd-style-mozilla.diff delete mode 100644 media-tv/xawtv/files/digest-xawtv-3.86-r2 delete mode 100644 media-tv/xawtv/files/digest-xawtv-3.94-r2 delete mode 100644 media-tv/xawtv/files/tv-fonts-1.0-gentoo.diff delete mode 100644 media-tv/xawtv/files/tv-fonts-1.1-nox.patch delete mode 100644 media-tv/xawtv/files/xawtv-3.94-gcc4.patch delete mode 100644 media-tv/xawtv/files/xawtv-3.95-autocolor.patch delete mode 100644 media-tv/xawtv/files/xawtv-3.95-bindnow.patch delete mode 100644 media-tv/xawtv/files/xawtv-3.95-sparc.patch delete mode 100644 media-tv/xawtv/xawtv-3.86-r2.ebuild delete mode 100644 media-tv/xawtv/xawtv-3.94-r2.ebuild (limited to 'media-tv/xawtv') diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog index df3532814ad7..180067f6ffce 100644 --- a/media-tv/xawtv/ChangeLog +++ b/media-tv/xawtv/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-tv/xawtv # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.29 2006/01/13 13:48:16 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.30 2006/02/04 17:23:49 flameeyes Exp $ + + 04 Feb 2006; Diego Pettenò + -files/tv-fonts-1.0-gentoo.diff, -files/tv-fonts-1.1-nox.patch, + -files/xawtv-3.94-gcc4.patch, -files/xawtv-3.95-autocolor.patch, + -files/xawtv-3.95-bindnow.patch, -files/xawtv-3.95-sparc.patch, + -files/alevtd-style-mozilla.diff, -xawtv-3.86-r2.ebuild, + -xawtv-3.94-r2.ebuild, xawtv-3.95.ebuild: + Move patches in a separate patchset out of ${FILESDIR}. *xawtv-3.95 (13 Jan 2006) diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest index 967dc850bae9..d6141fb46b21 100644 --- a/media-tv/xawtv/Manifest +++ b/media-tv/xawtv/Manifest @@ -1,30 +1,37 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 62d96b22c76c5f1158dc2f97b8d5fd25 ChangeLog 10051 -MD5 1f399235f11cf563eae5d9ca1085b5b2 files/alevtd-style-mozilla.diff 307 -MD5 e115a525876d643613edd9306ecbc01d files/digest-xawtv-3.86-r2 205 +MD5 2bf13a6bfd8c2a1d02adb74f2eb038bd ChangeLog 10465 +RMD160 dd07b5c7988f1eed9fcb0135849a68e28621925e ChangeLog 10465 +SHA256 91dd1a14fcf7b5297e6b6c2ad9ce4b948e17b7c952342c9e9b2fe5dfa116c445 ChangeLog 10465 MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94-r1 205 -MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94-r2 205 -MD5 ff0fa0163d09ad96b4c9d2df04c7f12a files/digest-xawtv-3.95 126 -MD5 e4dcb4819e11ae2fb4fa72f4f8420bca files/tv-fonts-1.0-gentoo.diff 426 -MD5 44aa5e0adbaeb323305dc1546b2b9249 files/tv-fonts-1.1-nox.patch 367 +RMD160 316ae590608e7cef1608e81e71fbf573ff01325c files/digest-xawtv-3.94-r1 205 +SHA256 87c18e89f921d4b819cac23058f96621a37019235678a822ea25639f79cb8aa7 files/digest-xawtv-3.94-r1 205 +MD5 574b3e5a0bf3441afda6d974b838f411 files/digest-xawtv-3.95 540 +RMD160 6122f90c534a0b44fcd631d7108194e515aa37db files/digest-xawtv-3.95 540 +SHA256 9737e9f26040e1114931dbb5191b2809e3dca75621a149b4e73bf055f21ee597 files/digest-xawtv-3.95 540 MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597 +RMD160 54897fefd31711f402da3e39cb97d4ef63bb200b files/webcamrc 597 +SHA256 9cf61695be6b8005c663a6c73f90bd4b048f9e16f95ba659b6bc1087bc6e248e files/webcamrc 597 MD5 a4a5b193c0bb1d65b4c7137257e2403e files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch 396 -MD5 a070450a725849377ac30c56eb059f9a files/xawtv-3.94-gcc4.patch 2452 +RMD160 4fa77953a65d9685da2c6593e78670a848ae647b files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch 396 +SHA256 bd6a36d1c8a5954f8191765e0798f0359bfdbe1f34c51fbbce447845173fbb2c files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch 396 MD5 eeb0da894fddca794ffc60f0033ce58c files/xawtv-3.94-no-x11.patch 577 -MD5 ed111a9d627aebd550ac446d06455319 files/xawtv-3.95-autocolor.patch 865 -MD5 3556f04c3c45cad3de6e43e1b36deae0 files/xawtv-3.95-bindnow.patch 474 -MD5 fe9b7a0adfbb3d1547bc9cc3b40a89e5 files/xawtv-3.95-sparc.patch 1277 +RMD160 03246cd3a593e169d2607250c5137fb7b368e6a5 files/xawtv-3.94-no-x11.patch 577 +SHA256 f93d032e9d48db8b3e470c07b77de8520d7deb110ab4d86d5fff3253958cd01b files/xawtv-3.94-no-x11.patch 577 MD5 20e2255501865de5b568424821abf69d metadata.xml 161 -MD5 b656c9ce1bf60ab75f08e8b4beff94a3 xawtv-3.86-r2.ebuild 2151 +RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 metadata.xml 161 +SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd metadata.xml 161 MD5 ddaee2d76f650fa8b2839b5c103c68ec xawtv-3.94-r1.ebuild 2347 -MD5 712f090edf08fcb884b58b94a7ff7666 xawtv-3.94-r2.ebuild 2988 -MD5 e970779c66d008c21cb6b1a650d4a316 xawtv-3.95.ebuild 3662 +RMD160 3e763a9820922a173383d31a73d01f6d42116785 xawtv-3.94-r1.ebuild 2347 +SHA256 bda8ce4856719beedbf5a10f468b58746c71aaf2386032e60e9d1af3d0e3d1a2 xawtv-3.94-r1.ebuild 2347 +MD5 5ede2fe2c5a3b2437c190481df423acd xawtv-3.95.ebuild 3554 +RMD160 5c1085f0e7af99d269d5db652f489c2f2e8c202a xawtv-3.95.ebuild 3554 +SHA256 d236dacd64c07e23afeb32b4ea27ba15519598bab8dc8406e5cde99fe5961bbe xawtv-3.95.ebuild 3554 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDx6+4AiZjviIA2XgRAhtgAJsHRCimpL1x689spZw45dsjwpDJ/QCfbC35 -S9B0ElZoxxbLXEL8Bk0ysds= -=jc2+ +iD8DBQFD5OM7AiZjviIA2XgRAtPkAKC9viKsmAzvFw5gPlr7oLvtWp0SsACdG9IK +OgEYF2NGsusmORrGtlmKfKU= +=AfNe -----END PGP SIGNATURE----- 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 - #include - #include -+#include - - #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 - #include - #include -+#include - - #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; diff --git a/media-tv/xawtv/xawtv-3.86-r2.ebuild b/media-tv/xawtv/xawtv-3.86-r2.ebuild deleted file mode 100644 index 1f7d142c3347..000000000000 --- a/media-tv/xawtv/xawtv-3.86-r2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.86-r2.ebuild,v 1.2 2005/01/25 15:25:35 cardoe Exp $ - -inherit virtualx eutils - -IUSE="aalib alsa mmx motif nls opengl quicktime" - -MY_PATCH="xaw-deinterlace-3.76-0.1.1.diff.bz2" -MY_FONT=tv-fonts-1.0 -DESCRIPTION="TV application for the bttv driver" -HOMEPAGE="http://bytesex.org/xawtv/" -SRC_URI="http://bytesex.org/xawtv/${PN}_${PV}.tar.gz - http://bytesex.org/xawtv/${MY_FONT}.tar.bz2 - mirror://gentoo/${MY_PATCH}" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ~ppc" - -DEPEND=">=sys-apps/sed-4.0.5 - >=sys-libs/ncurses-5.1 - >=media-libs/jpeg-6b - media-libs/libpng - media-libs/zvbi - virtual/x11 - alsa? ( media-libs/alsa-lib ) - aalib? ( media-libs/aalib ) - motif? ( x11-libs/openmotif - app-text/recode ) - opengl? ( virtual/opengl ) - quicktime? ( virtual/quicktime )" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/alevtd-style-mozilla.diff -} - -src_compile() { - use mmx || \ - sed -i "s:#define MMX::" libng/plugins/linear_blend.c - - econf \ - `use_enable alsa` \ - `use_enable opengl gl` \ - `use_enable quicktime` \ - `use_enable motif` \ - `use_enable aalib aa` \ - --with-x \ - --enable-xfree-ext \ - --enable-xvideo \ - --enable-zvbi || die "xawtv failed" - - make || die - - cd ${WORKDIR}/${MY_FONT} - DISPLAY="" Xmake || die "tvfonts failed" -} - -src_install() { - cd ${S} - einstall \ - libdir=${D}/usr/lib/xawtv \ - resdir=${D}/etc/X11 || die - - dodoc COPYING Changes README* TODO - - if [ -d /home/httpd ] - then - exeinto /home/httpd/cgi-bin - doexe scripts/webcam.cgi - dodoc ${FILESDIR}/webcamrc - fi - - if ! use nls - then - rm -f ${D}/usr/share/man/fr - rm -f ${D}/usr/share/man/es - fi - - # The makefile seems to be fubar'd for some data - dodir /usr/share/${PN} - mv ${D}/usr/share/*.list ${D}/usr/share/${PN} - mv ${D}/usr/share/Index* ${D}/usr/share/${PN} - - cd ${WORKDIR}/${MY_FONT} - insinto /usr/X11R6/lib/X11/fonts/xawtv - doins *.gz fonts.alias -} - -pkg_postinst() { - - ebegin "installing teletype fonts into /usr/X11R6/lib/X11/fonts/xawtv" - cd /usr/X11R6/lib/X11/fonts/xawtv - mkfontdir - eend -} diff --git a/media-tv/xawtv/xawtv-3.94-r2.ebuild b/media-tv/xawtv/xawtv-3.94-r2.ebuild deleted file mode 100644 index 88eb8a464d3b..000000000000 --- a/media-tv/xawtv/xawtv-3.94-r2.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.94-r2.ebuild,v 1.5 2005/10/09 12:29:17 zzam Exp $ - -inherit virtualx eutils font - -IUSE="aalib alsa dv lirc mmx motif nls opengl quicktime X xv zvbi" - -MY_PATCH="xaw-deinterlace-3.76-0.1.1.diff.bz2" -MY_FONT=tv-fonts-1.0 -DESCRIPTION="TV application for the bttv driver" -HOMEPAGE="http://bytesex.org/xawtv/" -SRC_URI="http://dl.bytesex.org/releases/xawtv/${P}.tar.gz - X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 ) - mirror://gentoo/${MY_PATCH}" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64" - -DEPEND=">=sys-libs/ncurses-5.1 - >=media-libs/jpeg-6b - media-libs/libpng - X? ( virtual/x11 ) - motif? ( virtual/x11 - x11-libs/openmotif - app-text/recode ) - xv? ( virtual/x11 ) - alsa? ( media-libs/alsa-lib ) - aalib? ( media-libs/aalib ) - dv? ( media-libs/libdv ) - lirc? ( app-misc/lirc ) - opengl? ( virtual/opengl ) - quicktime? ( virtual/quicktime ) - zvbi? ( media-libs/zvbi ) - sys-devel/autoconf - sys-devel/automake - sys-devel/libtool" - -pkg_setup() { - if use X; then - font_pkg_setup - fi -} - -src_unpack() { - unpack ${A} - epatch ${FILESDIR}/${P}-allow-xlibs-in-normal-search-path.patch - epatch ${FILESDIR}/${P}-gcc4.patch - epatch ${FILESDIR}/${P}-no-x11.patch - cd ${S} - autoreconf || "reconf failed" -} - -src_compile() { - econf \ - $(use_with X x) \ - $(use_enable X xfree-ext) \ - $(use_enable xv xvideo) \ - $(use_enable dv) \ - $(use_enable mmx) \ - $(use_enable motif) \ - $(use_enable quicktime) \ - $(use_enable alsa) \ - $(use_enable lirc) \ - $(use_enable opengl gl) \ - $(use_enable zvbi) \ - $(use_enable aalib aa) \ - || die " xawtv configure failed" - - emake || die "Make failed" - - if use X; then - cd ${WORKDIR}/${MY_FONT} - DISPLAY="" Xmake || die "tvfonts failed" - fi -} - -src_install() { - cd ${S} - make install DESTDIR=${D} resdir=${D}/etc/X11 || die "make install failed" - - dodoc COPYING Changes README* TODO ${FILESDIR}/webcamrc - insinto cgi-bin - dodoc scripts/webcam.cgi - - use X || use xv || \ - rm -f ${D}/usr/share/man/man1/{pia,propwatch}.1 \ - ${D}/usr/share/{man,man/fr,man/es}/man1/xawtv.1 \ - ${D}/usr/share/{man,man/es}/man1/{rootv,v4lctl,xawtv-remote}.1 - - use motif || \ - rm -f ${D}/usr/share/man/man1/{motv,mtt}.1 - - use zvbi || \ - rm -f ${D}/usr/share/man/man1/{alevtd,mtt}.1 \ - ${D}/usr/share/{man,man/es}/man1/scantv.1 - - use nls || \ - rm -f ${D}/usr/share/man/fr \ - ${D}/usr/share/man/es - - # The makefile seems to be fubar'd for some data - dodir /usr/share/${PN} - mv ${D}/usr/share/*.list ${D}/usr/share/${PN} - mv ${D}/usr/share/Index* ${D}/usr/share/${PN} - - if use X; then - cd ${WORKDIR}/${MY_FONT} - insinto /usr/share/fonts/xawtv - doins *.gz fonts.alias - - font_xfont_config - font_xft_config - fi -} - -pkg_postinst() { - if use X; then - ebegin "installing teletype fonts into /usr/share/fonts/xawtv" - cd /usr/share/fonts/xawtv - mkfontdir - eend - fi -} diff --git a/media-tv/xawtv/xawtv-3.95.ebuild b/media-tv/xawtv/xawtv-3.95.ebuild index f2416badc3d1..57f778718517 100644 --- a/media-tv/xawtv/xawtv-3.95.ebuild +++ b/media-tv/xawtv/xawtv-3.95.ebuild @@ -1,16 +1,19 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95.ebuild,v 1.1 2006/01/13 13:48:16 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95.ebuild,v 1.2 2006/02/04 17:23:49 flameeyes Exp $ inherit eutils font autotools flag-o-matic +PATCHLEVEL="1" + IUSE="aalib alsa dv lirc mmx motif nls opengl quicktime X xv zvbi xext" MY_FONT=tv-fonts-1.1 DESCRIPTION="TV application for the bttv driver" HOMEPAGE="http://bytesex.org/xawtv/" SRC_URI="http://dl.bytesex.org/releases/xawtv/${P}.tar.gz - X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 )" + X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 ) + mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" SLOT="0" LICENSE="GPL-2" @@ -70,14 +73,11 @@ src_unpack() { unpack ${A} if use X; then cd "${WORKDIR}/${MY_FONT}" - epatch "${FILESDIR}/${MY_FONT}-nox.patch" + epatch "${WORKDIR}/patches/extra/${MY_FONT}-nox.patch" fi cd "${S}" - epatch "${FILESDIR}/${PN}-3.94-allow-xlibs-in-normal-search-path.patch" - epatch "${FILESDIR}/${PN}-3.94-no-x11.patch" - epatch "${FILESDIR}/${P}-bindnow.patch" - epatch "${FILESDIR}/${P}-autocolor.patch" - epatch "${FILESDIR}/${P}-sparc.patch" + + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" eautoreconf } -- cgit v1.2.3-65-gdbad