[vlc-commits] contrib: mpg123: don't detect unicode with PathCombineW on Winstore

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Mar 12 14:50:45 2019 +0100| [64e8bf5feba5b1ae95bcf3e89f2c42aa56ee7450] | committer: Steve Lhomme

contrib: mpg123: don't detect unicode with PathCombineW on Winstore

It's not available and won't be used. But the build fails if it's not detected.

(cherry picked from commit 39516a6d7e56d35f5d6f501f5e996b5b9c817de6)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=64e8bf5feba5b1ae95bcf3e89f2c42aa56ee7450
---

 contrib/src/mpg123/winstore.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/contrib/src/mpg123/winstore.patch b/contrib/src/mpg123/winstore.patch
index 416faeaba9..d325156329 100644
--- a/contrib/src/mpg123/winstore.patch
+++ b/contrib/src/mpg123/winstore.patch
@@ -75,3 +75,23 @@
  #endif
  #ifdef HAVE_SYS_STAT_H
  #  include <sys/stat.h>
+--- mpg123/configure.ac.winstore	2019-03-12 14:32:33.852490800 +0100
++++ mpg123/configure.ac	2019-03-12 14:44:17.475401200 +0100
+@@ -2202,7 +2202,7 @@ if test "x$win32_specific_codes" = xenab
+       {
+         MultiByteToWideChar (0, 0, NULL, 0, NULL, 0);
+         WideCharToMultiByte (0, 0, NULL, 0, NULL, 0, NULL, NULL);
+-        PathCombineW(0,0,0);
++        //PathCombineW(0,0,0);
+         return 0;
+       }
+     ])], [win32_wide_working=yes], [win32_winver_bump=yes])
+@@ -2217,7 +2217,7 @@ if test "x$win32_specific_codes" = xenab
+         {
+           MultiByteToWideChar (0, 0, NULL, 0, NULL, 0);
+           WideCharToMultiByte (0, 0, NULL, 0, NULL, 0, NULL, NULL);
+-          PathCombineW(0,0,0);
++          //PathCombineW(0,0,0);
+           return 0;
+         }
+       ])], [win32_wide_working=yes], [AC_MSG_RESULT([no])])