3da4704bb2
[Thomas: - replace patch 0001 fixing autoreconf by a simpler patch that simply drops the -Wall and -Werror flags passed to automake. - reformat the two patches using Git - drop the "uclibc || glibc" dependency inherited from libv4l, since libv4l has now been fixed to build on musl. - drop the hook work arounding a build issue around man pages, and replace by a patch that completely disables the build/installation of documentation. - change license to LGPLv2.1+, as noted in the COPYING file. - drop --enable-shared=yes, since it is already passed by the autotools-package infrastructure] Signed-off-by: Viacheslav Volkov <sv99@inbox.ru> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
28 lines
833 B
Diff
28 lines
833 B
Diff
From 5dc8322b4f9a3de29b3da70b69e16356a2a1764c Mon Sep 17 00:00:00 2001
|
|
From: Viacheslav Volkov <sv99@inbox.ru>
|
|
Date: Sat, 19 Dec 2015 19:07:09 +0100
|
|
Subject: [PATCH] Fix function protoype to be compatible with recent libjpeg
|
|
|
|
Signed-off-by: Viacheslav Volkov <sv99@inbox.ru>
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
zbar/jpeg.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/zbar/jpeg.c b/zbar/jpeg.c
|
|
index 972bfea..fdd1619 100644
|
|
--- a/zbar/jpeg.c
|
|
+++ b/zbar/jpeg.c
|
|
@@ -68,7 +68,7 @@ void init_source (j_decompress_ptr cinfo)
|
|
cinfo->src->bytes_in_buffer = img->datalen;
|
|
}
|
|
|
|
-int fill_input_buffer (j_decompress_ptr cinfo)
|
|
+boolean fill_input_buffer (j_decompress_ptr cinfo)
|
|
{
|
|
/* buffer underrun error case */
|
|
cinfo->src->next_input_byte = fake_eoi;
|
|
--
|
|
2.6.4
|
|
|