From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SXOvl-0007Rd-79 for garchives@archives.gentoo.org; Thu, 24 May 2012 03:41:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67232E0BAD; Thu, 24 May 2012 03:41:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2A9B0E0BAD for ; Thu, 24 May 2012 03:41:33 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29CA31B4010 for ; Thu, 24 May 2012 03:41:32 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2166) id B905520047; Thu, 24 May 2012 03:41:30 +0000 (UTC) From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-video/camserv: ChangeLog camserv-0.5.1-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog camserv-0.5.1-r2.ebuild X-VCS-Directories: media-video/camserv X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Message-Id: <20120524034130.B905520047@flycatcher.gentoo.org> Date: Thu, 24 May 2012 03:41:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 25ea4ca2-d247-4463-a76b-a2a73a0ef636 X-Archives-Hash: b55ec625d3bfb43e9caf1d782cba0f19 ssuominen 12/05/24 03:41:30 Modified: ChangeLog camserv-0.5.1-r2.ebuild Log: Use libv4l1-videodev.h from media-libs/libv4l to build libvideo_v4l.so= because linux-headers don't ship linux/videodev.h anymore wrt #396635 =20 (Portage version: 2.2.0_alpha107/cvs/Linux x86_64) Revision Changes Path 1.25 media-video/camserv/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/camser= v/ChangeLog?rev=3D1.25&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/camser= v/ChangeLog?rev=3D1.25&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/camser= v/ChangeLog?r1=3D1.24&r2=3D1.25 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ChangeLog 26 Feb 2011 19:20:33 -0000 1.24 +++ ChangeLog 24 May 2012 03:41:30 -0000 1.25 @@ -1,6 +1,10 @@ # ChangeLog for media-video/camserv -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.24 = 2011/02/26 19:20:33 signals Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.25 = 2012/05/24 03:41:30 ssuominen Exp $ + + 24 May 2012; Samuli Suominen camserv-0.5.1-r2.e= build: + Use libv4l1-videodev.h from media-libs/libv4l to build libvideo_v4l.so + because linux-headers don't ship linux/videodev.h anymore wrt #396635 =20 26 Feb 2011; Kevin McCarthy camserv-0.5.1-r2.ebui= ld: Updated depends from media-libs/jpeg to virtual/jpeg 1.16 media-video/camserv/camserv-0.5.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/camser= v/camserv-0.5.1-r2.ebuild?rev=3D1.16&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/camser= v/camserv-0.5.1-r2.ebuild?rev=3D1.16&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/camser= v/camserv-0.5.1-r2.ebuild?r1=3D1.15&r2=3D1.16 Index: camserv-0.5.1-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.eb= uild,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- camserv-0.5.1-r2.ebuild 26 Feb 2011 19:20:33 -0000 1.15 +++ camserv-0.5.1-r2.ebuild 24 May 2012 03:41:30 -0000 1.16 @@ -1,7 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.= ebuild,v 1.15 2011/02/26 19:20:33 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.= ebuild,v 1.16 2012/05/24 03:41:30 ssuominen Exp $ =20 +EAPI=3D4 inherit autotools eutils =20 DESCRIPTION=3D"A streaming video server" @@ -15,21 +16,28 @@ =20 RDEPEND=3D"virtual/jpeg media-libs/imlib2" -DEPEND=3D"${RDEPEND}" +DEPEND=3D"${RDEPEND} + media-libs/libv4l" # libv4l1-videodev.h wrt #396635 =20 -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P/.1}-errno.patch - epatch "${FILESDIR}"/${P}-libtool.patch - epatch "${FILESDIR}"/${P}-memcpy.patch - # no longer existing macro, but we don't need it - sed -i -e '/AM_ACLOCAL_INCLUDE/d' configure.in || die - AT_M4DIR=3D"${S}/macros" eautoreconf +DOCS=3D"AUTHORS BUGS ChangeLog NEWS README TODO javascript.txt" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P/.1}-errno.patch \ + "${FILESDIR}"/${P}-libtool.patch \ + "${FILESDIR}"/${P}-memcpy.patch + + # no longer existing macro (AM_ACLOCAL_INCLUDE), but we don't need it + # linux-headers no longer ship videodev.h wrt #396635 + sed -i \ + -e '/AM_ACLOCAL_INCLUDE/d' \ + -e 's:linux/videodev.h:libv4l1-videodev.h:' \ + configure.in camserv/video_v4l.c || die + + AT_M4DIR=3Dmacros eautoreconf } =20 src_install() { - emake DESTDIR=3D"${D}" install || die "emake install failed." - dodoc AUTHORS BUGS ChangeLog NEWS README TODO javascript.txt + default newinitd "${FILESDIR}"/camserv.init camserv }