[PATCH 1/8] [PATCH for ZBar] Include windows.h for vfw

2019-04-09 Thread Руслан Ижбулатов
vfw.h can't be included without windows.h to supply basic type definitions. Signed-off-by: Руслан Ижбулатов --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 58b97ec..6e092e0 100644 --- a/configure.ac +++ b/configu

[PATCH 8/8] [PATCH for ZBar] Correctly generate version.xml and reldate.xml

2019-04-09 Thread Руслан Ижбулатов
The buildsystem expects these files to be in srcdir, so put them there. Otherwise documentation won't build (xmlto complains that it can't find the files. Note that it uses an absolute path, so there's no way to solve this with its --searchpath argument). Signed-off-by: Р

[PATCH 7/8] [PATCH for ZBar] Make use of glib thread names

2019-04-09 Thread Руслан Ижбулатов
This is optional, but why not use it? Signed-off-by: Руслан Ижбулатов --- gtk/zbargtk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/zbargtk.c b/gtk/zbargtk.c index 595acfe..c16f05c 100644 --- a/gtk/zbargtk.c +++ b/gtk/zbargtk.c @@ -637,7 +637,7 @@ static void

[PATCH 0/8] [PATCH for ZBar] MinGW compatibility patches

2019-04-09 Thread Руслан Ижбулатов
Here's a few patches that might be useful. Руслан Ижбулатов (8): Include windows.h for vfw Specify correct path to barcode.png Check for clock_gettime on pthread library as well Disable zbarcam-gtk on Windows Use -no-undefined for libzbargtk Make zbargtk build on Windows Make u

[PATCH 2/8] [PATCH for ZBar] Specify correct path to barcode.png

2019-04-09 Thread Руслан Ижбулатов
$(srcdir)/examples/barcode.png does not exist anymore. Signed-off-by: Руслан Ижбулатов --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c767d15..a9367b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,7 +73,7 @@ EXTRA_DIST

[PATCH 6/8] [PATCH for ZBar] Make zbargtk build on Windows

2019-04-09 Thread Руслан Ижбулатов
The code is mostly platform-agnostic, except for this small part that is written for X. Add ifdefs with an appropriate W32 header, and call zbar_window_attach() with correct W32 arguments. Use HAVE_X as a condition. Signed-off-by: Руслан Ижбулатов --- gtk/zbargtk.c | 10 ++ 1 file

[PATCH 3/8] [PATCH for ZBar] Check for clock_gettime on pthread library as well

2019-04-09 Thread Руслан Ижбулатов
On Windows that function might be in libpthread. Signed-off-by: Руслан Ижбулатов --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6e092e0..3224888 100644 --- a/configure.ac +++ b/configure.ac @@ -183,7 +183,7 @@ ZBAR_CHK_CODE

[PATCH 4/8] [PATCH for ZBar] Disable zbarcam-gtk on Windows

2019-04-09 Thread Руслан Ижбулатов
It requires scan_video.c, which includes linux/videodev2.h, so the code is clearly not meant to be built for Windows, even if GTK is available there. Signed-off-by: Руслан Ижбулатов --- zbarcam/Makefile.am.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zbarcam/Makefile.am.inc b

[PATCH 5/8] [PATCH for ZBar] Use -no-undefined for libzbargtk

2019-04-09 Thread Руслан Ижбулатов
-no-undefined is required to build shlibs on Windows. Doesn't hurt on other platforms either (unless a shlib is built with undefined symbols by design, which is not the case here). Signed-off-by: Руслан Ижбулатов --- gtk/Makefile.am.inc | 2 +- 1 file changed, 1 insertion(+), 1 del