* [gentoo-commits] gentoo-x86 commit in media-gfx/zbar: ChangeLog zbar-0.10-r2.ebuild
@ 2013-02-28 11:02 Michael Weber (xmw)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber (xmw) @ 2013-02-28 11:02 UTC (permalink / raw
To: gentoo-commits
xmw 13/02/28 11:02:42
Modified: ChangeLog
Added: zbar-0.10-r2.ebuild
Log:
Fix compilation (bug 455076, reported by renesanso)
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path
1.7 media-gfx/zbar/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?r1=1.6&r2=1.7
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 28 Jul 2012 23:07:30 -0000 1.6
+++ ChangeLog 28 Feb 2013 11:02:42 -0000 1.7
@@ -1,6 +1,12 @@
# ChangeLog for media-gfx/zbar
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.6 2012/07/28 23:07:30 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.7 2013/02/28 11:02:42 xmw Exp $
+
+*zbar-0.10-r2 (28 Feb 2013)
+
+ 28 Feb 2013; Michael Weber <xmw@gentoo.org> +zbar-0.10-r2.ebuild,
+ +files/zbar-0.10-errors.patch:
+ Fix compilation (bug 455076, reported by renesanso)
28 Jul 2012; Michael Weber <xmw@gentoo.org> -zbar-0.10.ebuild:
Drop old
1.1 media-gfx/zbar/zbar-0.10-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild?rev=1.1&content-type=text/plain
Index: zbar-0.10-r2.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild,v 1.1 2013/02/28 11:02:42 xmw Exp $
EAPI=5
PYTHON_DEPEND="2:2.6"
inherit autotools eutils flag-o-matic python
DESCRIPTION="Library and tools for reading barcodes from images or video"
HOMEPAGE="http://zbar.sourceforge.net/"
SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
RDEPEND="gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 )
imagemagick? ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
jpeg? ( virtual/jpeg )
python? ( gtk? ( >=dev-python/pygtk-2 ) )
qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 )
X? ( x11-libs/libXext
xv? ( x11-libs/libXv ) )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}"/${P}-no-v4l1-check.patch
epatch "${FILESDIR}"/${P}-errors.patch
python_convert_shebangs 2 examples/upcrpc.py test/{barcodetest,test_pygtk}.py
sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581
eautoreconf
}
src_configure() {
append-cflags -DNDEBUG
econf \
$(use_with jpeg) \
$(use_with gtk) \
$(use_with imagemagick) \
$(use_with python) \
$(use_with qt4 qt) \
$(use_enable static-libs static) \
$(use_enable threads pthread) \
$(use_with X x) \
$(use_with xv xv) \
$(use_enable v4l video)
}
src_install() {
emake DESTDIR="${D}" install
dodoc HACKING NEWS README TODO
rm -r "${ED}"/usr/share/doc/${PN}
prune_libtool_files --all
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/zbar: ChangeLog zbar-0.10-r2.ebuild
@ 2013-03-01 8:00 Michael Weber (xmw)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber (xmw) @ 2013-03-01 8:00 UTC (permalink / raw
To: gentoo-commits
xmw 13/03/01 08:00:15
Modified: ChangeLog zbar-0.10-r2.ebuild
Log:
Fix imagemagick dependency.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path
1.8 media-gfx/zbar/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?r1=1.7&r2=1.8
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog 28 Feb 2013 11:02:42 -0000 1.7
+++ ChangeLog 1 Mar 2013 08:00:15 -0000 1.8
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/zbar
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.7 2013/02/28 11:02:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.8 2013/03/01 08:00:15 xmw Exp $
+
+ 01 Mar 2013; Michael Weber <xmw@gentoo.org> zbar-0.10-r2.ebuild:
+ Fix imagemagick dependency.
*zbar-0.10-r2 (28 Feb 2013)
1.2 media-gfx/zbar/zbar-0.10-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild?r1=1.1&r2=1.2
Index: zbar-0.10-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zbar-0.10-r2.ebuild 28 Feb 2013 11:02:42 -0000 1.1
+++ zbar-0.10-r2.ebuild 1 Mar 2013 08:00:15 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild,v 1.1 2013/02/28 11:02:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild,v 1.2 2013/03/01 08:00:15 xmw Exp $
EAPI=5
PYTHON_DEPEND="2:2.6"
@@ -17,7 +17,9 @@
IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
RDEPEND="gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 )
- imagemagick? ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+ imagemagick? (
+ || ( media-gfx/imagemagick
+ media-gfx/graphicsmagick[imagemagick] ) )
jpeg? ( virtual/jpeg )
python? ( gtk? ( >=dev-python/pygtk-2 ) )
qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 )
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-01 8:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-28 11:02 [gentoo-commits] gentoo-x86 commit in media-gfx/zbar: ChangeLog zbar-0.10-r2.ebuild Michael Weber (xmw)
-- strict thread matches above, loose matches on Subject: below --
2013-03-01 8:00 Michael Weber (xmw)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox