[mchehab-zbar] Update to 0.23.93 (microsoft#42739)

Author: dg0yt

ports/mchehab-zbar/c99.patch

@@ -2,11 +2,9 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mchehab/zbar
     REF "${VERSION}"
-    SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb
+    SHA512 2dd607afbb1e52346bfb740f916c8616112d14153f071f82458b7c653f647b332290a5089543abebfe1c7679eae98b349a84777185d61cfb9ff275bfecc6e08f
     HEAD_REF master
     PATCHES
-        c99.patch
-        issue219.patch
         windows.patch
         x64.patch
 )
@@ -17,10 +15,9 @@ if("nls" IN_LIST FEATURES)
 else()
     vcpkg_list(APPEND options "--disable-nls")
     set(ENV{AUTOPOINT} true) # true, the program
+    set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_HOST_INSTALLED_DIR}/share/gettext/aclocal/\"")
     # Simulate the relevant effects of (interactive) `gettextize`.
     file(TOUCH "${SOURCE_PATH}/po/Makefile.in.in")
-    file(GLOB_RECURSE m4_files "${CURRENT_HOST_INSTALLED_DIR}/share/gettext/aclocal/*.m4")
-    file(INSTALL ${m4_files} DESTINATION "${SOURCE_PATH}/config")
 endif()
 
 vcpkg_configure_make(

ports/mchehab-zbar/issue219.patch

@@ -1,7 +1,6 @@
 {
   "name": "mchehab-zbar",
-  "version": "0.23.90",
-  "port-version": 5,
+  "version": "0.23.93",
   "description": "ZBar is an open source software suite for reading bar codes from various sources, including webcams. This fork is actively maintained.",
   "homepage": "https://github.com/mchehab/zbar",
   "license": "LGPL-2.1-or-later",

ports/mchehab-zbar/portfile.cmake

@@ -1,5 +1,5 @@
 diff --git a/configure.ac b/configure.ac
-index c8fea14..eb0a097 100644
+index f0f9723..9e79db9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION],
@@ -11,45 +11,17 @@ index c8fea14..eb0a097 100644
  AM_CXXFLAGS="$AM_CFLAGS"
  AC_SUBST([AM_CPPFLAGS])
  AC_SUBST([AM_CFLAGS])
-diff --git a/zbar/libzbar.rc b/zbar/libzbar.rc
-index 413635b..c241f82 100644
---- a/zbar/libzbar.rc
-+++ b/zbar/libzbar.rc
-@@ -17,8 +17,7 @@ VS_VERSION_INFO VERSIONINFO
-             VALUE "InternalName", "libzbar"
-             VALUE "OriginalFilename", "libzbar-" XSTR(LIB_VERSION_MAJOR) ".dll"
- 
--            VALUE "FileVersion", XSTR(LIB_VERSION_MAJOR) "." \
--                XSTR(LIB_VERSION_MINOR) "." XSTR(LIB_VERSION_REVISION)
-+            VALUE "FileVersion", XSTR(LIB_VERSION_MAJOR) "." XSTR(LIB_VERSION_MINOR) "." XSTR(LIB_VERSION_REVISION)
-             VALUE "ProductVersion", PACKAGE_VERSION
- 
-             VALUE "FileDescription", "Bar code reader library"
 diff --git a/zbar/processor.h b/zbar/processor.h
-index d5e9fef..54d6584 100644
+index a8289e0..8a7e33c 100644
 --- a/zbar/processor.h
 +++ b/zbar/processor.h
-@@ -27,7 +27,9 @@
- #ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
+@@ -29,7 +29,9 @@
  #endif
--#include <unistd.h>
-+#ifndef WIN32
-+# include <unistd.h>
-+#endif
  #include <stdlib.h>
  #include <string.h>
++#ifndef WIN32
+ #include <unistd.h>
++#endif
 
-diff --git a/zbar/thread.h b/zbar/thread.h
-index 96d6415..252d3f2 100644
---- a/zbar/thread.h
-+++ b/zbar/thread.h
-@@ -35,7 +35,7 @@
- # define HAVE_THREADS
- # define ZTHREAD DWORD WINAPI
- 
--typedef ZTHREAD (zbar_thread_proc_t)(void*);
-+typedef ZTHREAD zbar_thread_proc_t(void*);
- 
- typedef DWORD zbar_thread_id_t;
- 
+ #include <zbar.h>
+ #include "error.h"

ports/mchehab-zbar/vcpkg.json

@@ -1,18 +1,18 @@
 diff --git a/zbar/decoder.c b/zbar/decoder.c
-index 7f7336f..e9ffc45 100644
+index 6c41b7f..cbf0bb7 100644
 --- a/zbar/decoder.c
 +++ b/zbar/decoder.c
 @@ -25,6 +25,7 @@
- #include <stdlib.h>     /* malloc, calloc, free */
- #include <stdio.h>      /* snprintf */
- #include <string.h>     /* memset, strlen */
-+#include <stddef.h>     /* offsetof */
+ #include <stdio.h>  /* snprintf */
+ #include <stdlib.h> /* malloc, calloc, free */
+ #include <string.h> /* memset, strlen */
++#include <stddef.h> /* offsetof */
 
  #include <zbar.h>
 
-@@ -113,7 +114,7 @@ void zbar_decoder_destroy (zbar_decoder_t *dcode)
+@@ -113,7 +114,7 @@ void zbar_decoder_destroy(zbar_decoder_t *dcode)
 
- void zbar_decoder_reset (zbar_decoder_t *dcode)
+ void zbar_decoder_reset(zbar_decoder_t *dcode)
  {
 -    memset(dcode, 0, (long)&dcode->buf_alloc - (long)dcode);
 +    memset(dcode, 0, offsetof(zbar_decoder_t, buf_alloc));

ports/mchehab-zbar/windows.patch

@@ -5857,8 +5857,8 @@
       "port-version": 0
     },
     "mchehab-zbar": {
-      "baseline": "0.23.90",
-      "port-version": 5
+      "baseline": "0.23.93",
+      "port-version": 0
     },
     "mcpp": {
       "baseline": "2.7.2.14",

ports/mchehab-zbar/x64.patch

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "41ada8728385b27a6c57dca0817c78e967f3cb3d",
+      "version": "0.23.93",
+      "port-version": 0
+    },
     {
       "git-tree": "368a491e8bad201ee1b88e88314b77c540dcea2b",
       "version": "0.23.90",