| 1 |
commit: a660f40c63bfba4fd9eb24134dac99fb25387e3f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 10 10:05:27 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 10 10:08:18 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a660f40c |
| 7 |
|
| 8 |
media-gfx/zbar: Drop old |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/641920 |
| 11 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
| 12 |
|
| 13 |
media-gfx/zbar/Manifest | 1 - |
| 14 |
media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch | 74 --------------- |
| 15 |
media-gfx/zbar/zbar-0.10-r6.ebuild | 72 --------------- |
| 16 |
media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild | 100 --------------------- |
| 17 |
4 files changed, 247 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest |
| 20 |
index 88e2bb7fdc2..eae44cfe62f 100644 |
| 21 |
--- a/media-gfx/zbar/Manifest |
| 22 |
+++ b/media-gfx/zbar/Manifest |
| 23 |
@@ -1,2 +1 @@ |
| 24 |
-DIST zbar-0.10.tar.bz2 592602 BLAKE2B e3379bb915d52912e9d64b4166c60e0625b1c3aae06492040b958b822e14cb9d5974e1e6b1dc69ef3cc4db11115aae76c98359198f1d0fad81312da3e6226e16 SHA512 76cb8a469e3ac9ea7932a95c500cf933501249cdb8dce4df558bf5681bd44c62111327b494e6e887079a5fd30b32154887dcc12962e6d27b1453f55457483db4 |
| 25 |
DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1 |
| 26 |
|
| 27 |
diff --git a/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch b/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch |
| 28 |
deleted file mode 100644 |
| 29 |
index b25827a0b99..00000000000 |
| 30 |
--- a/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,74 +0,0 @@ |
| 33 |
---- zbar-0.10/configure.ac |
| 34 |
-+++ zbar-0.10/configure.ac |
| 35 |
-@@ -147,19 +147,13 @@ |
| 36 |
- with_video="no" |
| 37 |
- AS_IF([test "x$enable_video" != "xno"], |
| 38 |
- [AS_IF([test "x$win32" = "xno"], |
| 39 |
-- [AC_CHECK_HEADERS([linux/videodev.h], [with_video="v4l1"], |
| 40 |
-- [AC_MSG_FAILURE([test for video support failed! |
| 41 |
--rebuild your kernel to include video4linux support or |
| 42 |
--configure --disable-video to skip building video support.])]) |
| 43 |
-- AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"], |
| 44 |
-+ [AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"], |
| 45 |
- [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])], |
| 46 |
- [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"], |
| 47 |
- [AC_MSG_FAILURE([test for VfW video support failed! |
| 48 |
- configure --disable-video to skip building vidoe support.])])]) |
| 49 |
- ]) |
| 50 |
- AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"]) |
| 51 |
--AM_CONDITIONAL([HAVE_V4L1], |
| 52 |
-- [test "x$with_video" = "xv4l1" || test "x$with_video" = "xv4l2"]) |
| 53 |
- AM_CONDITIONAL([HAVE_V4L2], [test "x$with_video" = "xv4l2"]) |
| 54 |
- |
| 55 |
- dnl X |
| 56 |
---- zbar-0.10/zbar/Makefile.am.inc |
| 57 |
-+++ zbar-0.10/zbar/Makefile.am.inc |
| 58 |
-@@ -53,12 +53,9 @@ |
| 59 |
- zbar_libzbar_la_SOURCES += zbar/processor/posix.h zbar/processor/posix.c |
| 60 |
- endif |
| 61 |
- |
| 62 |
--if HAVE_V4L1 |
| 63 |
--zbar_libzbar_la_SOURCES += zbar/video/v4l1.c |
| 64 |
- if HAVE_V4L2 |
| 65 |
- zbar_libzbar_la_SOURCES += zbar/video/v4l2.c |
| 66 |
- endif |
| 67 |
--endif |
| 68 |
- if WIN32 |
| 69 |
- if HAVE_VIDEO |
| 70 |
- zbar_libzbar_la_SOURCES += zbar/video/vfw.c |
| 71 |
---- zbar-0.10/zbar/video/v4l2.c |
| 72 |
-+++ zbar-0.10/zbar/video/v4l2.c |
| 73 |
-@@ -39,6 +39,9 @@ |
| 74 |
- # include <sys/mman.h> |
| 75 |
- #endif |
| 76 |
- #include <linux/videodev2.h> |
| 77 |
-+#include <sys/stat.h> |
| 78 |
-+#include <unistd.h> |
| 79 |
-+#include <fcntl.h> |
| 80 |
- |
| 81 |
- #include "video.h" |
| 82 |
- #include "image.h" |
| 83 |
-@@ -507,3 +507,23 @@ |
| 84 |
- vdo->dq = v4l2_dq; |
| 85 |
- return(0); |
| 86 |
- } |
| 87 |
-+ |
| 88 |
-+int _zbar_video_open (zbar_video_t *vdo, |
| 89 |
-+ const char *dev) |
| 90 |
-+{ |
| 91 |
-+ vdo->fd = open(dev, O_RDWR); |
| 92 |
-+ if(vdo->fd < 0) |
| 93 |
-+ return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, |
| 94 |
-+ "opening video device '%s'", dev)); |
| 95 |
-+ zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd); |
| 96 |
-+ |
| 97 |
-+ int rc = -1; |
| 98 |
-+ if(vdo->intf != VIDEO_V4L1) |
| 99 |
-+ rc = _zbar_v4l2_probe(vdo); |
| 100 |
-+ |
| 101 |
-+ if(rc && vdo->fd >= 0) { |
| 102 |
-+ close(vdo->fd); |
| 103 |
-+ vdo->fd = -1; |
| 104 |
-+ } |
| 105 |
-+ return(rc); |
| 106 |
-+} |
| 107 |
|
| 108 |
diff --git a/media-gfx/zbar/zbar-0.10-r6.ebuild b/media-gfx/zbar/zbar-0.10-r6.ebuild |
| 109 |
deleted file mode 100644 |
| 110 |
index 618e4f0f1ff..00000000000 |
| 111 |
--- a/media-gfx/zbar/zbar-0.10-r6.ebuild |
| 112 |
+++ /dev/null |
| 113 |
@@ -1,72 +0,0 @@ |
| 114 |
-# Copyright 1999-2017 Gentoo Foundation |
| 115 |
-# Distributed under the terms of the GNU General Public License v2 |
| 116 |
- |
| 117 |
-EAPI=5 |
| 118 |
- |
| 119 |
-PYTHON_COMPAT=( python2_7 ) |
| 120 |
- |
| 121 |
-inherit autotools eutils flag-o-matic python-single-r1 |
| 122 |
- |
| 123 |
-DESCRIPTION="Library and tools for reading barcodes from images or video" |
| 124 |
-HOMEPAGE="http://zbar.sourceforge.net/" |
| 125 |
-SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2" |
| 126 |
- |
| 127 |
-LICENSE="LGPL-2.1" |
| 128 |
-SLOT="0" |
| 129 |
-KEYWORDS="amd64 ~arm x86" |
| 130 |
-IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv" |
| 131 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 132 |
- |
| 133 |
-RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) |
| 134 |
- imagemagick? ( virtual/imagemagick-tools ) |
| 135 |
- jpeg? ( virtual/jpeg:0 ) |
| 136 |
- python? ( |
| 137 |
- ${PYTHON_DEPS} |
| 138 |
- gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) |
| 139 |
- ) |
| 140 |
- qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) |
| 141 |
- X? ( |
| 142 |
- x11-libs/libXext |
| 143 |
- xv? ( x11-libs/libXv ) |
| 144 |
- )" |
| 145 |
-DEPEND="${RDEPEND} |
| 146 |
- sys-devel/gettext |
| 147 |
- virtual/pkgconfig" |
| 148 |
- |
| 149 |
-pkg_setup() { |
| 150 |
- use python && python-single-r1_pkg_setup |
| 151 |
-} |
| 152 |
- |
| 153 |
-src_prepare() { |
| 154 |
- epatch "${FILESDIR}"/${P}-no-v4l1-check.patch \ |
| 155 |
- "${FILESDIR}"/${P}-errors.patch \ |
| 156 |
- "${FILESDIR}"/${P}-python-crash.patch \ |
| 157 |
- "${FILESDIR}"/${P}-v4l2-uvcvideo.patch |
| 158 |
- |
| 159 |
- use python && python_fix_shebang examples/upcrpc.py test/*.py |
| 160 |
- |
| 161 |
- sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581 |
| 162 |
- eautoreconf |
| 163 |
-} |
| 164 |
- |
| 165 |
-src_configure() { |
| 166 |
- append-cppflags -DNDEBUG |
| 167 |
- econf \ |
| 168 |
- $(use_with jpeg) \ |
| 169 |
- $(use_with gtk) \ |
| 170 |
- $(use_with imagemagick) \ |
| 171 |
- $(use_with python) \ |
| 172 |
- $(use_with qt4 qt) \ |
| 173 |
- $(use_enable static-libs static) \ |
| 174 |
- $(use_enable threads pthread) \ |
| 175 |
- $(use_with X x) \ |
| 176 |
- $(use_with xv xv) \ |
| 177 |
- $(use_enable v4l video) |
| 178 |
-} |
| 179 |
- |
| 180 |
-src_install() { |
| 181 |
- emake DESTDIR="${D}" install |
| 182 |
- dodoc HACKING NEWS README TODO |
| 183 |
- rm -r "${ED}"/usr/share/doc/${PN} |
| 184 |
- prune_libtool_files --all |
| 185 |
-} |
| 186 |
|
| 187 |
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild |
| 188 |
deleted file mode 100644 |
| 189 |
index d07b29d8905..00000000000 |
| 190 |
--- a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild |
| 191 |
+++ /dev/null |
| 192 |
@@ -1,100 +0,0 @@ |
| 193 |
-# Copyright 1999-2017 Gentoo Foundation |
| 194 |
-# Distributed under the terms of the GNU General Public License v2 |
| 195 |
- |
| 196 |
-EAPI=5 |
| 197 |
- |
| 198 |
-PYTHON_COMPAT=( python2_7 ) |
| 199 |
- |
| 200 |
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1 |
| 201 |
- |
| 202 |
-DESCRIPTION="Library and tools for reading barcodes from images or video" |
| 203 |
-HOMEPAGE="http://zbar.sourceforge.net/" |
| 204 |
-SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip" |
| 205 |
- |
| 206 |
-LICENSE="LGPL-2.1" |
| 207 |
-SLOT="0" |
| 208 |
-KEYWORDS="~amd64 ~arm ~x86" |
| 209 |
-IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv" |
| 210 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 211 |
- |
| 212 |
-CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) |
| 213 |
- imagemagick? ( virtual/imagemagick-tools ) |
| 214 |
- jpeg? ( virtual/jpeg:0 ) |
| 215 |
- python? ( |
| 216 |
- ${PYTHON_DEPS} |
| 217 |
- gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) |
| 218 |
- ) |
| 219 |
- qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) |
| 220 |
- X? ( |
| 221 |
- x11-libs/libXext |
| 222 |
- xv? ( x11-libs/libXv ) |
| 223 |
- )" |
| 224 |
-RDEPEND="${CDEPEND} |
| 225 |
- java? ( >=virtual/jre-1.4 )" |
| 226 |
-DEPEND="${CDEPEND} |
| 227 |
- java? ( >=virtual/jdk-1.4 ) |
| 228 |
- sys-devel/gettext |
| 229 |
- virtual/pkgconfig" |
| 230 |
- |
| 231 |
-pkg_setup() { |
| 232 |
- use python && python-single-r1_pkg_setup |
| 233 |
- java-pkg-opt-2_pkg_setup |
| 234 |
-} |
| 235 |
- |
| 236 |
-src_unpack() { |
| 237 |
- #vcs-snapshot doesn't work on .zip |
| 238 |
- default |
| 239 |
- mv * ${P} || die |
| 240 |
-} |
| 241 |
- |
| 242 |
-src_prepare() { |
| 243 |
- epatch "${FILESDIR}"/${PN}-0.10-errors.patch \ |
| 244 |
- "${FILESDIR}"/${PN}-0.10-python-crash.patch \ |
| 245 |
- "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch |
| 246 |
- |
| 247 |
- if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then |
| 248 |
- epatch "${FILESDIR}/${P}-ImageMagick-7.diff" |
| 249 |
- fi |
| 250 |
- |
| 251 |
- use python && python_fix_shebang examples/upcrpc.py test/*.py |
| 252 |
- java-pkg-opt-2_src_prepare |
| 253 |
- |
| 254 |
- sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \ |
| 255 |
- -e '/^AM_CFLAGS=/s: -Werror::' \ |
| 256 |
- -i configure.ac || die |
| 257 |
- sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ |
| 258 |
- -i java/Makefile.am |
| 259 |
- eautoreconf |
| 260 |
-} |
| 261 |
- |
| 262 |
-src_configure() { |
| 263 |
- if use java; then |
| 264 |
- export JAVACFLAGS="$(java-pkg_javac-args)" |
| 265 |
- export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)" |
| 266 |
- fi |
| 267 |
- |
| 268 |
- append-cppflags -DNDEBUG |
| 269 |
- econf \ |
| 270 |
- $(use_with java) \ |
| 271 |
- $(use_with jpeg) \ |
| 272 |
- $(use_with gtk) \ |
| 273 |
- $(use_with imagemagick) \ |
| 274 |
- $(use_with python) \ |
| 275 |
- $(use_with qt4 qt) \ |
| 276 |
- $(use_enable static-libs static) \ |
| 277 |
- $(use_enable threads pthread) \ |
| 278 |
- $(use_with X x) \ |
| 279 |
- $(use_with xv xv) \ |
| 280 |
- $(use_enable v4l video) |
| 281 |
-} |
| 282 |
- |
| 283 |
-src_install() { |
| 284 |
- emake DESTDIR="${D}" install |
| 285 |
- dodoc HACKING NEWS README TODO |
| 286 |
- rm -r "${ED}"/usr/share/doc/${PN} |
| 287 |
- prune_libtool_files --all |
| 288 |
-} |
| 289 |
- |
| 290 |
-pkg_preinst() { |
| 291 |
- java-pkg-opt-2_pkg_preinst |
| 292 |
-} |
Archives