Gentoo Archives: gentoo-commits

From: "Kacper Kowalik (xarthisius)" <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-tv/ivtv-utils: ChangeLog ivtv-utils-1.4.0-r1.ebuild
Date: Tue, 29 Jun 2010 19:32:08
Message-Id: 20100629193200.EBF9F2C621@corvid.gentoo.org
1 xarthisius 10/06/29 19:32:00
2
3 Modified: ChangeLog ivtv-utils-1.4.0-r1.ebuild
4 Log:
5 QA clean up and fixing build with --as-needed wrt bug 321303. Thanks to Diego for reporting. With beandog's blessing
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.10 media-tv/ivtv-utils/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/ivtv-utils/ChangeLog?rev=1.10&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/ivtv-utils/ChangeLog?rev=1.10&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/ivtv-utils/ChangeLog?r1=1.9&r2=1.10
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ChangeLog,v
18 retrieving revision 1.9
19 retrieving revision 1.10
20 diff -u -r1.9 -r1.10
21 --- ChangeLog 21 May 2010 01:55:17 -0000 1.9
22 +++ ChangeLog 29 Jun 2010 19:32:00 -0000 1.10
23 @@ -1,6 +1,11 @@
24 # ChangeLog for media-tv/ivtv-utils
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ChangeLog,v 1.9 2010/05/21 01:55:17 beandog Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ChangeLog,v 1.10 2010/06/29 19:32:00 xarthisius Exp $
28 +
29 + 29 Jun 2010; Kacper Kowalik <xarthisius@g.o>
30 + ivtv-utils-1.4.0-r1.ebuild, +files/ivtv-utils-1.4.0-gentoo.patch:
31 + QA clean up and fixing build with --as-needed wrt bug 321303. Thanks to
32 + Diego for reporting.
33
34 21 May 2010; Steve Dibb <beandog@g.o> ivtv-utils-1.4.0-r1.ebuild:
35 Add dep on v4l2-ctl
36
37
38
39 1.4 media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild?rev=1.4&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild?rev=1.4&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild?r1=1.3&r2=1.4
44
45 Index: ivtv-utils-1.4.0-r1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild,v
48 retrieving revision 1.3
49 retrieving revision 1.4
50 diff -u -r1.3 -r1.4
51 --- ivtv-utils-1.4.0-r1.ebuild 21 May 2010 01:55:17 -0000 1.3
52 +++ ivtv-utils-1.4.0-r1.ebuild 29 Jun 2010 19:32:00 -0000 1.4
53 @@ -1,10 +1,10 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild,v 1.3 2010/05/21 01:55:17 beandog Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild,v 1.4 2010/06/29 19:32:00 xarthisius Exp $
58
59 EAPI=2
60
61 -inherit eutils linux-mod linux-info
62 +inherit eutils linux-mod linux-info toolchain-funcs
63
64 DESCRIPTION="IVTV utilities for Hauppauge PVR PCI cards"
65 HOMEPAGE="http://www.ivtvdriver.org"
66 @@ -57,20 +57,22 @@
67 BUILD_PARAMS="KDIR=${KV_DIR}"
68 }
69
70 -src_install() {
71 - make DESTDIR="${D}" PREFIX="/usr" install || die "failed to install"
72 - use perl && dobin utils/perl/*.pl
73 +src_prepare() {
74 + epatch "${FILESDIR}"/${P}-gentoo.patch
75 +}
76 +
77 +src_compile() {
78 + tc-export CC CXX
79 + emake || die
80 +}
81
82 - # Shouldn't be installing linux headers, bug 273165
83 - rm "${D}"/usr/include/linux/ivtv.h
84 - rm "${D}"/usr/include/linux/ivtvfb.h
85 -
86 - # Installed separately now
87 - rm "${D}"/usr/bin/v4l2-ctl
88 -
89 - cd "${S}"
90 - dodoc README doc/* ChangeLog
91 - use perl && dodoc utils/perl/README.ptune
92 +src_install() {
93 + emake DESTDIR="${D}" PREFIX="/usr" install || die "failed to install"
94 + dodoc README doc/* ChangeLog || die
95 + if use perl; then
96 + dobin utils/perl/*.pl || die
97 + dodoc utils/perl/README.ptune || die
98 + fi
99 }
100
101 pkg_postinst() {