diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-18 15:11:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-18 15:11:02 +0000 |
| commit | 0fb71e0215ed52863e462cccef73c01aff44d43d (patch) | |
| tree | 428fc3fa92f9c69ed02878e9b6151a9fb810e651 /media-gfx/zbar | |
| parent | 9bd54251864651f49e673a08aec9ef79cfe08f04 (diff) | |
gentoo resync : 18.12.2017
Diffstat (limited to 'media-gfx/zbar')
| -rw-r--r-- | media-gfx/zbar/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 24 |
2 files changed, 23 insertions, 3 deletions
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index b2bf023354da..c7fdc6ae9664 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -7,5 +7,5 @@ DIST zbar-0.10.tar.bz2 592602 BLAKE2B e3379bb915d52912e9d64b4166c60e0625b1c3aae0 DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1 EBUILD zbar-0.10-r6.ebuild 1742 BLAKE2B 1ef919eae08a5aca610dcede6c34b5f6325f20cd384a406642d3f040efc7ff2b01f8e2d8d6a75a9abac290bf9dcd4e2b9dbcf5e197c1e8b9842d9d83d039eda9 SHA512 6a03ed2a6ed2b3a1c28cd58703600869148428030151f779324fc06d32d6fd1eae74584c40c53aba3f38b999229a01e2ce275fbb8e31885d951efa5ad42f9897 EBUILD zbar-0.10_p20121015-r1.ebuild 2397 BLAKE2B 2fa90db3ece690a7b988139e1fcdd089892967d9141a4dff719af8b4d91a8ff3bd16168a978ab298bac54338c41b8cedd9e03cb9cda9bdda2d8186142cf16067 SHA512 b5f6232d3fce9cb1842d5630537ff52056b185036506bae78f605dc5d2f0ec54f5d41edb2d58b6caa379e1f7dfdd266fcc9bd0d454eada9c73507924ae9dad55 -EBUILD zbar-0.10_p20121015-r2.ebuild 2850 BLAKE2B 06ef146c77bf80a98d6de7bee1649ad479128a4249861174409f8ad3e430ddd481d43cf835f3059052635e5c6a620377040dd4a31d567fd6f31119278c5ffd12 SHA512 dc4efb0cbbc4fb467731d5cccbd0e52d12b37c9f14a97e3b105b353fd65bfcf461f0c0bf2f6613af153941e86698f6f2ed9645ae6ed9d2fb39ad27e25375dde3 +EBUILD zbar-0.10_p20121015-r2.ebuild 3646 BLAKE2B 4ae7fd9a1927dfae76efbadcbb7ab9529f1f0378ac96b086112d09d7562bddff2dee8e4016840cf70bc9441dc3dbbde50a1520454be4dc3345c51b1a2172215c SHA512 7d914e641de1f63ecf9fa5a4e6f5d0fb830fa92fdf2e013a4cd7c3c39525d309f274c7219a3c9634ccf2b47d01484f014d80d942a34e031c29afc5527de27576 MISC metadata.xml 317 BLAKE2B f900040957f979d0931359e9399f89d60de14ef9e7d359de21f5c02807748a3efb0004926ab2890708511908b21aba7b824eace5bd13f5194c7f6bb633d4bd98 SHA512 911dee4073890017c8816d892b3e77e460328fc8e25e59c3ba74eafc909de73d743ac8c1c3015385bcbba1e7f175796704f6b1be6b1f37e0ce652da1749ee830 diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild index 3a552305df63..186a80e32ccd 100644 --- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild +++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild @@ -36,7 +36,9 @@ CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}] RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.4 )" DEPEND="${CDEPEND} - java? ( >=virtual/jdk-1.4 ) + java? ( >=virtual/jdk-1.4 + test? ( dev-java/junit:4 + dev-java/hamcrest-core:1.3 ) ) test? ( ${PYTHON_DEPS} ) app-arch/unzip sys-devel/gettext @@ -60,6 +62,10 @@ src_prepare() { "${FILESDIR}"/${PN}-0.10-python-crash.patch \ "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch + # fix use of deprecated qt4 function, bug 572488 + sed -e 's:numBytes:byteCount:g' \ + -i "${S}"/include/zbar/QZBarImage.h || die + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then eapply "${FILESDIR}/${P}-ImageMagick-7.diff" fi @@ -79,15 +85,29 @@ multilib_src_configure() { if multilib_is_native_abi && use java; then export JAVACFLAGS="$(java-pkg_javac-args)" export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)" + if use test ; then # bug 629078 + java-pkg_append_ CLASSPATH . + java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar) + java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar) + fi fi append-cppflags -DNDEBUG + + # different flags for image/graphics magick (bug 552350) + myimagemagick="--without-imagemagick" + has_version media-gfx/imagemagick && + myimagemagick="$(multilib_native_use_with imagemagick)" + mygraphicsmagick="--without-graphicsmagick" + has_version media-gfx/graphicsmagick && + mygraphicsmagick="$(multilib_native_use_with imagemagick graphicsmagick)" ECONF_SOURCE=${S} \ econf \ $(multilib_native_use_with java) \ $(use_with jpeg) \ $(use_with gtk) \ - $(multilib_native_use_with imagemagick) \ + ${myimagemagick} \ + ${mygraphicsmagick} \ $(multilib_native_use_with python) \ $(use_with qt4 qt) \ $(use_enable static-libs static) \ |