From nobody Wed Jun 22 02:02:42 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8647E8682DA; Wed, 22 Jun 2022 02:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LSRVB3KPYz4g3b; Wed, 22 Jun 2022 02:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655863362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9xkcqu9fq0LSzMPKz2w3HLFWpFxAqaVk76d8ZSKib8A=; b=O/a6r9Xn2ydpH5kfAs5VDBhifbkwQpR5KNOzP2tPOgpUfV7p64rFXemA0sgu1D/KsR2NDW mDwgc9C5DYm9IIMni7RLj0ZDqTADWKvoFv3xJnN7rIy96QMwSlI2XaUuuIOSzT5PmCalwX 8E+oCNA8rtqYuV6JUnVk7HtiyHkZ+VWTMP41w7jhw+hBkNP6zg+fj7ytLVh02utcXhZxIN kctxTiLDRzezbZTLP5o7lnLnS6QeZuw4KuYA21nswdHImGdxv9o7TX2T8mDN3g7cc7/h4g YXvHzXl3joioO4EiJcOrSwTi0FcUS86Wd0l/zv1suKhQj6xa2krlzMyLbwuH+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52E6E1CFFB; Wed, 22 Jun 2022 02:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25M22g8o037666; Wed, 22 Jun 2022 02:02:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25M22gxm037665; Wed, 22 Jun 2022 02:02:42 GMT (envelope-from git) Date: Wed, 22 Jun 2022 02:02:42 GMT Message-Id: <202206220202.25M22gxm037665@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: a76f826dc05f - main - www/yt-dlp: Simplify patches List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a76f826dc05fdd6ed29b8b38b45e223562f1f21c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655863362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9xkcqu9fq0LSzMPKz2w3HLFWpFxAqaVk76d8ZSKib8A=; b=dKLHfBE8w43peEZ8amk+EVDi2RpkKhS/j0K4VLBVIn5cN5oWqC89p+Q+X1UnjzZyZB/hMx Ym8iudNYkMjL/weut1vjntLEk6oX7DAE+l4aRxlEb0ue5xMUoidQ26Dp2lEmI8wTdONSNt Y4pptungOTJXsTej8rRzEltvLxHPO3KTN3frYCBnSmX03ixWC+0SFqrG59VgUruaCu+GDB qtdnvxBTgzUKces98c8P2whQ9+XMW6C0VX25eIqW8qaiPD3HEYqn83jCu516iBhnJsWVcZ /MamCsCk9AF7E7r62seLy3m/pQ4XYanPGDZUndNR1lcOUYQaK23Mj+kje09M2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655863362; a=rsa-sha256; cv=none; b=kO85FImCKIQgXXlyy9krvgdHgSuUXGCjUUlh/0l+oQAJBUGg3TRY6UbLlsA/g8ECoo6Sly a9mBDW5SUaPpUsX9R8rHu2AwG1hwPspMM/wXX/8SR5PNIQXwEDY0uyuyrCkp92ebbh0mwT TGedE0ClGVoKiyW9mmnTlB+CciwdsDIhrJgsyiAl0hlRKapv+eIStoMst/+wORFrCTrm8Q lpVn9pwSKq4N8UhwDSIqJ8tdeTPuecT5lEgMJEYi18FVhtbaYABWxpUKCFnN29lcMrtXjb TNc5J7vMjNfGsifh2qwyA7TEemdUFzkfUu8ktLla80yNOVrmpmQLM4eMgpUzUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a76f826dc05fdd6ed29b8b38b45e223562f1f21c commit a76f826dc05fdd6ed29b8b38b45e223562f1f21c Author: Yuri Victorovich AuthorDate: 2022-06-22 02:00:51 +0000 Commit: Yuri Victorovich CommitDate: 2022-06-22 02:00:51 +0000 www/yt-dlp: Simplify patches -U now refuses to work and recommends to use the package manager instead of being patched out entirely. --- www/yt-dlp/Makefile | 1 + www/yt-dlp/files/patch-yt__dlp_____init____.py | 32 -------------------------- www/yt-dlp/files/patch-yt__dlp_options.py | 13 ----------- www/yt-dlp/files/patch-yt__dlp_update.py | 13 +++++++++++ 4 files changed, 14 insertions(+), 45 deletions(-) diff --git a/www/yt-dlp/Makefile b/www/yt-dlp/Makefile index 39c1d711bfd1..8200cfe7b481 100644 --- a/www/yt-dlp/Makefile +++ b/www/yt-dlp/Makefile @@ -1,5 +1,6 @@ PORTNAME= yt-dlp DISTVERSION= 2022.06.22.1 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org diff --git a/www/yt-dlp/files/patch-yt__dlp_____init____.py b/www/yt-dlp/files/patch-yt__dlp_____init____.py deleted file mode 100644 index 3e4437de00c6..000000000000 --- a/www/yt-dlp/files/patch-yt__dlp_____init____.py +++ /dev/null @@ -1,32 +0,0 @@ ---- yt_dlp/__init__.py.orig 2022-06-22 00:50:42 UTC -+++ yt_dlp/__init__.py -@@ -879,20 +879,20 @@ def _real_main(argv=None): - return - - with YoutubeDL(ydl_opts) as ydl: -- pre_process = opts.update_self or opts.rm_cachedir -+ pre_process = opts.rm_cachedir - actual_use = all_urls or opts.load_info_filename - - if opts.rm_cachedir: - ydl.cache.remove() - -- updater = Updater(ydl) -- if opts.update_self and updater.update() and actual_use: -- if updater.cmd: -- return updater.restart() -- # This code is reachable only for zip variant in py < 3.10 -- # It makes sense to exit here, but the old behavior is to continue -- ydl.report_warning('Restart yt-dlp to use the updated version') -- # return 100, 'ERROR: The program must exit for the update to complete' -+ #updater = Updater(ydl) -+ #if opts.update_self and updater.update() and actual_use: -+ # if updater.cmd: -+ # return updater.restart() -+ # # This code is reachable only for zip variant in py < 3.10 -+ # # It makes sense to exit here, but the old behavior is to continue -+ # ydl.report_warning('Restart yt-dlp to use the updated version') -+ # # return 100, 'ERROR: The program must exit for the update to complete' - - if not actual_use: - if pre_process: diff --git a/www/yt-dlp/files/patch-yt__dlp_options.py b/www/yt-dlp/files/patch-yt__dlp_options.py deleted file mode 100644 index 7f7fdfb82562..000000000000 --- a/www/yt-dlp/files/patch-yt__dlp_options.py +++ /dev/null @@ -1,13 +0,0 @@ ---- yt_dlp/options.py.orig 2022-06-22 01:17:57 UTC -+++ yt_dlp/options.py -@@ -313,10 +313,6 @@ def create_parser(): - action='version', - help='Print program version and exit') - general.add_option( -- '-U', '--update', -- action='store_true', dest='update_self', -- help='Update this program to latest version') -- general.add_option( - '--no-update', - action='store_false', dest='update_self', - help='Do not update (default)') diff --git a/www/yt-dlp/files/patch-yt__dlp_update.py b/www/yt-dlp/files/patch-yt__dlp_update.py new file mode 100644 index 000000000000..605de73d672c --- /dev/null +++ b/www/yt-dlp/files/patch-yt__dlp_update.py @@ -0,0 +1,13 @@ +- this patch prevents -U from updating yt-dlp - it makes it "unrecognized" + +--- yt_dlp/update.py.orig 2022-06-22 01:54:04 UTC ++++ yt_dlp/update.py +@@ -29,7 +29,7 @@ def _get_variant_and_executable_path(): + + path = os.path.dirname(__file__) + if isinstance(__loader__, zipimporter): +- return 'zip', os.path.join(path, '..') ++ return 'unknown', os.path.join(path, '..') + elif (os.path.basename(sys.argv[0]) in ('__main__.py', '-m') + and os.path.exists(os.path.join(path, '../.git/HEAD'))): + return 'source', path