Version bump to version 3.95; modular x dependencies; added patch for SPARC alignment; added xext useflag to disable some extensions like xinerama and others; fixes bugs #118802, #115836, #112429, #96848, #94933, #81987.

(Portage version: 2529-svn)

8 files changed, 274 insertions, 9 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index f7cdbf7cabf8..df3532814ad7 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-tv/xawtv
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.28 2005/10/09 12:29:17 zzam Exp $
+# 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 $
+
+*xawtv-3.95 (13 Jan 2006)
+
+  13 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/tv-fonts-1.1-nox.patch, +files/xawtv-3.95-autocolor.patch,
+  +files/xawtv-3.95-bindnow.patch, +files/xawtv-3.95-sparc.patch,
+  +xawtv-3.95.ebuild:
+  Version bump to version 3.95; modular x dependencies; added patch for SPARC
+  alignment; added xext useflag to disable some extensions like xinerama and
+  others; fixes bugs #118802, #115836, #112429, #96848, #94933, #81987.
 
   09 Oct 2005; Matthias Schwarzott <zzam@gentoo.org>
   +files/xawtv-3.94-no-x11.patch, xawtv-3.94-r2.ebuild:
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index 373918aa5457..75ec15bc478e 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,14 +1,17 @@
-MD5 712f090edf08fcb884b58b94a7ff7666 xawtv-3.94-r2.ebuild 2988
-MD5 b656c9ce1bf60ab75f08e8b4beff94a3 xawtv-3.86-r2.ebuild 2151
 MD5 01d320b26a9a19c4c5d62fe054c14a79 ChangeLog 9582
-MD5 ddaee2d76f650fa8b2839b5c103c68ec xawtv-3.94-r1.ebuild 2347
-MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 eeb0da894fddca794ffc60f0033ce58c files/xawtv-3.94-no-x11.patch 577
 MD5 1f399235f11cf563eae5d9ca1085b5b2 files/alevtd-style-mozilla.diff 307
-MD5 e4dcb4819e11ae2fb4fa72f4f8420bca files/tv-fonts-1.0-gentoo.diff 426
-MD5 a4a5b193c0bb1d65b4c7137257e2403e files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch 396
 MD5 e115a525876d643613edd9306ecbc01d files/digest-xawtv-3.86-r2 205
 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 04a2ce4d8937cc7dfc255082396fa5fe 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
+MD5 eeb0da894fddca794ffc60f0033ce58c files/xawtv-3.94-no-x11.patch 577
+MD5 3556f04c3c45cad3de6e43e1b36deae0 files/xawtv-3.95-bindnow.patch 474
+MD5 20e2255501865de5b568424821abf69d metadata.xml 161
+MD5 b656c9ce1bf60ab75f08e8b4beff94a3 xawtv-3.86-r2.ebuild 2151
+MD5 ddaee2d76f650fa8b2839b5c103c68ec xawtv-3.94-r1.ebuild 2347
+MD5 712f090edf08fcb884b58b94a7ff7666 xawtv-3.94-r2.ebuild 2988
+MD5 99e9eb75bd4998675da5dade1283fa29 xawtv-3.95.ebuild 2855
diff --git a/media-tv/xawtv/files/digest-xawtv-3.95 b/media-tv/xawtv/files/digest-xawtv-3.95
new file mode 100644
index 000000000000..29d66bdeb104
--- /dev/null
+++ b/media-tv/xawtv/files/digest-xawtv-3.95
@@ -0,0 +1,2 @@
+MD5 ae73fc0efd53e53dca7077383cc22b5a tv-fonts-1.1.tar.bz2 80177
+MD5 ad25e03f7e128b318e392cb09f52207d xawtv-3.95.tar.gz 555731
diff --git a/media-tv/xawtv/files/tv-fonts-1.1-nox.patch b/media-tv/xawtv/files/tv-fonts-1.1-nox.patch
new file mode 100644
index 000000000000..57872394f8af
--- /dev/null
+++ b/media-tv/xawtv/files/tv-fonts-1.1-nox.patch
@@ -0,0 +1,15 @@
+--- 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.95-autocolor.patch b/media-tv/xawtv/files/xawtv-3.95-autocolor.patch
new file mode 100644
index 000000000000..84072f1acf48
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.95-autocolor.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000000..36033e7be3d3
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.95-bindnow.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..908f99010741
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.95-sparc.patch
@@ -0,0 +1,46 @@
+--- 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;
diff --git a/media-tv/xawtv/xawtv-3.95.ebuild b/media-tv/xawtv/xawtv-3.95.ebuild
new file mode 100644
index 000000000000..f2416badc3d1
--- /dev/null
+++ b/media-tv/xawtv/xawtv-3.95.ebuild
@@ -0,0 +1,154 @@
+# 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 $
+
+inherit eutils font autotools flag-o-matic
+
+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 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+	>=media-libs/jpeg-6b
+	media-libs/libpng
+	X? ( || ( (
+			media-libs/fontconfig
+			x11-libs/libFS
+			x11-libs/libICE
+			x11-libs/libXpm
+			x11-libs/libXmu
+			x11-libs/libX11
+			x11-libs/libXaw
+			x11-libs/libXt
+			x11-libs/libSM
+			x11-libs/libXft
+			x11-libs/libXext
+			x11-libs/libXrender
+		) virtual/x11 )
+		xext? ( || ( (
+				x11-libs/libXinerama
+				x11-libs/libXxf86dga
+				x11-libs/libXrandr
+				x11-libs/libXxf86vm
+			) virtual/x11 ) )
+		xv? ( || ( x11-libs/libXv virtual/x11 ) )
+	)
+	motif? ( x11-libs/openmotif
+		app-text/recode )
+	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 )"
+
+DEPEND="${RDEPEND}
+	X? ( || ( (
+				x11-proto/videoproto
+				x11-proto/xproto
+				x11-proto/xextproto
+			) virtual/x11 )
+			xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+		)"
+
+pkg_setup() {
+	if use X; then
+		font_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		epatch "${FILESDIR}/${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"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with X x) \
+		$(use_enable xext 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 BINDNOW_FLAGS=$(bindnow-flags) verbose=yes || die "Make failed"
+
+	if use X; then
+		cd ${WORKDIR}/${MY_FONT}
+		emake DISPLAY= || die "tvfonts failed"
+	fi
+}
+
+src_install() {
+	cd ${S}
+	make install DESTDIR=${D} resdir=${D}/etc/X11 || die "make install failed"
+
+	dodoc Changes README* TODO ${FILESDIR}/webcamrc
+	docinto cgi-bin
+	dodoc scripts/webcam.cgi
+
+	use X || \
+		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
+}