From 5fdb494b69b3c22be3251ac56462cd0e542d2e93 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Wed, 13 Mar 2019 18:21:47 +0100 Subject: [PATCH] youtube-dl: use as default Python3 and update to 2019.4.7 - Use files.pythonhosted.org for PKG_SOURCE_URL to be unified across Python packages - Add Python sources - Change the description a little bit - Change URL as upstream is moving from youtube-dl.org to yt-dl.org - Removed patch as it is no longer necessary Signed-off-by: Josef Schlehofer --- multimedia/youtube-dl/Makefile | 47 ++++++++++--------- .../youtube-dl/patches/dont-use-pandoc.patch | 21 --------- 2 files changed, 24 insertions(+), 44 deletions(-) delete mode 100644 multimedia/youtube-dl/patches/dont-use-pandoc.patch diff --git a/multimedia/youtube-dl/Makefile b/multimedia/youtube-dl/Makefile index 433c3b92f0..05289b83df 100644 --- a/multimedia/youtube-dl/Makefile +++ b/multimedia/youtube-dl/Makefile @@ -8,46 +8,47 @@ include $(TOPDIR)/rules.mk PKG_NAME:=youtube-dl -PKG_VERSION:=2019.03.01 +PKG_VERSION:=2019.4.7 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/rg3/youtube-dl/tar.gz/$(PKG_VERSION)? -PKG_HASH:=65a4ed3588ff67c69b4b3a507acefb29225d5051ffe606688778cfaf8efd79a5 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=youtube_dl-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/y/youtube_dl/ +PKG_HASH:=d8250c9fedea3bcf5c2df62012e9814c96db53540a2842b8f8345885adfd0a85 + +PKG_BUILD_DIR:=$(BUILD_DIR)/youtube_dl-$(PKG_VERSION) PKG_LICENSE:=Unlicense PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Adrian Panella , Josef Schlehofer -PKG_BUILD_DEPENDS:=python/host zip/host - include $(INCLUDE_DIR)/package.mk +include ../../lang/python/python3-package.mk -define Package/youtube-dl +define Package/youtube-dl/Default SECTION:=multimedia CATEGORY:=Multimedia - TITLE:=utility to download videos from YouTube.com - DEPENDS:=+python-openssl +python-email +python-xml +python-codecs +python-ctypes +ca-certificates - URL:=https://youtube-dl.org + TITLE:=Utility to download videos from YouTube.com + DEPENDS:=+ca-certificates + URL:=https://yt-dl.org endef define Package/youtube-dl/description youtube-dl is a small command-line program to download videos - from YouTube.com and a few more sites. - It requires the Python interpreter. + from YouTube.com and other video sites. + It requires the Python3 interpreter. endef -define Package/youtube-dl/install - $(INSTALL_DIR) $(1)/usr/bin - - python -m compileall $(PKG_BUILD_DIR)/youtube_dl/ - cd $(PKG_BUILD_DIR) && zip --quiet youtube-dl-c.zip youtube_dl/*.pyc youtube_dl/*/*.pyc - cd $(PKG_BUILD_DIR) && zip --quiet --junk-paths youtube-dl-c.zip youtube_dl/__main__.pyc - echo '#!/usr/bin/env python' > $(PKG_BUILD_DIR)/youtube-dl-c - cat $(PKG_BUILD_DIR)/youtube-dl-c.zip >> $(PKG_BUILD_DIR)/youtube-dl-c - - $(INSTALL_BIN) -T $(PKG_BUILD_DIR)/youtube-dl-c $(1)/usr/bin/youtube-dl +define Package/youtube-dl +$(call Package/youtube-dl/Default) + DEPENDS+= \ + +PACKAGE_youtube-dl:python3 \ + +PACKAGE_youtube-dl:python3-email \ + +PACKAGE_youtube-dl:python3-xml \ + +PACKAGE_youtube-dl:python3-codecs \ + +PACKAGE_youtube-dl:python3-ctypes + VARIANT:=python3 endef +$(eval $(call Py3Package,youtube-dl)) $(eval $(call BuildPackage,youtube-dl)) +$(eval $(call BuildPackage,youtube-dl-src)) diff --git a/multimedia/youtube-dl/patches/dont-use-pandoc.patch b/multimedia/youtube-dl/patches/dont-use-pandoc.patch deleted file mode 100644 index 51b3dd5886..0000000000 --- a/multimedia/youtube-dl/patches/dont-use-pandoc.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Makefile b/Makefile -index 4a62f44..fee93e8 100644 ---- a/Makefile -+++ b/Makefile -@@ -85,12 +85,12 @@ supportedsites: - $(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md - - README.txt: README.md -- pandoc -f $(MARKDOWN) -t plain README.md -o README.txt -+# pandoc -f $(MARKDOWN) -t plain README.md -o README.txt - - youtube-dl.1: README.md -- $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md -- pandoc -s -f $(MARKDOWN) -t man youtube-dl.1.temp.md -o youtube-dl.1 -- rm -f youtube-dl.1.temp.md -+# $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md -+# pandoc -s -f $(MARKDOWN) -t man youtube-dl.1.temp.md -o youtube-dl.1 -+# rm -f youtube-dl.1.temp.md - - youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in - $(PYTHON) devscripts/bash-completion.py