diff options
Diffstat (limited to 'mingw.patch')
| -rw-r--r-- | mingw.patch | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/mingw.patch b/mingw.patch index 4bb4cc9bbec8..8547ae9c666d 100644 --- a/mingw.patch +++ b/mingw.patch @@ -1,18 +1,18 @@ -diff -ruN AviSynthPlus-3.7.1/avs_core/CMakeLists.txt patched/avs_core/CMakeLists.txt ---- AviSynthPlus-3.7.1/avs_core/CMakeLists.txt 2021-12-28 13:00:08.000000000 +0100 -+++ patched/avs_core/CMakeLists.txt 2022-01-04 18:40:22.879994562 +0100 -@@ -126,7 +126,7 @@ - if (MSVC) - target_link_libraries("AvsCore" "uuid" "winmm" "vfw32" "msacm32" "gdi32" "user32" "advapi32" "ole32" "imagehlp") - elseif (MINGW) -- target_link_libraries("AvsCore" "uuid" "winmm" "msacm32" "gdi32" "ole32" "vfw32" "imagehlp" "${SYSLIB}" "${FSLIB}" -static) -+ target_link_libraries("AvsCore" "uuid" "winmm" "msacm32" "gdi32" "ole32" "vfw32" "imagehlp" "${SYSLIB}" "${FSLIB}" "ssp" -static) +diff -ruN AviSynthPlus-3.7.3/avs_core/CMakeLists.txt patched/avs_core/CMakeLists.txt +--- AviSynthPlus-3.7.3/avs_core/CMakeLists.txt 2023-07-16 02:44:05.000000000 +0200 ++++ patched/avs_core/CMakeLists.txt 2023-07-27 13:57:04.060000000 +0200 +@@ -111,7 +111,7 @@ + elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + set(SYSLIB "pthread") + elseif(MSVC OR MINGW) +- set(SYSLIB "uuid" "winmm" "vfw32" "msacm32" "gdi32" "user32" "advapi32" "ole32" "imagehlp") ++ set(SYSLIB "uuid" "winmm" "vfw32" "msacm32" "gdi32" "user32" "advapi32" "ole32" "imagehlp" "ssp") else() - target_link_libraries("AvsCore" "${SYSLIB}" "${FSLIB}") + set(SYSLIB "pthread" "dl" "m") endif() -diff -ruN AviSynthPlus-3.7.1/avs_core/core/BufferPool.h patched/avs_core/core/BufferPool.h ---- AviSynthPlus-3.7.1/avs_core/core/BufferPool.h 2021-12-28 13:00:08.000000000 +0100 -+++ patched/avs_core/core/BufferPool.h 2022-01-04 18:40:04.139994555 +0100 +diff -ruN AviSynthPlus-3.7.3/avs_core/core/BufferPool.h patched/avs_core/core/BufferPool.h +--- AviSynthPlus-3.7.3/avs_core/core/BufferPool.h 2023-07-16 02:44:05.000000000 +0200 ++++ patched/avs_core/core/BufferPool.h 2023-07-27 13:54:14.396666668 +0200 @@ -11,12 +11,12 @@ private: @@ -37,9 +37,9 @@ diff -ruN AviSynthPlus-3.7.1/avs_core/core/BufferPool.h patched/avs_core/core/Bu void Free(void* ptr); }; -diff -ruN AviSynthPlus-3.7.1/avs_core/core/internal.h patched/avs_core/core/internal.h ---- AviSynthPlus-3.7.1/avs_core/core/internal.h 2021-12-28 13:00:08.000000000 +0100 -+++ patched/avs_core/core/internal.h 2022-01-04 18:40:04.139994555 +0100 +diff -ruN AviSynthPlus-3.7.3/avs_core/core/internal.h patched/avs_core/core/internal.h +--- AviSynthPlus-3.7.3/avs_core/core/internal.h 2023-07-16 02:44:05.000000000 +0200 ++++ patched/avs_core/core/internal.h 2023-07-27 13:54:14.396666668 +0200 @@ -47,7 +47,7 @@ #include <limits.h> #endif @@ -49,9 +49,9 @@ diff -ruN AviSynthPlus-3.7.1/avs_core/core/internal.h patched/avs_core/core/inte #ifdef AVS_WINDOWS #include <intrin.h> #else -diff -ruN AviSynthPlus-3.7.1/avs_core/core/ThreadPool.h patched/avs_core/core/ThreadPool.h ---- AviSynthPlus-3.7.1/avs_core/core/ThreadPool.h 2021-12-28 13:00:08.000000000 +0100 -+++ patched/avs_core/core/ThreadPool.h 2022-01-04 18:40:04.143327888 +0100 +diff -ruN AviSynthPlus-3.7.3/avs_core/core/ThreadPool.h patched/avs_core/core/ThreadPool.h +--- AviSynthPlus-3.7.3/avs_core/core/ThreadPool.h 2023-07-16 02:44:05.000000000 +0200 ++++ patched/avs_core/core/ThreadPool.h 2023-07-27 13:54:14.396666668 +0200 @@ -42,7 +42,7 @@ return ret; } @@ -61,10 +61,10 @@ diff -ruN AviSynthPlus-3.7.1/avs_core/core/ThreadPool.h patched/avs_core/core/Th { Wait(); delete [] pairs; -diff -ruN AviSynthPlus-3.7.1/avs_core/filters/AviSource/avi_source.cpp patched/avs_core/filters/AviSource/avi_source.cpp ---- AviSynthPlus-3.7.1/avs_core/filters/AviSource/avi_source.cpp 2021-12-28 13:00:08.000000000 +0100 -+++ patched/avs_core/filters/AviSource/avi_source.cpp 2022-01-04 18:40:04.143327888 +0100 -@@ -294,7 +294,7 @@ +diff -ruN AviSynthPlus-3.7.3/avs_core/filters/AviSource/avi_source.cpp patched/avs_core/filters/AviSource/avi_source.cpp +--- AviSynthPlus-3.7.3/avs_core/filters/AviSource/avi_source.cpp 2023-07-16 02:44:05.000000000 +0200 ++++ patched/avs_core/filters/AviSource/avi_source.cpp 2023-07-27 13:54:14.396666668 +0200 +@@ -298,7 +298,7 @@ return result; } @@ -73,10 +73,10 @@ diff -ruN AviSynthPlus-3.7.1/avs_core/filters/AviSource/avi_source.cpp patched/a static __inline LRESULT ICDecompressEx(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiSrc,LPVOID lpSrc,INT xSrc,INT ySrc,INT dxSrc,INT dySrc,LPBITMAPINFOHEADER lpbiDst,LPVOID lpDst,INT xDst,INT yDst,INT dxDst,INT dyDst) { -diff -ruN AviSynthPlus-3.7.1/avs_core/include/avisynth.h patched/avs_core/include/avisynth.h ---- AviSynthPlus-3.7.1/avs_core/include/avisynth.h 2021-12-28 13:00:08.000000000 +0100 -+++ patched/avs_core/include/avisynth.h 2022-01-04 18:40:04.143327888 +0100 -@@ -1635,7 +1635,7 @@ +diff -ruN AviSynthPlus-3.7.3/avs_core/include/avisynth.h patched/avs_core/include/avisynth.h +--- AviSynthPlus-3.7.3/avs_core/include/avisynth.h 2023-07-16 02:44:05.000000000 +0200 ++++ patched/avs_core/include/avisynth.h 2023-07-27 13:54:14.400000002 +0200 +@@ -1764,7 +1764,7 @@ { public: @@ -85,9 +85,9 @@ diff -ruN AviSynthPlus-3.7.1/avs_core/include/avisynth.h patched/avs_core/includ virtual void __stdcall Wait() = 0; virtual AVSValue __stdcall Get(size_t i) = 0; virtual size_t __stdcall Size() const = 0; -diff -ruN AviSynthPlus-3.7.1/plugins/ImageSeq/CMakeLists.txt patched/plugins/ImageSeq/CMakeLists.txt ---- AviSynthPlus-3.7.1/plugins/ImageSeq/CMakeLists.txt 2021-12-28 13:00:08.000000000 +0100 -+++ patched/plugins/ImageSeq/CMakeLists.txt 2022-01-04 18:40:04.146661222 +0100 +diff -ruN AviSynthPlus-3.7.3/plugins/ImageSeq/CMakeLists.txt patched/plugins/ImageSeq/CMakeLists.txt +--- AviSynthPlus-3.7.3/plugins/ImageSeq/CMakeLists.txt 2023-07-16 02:44:05.000000000 +0200 ++++ patched/plugins/ImageSeq/CMakeLists.txt 2023-07-27 13:54:14.400000002 +0200 @@ -43,14 +43,14 @@ # Specify include directories target_include_directories(${ProjectName} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib/DevIL_x86 ${AvsCore_SOURCE_DIR}) @@ -105,9 +105,9 @@ diff -ruN AviSynthPlus-3.7.1/plugins/ImageSeq/CMakeLists.txt patched/plugins/Ima # Copy binary dependencies to a common folder for easy deployment configure_file("${PROJECT_SOURCE_DIR}/lib/DevIL_x64/DevIL.dll" "${CMAKE_BINARY_DIR}/Output/system/DevIL.dll" COPYONLY) endif() -diff -ruN AviSynthPlus-3.7.1/plugins/VDubFilter/CMakeLists.txt patched/plugins/VDubFilter/CMakeLists.txt ---- AviSynthPlus-3.7.1/plugins/VDubFilter/CMakeLists.txt 2021-12-28 13:00:08.000000000 +0100 -+++ patched/plugins/VDubFilter/CMakeLists.txt 2022-01-04 18:40:04.146661222 +0100 +diff -ruN AviSynthPlus-3.7.3/plugins/VDubFilter/CMakeLists.txt patched/plugins/VDubFilter/CMakeLists.txt +--- AviSynthPlus-3.7.3/plugins/VDubFilter/CMakeLists.txt 2023-07-16 02:44:05.000000000 +0200 ++++ patched/plugins/VDubFilter/CMakeLists.txt 2023-07-27 13:54:14.400000002 +0200 @@ -22,7 +22,7 @@ endif() |