Page MenuHomeFreeBSD
Files F103198440

D33090.diff
No OneTemporary
Actions

D33090.diff
View Options

diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gpodder
DISTVERSION= 3.10.17
+PORTREVISION= 1
CATEGORIES= multimedia python
MAINTAINER= rm@FreeBSD.org
@@ -18,7 +19,7 @@
${PYTHON_PKGNAMEPREFIX}podcastparser>=0.6.0:devel/py-podcastparser@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR} \
- youtube_dl>0:www/youtube_dl \
+ yt-dlp:www/yt-dlp \
${PYTHON_PKGNAMEPREFIX}eyed3>=0:audio/py-eyed3@${PY_FLAVOR}
USES= gettext gmake gnome python:3.5+ shebangfix
diff --git a/multimedia/haruna/Makefile b/multimedia/haruna/Makefile
--- a/multimedia/haruna/Makefile
+++ b/multimedia/haruna/Makefile
@@ -1,5 +1,6 @@
PORTNAME= haruna
DISTVERSION= 0.7.3
+PORTREVISION= 1
MASTER_SITES= KDE/stable/${PORTNAME}/
CATEGORIES= multimedia kde
@@ -8,7 +9,7 @@
LIB_DEPENDS= libmpv.so:multimedia/mpv
RUN_DEPENDS= kio-extras>0:devel/kio-extras \
- youtube-dl:www/youtube_dl
+ yt-dlp:www/yt-dlp
USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons \
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lives
DISTVERSION= 3.2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= http://lives-video.com/releases/
DISTNAME= LiVES-${PORTVERSION}
@@ -60,10 +60,10 @@
OPTIONS_GROUP_EXT_WIN_CAPTURE= WMCTRL XDOTOOL
OPTIONS_GROUP_MP3= MPG123 MPG321
OPTIONS_GROUP_MPLAYERS= MPLAYER MPV
-OPTIONS_GROUP_YOUTUBE_DLX= YOUTUBE_DL YOUTUBE_DLC
+OPTIONS_RADIO_YOUTUBE_DLX= YOUTUBE_DL YOUTUBE_DLC YTDLP
OPTIONS_DEFAULT= CDDA2WAV DOCS DV FFTW GHOSTSCRIPT IMAGEMAGICK JACK LAME \
MPG123 MPLAYER NLS OGG OGG123 OGM OPENCV SCHROEDINGER \
- THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YOUTUBE_DL
+ THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YTDLP
OPTIONS_SUB= yes
ALSA_CONFIGURE_OFF= --disable-alsa
@@ -136,6 +136,8 @@
libwayland-cursor.so:graphics/wayland
WMCTRL_DESC= Install wmctrl
WMCTRL_RUN_DEPENDS= wmctrl:x11/wmctrl
+YTDLP_DESC= Install yt-dlp (youtube-dl fork) - requires SYMLINK option
+YTDLP_RUN_DEPENDS= yt-dlp:www/yt-dlp
YOUTUBE_DL_DESC= Install youtube-dl
YOUTUBE_DL_RUN_DEPENDS= youtube-dl:www/youtube_dl
YOUTUBE_DLC_DESC= Install youtube-dlc
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mpv
DISTVERSIONPREFIX= v
DISTVERSION= 0.34.0
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia audio
MASTER_SITES= https://waf.io/:waf
@@ -47,11 +47,13 @@
OPTIONS_DEFINE= ARCHIVE DOCS LCMS2 LUAJIT MANPAGES MUJS TEST UCHARDET EXAMPLES ZIMG
OPTIONS_DEFAULT= ARCHIVE DVDNAV MANPAGES OPENGL UCHARDET \
- V4L VAAPI VDPAU VULKAN WAYLAND X11 YTDL
+ V4L VAAPI VDPAU VULKAN WAYLAND X11 YTDLP
OPTIONS_GROUP= IN VO AO
-OPTIONS_GROUP_IN= CDIO DVDNAV LIBBLURAY V4L YTDL
+OPTIONS_GROUP_IN= CDIO DVDNAV LIBBLURAY V4L
OPTIONS_GROUP_VO= CACA OPENGL SIXEL VAAPI VDPAU VULKAN WAYLAND X11
OPTIONS_GROUP_AO= ALSA JACK OPENAL PULSEAUDIO SDL
+OPTIONS_RADIO= YOUTUBE
+OPTIONS_RADIO_YOUTUBE= YTDL YTDLP
OPTIONS_SUB= yes
DVDNAV_DESC= DVD menu navigation
@@ -60,6 +62,7 @@
SIXEL_DESC= Sixel graphics support
UCHARDET_DESC= Guess subtitle encoding via uchardet
VULKAN_DESC= Vulkan output support
+YTDLP_DESC= Install yt-dlp (youtube-dl fork)
YTDL_DESC= Install youtube-dl
ZIMG_DESC= High quality software scaling via "z" library
IN_DESC= Input
@@ -157,6 +160,8 @@
X11_USE= XORG=x11,xext,xinerama,xorgproto,xrandr,xscrnsaver,xv,xxf86vm
X11_CONFIGURE_OFF= --disable-x11
+YTDLP_RUN_DEPENDS= yt-dlp:www/yt-dlp
+
YTDL_RUN_DEPENDS= youtube-dl:www/youtube_dl
ZIMG_LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg
diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile
--- a/multimedia/smtube/Makefile
+++ b/multimedia/smtube/Makefile
@@ -2,6 +2,7 @@
PORTNAME= smtube
DISTVERSION= 21.10.0
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= SF/smtube/SMTube/${PORTVERSION}/
@@ -11,7 +12,7 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/Copying.txt
-RUN_DEPENDS= youtube-dl:www/youtube_dl
+RUN_DEPENDS= yt-dlp:www/yt-dlp
USES= gl gmake qt:5 tar:bzip2
USE_GL= gl
diff --git a/multimedia/ytfzf/Makefile b/multimedia/ytfzf/Makefile
--- a/multimedia/ytfzf/Makefile
+++ b/multimedia/ytfzf/Makefile
@@ -1,6 +1,7 @@
PORTNAME= ytfzf
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= 0mp@FreeBSD.org
@@ -16,7 +17,7 @@
notify-send:devel/libnotify \
shuf:sysutils/shuf \
ueberzug:graphics/py-ueberzug@${PY_FLAVOR} \
- youtube-dl:www/youtube_dl
+ yt-dlp:www/yt-dlp
USES= python
USE_GITHUB= yes
diff --git a/net-p2p/awgg/Makefile b/net-p2p/awgg/Makefile
--- a/net-p2p/awgg/Makefile
+++ b/net-p2p/awgg/Makefile
@@ -1,6 +1,6 @@
PORTNAME= awgg
PORTVERSION= 0.6.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-p2p
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
@@ -12,7 +12,7 @@
RUN_DEPENDS= aria2c:www/aria2 \
wget:ftp/wget \
curl:ftp/curl \
- youtube-dl:www/youtube_dl \
+ yt-dlp:www/yt-dlp \
axel:ftp/axel
gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
diff --git a/www/py-pafy/Makefile b/www/py-pafy/Makefile
--- a/www/py-pafy/Makefile
+++ b/www/py-pafy/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pafy
PORTVERSION= 0.5.5
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +13,8 @@
LICENSE= GPLv3
# At the moment the internal backend does not work
-BUILD_DEPENDS= youtube_dl>=2016.02.22:www/youtube_dl
-RUN_DEPENDS= youtube_dl>=2016.02.22:www/youtube_dl
+BUILD_DEPENDS= yt-dlp:www/yt-dlp
+RUN_DEPENDS= yt-dlp:www/yt-dlp
USES= python:3.6+
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-pafy/files/patch-pafy_backend__youtube__dl.py b/www/py-pafy/files/patch-pafy_backend__youtube__dl.py
--- a/www/py-pafy/files/patch-pafy_backend__youtube__dl.py
+++ b/www/py-pafy/files/patch-pafy_backend__youtube__dl.py
@@ -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
diff --git a/www/py-pafy/files/patch-pafy_pafy.py b/www/py-pafy/files/patch-pafy_pafy.py
--- a/www/py-pafy/files/patch-pafy_pafy.py
+++ b/www/py-pafy/files/patch-pafy_pafy.py
@@ -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(
diff --git a/www/yt-dlp/Makefile b/www/yt-dlp/Makefile
--- a/www/yt-dlp/Makefile
+++ b/www/yt-dlp/Makefile
@@ -25,7 +25,7 @@
NO_ARCH= yes
OPTIONS_DEFINE= FFMPEG RTMPDUMP SYMLINK
-OPTIONS_DEFAULT= FFMPEG RTMPDUMP
+OPTIONS_DEFAULT= FFMPEG RTMPDUMP SYMLINK
OPTIONS_SUB= yes
FFMPEG_RUN_DEPENDS= ffprobe:multimedia/ffmpeg

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 4:07 AM (17 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14789395
Default Alt Text
D33090.diff (7 KB)

Event Timeline