diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-11 16:02:49 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-11 16:02:49 +0100 |
commit | 88ebe56470c37b02a044e1091cad6b2df0f3be8f (patch) | |
tree | d80b2d9337c01c4a0fe11a2ef9691fc3153ed6d3 /media-gfx/zbar/files | |
parent | 4645b6f17f0da81e9fe84081fb126a37102ba153 (diff) |
gentoo resync : 11.05.2018
Diffstat (limited to 'media-gfx/zbar/files')
-rw-r--r-- | media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch | 74 |
1 files changed, 0 insertions, 74 deletions
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 deleted file mode 100644 index b25827a0b998..000000000000 --- a/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- zbar-0.10/configure.ac -+++ zbar-0.10/configure.ac -@@ -147,19 +147,13 @@ - with_video="no" - AS_IF([test "x$enable_video" != "xno"], - [AS_IF([test "x$win32" = "xno"], -- [AC_CHECK_HEADERS([linux/videodev.h], [with_video="v4l1"], -- [AC_MSG_FAILURE([test for video support failed! --rebuild your kernel to include video4linux support or --configure --disable-video to skip building video support.])]) -- AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"], -+ [AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"], - [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])], - [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"], - [AC_MSG_FAILURE([test for VfW video support failed! - configure --disable-video to skip building vidoe support.])])]) - ]) - AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"]) --AM_CONDITIONAL([HAVE_V4L1], -- [test "x$with_video" = "xv4l1" || test "x$with_video" = "xv4l2"]) - AM_CONDITIONAL([HAVE_V4L2], [test "x$with_video" = "xv4l2"]) - - dnl X ---- zbar-0.10/zbar/Makefile.am.inc -+++ zbar-0.10/zbar/Makefile.am.inc -@@ -53,12 +53,9 @@ - zbar_libzbar_la_SOURCES += zbar/processor/posix.h zbar/processor/posix.c - endif - --if HAVE_V4L1 --zbar_libzbar_la_SOURCES += zbar/video/v4l1.c - if HAVE_V4L2 - zbar_libzbar_la_SOURCES += zbar/video/v4l2.c - endif --endif - if WIN32 - if HAVE_VIDEO - zbar_libzbar_la_SOURCES += zbar/video/vfw.c ---- zbar-0.10/zbar/video/v4l2.c -+++ zbar-0.10/zbar/video/v4l2.c -@@ -39,6 +39,9 @@ - # include <sys/mman.h> - #endif - #include <linux/videodev2.h> -+#include <sys/stat.h> -+#include <unistd.h> -+#include <fcntl.h> - - #include "video.h" - #include "image.h" -@@ -507,3 +507,23 @@ - vdo->dq = v4l2_dq; - return(0); - } -+ -+int _zbar_video_open (zbar_video_t *vdo, -+ const char *dev) -+{ -+ vdo->fd = open(dev, O_RDWR); -+ if(vdo->fd < 0) -+ return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, -+ "opening video device '%s'", dev)); -+ zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd); -+ -+ int rc = -1; -+ if(vdo->intf != VIDEO_V4L1) -+ rc = _zbar_v4l2_probe(vdo); -+ -+ if(rc && vdo->fd >= 0) { -+ close(vdo->fd); -+ vdo->fd = -1; -+ } -+ return(rc); -+} |