1 |
xmw 13/02/28 11:02:42 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: zbar-0.10-r2.ebuild |
5 |
Log: |
6 |
Fix compilation (bug 455076, reported by renesanso) |
7 |
|
8 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
9 |
|
10 |
Revision Changes Path |
11 |
1.7 media-gfx/zbar/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.7&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.7&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?r1=1.6&r2=1.7 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v |
20 |
retrieving revision 1.6 |
21 |
retrieving revision 1.7 |
22 |
diff -u -r1.6 -r1.7 |
23 |
--- ChangeLog 28 Jul 2012 23:07:30 -0000 1.6 |
24 |
+++ ChangeLog 28 Feb 2013 11:02:42 -0000 1.7 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for media-gfx/zbar |
27 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.6 2012/07/28 23:07:30 xmw Exp $ |
29 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.7 2013/02/28 11:02:42 xmw Exp $ |
31 |
+ |
32 |
+*zbar-0.10-r2 (28 Feb 2013) |
33 |
+ |
34 |
+ 28 Feb 2013; Michael Weber <xmw@g.o> +zbar-0.10-r2.ebuild, |
35 |
+ +files/zbar-0.10-errors.patch: |
36 |
+ Fix compilation (bug 455076, reported by renesanso) |
37 |
|
38 |
28 Jul 2012; Michael Weber <xmw@g.o> -zbar-0.10.ebuild: |
39 |
Drop old |
40 |
|
41 |
|
42 |
|
43 |
1.1 media-gfx/zbar/zbar-0.10-r2.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: zbar-0.10-r2.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2013 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild,v 1.1 2013/02/28 11:02:42 xmw Exp $ |
53 |
|
54 |
EAPI=5 |
55 |
PYTHON_DEPEND="2:2.6" |
56 |
|
57 |
inherit autotools eutils flag-o-matic python |
58 |
|
59 |
DESCRIPTION="Library and tools for reading barcodes from images or video" |
60 |
HOMEPAGE="http://zbar.sourceforge.net/" |
61 |
SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2" |
62 |
|
63 |
LICENSE="LGPL-2.1" |
64 |
SLOT="0" |
65 |
KEYWORDS="~amd64 ~x86" |
66 |
IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv" |
67 |
|
68 |
RDEPEND="gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 ) |
69 |
imagemagick? ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) |
70 |
jpeg? ( virtual/jpeg ) |
71 |
python? ( gtk? ( >=dev-python/pygtk-2 ) ) |
72 |
qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) |
73 |
X? ( x11-libs/libXext |
74 |
xv? ( x11-libs/libXv ) )" |
75 |
DEPEND="${RDEPEND} |
76 |
virtual/pkgconfig" |
77 |
|
78 |
pkg_setup() { |
79 |
python_set_active_version 2 |
80 |
python_pkg_setup |
81 |
} |
82 |
|
83 |
src_prepare() { |
84 |
epatch "${FILESDIR}"/${P}-no-v4l1-check.patch |
85 |
epatch "${FILESDIR}"/${P}-errors.patch |
86 |
|
87 |
python_convert_shebangs 2 examples/upcrpc.py test/{barcodetest,test_pygtk}.py |
88 |
|
89 |
sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581 |
90 |
eautoreconf |
91 |
} |
92 |
|
93 |
src_configure() { |
94 |
append-cflags -DNDEBUG |
95 |
econf \ |
96 |
$(use_with jpeg) \ |
97 |
$(use_with gtk) \ |
98 |
$(use_with imagemagick) \ |
99 |
$(use_with python) \ |
100 |
$(use_with qt4 qt) \ |
101 |
$(use_enable static-libs static) \ |
102 |
$(use_enable threads pthread) \ |
103 |
$(use_with X x) \ |
104 |
$(use_with xv xv) \ |
105 |
$(use_enable v4l video) |
106 |
} |
107 |
|
108 |
src_install() { |
109 |
emake DESTDIR="${D}" install |
110 |
dodoc HACKING NEWS README TODO |
111 |
rm -r "${ED}"/usr/share/doc/${PN} |
112 |
prune_libtool_files --all |
113 |
} |