diff --git a/contrib/src/ffmpeg/fetch_and_patch.bat b/contrib/src/ffmpeg/fetch_and_patch.bat index 1d2451e35ffdb0703934b0f67ccd9c4e3f1b0d40..37018ef004b593b9fbb6d74c8dce7359443fc1df 100644 --- a/contrib/src/ffmpeg/fetch_and_patch.bat +++ b/contrib/src/ffmpeg/fetch_and_patch.bat @@ -17,6 +17,6 @@ del %FFMPEG_VERSION%.tar && del %FFMPEG_VERSION%.tar.gz && del pax_global_header rename FFmpeg-%FFMPEG_VERSION% ffmpeg cd ffmpeg -git apply --reject --whitespace=fix %SRC%\ffmpeg\windows-no-pkg-config.patch +git apply --reject --whitespace=fix %SRC%\ffmpeg\windows-configure.patch cd %SRC% \ No newline at end of file diff --git a/contrib/src/ffmpeg/windows-configure.patch b/contrib/src/ffmpeg/windows-configure.patch new file mode 100644 index 0000000000000000000000000000000000000000..498da1148fdc903aa22a554ece014ff50cffa049 --- /dev/null +++ b/contrib/src/ffmpeg/windows-configure.patch @@ -0,0 +1,32 @@ +--- a/configure ++++ b/configure +@@ -1486,7 +1486,7 @@ require_cpp_condition(){ + require_pkg_config(){ + log require_pkg_config "$@" + pkg_version="$2" +- check_pkg_config "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message" ++ #check_pkg_config "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message" + } + + hostcc_e(){ +@@ -6735,17 +6735,6 @@ flatten_extralibs_wrapper(){ + eval printf \''%s'\' \""\$$list_name"\" + } + +-for linkunit in $LIBRARY_LIST; do +- unset current_extralibs +- eval components=\$$(toupper ${linkunit})_COMPONENTS_LIST +- for comp in ${components}; do +- enabled $comp || continue +- comp_extralibs="${comp}_extralibs" +- append current_extralibs $comp_extralibs +- done +- eval prepend ${linkunit}_extralibs $current_extralibs +-done +- + for linkunit in $LIBRARY_LIST $PROGRAM_LIST $EXTRALIBS_LIST; do + eval ${linkunit}_extralibs=\$\(flatten_extralibs_wrapper ${linkunit}_extralibs\) + done +-- +2.10.2.windows.1 + diff --git a/contrib/src/ffmpeg/windows-no-pkg-config.patch b/contrib/src/ffmpeg/windows-no-pkg-config.patch deleted file mode 100644 index 9be661617e3da644620b830d257eff0b90c5eb04..0000000000000000000000000000000000000000 --- a/contrib/src/ffmpeg/windows-no-pkg-config.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/configure -+++ b/configure -@@ -1486,7 +1486,7 @@ require_cpp_condition(){ - require_pkg_config(){ - log require_pkg_config "$@" - pkg_version="$2" -- check_pkg_config "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message" -+ #check_pkg_config "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message" - } - - hostcc_e(){ --- -2.10.2.windows.1 - diff --git a/contrib/src/ffmpeg/windows-uwp-x64-configure-make.sh b/contrib/src/ffmpeg/windows-uwp-x64-configure-make.sh index 22eb07eaa08a477b4731724a449d35e48bee88e7..be945808ee62f7df98b57f1e319dcc556ae2bbc1 100644 --- a/contrib/src/ffmpeg/windows-uwp-x64-configure-make.sh +++ b/contrib/src/ffmpeg/windows-uwp-x64-configure-make.sh @@ -11,6 +11,8 @@ cd Output/Windows10/x64 --disable-programs \ --disable-d3d11va \ --disable-dxva2 \ +--disable-debug \ +--disable-postproc \ --arch=x86_64 \ --enable-shared \ --enable-cross-compile \ @@ -23,8 +25,7 @@ cd Output/Windows10/x64 --enable-parser=h264 \ --enable-libx264 \ --extra-cflags="-MD -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_WIN32_WINNT=0x0A00 -I../../../../../msvc/include -I../../../../../msvc/include/opus" \ ---extra-ldflags="-APPCONTAINER WindowsApp.lib libopus.lib -LIBPATH:../../../../../msvc/lib/x64" \ +--extra-ldflags="-APPCONTAINER WindowsApp.lib libopus.lib libx264.lib -LIBPATH:../../../../../msvc/lib/x64" \ --prefix=../../../Build/Windows10/x64 -make -j8 -make install +make -j8 install cd ../../.. \ No newline at end of file