diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2010-08-07 14:32:46 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2010-08-07 14:32:46 +0000 |
| commit | c498ddebd7f0fc90b42643a85ca46752ff677aa9 (patch) | |
| tree | f1a44d47b1d32a4e727812a08adce3851edd4a00 /dev-python | |
| parent | Stable on amd64 wrt bug #331439 (diff) | |
| download | historical-c498ddebd7f0fc90b42643a85ca46752ff677aa9.tar.gz historical-c498ddebd7f0fc90b42643a85ca46752ff677aa9.tar.bz2 historical-c498ddebd7f0fc90b42643a85ca46752ff677aa9.zip | |
fix compilation bug 331433; namely, import ml.h
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/PyQrcodec/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/PyQrcodec/Manifest | 15 | ||||
| -rw-r--r-- | dev-python/PyQrcodec/PyQrcodec-1.0.ebuild | 11 | ||||
| -rw-r--r-- | dev-python/PyQrcodec/files/opencv-2.0-compat.patch | 11 |
4 files changed, 38 insertions, 7 deletions
diff --git a/dev-python/PyQrcodec/ChangeLog b/dev-python/PyQrcodec/ChangeLog index fc21308a95c2..aa3e1da323a7 100644 --- a/dev-python/PyQrcodec/ChangeLog +++ b/dev-python/PyQrcodec/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/PyQrcodec -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQrcodec/ChangeLog,v 1.4 2009/07/26 19:16:23 bangert Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQrcodec/ChangeLog,v 1.5 2010/08/07 14:32:46 ferringb Exp $ + + 07 Aug 2010; Brian Harring <ferringb@gentoo.org> PyQrcodec-1.0.ebuild, + +files/opencv-2.0-compat.patch: + bug 331433- update for opencv 2.0 header changes. 26 Jul 2009; Thilo Bangert <bangert@gentoo.org> metadata.xml: add <herd> tag diff --git a/dev-python/PyQrcodec/Manifest b/dev-python/PyQrcodec/Manifest index 3972feabeaf9..60a1a1e10800 100644 --- a/dev-python/PyQrcodec/Manifest +++ b/dev-python/PyQrcodec/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX opencv-2.0-compat.patch 351 RMD160 a4d23a0d309d1e08e47bbae41289882ac21a926a SHA1 9472d6288841996ae570c18d374c9eb76f55b3d0 SHA256 45ce1cb2f29a72ef8b6751c0cac3f9468288ad8999c20aefc4b52b055a3d00f8 DIST PyQrcodec_Linux.tar.gz 53779 RMD160 a86c79c0ed53283dac854a9768efaed19cf07e71 SHA1 6c01c0960caf32a18a5d0d0059c666dc147e3ca5 SHA256 e8cdc7b01862b45682c8e8a23cb837cfce07770713ac3682547aabd071ff5c44 -EBUILD PyQrcodec-1.0.ebuild 584 RMD160 21cdbb76e68b250c7841eea4adcef65b14841b33 SHA1 610e019f3d446efd8999c146a944a638bc3554c1 SHA256 7e7a9c7ed893152f77dd7583943c3523433ae22d8adb45ecce8710a31f19caa5 -MISC ChangeLog 675 RMD160 6cf939f072ad714edbf770b04b583c3797b50a66 SHA1 c10a6a263eb262160f970ac9b35efdee0da8eba6 SHA256 81062f3c037af26e041847a865d423a31059b3bac3a95464a166277b998e6858 +EBUILD PyQrcodec-1.0.ebuild 676 RMD160 4ec67c164ec7a8077ed35793c49fdf261070eb20 SHA1 9346b7885d54cf03d898b525a7259202af5b95b2 SHA256 19ea4ce4df9cbfd08abb9c8d0b60f9ef54bc7f4538ce43ddcf535007a6584c6e +MISC ChangeLog 836 RMD160 1033b46e33dad409d89de284417bbc81f72f1f8e SHA1 32822911ea7abf0c0dd09936215b4c8446c6ab8a SHA256 989a2cd5fdb460fe021a04eaa988c9a7d955ef22beefd61806b8bb47f3da2c1f MISC metadata.xml 620 RMD160 5e8c5c4d67bb5dbd5aade7cdd9476e44ced34ad3 SHA1 ed8009a03b1c4d93513e2fad8c41b4be8ff539d0 SHA256 e8c9e7d638c3e56fe956d933a3923a10ccb1ada68e9ce89e6be2be7b7aed49f2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkxdbpYACgkQsiLx3HvNzgd3EQCg0ukTjV21ripPzpFJ5LEKwkPE +whoAoLb5LpHzmI5/gulpON8adyjE8K50 +=NFxT +-----END PGP SIGNATURE----- diff --git a/dev-python/PyQrcodec/PyQrcodec-1.0.ebuild b/dev-python/PyQrcodec/PyQrcodec-1.0.ebuild index d4cc52293cd9..f859ead673d5 100644 --- a/dev-python/PyQrcodec/PyQrcodec-1.0.ebuild +++ b/dev-python/PyQrcodec/PyQrcodec-1.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQrcodec/PyQrcodec-1.0.ebuild,v 1.2 2009/02/15 21:58:47 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQrcodec/PyQrcodec-1.0.ebuild,v 1.3 2010/08/07 14:32:46 ferringb Exp $ -inherit distutils +inherit distutils eutils DESCRIPTION="PyQrCodec is a Python module for encoding and decoding QrCode images." HOMEPAGE="http://www.pedemonte.eu/pyqr/index.py/pyqrhome" @@ -17,3 +17,8 @@ DEPEND="dev-python/imaging media-libs/opencv" S="${WORKDIR}/PyQrCodec" + +src_unpack() { + distutils_src_unpack + epatch "$FILESDIR"/opencv-2.0-compat.patch +} diff --git a/dev-python/PyQrcodec/files/opencv-2.0-compat.patch b/dev-python/PyQrcodec/files/opencv-2.0-compat.patch new file mode 100644 index 000000000000..ff675a0403e9 --- /dev/null +++ b/dev-python/PyQrcodec/files/opencv-2.0-compat.patch @@ -0,0 +1,11 @@ +diff -urN PyQrCodec/qr_dec/imagereader.h PyQrCodec-new/qr_dec/imagereader.h +--- PyQrCodec/qr_dec/imagereader.h 2007-02-21 15:22:02.000000000 -0800 ++++ PyQrCodec-new/qr_dec/imagereader.h 2010-08-07 07:24:52.800113738 -0700 +@@ -19,6 +19,7 @@ + #endif + + #include <cv.h> ++#include <ml.h> + #include <memory.h> + #include "qrerror.h" + #include "container.h" |