-
Notifications
You must be signed in to change notification settings - Fork 740
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ports that depend on youtube-dl: Depend on yt-dlp
yt-dlp [1] is a youtube-dl fork with additional features and fixes. For ports that depend on www/youtube-dl switch the dependency to www/yt-dlp. For ports that have an optional dependency on www/youtube-dl, create a new OPTIONS_RADIO that includes www/yt-dlp and make it the default. [1] https://github.com/yt-dlp/yt-dlp Other changes: - www/yt-dlp: Turn the symlink option on by default - www/py-pafy: Fix build when depending on www/yt-dlp PR: 259944 Reported by: Oleh Vinichenko <moonlapse81@gmail.com> Reviewed by: diizzy, Oleh Vinichenko <moonlapse81@gmail.com>, VVD <vvd@unislabs.com> Approved by: 0mp, adridg (kde@), rm, tcberner (multimedia@), yuri (maintainers) acm and nivit (maintainers, timeout) Differential Revision: https://reviews.freebsd.org/D33090
- Loading branch information
Showing
11 changed files
with
37 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,14 @@ | ||
--- pafy/backend_youtube_dl.py.orig 2018-02-11 21:15:57 UTC | ||
--- pafy/backend_youtube_dl.py.orig 2019-11-20 14:42:31 UTC | ||
+++ pafy/backend_youtube_dl.py | ||
@@ -8,6 +8,9 @@ if sys.version_info[:2] >= (3, 0): | ||
@@ -10,7 +10,10 @@ if sys.version_info[:2] >= (3, 0): | ||
else: | ||
uni = unicode | ||
|
||
-import youtube_dl | ||
+if sys.platform.startswith('freebsd'): | ||
+ # FreeBSD installs youtube_dl as a zip archive | ||
+ sys.path.insert(1, '%%LOCALBASE%%/bin/youtube-dl') | ||
import youtube_dl | ||
+import yt_dlp | ||
|
||
from . import g | ||
from .backend_shared import BasePafy, BaseStream, remux, get_status_string, get_size_done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,14 @@ | ||
--- pafy/pafy.py.orig 2018-02-11 21:15:57 UTC | ||
--- pafy/pafy.py.orig 2019-11-20 14:42:31 UTC | ||
+++ pafy/pafy.py | ||
@@ -45,6 +45,9 @@ Pafy = None | ||
@@ -45,7 +45,10 @@ Pafy = None | ||
backend = "internal" | ||
if os.environ.get("PAFY_BACKEND") != "internal": | ||
try: | ||
- import youtube_dl | ||
+ if sys.platform.startswith('freebsd'): | ||
+ # FreeBSD installs youtube_dl as a zip archive | ||
+ sys.path.insert(1, '%%LOCALBASE%%/bin/youtube-dl') | ||
import youtube_dl | ||
+ import yt_dlp | ||
backend = "youtube-dl" | ||
except ImportError: | ||
raise ImportError( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters