build(deps): bump youtube-dl (#157)

LizardByte · Mar 10, 2024 · ab26f1e · ab26f1e
1 parent cf9fe27
commit ab26f1e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 55 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -61,6 +61,7 @@ jobs:
           python-version: '2.7'
 
       - name: Patch third-party deps
+        if: false  # disabled
         shell: bash
         working-directory: PlexyGlass.bundle/third-party
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -48,14 +48,14 @@ python2 -m pip --no-python-version-warning --disable-pip-version-check install -
 python2 ./scripts/build_plist.py
 _BUILD
 
-# patch youtube-dl, cannot use git apply because we don't pass in any git files
-WORKDIR /build/Contents/Libraries/Shared
-RUN <<_PATCH
-#!/bin/bash
-set -e
-patch_dir=/build/patches
-patch -p1 < "${patch_dir}/youtube_dl-compat.patch"
-_PATCH
+## patch youtube-dl, cannot use git apply because we don't pass in any git files
+#WORKDIR /build/Contents/Libraries/Shared
+#RUN <<_PATCH
+##!/bin/bash
+#set -e
+#patch_dir=/build/patches
+#patch -p1 < "${patch_dir}/youtube_dl-compat.patch"
+#_PATCH
 
 WORKDIR /build
 

diff --git a/docs/source/contributing/build.rst b/docs/source/contributing/build.rst
@@ -18,14 +18,14 @@ Setup venv
 ----------
 It is recommended to setup and activate a `venv`_.
 
-Apply Patches
--------------
-Patch YouTube-DL
-   .. code-block:: bash
-
-      pushd ./third-party/youtube-dl
-      git apply -v ../../patches/youtube_dl-compat.patch
-      popd
+.. Apply Patches
+.. -------------
+.. Patch YouTube-DL
+..    .. code-block:: bash
+..
+..       pushd ./third-party/youtube-dl
+..       git apply -v ../../patches/youtube_dl-compat.patch
+..       popd
 
 Install Requirements
 --------------------

diff --git a/patches/youtube_dl-compat.patch b/patches/youtube_dl-compat.patch
diff --git a/third-party/youtube-dl b/third-party/youtube-dl