[patch] xawtv-3.94-r1.diff (webapp support)

xawtv-3.94-r1.diff (text/plain), 3.71 KB, created by Octavio Ruiz (Ta^3) on 2005-04-05 18:06:43 UTC

--- /usr/portage/media-tv/xawtv/xawtv-3.94-r1.ebuild	2005-01-25 09:25:35.000000000 -0600
+++ /usr/local/portage/media-tv/xawtv/xawtv-3.94-r1.ebuild	2005-04-05 19:24:37.000000000 -0500
@@ -1,10 +1,12 @@
 # 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-r1.ebuild,v 1.1 2005/01/25 15:25:35 cardoe Exp $
+# $Header: $
 
 inherit virtualx eutils
 
-IUSE="aalib alsa lirc mmx motif nls opengl quicktime zvbi"
+IUSE="aalib alsa cgi lirc mmx motif nls opengl quicktime zvbi dv xv X"
+
+use cgi && inherit webapp
 
 MY_PATCH="xaw-deinterlace-3.76-0.1.1.diff.bz2"
 MY_FONT=tv-fonts-1.0
@@ -14,24 +16,27 @@
 	http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2
 	mirror://gentoo/${MY_PATCH}"
 
-SLOT="0"
+#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 )
+DEPEND=">=media-libs/jpeg-6b
+	>=sys-libs/ncurses-5.1
+	X? ( virtual/x11 )
 	aalib? ( media-libs/aalib )
-	motif? ( x11-libs/openmotif
-		app-text/recode )
+	alsa? ( media-libs/alsa-lib )
+	cgi? ( net-www/webapp-config )
+	dv? ( media-libs/libdv )
+	lirc? ( app-misc/lirc )
+	media-libs/libpng
+	motif? ( x11-libs/openmotif app-text/recode )
 	opengl? ( virtual/opengl )
 	quicktime? ( virtual/quicktime )
-	zvbi? ( media-libs/zvbi )
 	sys-devel/autoconf
 	sys-devel/automake
-	sys-devel/libtool"
+	sys-devel/libtool
+	xv? ( virtual/x11 )
+	zvbi? ( media-libs/zvbi )"
 
 src_unpack() {
 	unpack ${A}
@@ -42,54 +47,38 @@
 
 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"
+		$(use_with X x) \
+		$(use_enable X xfree-ext) \
+		$(use_enable xv xvideo) \
+		$(use_enable dv) \
+		$(use_enable motif) \
+		$(use_enable quicktime) \
+		$(use_enable alsa) \
+		$(use_enable lirc) \
+		$(use_enable opengl gl) \
+		$(use_enable zvbi) \
+		$(use_enable aalib aa) \
+		$(use_enable mmx) \
+		|| die " xawtv configure failed"
 
-	make || die
+	emake || die
 
 	cd ${WORKDIR}/${MY_FONT}
 	DISPLAY="" Xmake || die "tvfonts failed"
 }
 
 src_install() {
+	webapp_src_preinst
+
 	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
+	make install DESTDIR=${D} || die "make install failed"
+
+	dodoc COPYING Changes README* TODO ${FILESDIR}/webcamrc
+	cp -f scripts/webcam.cgi ${D}${MY_CGIBINDIR}
+
+	use nls ||
+		rm -rf ${D}/usr/share/man/fr ${D}/usr/share/man/es
 
 	# The makefile seems to be fubar'd for some data
 	dodir /usr/share/${PN}
@@ -97,14 +86,17 @@
 	mv ${D}/usr/share/Index* ${D}/usr/share/${PN}
 
 	cd ${WORKDIR}/${MY_FONT}
-	insinto /usr/X11R6/lib/X11/fonts/xawtv
+	insinto /usr/share/fonts/xawtv
 	doins *.gz fonts.alias
+
+	webapp_src_install
 }
 
 pkg_postinst() {
-
-	ebegin "installing teletype fonts into /usr/X11R6/lib/X11/fonts/xawtv"
-	cd /usr/X11R6/lib/X11/fonts/xawtv
-	mkfontdir
+	ebegin "installing teletype fonts into /usr/share/fonts/xawtv"
+		cd /usr/share/fonts/xawtv
+		mkfontdir
 	eend
+
+	webapp_pkg_postinst
 }