Erik de Castro Lopo wrote:> lvqcl wrote: > >> The set of four patches that remove dependency of libFLAC on win_utf8_io. >> >> Tested only on Windows, with MSVC and MSYS/MinGW (both autotools and makefile.lite) >> >> Please review, especially makefile patches, I'm not very familiar with them. > > Applied. All good. Thanks.But the 1st patch ('1_sources.patch' file) was not applied... I suspect that Windows build is broken now. Before this set of 4 patches, I posted a patch that tries to prevent unnecessary inclusion of windows.h -- 'use_winapi_macro.patch' file from <http://lists.xiph.org/pipermail/flac-dev/2016-February/005856.html> message. '1_sources.patch' was made after it, and as a result 'use_winapi_macro.patch' must be applied before it. If you object to that patch, I can make version of '1_sources.patch' that is based on the current code.
Erik de Castro Lopo
2016-Feb-08 19:48 UTC
[flac-dev] [PATCH] remove libFLAC dependency of win_utf8_io
lvqcl wrote:> But the 1st patch ('1_sources.patch' file) was not applied...When I tried apply that patch, all but one hunk succeeded. I inspected the rejected part, but that seemed to have already been applied.> Before this set of 4 patches, I posted a patch that tries to prevent unnecessary > inclusion of windows.h -- 'use_winapi_macro.patch' file from > <http://lists.xiph.org/pipermail/flac-dev/2016-February/005856.html> message.That is that not this commit? commit a5c8e8e14de182c4e8c5a8cd0b6be7c75ab6f021 Author: Erik de Castro Lopo <erikd at mega-nerd.com> Date: Thu Feb 4 13:42:33 2016 +1100 src/share/utf8/utf8.c: Windows API usage fixes Patch-from: <lvqcl.mail at gmail.com>> '1_sources.patch' was made after it, and as a result 'use_winapi_macro.patch' > must be applied before it. If you object to that patch, I can make version of > '1_sources.patch' that is based on the current code.Lets just get a patch that fixes what we have now. Cheers, Erik -- ---------------------------------------------------------------------- Erik de Castro Lopo http://www.mega-nerd.com/
Erik de Castro Lopo wrote:> When I tried apply that patch, all but one hunk succeeded. I inspected > the rejected part, but that seemed to have already been applied.'1_sources.patch' creates windows_unicode_filenames.h and windows_unicode_filenames.c files that don't exist in the current git.> Lets just get a patch that fixes what we have now.Here it is: the missing parts of d40a6bc commit are in the attached fix_d40a6bc_commit.patch Also an (optional) use_winapi_macro.patch from <http://lists.xiph.org/pipermail/flac-dev/2016-February/005856.html> was re-made and attached. -------------- next part -------------- A non-text attachment was scrubbed... Name: fix_d40a6bc_commit.patch Type: application/octet-stream Size: 10246 bytes Desc: not available Url : http://lists.xiph.org/pipermail/flac-dev/attachments/20160209/b2a898fe/attachment.obj -------------- next part -------------- A non-text attachment was scrubbed... Name: use_winapi_macro.patch Type: application/octet-stream Size: 2105 bytes Desc: not available Url : http://lists.xiph.org/pipermail/flac-dev/attachments/20160209/b2a898fe/attachment-0001.obj
Maybe Matching Threads
- [PATCH] remove libFLAC dependency of win_utf8_io
- [PATCH] remove libFLAC dependency of win_utf8_io
- [PATCH 5/5] win_utf8_io: Avoid forbidden functions when building for WinRT/UWP
- [PATCH] move CreateFile() function from libFLAC
- Compilation failure using mingw-w64 and gcc-5.3.0