bumped to 3.93 to fix compile issues

5 files changed, 138 insertions, 11 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 09d3552ed42c..7518d23dc4cf 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/xawtv
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.14 2004/07/18 10:54:44 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.15 2004/07/29 02:50:25 morfic Exp $
+
+*xawtv-3.93 (28 Jul 2004)
+
+  28 Jul 2004; Daniel Goller <morfic@gentoo.org>  xawtv-3.93.ebuild:
+  Version bump, fixes gcc3.4 issues, effectivly closing bugs #52384 and #58002
+  Thanks penguinbox@coqui.net and alpeterson@wsu.edu
 
 *xawtv-3.92 (18 Jul 2004)
 
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index 0cfdb545a6b1..ece755195830 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,18 +1,25 @@
-MD5 220d20b87b9c86a838ae2a5e392049b8 ChangeLog 7395
-MD5 20e2255501865de5b568424821abf69d metadata.xml 161
+MD5 673b0c0ae411ec77acdbbe63377d65ee xawtv-3.93.ebuild 2272
 MD5 a10eeba3565be0493064ed9a5276228c xawtv-3.86-r1.ebuild 2417
 MD5 94b2e35265a450ffa762ce6524d9d781 xawtv-3.88.1.ebuild 2412
-MD5 6d04d79278cde44b356896d11e7f3cde xawtv-3.88.ebuild 2410
-MD5 470b96941abf1918295ee5ba2a66a0dc xawtv-3.91-r1.ebuild 2282
 MD5 fd5e2bcb1e90756439a6bfe7bac92aa1 xawtv-3.90.ebuild 2222
+MD5 27e0d5785b11fdc12d153c06524f9fef .#Manifest.1.21 1198
+MD5 f05d4c121c3672ca78dde2fd0916ffea .#xawtv-3.91-r1.ebuild.1.3 2443
+MD5 6d04d79278cde44b356896d11e7f3cde xawtv-3.88.ebuild 2410
+MD5 1110f9cf59e87f83910623b882a35971 xawtv-3.91-r1.ebuild 2455
+MD5 220d20b87b9c86a838ae2a5e392049b8 ChangeLog 7395
+MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 610d7db36ed4e1726690635bb8761765 xawtv-3.90-r1.ebuild 2242
+MD5 a0f6f223b53fdb234f803bd3efc0fcb6 .#Manifest.1.22 1604
+MD5 203e847ea7b376c537fa4ce0a1066bb4 .#xawtv-3.91-r1.ebuild.1.4 2429
 MD5 673b0c0ae411ec77acdbbe63377d65ee xawtv-3.92.ebuild 2272
-MD5 6a07c4c744b1c6004fb3d6504359ed50 files/digest-xawtv-3.86-r1 399
-MD5 2d7c5b5b3bb0b4ebfe507c800e5b5e21 files/digest-xawtv-3.88 205
 MD5 309f5000ed37fb2aef346e12a62fbb04 files/digest-xawtv-3.88.1 207
+MD5 2d7c5b5b3bb0b4ebfe507c800e5b5e21 files/digest-xawtv-3.88 205
 MD5 75d1944d291d44ff7e8e55150dac925c files/digest-xawtv-3.90 205
-MD5 75d1944d291d44ff7e8e55150dac925c files/digest-xawtv-3.90-r1 205
+MD5 dec8d53e49ebcce640ad0af4813d6335 files/digest-xawtv-3.93 205
+MD5 bdfc412478f79de7122e7bcd65fcc55a files/xawtv-gcc3.4.patch 2803
 MD5 e4dcb4819e11ae2fb4fa72f4f8420bca files/tv-fonts-1.0-gentoo.diff 426
-MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
+MD5 6a07c4c744b1c6004fb3d6504359ed50 files/digest-xawtv-3.86-r1 399
+MD5 75d1944d291d44ff7e8e55150dac925c files/digest-xawtv-3.90-r1 205
 MD5 6b6807d0579bb9ff63ab9e2ca88fd1d1 files/digest-xawtv-3.91-r1 205
+MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
 MD5 c3eef32ef6f30d6ac3c14c92418716ac files/digest-xawtv-3.92 205
diff --git a/media-tv/xawtv/files/digest-xawtv-3.93 b/media-tv/xawtv/files/digest-xawtv-3.93
new file mode 100644
index 000000000000..352a185973ae
--- /dev/null
+++ b/media-tv/xawtv/files/digest-xawtv-3.93
@@ -0,0 +1,3 @@
+MD5 8d2731e6e95f173f41a0ddc875d55804 xawtv-3.93.tar.gz 559208
+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/xawtv-3.91-r1.ebuild b/media-tv/xawtv/xawtv-3.91-r1.ebuild
index 4ed1654f9136..c9df636ad772 100644
--- a/media-tv/xawtv/xawtv-3.91-r1.ebuild
+++ b/media-tv/xawtv/xawtv-3.91-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.91-r1.ebuild,v 1.5 2004/07/18 10:46:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.91-r1.ebuild,v 1.6 2004/07/29 02:50:25 morfic Exp $
 
-inherit virtualx
+inherit virtualx gcc eutils
 
 IUSE="aalib alsa lirc mmx motif nls opengl quicktime zvbi"
 
@@ -30,6 +30,17 @@ DEPEND=">=sys-libs/ncurses-5.1
 	quicktime? ( virtual/quicktime )
 	zvbi? ( media-libs/zvbi )"
 
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+	epatch ${FILESDIR}/xawtv-gcc3.4.patch
+	fi
+}
+
+
 src_compile() {
 
 #	mmx enables 32bit assembly which is not valid when compiling 64bit on amd64
diff --git a/media-tv/xawtv/xawtv-3.93.ebuild b/media-tv/xawtv/xawtv-3.93.ebuild
new file mode 100644
index 000000000000..efaa9119f303
--- /dev/null
+++ b/media-tv/xawtv/xawtv-3.93.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.93.ebuild,v 1.1 2004/07/29 02:50:25 morfic Exp $
+
+inherit virtualx
+
+IUSE="aalib alsa lirc mmx motif nls opengl quicktime 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
+	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
+	virtual/x11
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	motif? ( x11-libs/openmotif
+		app-text/recode )
+	opengl? ( virtual/opengl )
+	quicktime? ( virtual/quicktime )
+	zvbi? ( media-libs/zvbi )"
+
+src_compile() {
+
+#	mmx enables 32bit assembly which is not valid when compiling 64bit on amd64
+	if [ "${ARCH}" = "x86" ]
+	then
+		myconf="`use_enable mmx`"
+	else
+		myconf=""
+	fi
+
+	econf \
+		--with-x \
+		--enable-xfree-ext \
+		--enable-xvideo \
+		--enable-dv \
+		`use_enable motif` \
+		`use_enable quicktime` \
+		`use_enable alsa` \
+		`use_enable lirc` \
+		`use_enable opengl gl`\
+		`use_enable zvbi`\
+		${myconf} \
+		`use_enable aalib aa` || die " xawtv configure 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 /var/www/localhost ]
+	then
+		exeinto /var/www/localhost/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
+}