diff options
Diffstat (limited to 'media-gfx/zbar')
| -rw-r--r-- | media-gfx/zbar/Manifest | 8 | ||||
| -rw-r--r-- | media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch (renamed from media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff) | 3 | ||||
| -rw-r--r-- | media-gfx/zbar/metadata.xml | 7 | ||||
| -rw-r--r-- | media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild | 10 | ||||
| -rw-r--r-- | media-gfx/zbar/zbar-0.20.1.ebuild | 161 |
5 files changed, 176 insertions, 13 deletions
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index 392e18b6e00e..abebb2977bfe 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,7 +1,9 @@ AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1 AUX zbar-0.10-python-crash.patch 604 BLAKE2B 463f23b6338455b0029fce845fcbb02168c86b9ddc116f34f15668459d8ac86d77dabe388cd61af9182c02be37475363ff832d7c8c705d29bf1829f7ccb167b3 SHA512 56e1848466b2178fb25a1f88f1a35113c01d370927b5778af96f1b96bcdaa8349308ac7ef14fb247bc5ec4165b2f7daa717159f3f7786ced9c043428afd641ba AUX zbar-0.10-v4l2-uvcvideo.patch 1487 BLAKE2B 61486465183a50ee0e515d6232923c63819e707d4a429a653f94ea6b7f404e8a5ab54602e074df0fab3f0188c50e8f4fc12a6ac5a63509484d7cd24925bb1957 SHA512 6a53eb54ed3ad83cacb9a09d0b119550d364e586990725f0a423a180fab790e18c2c6d8201d185a51bd26ea3955018416b2993fbdb5e5a555e13183b3bce7b1a -AUX zbar-0.10_p20121015-ImageMagick-7.diff 1064 BLAKE2B 95d67582bbc8ad65aa23c8a7a5152c198c0a9c105189c769b785d418128871d326ff3b9c8ed52e316e3e0b0fc5c6e9c247c0115b6d82ccb812f243cfaab93138 SHA512 90e09dabfaec0f1e68e8bdb040a2903377c658a39f9d0beb1a92546c26acf7e68115a6f6a745f930edc7c55353f51c7f58888fea564c259d1f5155ff1f35d6f9 +AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1 -EBUILD zbar-0.10_p20121015-r3.ebuild 3551 BLAKE2B 3e3b0d7557555561cbab893a3fc8c0be9add582606919c7c50cb257cebe84c5b8c2f863df7744c770aa51508220bd9a3290d7d4f9b5ab662858d88c4866fb41a SHA512 130c52b8e2d7ecadfd6e248309fb649bfff97c458c173e2b64ae1b82bdfed5f3ec255c02f1e2de99db0c6316b2fbc052d7823ebc74d3a355f8803e08be4ff6c5 -MISC metadata.xml 317 BLAKE2B f900040957f979d0931359e9399f89d60de14ef9e7d359de21f5c02807748a3efb0004926ab2890708511908b21aba7b824eace5bd13f5194c7f6bb633d4bd98 SHA512 911dee4073890017c8816d892b3e77e460328fc8e25e59c3ba74eafc909de73d743ac8c1c3015385bcbba1e7f175796704f6b1be6b1f37e0ce652da1749ee830 +DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42 +EBUILD zbar-0.10_p20121015-r3.ebuild 3548 BLAKE2B 24e764ae81a68d9d98c9b8e8c8cf7a8dd7b39575c7f24069a466cdd042e1b86029f23fb72247dee0dfccf0505c6126f06cac9ac0f3b731d9d02082bec4380618 SHA512 2ff8dd34f79079d14e09b7a206a2f1f6944be1b6ff24e8b8b0ff1a27857aa6ccd34c5777cbf23e32736cbf39be3acc803c459259fe501f6784122a5a19cafd16 +EBUILD zbar-0.20.1.ebuild 3692 BLAKE2B 58f3c764c385c869bd62e26942631c0e4da54b9cc7a9cc36c65eefb3e6b92d3c8392bd6bd2b30ce0a37cbacc640124d6c6d6afa3b19f70f67e25dfb53cc09b4a SHA512 9dd2b3770af1385288f3e69bef96a3f92428dde72b7a8c938d1a6591e337d9e4f1b9c527833f89b6d5e09de56adad2db498d58bf9a4156493d6d525f92ffc6d0 +MISC metadata.xml 353 BLAKE2B 7b2ecbdb282d7be372b33efc762ff91d574edf1f176e65c300a2a1cdab0d9c86a12be1d4c49f48a684237eb265ee7491ef9bebbfd62a6005246031f7271b7e32 SHA512 8547b611ca96a01ec0d6dcd01c61203984af10306223a77071fe9be348d1ca7ceb290c4160ca9eb8ebc04227caa9b9f5bf3d3d436b97f140fc534fbd3236826c diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch index a56ab7d913b0..f58c3e4d9c45 100644 --- a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff +++ b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch @@ -1,3 +1,6 @@ +Fixed build with imagemagick-7 (bug #592324). +Thanks-to: Jürgen Rose + diff -r -U3 zbar-0.10_p20121015_orig/configure.ac zbar-0.10_p20121015/configure.ac --- zbar-0.10_p20121015_orig/configure.ac 2016-08-28 16:59:23.969753652 +0200 +++ zbar-0.10_p20121015/configure.ac 2016-08-28 17:17:15.384494517 +0200 diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml index 4c17cb6e9bf7..fd5ad454e03a 100644 --- a/media-gfx/zbar/metadata.xml +++ b/media-gfx/zbar/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>xmw@gentoo.org</email> - <name>Michael Weber</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">zbar</remote-id> + <remote-id type="github">mchehab/zbar</remote-id> + <bugs-to>https://github.com/mchehab/zbar/issues</bugs-to> </upstream> </pkgmetadata> diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild index ecdd0ad2dbfc..6990df2d2b35 100644 --- a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild +++ b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild @@ -1,15 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 ) - -inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal \ - python-single-r1 virtualx +inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx DESCRIPTION="Library and tools for reading barcodes from images or video" -HOMEPAGE="http://zbar.sourceforge.net/" +HOMEPAGE="https://github.com/mchehab/zbar" SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip" LICENSE="LGPL-2.1" @@ -65,7 +63,7 @@ src_prepare() { -i "${S}"/include/zbar/QZBarImage.h || die if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then - eapply "${FILESDIR}/${P}-ImageMagick-7.diff" + eapply "${FILESDIR}/${P}-ImageMagick-7.patch" fi use python && python_fix_shebang examples/upcrpc.py test/*.py diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild new file mode 100644 index 000000000000..1299e249e153 --- /dev/null +++ b/media-gfx/zbar/zbar-0.20.1.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx + +DESCRIPTION="Library and tools for reading barcodes from images or video" +HOMEPAGE="https://github.com/mchehab/zbar" +SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm x86" +IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( X ${PYTHON_REQUIRED_USE} ) +" + +COMMON_DEPEND=" + gtk? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:2[${MULTILIB_USEDEP}] + ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:= ) + graphicsmagick? ( media-gfx/graphicsmagick:= ) + ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + ) + X? ( + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) + ) +" +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.8 ) +" +DEPEND="${COMMON_DEPEND} + sys-devel/gettext + virtual/pkgconfig + gtk? ( dev-util/glib-utils ) + java? ( + >=virtual/jdk-1.8 + test? ( + dev-java/junit:4 + dev-java/hamcrest-core:1.3 + ) + ) + test? ( ${PYTHON_DEPS} ) +" + +PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch ) + +pkg_setup() { + if use python || use test; then + python-single-r1_pkg_setup + fi + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then + eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch" + fi + + use python && python_fix_shebang examples/upcrpc.py test/*.py + java-pkg-opt-2_src_prepare + + sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \ + -e '/^AM_CFLAGS=/s: -Werror::' \ + -i configure.ac || die + sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ + -i java/Makefile.am || die + eautoreconf +} + +multilib_src_configure() { + append-cppflags -DNDEBUG + + local myeconfargs=( + $(use_with gtk) + $(multilib_native_use_with graphicsmagick graphicsmagick) + $(multilib_native_use_with imagemagick) + $(multilib_native_use_with java) + $(use_with jpeg) + $(multilib_native_use_with python python2) + $(use_enable static-libs static) + $(use_enable threads pthread) + $(use_enable v4l video) + $(use_with X x) + $(use_with X xshm) + $(use_with xv xv) + ) + + if multilib_is_native_abi; then + if 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 + if use qt5; then + myeconfargs+=( + $(use_with qt5 qt) + $(use_with qt5) + ) + else + myeconfargs+=( --without-qt ) + fi + else + myeconfargs+=( --without-qt ) + fi + + ECONF_SOURCE=${S} \ + econf "${myeconfargs[@]}" + + # work around out-of-source build issues for multilib systems + # https://bugs.gentoo.org/672184 + mkdir gtk pygtk qt test zbarcam || die +} + +src_test() { + virtx multilib-minimal_src_test +} + +src_install() { + if use qt5; then + local MULTILIB_WRAPPED_HEADERS=( + /usr/include/zbar/QZBar.h + /usr/include/zbar/QZBarImage.h + ) + fi + multilib-minimal_src_install +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst +} |