From bea233325b1fca63e8c5407502aba6318ea9f46d Mon Sep 17 00:00:00 2001 From: Luiz Henrique Laurini Date: Thu, 21 Oct 2021 16:45:49 +0200 Subject: [PATCH] Remove avcodec patch --- .github/workflows/avcodec-fix.patch | 20 -------------------- Dockerfile | 3 --- 2 files changed, 23 deletions(-) delete mode 100644 .github/workflows/avcodec-fix.patch diff --git a/.github/workflows/avcodec-fix.patch b/.github/workflows/avcodec-fix.patch deleted file mode 100644 index 4b9b94354d..0000000000 --- a/.github/workflows/avcodec-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- avcodec-58.dll.txt 2021-05-02 21:56:52.069320800 -0300 -+++ avcodec-58.dll.fixed.txt 2021-05-02 21:57:07.464984700 -0300 -@@ -841388,7 +841388,7 @@ - 00cd6ab0: 6176 315f 6478 5f61 6c67 6f00 2000 616f av1_dx_algo. .ao - 00cd6ac0: 6d5f 636f 6465 635f 6275 696c 645f 636f m_codec_build_co - 00cd6ad0: 6e66 6967 0000 0000 2100 616f 6d5f 636f nfig....!.aom_co --00cd6ae0: 6465 635f 636f 6e74 726f 6c5f 0000 0000 dec_control_.... -+00cd6ae0: 6465 635f 636f 6e74 726f 6c00 0000 0000 dec_control..... - 00cd6af0: 2200 616f 6d5f 636f 6465 635f 6465 635f ".aom_codec_dec_ - 00cd6b00: 696e 6974 5f76 6572 0000 0000 2300 616f init_ver....#.ao - 00cd6b10: 6d5f 636f 6465 635f 6465 636f 6465 0000 m_codec_decode.. -@@ -841808,7 +841808,7 @@ - 00cd84f0: 3634 5f70 6172 616d 5f70 6172 7365 0000 64_param_parse.. - 00cd8500: 2e00 7832 3634 5f70 6963 7475 7265 5f69 ..x264_picture_i - 00cd8510: 6e69 7400 0100 7832 3635 5f61 7069 5f67 nit...x265_api_g --00cd8520: 6574 5f31 3838 0000 0500 636f 6d70 7265 et_188....compre -+00cd8520: 6574 5f31 3932 0000 0500 636f 6d70 7265 et_192....compre - 00cd8530: 7373 0000 0600 636f 6d70 7265 7373 3200 ss....compress2. - 00cd8540: 0c00 6465 666c 6174 6500 0000 0d00 6465 ..deflate.....de - 00cd8550: 666c 6174 6542 6f75 6e64 0000 0f00 6465 flateBound....de diff --git a/Dockerfile b/Dockerfile index ead70c099a..fe9ac710c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,9 +54,6 @@ RUN DIST=dist/scrcpy-win64; \ cp platform-tools/{AdbWin{,Usb}Api.dll,adb.exe} ${DIST} && \ cp build-win64/server/scrcpy-server ${DIST} && \ scripts/copy-libs.sh build-win64/app/scrcpy.exe ${DIST} && \ - xxd ${DIST}/avcodec-58.dll > avcodec-58.dll.txt && \ - patch -i /scrcpy/.github/workflows/avcodec-fix.patch avcodec-58.dll.txt && \ - xxd -r avcodec-58.dll.txt > ${DIST}/avcodec-58.dll && \ cd dist && \ tar -cJf scrcpy-win64.tar.xz scrcpy-win64 && \ rm -r scrcpy-win64