Changes - SailfishOS Open Build Service

Changes of Revision 2

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:youtube-dl.changes
@@ -1,5 +1,11 @@ +* Wed Jan 5 2022 Nephros <sailfish@nephros.org> - 2021.12.17-1.0.0 +- youtube-dl: version bump after new upstream release + +* Tue Aug 03 2021 Nephros <sailfish@nephros.org> - 2021.06.06-1.1.2 +- package unzipped version isntead of zipped + * Tue Aug 03 2021 Nephros <sailfish@nephros.org> - 2021.06.06-1.0.1 - - OBS Chum version +- OBS Chum version * Mon Jun 06 2021 Nephros <sailfish@nephros.org> - 2021.06.06-1.0nep - youtube-dl: version bump after new upstream release
[-] [+]	Changed	_service:tar_git:youtube-dl.spec ^
@@ -7,10 +7,11 @@ # >> macros # << macros +%define int_name youtube_dl Summary: YouTube video downloader -Version: 2021.06.06+obs.20210803085101.409573d02 -Release: 1.0.1 +Version: 2021.12.17+obs1 +Release: 1.1.2 Group: Applications/Multimedia License: Unlicense BuildArch: noarch @@ -19,15 +20,73 @@ Source100: youtube-dl.yaml Patch0: fix_ffmpeg_sfos.patch Requires: ffmpeg-tools -Requires: python +Requires: youtube-dl-bin +BuildRequires: pkgconfig(python2) +BuildRequires: pkgconfig(python) BuildRequires: make BuildRequires: sed BuildRequires: zip -BuildRequires: python +BuildRequires: python2-rpm-macros +BuildRequires: python3-rpm-macros %description Command-line program to download videos from YouTube.com and other video sites +%if "%{?vendor}" == "chum" +PackageName: YouTube-DL +Type: console-application +DeveloperName: nephros +Categories: + - Media + - Video +%endif + + +%package bash-completion +Summary: bash-completion support for %{name} +Group: Applications/Multimedia + +%description bash-completion +%{summary}. + +%package standalone +Summary: Standalone (zippped) version of %{name} +Group: Applications/Multimedia +Requires: python +Provides: youtube-dl-bin = %{version} +Conflicts: %{name}-script +Obsoletes: youtube-dl-bin < %{version} + +%description standalone +%{summary}. + +%package script +Summary: Script (unzipped) version of %{name} +Group: Applications/Multimedia +Requires: %{name}-python +Provides: youtube-dl-bin = %{version} +Conflicts: %{name}-standalone +Obsoletes: youtube-dl-bin < %{version} + +%description script +%{summary}. + +%package python +Summary: Embedded (python) version of %{name} for apps +Group: Applications/Multimedia +Requires: python + +%description python +%{summary}. + +%package python3 +Summary: Embedded (python3) version of %{name} for apps +Group: Applications/Multimedia +Requires: python3-base + +%description python3 +%{summary}. + %prep %setup -q -n %{name}-%{version}/upstream @@ -37,34 +96,105 @@ # lets just set the revision, otherwise the subpackage version might be used for %%{version} #sed -i "s/__version__ = '.'/__version__ = '%%{version}-%%{release}'/" youtube_dl/version.py sed -i "s/__version__ = '$.$'/__version__ = '\1-%{release}'/" youtube_dl/version.py +echo "Build host SFOS version is: " %{sailfishos_version} # << setup %build # >> build pre +# generate the bash completion file +./devscripts/bash-completion.py +#%%{__python} setup.py build +%py2_build +%py3_build %{__make} youtube-dl # << build pre # >> build post -# generate the bash completion file -./devscripts/bash-completion.py +cp youtube-dl youtube-dl-standalone # << build post %install rm -rf %{buildroot} # >> install pre # do a manual install instead of make so we don't get docs etc. -%{__install} -m 755 -D youtube-dl %{buildroot}%{_bindir}/youtube-dl +%{__install} -m 755 -D youtube-dl-standalone %{buildroot}%{_bindir}/youtube-dl-standalone +%{__install} -m 755 -D bin/youtube-dl %{buildroot}%{_bindir}/youtube-dl.py %{__install} -m 644 -D youtube-dl.bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/%{name} +#%%{__python} setup.py install --skip-build --prefix=%%{_prefix} --root=%%{buildroot} +%py2_install +%py3_install # << install pre # >> install post +# gets installed here, does not belong as prefix/syconfdir expands to /usr/etc/... +rm -r %{buildroot}%{_prefix}%{_sysconfdir}/bash_completion.d + +# fix shebangs for python3: +find %{buildroot}%{python3_sitelib} -type f -exec sed -i '1s=^#!/usr/bin/$python\\|env python$[23]\?=#!%{__python3}=' {} + + # << install post +%preun standalone +# >> preun standalone +if [ $1 -lt 1 ] ; then +rm %{_bindir}/youtube-dl \|\|: +fi +# << preun standalone + +%post standalone +# >> post standalone +ln -sf youtube-dl-standalone %{_bindir}/youtube-dl \|\|: +# << post standalone + +%preun script +# >> preun script +if [ $1 -lt 1 ] ; then +rm %{_bindir}/youtube-dl \|\|: +fi +# << preun script + +%post script +# >> post script +ln -sf youtube-dl.py %{_bindir}/youtube-dl \|\|: +# << post script + %files %defattr(-,root,root,-) -%{_bindir}/youtube-dl -%config %{_sysconfdir}/bash_completion.d/%{name} # >> files # << files + +%files bash-completion +%defattr(-,root,root,-) +%config %{_sysconfdir}/bash_completion.d/%{name} +# >> files bash-completion +# << files bash-completion + +%files standalone +%defattr(-,root,root,-) +%{_bindir}/youtube-dl-standalone +%ghost %{_bindir}/youtube-dl +# >> files standalone +# << files standalone + +%files script +%defattr(-,root,root,-) +%{_bindir}/youtube-dl.py +%ghost %{_bindir}/youtube-dl +# >> files script +# << files script + +%files python +%defattr(-,root,root,-) +%{python2_sitelib}/%{int_name} +%{python2_sitelib}/%{int_name}egg-info +# >> files python +# << files python + +%files python3 +%defattr(-,root,root,-) +%{python3_sitelib}/%{int_name} +%{python3_sitelib}/%{int_name}egg-info +# >> files python3
[-] [+]	Changed	_service ^
@@ -1,8 +1,8 @@ <services> <service name="tar_git"> <param name="url">https://gitlab.com/nephros/youtube-dl</param> - <param name="branch">obs</param> - <param name="revision">409573d02337731c411a39fa25e77a0a33059789</param> + <!-- param name="branch">dlp</param --> + <param name="revision">2021.12.17+obs1</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Deleted	_service:tar_git:youtube-dl-2021.06.06+obs.20210803085101.409573d02.tar.gz/upstream/youtube_dl/extractor/liveleak.py ^
@@ -1,191 +0,0 @@ -from __future__ import unicode_literals - -import re - -from .common import InfoExtractor -from ..utils import int_or_none - - -class LiveLeakIE(InfoExtractor): - _VALID_URL = r'https?://(?:\w+\.)?liveleak\.com/view\?.?\b[it]=(?P<id>[\w_]+)' - _TESTS = [{ - 'url': 'http://www.liveleak.com/view?i=757_1364311680', - 'md5': '0813c2430bea7a46bf13acf3406992f4', - 'info_dict': { - 'id': '757_1364311680', - 'ext': 'mp4', - 'description': 'extremely bad day for this guy..!', - 'uploader': 'ljfriel2', - 'title': 'Most unlucky car accident', - 'thumbnail': r're:^https?://.\.jpg$' - } - }, { - 'url': 'http://www.liveleak.com/view?i=f93_1390833151', - 'md5': 'd3f1367d14cc3c15bf24fbfbe04b9abf', - 'info_dict': { - 'id': 'f93_1390833151', - 'ext': 'mp4', - 'description': 'German Television Channel NDR does an exclusive interview with Edward Snowden.\r\nUploaded on LiveLeak cause German Television thinks the rest of the world isn\'t intereseted in Edward Snowden.', - 'uploader': 'ARD_Stinkt', - 'title': 'German Television does first Edward Snowden Interview (ENGLISH)', - 'thumbnail': r're:^https?://.\.jpg$' - } - }, { - # Prochan embed - 'url': 'http://www.liveleak.com/view?i=4f7_1392687779', - 'md5': '42c6d97d54f1db107958760788c5f48f', - 'info_dict': { - 'id': '4f7_1392687779', - 'ext': 'mp4', - 'description': "The guy with the cigarette seems amazingly nonchalant about the whole thing... I really hope my friends' reactions would be a bit stronger.\r\n\r\nAction-go to 0:55.", - 'uploader': 'CapObveus', - 'title': 'Man is Fatally Struck by Reckless Car While Packing up a Moving Truck', - 'age_limit': 18, - }, - 'skip': 'Video is dead', - }, { - # Covers https://github.com/ytdl-org/youtube-dl/pull/5983 - # Multiple resolutions - 'url': 'http://www.liveleak.com/view?i=801_1409392012', - 'md5': 'c3a449dbaca5c0d1825caecd52a57d7b', - 'info_dict': { - 'id': '801_1409392012', - 'ext': 'mp4', - 'description': 'Happened on 27.7.2014. \r\nAt 0:53 you can see people still swimming at near beach.', - 'uploader': 'bony333', - 'title': 'Crazy Hungarian tourist films close call waterspout in Croatia', - 'thumbnail': r're:^https?://.\.jpg$' - } - }, { - # Covers https://github.com/ytdl-org/youtube-dl/pull/10664#issuecomment-247439521 - 'url': 'http://m.liveleak.com/view?i=763_1473349649', - 'add_ie': ['Youtube'], - 'info_dict': { - 'id': '763_1473349649', - 'ext': 'mp4', - 'title': 'Reporters and public officials ignore epidemic of black on asian violence in Sacramento \| Colin Flaherty', - 'description': 'Colin being the warrior he is and showing the injustice Asians in Sacramento are being subjected to.', - 'uploader': 'Ziz', - 'upload_date': '20160908', - 'uploader_id': 'UCEbta5E_jqlZmEJsriTEtnw' - }, - 'params': { - 'skip_download': True, - }, - }, { - 'url': 'https://www.liveleak.com/view?i=677_1439397581', - 'info_dict': { - 'id': '677_1439397581', - 'title': 'Fuel Depot in China Explosion caught on video', - }, - 'playlist_count': 3, - }, { - 'url': 'https://www.liveleak.com/view?t=HvHi_1523016227', - 'only_matching': True, - }, { - # No original video - 'url': 'https://www.liveleak.com/view?t=C26ZZ_1558612804', - 'only_matching': True, - }] - - @staticmethod - def _extract_urls(webpage): - return re.findall( - r'<iframe[^>]+src="(https?://(?:\w+\.)?liveleak\.com/ll_embed\?[^"][ift]=[\w_]+[^"]+)"', - webpage) - - def _real_extract(self, url): - video_id = self._match_id(url) - webpage = self._download_webpage(url, video_id) - - video_title = self._og_search_title(webpage).replace('LiveLeak.com -', '').strip() - video_description = self._og_search_description(webpage) - video_uploader = self._html_search_regex( - r'By:.?(\w+)</a>', webpage, 'uploader', fatal=False) - age_limit = int_or_none(self._search_regex( - r'you confirm that you are ([0-9]+) years and over.', - webpage, 'age limit', default=None)) - video_thumbnail = self._og_search_thumbnail(webpage) - - entries = self._parse_html5_media_entries(url, webpage, video_id) - if not entries: - # Maybe an embed? - embed_url = self._search_regex( - r'<iframe[^>]+src="((?:https?:)?//(?:www\.)?(?:prochan\|youtube)\.com/embed[^"]+)"', - webpage, 'embed URL') - return { - '_type': 'url_transparent', - 'url': embed_url, - 'id': video_id, - 'title': video_title, - 'description': video_description, - 'uploader': video_uploader, - 'age_limit': age_limit, - } - - for idx, info_dict in enumerate(entries): - formats = [] - for a_format in info_dict['formats']: - if not a_format.get('height'): - a_format['height'] = int_or_none(self._search_regex( - r'([0-9]+)p\.mp4', a_format['url'], 'height label', - default=None)) - formats.append(a_format) - - # Removing '..mp4' gives the raw video, which is essentially - # the same video without the LiveLeak logo at the top (see - # https://github.com/ytdl-org/youtube-dl/pull/4768) - orig_url = re.sub(r'\.mp4\.[^.]+', '', a_format['url']) - if a_format['url'] != orig_url: - format_id = a_format.get('format_id') - format_id = 'original' + ('-' + format_id if format_id else '') - if self._is_valid_url(orig_url, video_id, format_id): - formats.append({ - 'format_id': format_id, - 'url': orig_url, - 'preference': 1, - }) - self._sort_formats(formats) - info_dict['formats'] = formats - - # Don't append entry ID for one-video pages to keep backward compatibility - if len(entries) > 1: - info_dict['id'] = '%s_%s' % (video_id, idx + 1) - else: - info_dict['id'] = video_id - - info_dict.update({ - 'title': video_title, - 'description': video_description, - 'uploader': video_uploader, - 'age_limit': age_limit, - 'thumbnail': video_thumbnail, - }) - - return self.playlist_result(entries, video_id, video_title) - - -class LiveLeakEmbedIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?liveleak\.com/ll_embed\?.?\b(?P<kind>[ift])=(?P<id>[\w_]+)' - - # See generic.py for actual test cases - _TESTS = [{ - 'url': 'https://www.liveleak.com/ll_embed?i=874_1459135191', - 'only_matching': True, - }, { - 'url': 'https://www.liveleak.com/ll_embed?f=ab065df993c1', - 'only_matching': True, - }] - - def _real_extract(self, url): - kind, video_id = re.match(self._VALID_URL, url).groups() - - if kind == 'f': - webpage = self._download_webpage(url, video_id) - liveleak_url = self._search_regex( - r'(?:logourl\s:\s\|window\.open\()(?P<q1>[\'"])(?P<url>%s)(?P=q1)' % LiveLeakIE._VALID_URL, - webpage, 'LiveLeak URL', group='url') - else: - liveleak_url = 'http://www.liveleak.com/view?%s=%s' % (kind, video_id) - - return self.url_result(liveleak_url, ie=LiveLeakIE.ie_key())
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/.github/ISSUE_TEMPLATE/1_broken_site.md ^
@@ -18,7 +18,7 @@ <!-- Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl: -- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.06.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED. +- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED. - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser. - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape. - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates. @@ -26,7 +26,7 @@ --> - [ ] I'm reporting a broken site support -- [ ] I've verified that I'm running youtube-dl version 2021.06.06 +- [ ] I've verified that I'm running youtube-dl version 2021.12.17 - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped - [ ] I've searched the bugtracker for similar issues including closed ones @@ -41,7 +41,7 @@ [debug] User config: [] [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj'] [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251 - [debug] youtube-dl version 2021.06.06 + [debug] youtube-dl version 2021.12.17 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4 [debug] Proxy map: {}
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/.github/ISSUE_TEMPLATE/2_site_support_request.md ^
@@ -19,7 +19,7 @@ <!-- Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl: -- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.06.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED. +- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED. - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser. - Make sure that site you are requesting is not dedicated to copyright infringement, see https://yt-dl.org/copyright-infringement. youtube-dl does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights. - Search the bugtracker for similar site support requests: http://yt-dl.org/search-issues. DO NOT post duplicates. @@ -27,7 +27,7 @@ --> - [ ] I'm reporting a new site support request -- [ ] I've verified that I'm running youtube-dl version 2021.06.06 +- [ ] I've verified that I'm running youtube-dl version 2021.12.17 - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that none of provided URLs violate any copyrights - [ ] I've searched the bugtracker for similar site support requests including closed ones
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/.github/ISSUE_TEMPLATE/3_site_feature_request.md ^
@@ -18,13 +18,13 @@ <!-- Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl: -- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.06.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED. +- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED. - Search the bugtracker for similar site feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates. - Finally, put x into all relevant boxes (like this [x]) --> - [ ] I'm reporting a site feature request -- [ ] I've verified that I'm running youtube-dl version 2021.06.06 +- [ ] I've verified that I'm running youtube-dl version 2021.12.17 - [ ] I've searched the bugtracker for similar site feature requests including closed ones
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/.github/ISSUE_TEMPLATE/4_bug_report.md ^
@@ -18,7 +18,7 @@ <!-- Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl: -- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.06.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED. +- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED. - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser. - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape. - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates. @@ -27,7 +27,7 @@ --> - [ ] I'm reporting a broken site support issue -- [ ] I've verified that I'm running youtube-dl version 2021.06.06 +- [ ] I've verified that I'm running youtube-dl version 2021.12.17 - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped - [ ] I've searched the bugtracker for similar bug reports including closed ones @@ -43,7 +43,7 @@ [debug] User config: [] [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj'] [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251 - [debug] youtube-dl version 2021.06.06 + [debug] youtube-dl version 2021.12.17 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4 [debug] Proxy map: {}
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/.github/ISSUE_TEMPLATE/5_feature_request.md ^
@@ -19,13 +19,13 @@ <!-- Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl: -- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.06.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED. +- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED. - Search the bugtracker for similar feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates. - Finally, put x into all relevant boxes (like this [x]) --> - [ ] I'm reporting a feature request -- [ ] I've verified that I'm running youtube-dl version 2021.06.06 +- [ ] I've verified that I'm running youtube-dl version 2021.12.17 - [ ] I've searched the bugtracker for similar feature requests including closed ones
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/ChangeLog ^
@@ -1,3 +1,28 @@ +version 2021.12.17 + +Core +* [postprocessor/ffmpeg] Show ffmpeg output on error (#22680, #29336) + +Extractors +* [youtube] Update signature function patterns (#30363, #30366) +* [peertube] Only call description endpoint if necessary (#29383) +* [periscope] Pass referer to HLS requests (#29419) +- [liveleak] Remove extractor (#17625, #24222, #29331) ++ [pornhub] Add support for pornhubthbh7ap3u.onion +* [pornhub] Detect geo restriction +* [pornhub] Dismiss tbr extracted from download URLs (#28927) +* [curiositystream:collection] Extend _VALID_URL (#26326, #29117) +* [youtube] Make get_video_info processing more robust (#29333) +* [youtube] Workaround for get_video_info request (#29333) +* [bilibili] Strip uploader name (#29202) +* [youtube] Update invidious instance list (#29281) +* [umg:de] Update GraphQL API URL (#29304) +* [nrk] Switch psapi URL to https (#29344) ++ [egghead] Add support for app.egghead.io (#28404, #29303) +* [appleconnect] Fix extraction (#29208) ++ [orf:tvthek] Add support for MPD formats (#28672, #29236) + + version 2021.06.06 Extractors
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/README.md ^
@@ -893,7 +893,7 @@ ### The exe throws an error due to missing `MSVCR100.dll` -To run the exe you need to install first the [Microsoft Visual C++ 2010 Redistributable Package (x86)](https://www.microsoft.com/en-US/download/details.aspx?id=5555). +To run the exe you need to install first the [Microsoft Visual C++ 2010 Service Pack 1 Redistributable Package (x86)](https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe). ### On Windows, how should I set up ffmpeg and youtube-dl? Where should I put the exe files?
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/docs/supportedsites.md ^
@@ -472,8 +472,6 @@ - LinuxAcademy - LiTV - LiveJournal - - LiveLeak - - LiveLeakEmbed - livestream - livestream:original - LnkGo
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/appleconnect.py ^
@@ -9,10 +9,10 @@ class AppleConnectIE(InfoExtractor): - _VALID_URL = r'https?://itunes\.apple\.com/\w{0,2}/?post/idsa\.(?P<id>[\w-]+)' - _TEST = { + _VALID_URL = r'https?://itunes\.apple\.com/\w{0,2}/?post/(?:id)?sa\.(?P<id>[\w-]+)' + _TESTS = [{ 'url': 'https://itunes.apple.com/us/post/idsa.4ab17a39-2720-11e5-96c5-a5b38f6c42d3', - 'md5': 'e7c38568a01ea45402570e6029206723', + 'md5': 'c1d41f72c8bcaf222e089434619316e4', 'info_dict': { 'id': '4ab17a39-2720-11e5-96c5-a5b38f6c42d3', 'ext': 'm4v', @@ -22,7 +22,10 @@ 'upload_date': '20150710', 'timestamp': 1436545535, }, - } + }, { + 'url': 'https://itunes.apple.com/us/post/sa.0fe0229f-2457-11e5-9f40-1bb645f2d5d9', + 'only_matching': True, + }] def _real_extract(self, url): video_id = self._match_id(url) @@ -36,7 +39,7 @@ video_data = self._parse_json(video_json, video_id) timestamp = str_to_int(self._html_search_regex(r'data-timestamp="(\d+)"', webpage, 'timestamp')) - like_count = str_to_int(self._html_search_regex(r'(\d+) Loves', webpage, 'like count')) + like_count = str_to_int(self._html_search_regex(r'(\d+) Loves', webpage, 'like count', default=None)) return { 'id': video_id,
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/bilibili.py ^
@@ -233,7 +233,7 @@ webpage) if uploader_mobj: info.update({ - 'uploader': uploader_mobj.group('name'), + 'uploader': uploader_mobj.group('name').strip(), 'uploader_id': uploader_mobj.group('id'), }) if not info.get('uploader'):
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/curiositystream.py ^
@@ -145,7 +145,7 @@ class CuriosityStreamCollectionIE(CuriosityStreamBaseIE): IE_NAME = 'curiositystream:collection' - _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/(?:collection\|series)/(?P<id>\d+)' + _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/(?:collections?\|series)/(?P<id>\d+)' _TESTS = [{ 'url': 'https://app.curiositystream.com/collection/2', 'info_dict': { @@ -157,6 +157,9 @@ }, { 'url': 'https://curiositystream.com/series/2', 'only_matching': True, + }, { + 'url': 'https://curiositystream.com/collections/36', + 'only_matching': True, }] def _real_extract(self, url):
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/egghead.py ^
@@ -22,16 +22,19 @@ class EggheadCourseIE(EggheadBaseIE): IE_DESC = 'egghead.io course' IE_NAME = 'egghead:course' - _VALID_URL = r'https://egghead\.io/courses/(?P<id>[^/?#&]+)' - _TEST = { + _VALID_URL = r'https://(?:app\.)?egghead\.io/(?:course\|playlist)s/(?P<id>[^/?#&]+)' + _TESTS = [{ 'url': 'https://egghead.io/courses/professor-frisby-introduces-composable-functional-javascript', 'playlist_count': 29, 'info_dict': { - 'id': '72', + 'id': '432655', 'title': 'Professor Frisby Introduces Composable Functional JavaScript', 'description': 're:(?s)^This course teaches the ubiquitous.*You\'ll start composing functionality before you know it.$', }, - } + }, { + 'url': 'https://app.egghead.io/playlists/professor-frisby-introduces-composable-functional-javascript', + 'only_matching': True, + }] def _real_extract(self, url): playlist_id = self._match_id(url) @@ -65,7 +68,7 @@ class EggheadLessonIE(EggheadBaseIE): IE_DESC = 'egghead.io lesson' IE_NAME = 'egghead:lesson' - _VALID_URL = r'https://egghead\.io/(?:api/v1/)?lessons/(?P<id>[^/?#&]+)' + _VALID_URL = r'https://(?:app\.)?egghead\.io/(?:api/v1/)?lessons/(?P<id>[^/?#&]+)' _TESTS = [{ 'url': 'https://egghead.io/lessons/javascript-linear-data-flow-with-container-style-types-box', 'info_dict': { @@ -88,6 +91,9 @@ }, { 'url': 'https://egghead.io/api/v1/lessons/react-add-redux-to-a-react-application', 'only_matching': True, + }, { + 'url': 'https://app.egghead.io/lessons/javascript-linear-data-flow-with-container-style-types-box', + 'only_matching': True, }] def _real_extract(self, url):
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/extractors.py ^
@@ -610,10 +610,6 @@ from .linuxacademy import LinuxAcademyIE from .litv import LiTVIE from .livejournal import LiveJournalIE -from .liveleak import ( - LiveLeakIE, - LiveLeakEmbedIE, -) from .livestream import ( LivestreamIE, LivestreamOriginalIE,
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/generic.py ^
@@ -84,7 +84,6 @@ from .digiteka import DigitekaIE from .arkena import ArkenaIE from .instagram import InstagramIE -from .liveleak import LiveLeakIE from .threeqsdn import ThreeQSDNIE from .theplatform import ThePlatformIE from .kaltura import KalturaIE @@ -1629,31 +1628,6 @@ 'upload_date': '20160409', }, }, - # LiveLeak embed - { - 'url': 'http://www.wykop.pl/link/3088787/', - 'md5': '7619da8c820e835bef21a1efa2a0fc71', - 'info_dict': { - 'id': '874_1459135191', - 'ext': 'mp4', - 'title': 'Man shows poor quality of new apartment building', - 'description': 'The wall is like a sand pile.', - 'uploader': 'Lake8737', - }, - 'add_ie': [LiveLeakIE.ie_key()], - }, - # Another LiveLeak embed pattern (#13336) - { - 'url': 'https://milo.yiannopoulos.net/2017/06/concealed-carry-robbery/', - 'info_dict': { - 'id': '2eb_1496309988', - 'ext': 'mp4', - 'title': 'Thief robs place where everyone was armed', - 'description': 'md5:694d73ee79e535953cf2488562288eee', - 'uploader': 'brazilwtf', - }, - 'add_ie': [LiveLeakIE.ie_key()], - }, # Duplicated embedded video URLs { 'url': 'http://www.hudl.com/athlete/2538180/highlights/149298443', @@ -3179,11 +3153,6 @@ return self.url_result( self._proto_relative_url(instagram_embed_url), InstagramIE.ie_key()) - # Look for LiveLeak embeds - liveleak_urls = LiveLeakIE._extract_urls(webpage) - if liveleak_urls: - return self.playlist_from_matches(liveleak_urls, video_id, video_title) - # Look for 3Q SDN embeds threeqsdn_url = ThreeQSDNIE._extract_url(webpage) if threeqsdn_url:
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/nrk.py ^
@@ -58,7 +58,7 @@ def _call_api(self, path, video_id, item=None, note=None, fatal=True, query=None): return self._download_json( - urljoin('http://psapi.nrk.no/', path), + urljoin('https://psapi.nrk.no/', path), video_id, note or 'Downloading %s JSON' % item, fatal=fatal, query=query, headers={'Accept-Encoding': 'gzip, deflate, br'})
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/orf.py ^
@@ -98,6 +98,9 @@ elif ext == 'f4m': formats.extend(self._extract_f4m_formats( src, video_id, f4m_id=format_id, fatal=False)) + elif ext == 'mpd': + formats.extend(self._extract_mpd_formats( + src, video_id, mpd_id=format_id, fatal=False)) else: formats.append({ 'format_id': format_id,
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/peertube.py ^
@@ -569,15 +569,15 @@ formats.append(f) self._sort_formats(formats) - full_description = self._call_api( - host, video_id, 'description', note='Downloading description JSON', - fatal=False) + description = video.get('description') + if len(description) >= 250: + # description is shortened + full_description = self._call_api( + host, video_id, 'description', note='Downloading description JSON', + fatal=False) - description = None - if isinstance(full_description, dict): - description = str_or_none(full_description.get('description')) - if not description: - description = video.get('description') + if isinstance(full_description, dict): + description = str_or_none(full_description.get('description')) or description subtitles = self.extract_subtitles(host, video_id)
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/periscope.py ^
@@ -12,6 +12,10 @@ class PeriscopeBaseIE(InfoExtractor): + _M3U8_HEADERS = { + 'Referer': 'https://www.periscope.tv/' + } + def _call_api(self, method, query, item_id): return self._download_json( 'https://api.periscope.tv/api/v2/%s' % method, @@ -54,9 +58,11 @@ m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native' if state in ('ended', 'timed_out') else 'm3u8', - m3u8_id=format_id, fatal=fatal) + m3u8_id=format_id, fatal=fatal, headers=self._M3U8_HEADERS) if len(m3u8_formats) == 1: self._add_width_and_height(m3u8_formats[0], width, height) + for f in m3u8_formats: + f.setdefault('http_headers', {}).update(self._M3U8_HEADERS) return m3u8_formats
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/pornhub.py ^
@@ -30,6 +30,7 @@ class PornHubBaseIE(InfoExtractor): _NETRC_MACHINE = 'pornhub' + _PORNHUB_HOST_RE = r'(?:(?P<host>pornhub(?:premium)?\.(?:com\|net\|org))\|pornhubthbh7ap3u\.onion)' def _download_webpage_handle(self, args, kwargs): def dl(args, *kwargs): @@ -122,11 +123,13 @@ _VALID_URL = r'''(?x) https?:// (?: - (?:[^/]+\.)?(?P<host>pornhub(?:premium)?\.(?:com\|net\|org))/(?:(?:view_video\.php\|video/show)\?viewkey=\|embed/)\| + (?:[^/]+\.)? + %s + /(?:(?:view_video\.php\|video/show)\?viewkey=\|embed/)\| (?:www\.)?thumbzilla\.com/video/ ) (?P<id>[\da-z]+) - ''' + ''' % PornHubBaseIE._PORNHUB_HOST_RE _TESTS = [{ 'url': 'http://www.pornhub.com/view_video.php?viewkey=648719015', 'md5': 'a6391306d050e4547f62b3f485dd9ba9', @@ -236,6 +239,13 @@ }, { 'url': 'https://www.pornhubpremium.com/view_video.php?viewkey=ph5f75b0f4b18e3', 'only_matching': True, + }, { + # geo restricted + 'url': 'https://www.pornhub.com/view_video.php?viewkey=ph5a9813bfa7156', + 'only_matching': True, + }, { + 'url': 'http://pornhubthbh7ap3u.onion/view_video.php?viewkey=ph5a9813bfa7156', + 'only_matching': True, }] @staticmethod @@ -275,6 +285,11 @@ 'PornHub said: %s' % error_msg, expected=True, video_id=video_id) + if any(re.search(p, webpage) for p in ( + r'class=["\']geoBlocked["\']', + r'>\sThis content is unavailable in your country')): + self.raise_geo_restricted() + # video_title from flashvars contains whitespace instead of non-ASCII (see # http://www.pornhub.com/view_video.php?viewkey=1331683002), not relying # on that anymore. @@ -408,17 +423,14 @@ format_url, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls', fatal=False)) return - tbr = None - mobj = re.search(r'(?P<height>\d+)[pP]?_(?P<tbr>\d+)[kK]', format_url) - if mobj: - if not height: - height = int(mobj.group('height')) - tbr = int(mobj.group('tbr')) + if not height: + height = int_or_none(self._search_regex( + r'(?P<height>\d+)[pP]?_\d+[kK]', format_url, 'height', + default=None)) formats.append({ 'url': format_url, 'format_id': '%dp' % height if height else None, 'height': height, - 'tbr': tbr, }) for video_url, height in video_urls: @@ -440,7 +452,8 @@ add_format(video_url, height) continue add_format(video_url) - self._sort_formats(formats) + self._sort_formats( + formats, field_preference=('height', 'width', 'fps', 'format_id')) video_uploader = self._html_search_regex( r'(?s)From: .+?<(?:a\b[^>]+\bhref=["\']/(?:(?:user\|channel)s\|model\|pornstar)/\|span\b[^>]+\bclass=["\']username)[^>]+>(.+?)<', @@ -513,7 +526,7 @@ class PornHubUserIE(PornHubPlaylistBaseIE): - _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?(?P<host>pornhub(?:premium)?\.(?:com\|net\|org))/(?:(?:user\|channel)s\|model\|pornstar)/(?P<id>[^/?#&]+))(?:[?#&]\|/(?!videos)\|$)' + _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?%s/(?:(?:user\|channel)s\|model\|pornstar)/(?P<id>[^/?#&]+))(?:[?#&]\|/(?!videos)\|$)' % PornHubBaseIE._PORNHUB_HOST_RE _TESTS = [{ 'url': 'https://www.pornhub.com/model/zoe_ph', 'playlist_mincount': 118, @@ -542,6 +555,9 @@ # Same as before, multi page 'url': 'https://www.pornhubpremium.com/pornstar/lily-labeau', 'only_matching': True, + }, { + 'url': 'https://pornhubthbh7ap3u.onion/model/zoe_ph', + 'only_matching': True, }] def _real_extract(self, url): @@ -617,7 +633,7 @@ class PornHubPagedVideoListIE(PornHubPagedPlaylistBaseIE): - _VALID_URL = r'https?://(?:[^/]+\.)?(?P<host>pornhub(?:premium)?\.(?:com\|net\|org))/(?P<id>(?:[^/]+/)[^/?#&]+)' + _VALID_URL = r'https?://(?:[^/]+\.)?%s/(?P<id>(?:[^/]+/)[^/?#&]+)' % PornHubBaseIE._PORNHUB_HOST_RE _TESTS = [{ 'url': 'https://www.pornhub.com/model/zoe_ph/videos', 'only_matching': True, @@ -722,6 +738,9 @@ }, { 'url': 'https://de.pornhub.com/playlist/4667351', 'only_matching': True, + }, { + 'url': 'https://pornhubthbh7ap3u.onion/model/zoe_ph/videos', + 'only_matching': True, }] @classmethod @@ -732,7 +751,7 @@ class PornHubUserVideosUploadIE(PornHubPagedPlaylistBaseIE): - _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?(?P<host>pornhub(?:premium)?\.(?:com\|net\|org))/(?:(?:user\|channel)s\|model\|pornstar)/(?P<id>[^/]+)/videos/upload)' + _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?%s/(?:(?:user\|channel)s\|model\|pornstar)/(?P<id>[^/]+)/videos/upload)' % PornHubBaseIE._PORNHUB_HOST_RE _TESTS = [{ 'url': 'https://www.pornhub.com/pornstar/jenny-blighe/videos/upload', 'info_dict': { @@ -742,4 +761,7 @@ }, { 'url': 'https://www.pornhub.com/model/zoe_ph/videos/upload', 'only_matching': True, + }, { + 'url': 'http://pornhubthbh7ap3u.onion/pornstar/jenny-blighe/videos/upload', + 'only_matching': True, }]
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/umg.py ^
@@ -28,7 +28,7 @@ def _real_extract(self, url): video_id = self._match_id(url) video_data = self._download_json( - 'https://api.universal-music.de/graphql', + 'https://graphql.universal-music.de/', video_id, query={ 'query': '''{ universalMusic(channel:16) { @@ -56,11 +56,9 @@ formats = [] def add_m3u8_format(format_id): - m3u8_formats = self._extract_m3u8_formats( + formats.extend(self._extract_m3u8_formats( hls_url_template % format_id, video_id, 'mp4', - 'm3u8_native', m3u8_id='hls', fatal='False') - if m3u8_formats and m3u8_formats[0].get('height'): - formats.extend(m3u8_formats) + 'm3u8_native', m3u8_id='hls', fatal=False)) for f in video_data.get('formats', []): f_url = f.get('url')
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/extractor/youtube.py ^
@@ -353,7 +353,7 @@ r'(?:www\.)?invidious\.13ad\.de', r'(?:www\.)?invidious\.mastodon\.host', r'(?:www\.)?invidious\.zapashcanon\.fr', - r'(?:www\.)?invidious\.kavin\.rocks', + r'(?:www\.)?(?:invidious(?:-us)?\|piped)\.kavin\.rocks', r'(?:www\.)?invidious\.tinfoil-hat\.net', r'(?:www\.)?invidious\.himiko\.cloud', r'(?:www\.)?invidious\.reallyancient\.tech', @@ -380,6 +380,14 @@ r'(?:www\.)?invidious\.toot\.koeln', r'(?:www\.)?invidious\.fdn\.fr', r'(?:www\.)?watch\.nettohikari\.com', + r'(?:www\.)?invidious\.namazso\.eu', + r'(?:www\.)?invidious\.silkky\.cloud', + r'(?:www\.)?invidious\.exonip\.de', + r'(?:www\.)?invidious\.riverside\.rocks', + r'(?:www\.)?invidious\.blamefran\.net', + r'(?:www\.)?invidious\.moomoo\.de', + r'(?:www\.)?ytb\.trom\.tf', + r'(?:www\.)?yt\.cyberhost\.uk', r'(?:www\.)?kgg2m7yk5aybusll\.onion', r'(?:www\.)?qklhadlycap4cnod\.onion', r'(?:www\.)?axqzx4s6s54s32yentfqojs3x5i7faxza6xo3ehd4bzzsg2ii4fv2iid\.onion', @@ -388,6 +396,10 @@ r'(?:www\.)?invidious\.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd\.onion', r'(?:www\.)?owxfohz4kjyv25fvlqilyxast7inivgiktls3th44jhk3ej3i7ya\.b32\.i2p', r'(?:www\.)?4l2dgddgsrkf2ous66i6seeyi6etzfgrue332grh2n7madpwopotugyd\.onion', + r'(?:www\.)?w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd\.onion', + r'(?:www\.)?kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad\.onion', + r'(?:www\.)?grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad\.onion', + r'(?:www\.)?hpniueoejy4opn7bc4ftgazyqjoeqwlvh2uiku2xqku6zpoa4bf5ruid\.onion', ) _VALID_URL = r"""(?x)^ ( @@ -1311,10 +1323,10 @@ funcname = self._search_regex( (r'\b[cs]\s&&\s[adf]\.set$[^,]+\s,\sencodeURIComponent\s\(\s(?P<sig>[a-zA-Z0-9$]+)\(', r'\b[a-zA-Z0-9]+\s&&\s[a-zA-Z0-9]+\.set\([^,]+\s,\sencodeURIComponent\s\(\s(?P<sig>[a-zA-Z0-9$]+)\(', - r'\bm=(?P<sig>[a-zA-Z0-9$]{2})\(decodeURIComponent\(h\.s$\)', - r'\bc&&$c=(?P<sig>[a-zA-Z0-9$]{2})\(decodeURIComponent\(c$\)', - r'(?:\b\|[^a-zA-Z0-9$])(?P<sig>[a-zA-Z0-9$]{2})\s=\sfunction$\sa\s$\s{\sa\s=\sa\.split$\s""\s$;[a-zA-Z0-9$]{2}\.[a-zA-Z0-9$]{2}$a,\d+$', - r'(?:\b\|[^a-zA-Z0-9$])(?P<sig>[a-zA-Z0-9$]{2})\s=\sfunction$\sa\s$\s{\sa\s=\sa\.split$\s""\s$', + r'\bm=(?P<sig>[a-zA-Z0-9$]{2,})$decodeURIComponent\(h\.s$\)', + r'\bc&&$c=(?P<sig>[a-zA-Z0-9$]{2,})\(decodeURIComponent\(c$\)', + r'(?:\b\|[^a-zA-Z0-9$])(?P<sig>[a-zA-Z0-9$]{2,})\s=\sfunction$\sa\s$\s{\sa\s=\sa\.split$\s""\s$;[a-zA-Z0-9$]{2}\.[a-zA-Z0-9$]{2}$a,\d+$', + r'(?:\b\|[^a-zA-Z0-9$])(?P<sig>[a-zA-Z0-9$]{2,})\s=\sfunction$\sa\s$\s{\sa\s=\sa\.split$\s""\s$', r'(?P<sig>[a-zA-Z0-9$]+)\s=\sfunction$\sa\s$\s{\sa\s=\sa\.split$\s""\s$', # Obsolete patterns r'(["\'])signature\1\s,\s(?P<sig>[a-zA-Z0-9$]+)\(', @@ -1492,19 +1504,25 @@ playability_status = player_response.get('playabilityStatus') or {} if playability_status.get('reason') == 'Sign in to confirm your age': - pr = self._parse_json(try_get(compat_parse_qs( - self._download_webpage( - base_url + 'get_video_info', video_id, - 'Refetching age-gated info webpage', - 'unable to download video info webpage', query={ - 'video_id': video_id, - 'eurl': 'https://youtube.googleapis.com/v/' + video_id, - 'html5': 1, - }, fatal=False)), - lambda x: x['player_response'][0], - compat_str) or '{}', video_id) - if pr: - player_response = pr + video_info = self._download_webpage( + base_url + 'get_video_info', video_id, + 'Refetching age-gated info webpage', + 'unable to download video info webpage', query={ + 'video_id': video_id, + 'eurl': 'https://youtube.googleapis.com/v/' + video_id, + 'html5': 1, + # See https://github.com/ytdl-org/youtube-dl/issues/29333#issuecomment-864049544 + 'c': 'TVHTML5', + 'cver': '6.20180913', + }, fatal=False) + if video_info: + pr = self._parse_json( + try_get( + compat_parse_qs(video_info), + lambda x: x['player_response'][0], compat_str) or '{}', + video_id, fatal=False) + if pr and isinstance(pr, dict): + player_response = pr trailer_video_id = try_get( playability_status,
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/postprocessor/ffmpeg.py ^
@@ -231,7 +231,10 @@ stdout, stderr = p.communicate() if p.returncode != 0: stderr = stderr.decode('utf-8', 'replace') - msg = stderr.strip().split('\n')[-1] + msgs = stderr.strip().split('\n') + msg = msgs[-1] + if self._downloader.params.get('verbose', False): + self._downloader.to_screen('[debug] ' + '\n'.join(msgs[:-1])) raise FFmpegPostProcessorError(msg) self.try_utime(out_path, oldest_mtime, oldest_mtime)
[-] [+]	Changed	_service:tar_git:youtube-dl-2021.12.17+obs1.tar.gz/upstream/youtube_dl/version.py ^
@@ -1,3 +1,3 @@ from __future__ import unicode_literals -__version__ = '2021.06.06' +__version__ = '2021.12.17'
[-] [+]	Changed	_service:tar_git:youtube-dl.yaml ^
@@ -1,7 +1,7 @@ Summary: YouTube video downloader Name: youtube-dl -Version: 2021.06.06 -Release: 1.0.1 +Version: 2021.12.17 +Release: 1.1.2 License: Unlicense Group: Applications/Multimedia BuildArch: noarch @@ -9,23 +9,92 @@ SCM: https://github.com/ytdl-org/youtube-dl Sources: - '%{name}-%{version}.tar.gz' -Description: +Description: \| Command-line program to download videos from YouTube.com and other video sites + + %if "%{?vendor}" == "chum" + PackageName: YouTube-DL + Type: console-application + DeveloperName: nephros + Categories: + - Media + - Video + %endif + Patches: - fix_ffmpeg_sfos.patch +Macros: + - 'int_name;youtube_dl' Requires: - ffmpeg-tools - - python + - youtube-dl-bin PkgBR: - make - sed - zip + - python2-rpm-macros + - python3-rpm-macros +PkgConfigBR: + - python2 - python SetupOptions: '-q -n %{name}-%{version}/upstream' Configure: none # build and install manually so we only get the tool, no docs etc. Builder: "none" Files: - - '%{_bindir}/youtube-dl' - - '%config %{_sysconfdir}/bash_completion.d/%{name}' +SubPackages: + - Name: bash-completion + Summary: bash-completion support for %{name} + Group: Applications/Multimedia + AutoDepend: false + Files: + - '%config %{_sysconfdir}/bash_completion.d/%{name}' + - Name: standalone + Summary: Standalone (zippped) version of %{name} + Group: Applications/Multimedia + AutoDepend: false + Requires: + - python + Conflicts: + - '%{name}-script' + Obsoletes: + - youtube-dl-bin < %{version} + Provides: + - youtube-dl-bin = %{version} + Files: + - '%{_bindir}/youtube-dl-standalone' + - '%ghost %{_bindir}/youtube-dl' + - Name: script + Summary: Script (unzipped) version of %{name} + Group: Applications/Multimedia + AutoDepend: false + Requires: + - '%{name}-python' # python2 only for now + Conflicts: + - '%{name}-standalone' + Obsoletes: + - youtube-dl-bin < %{version} + Provides: + - youtube-dl-bin = %{version} + Files: + - '%{_bindir}/youtube-dl.py' + - '%ghost %{_bindir}/youtube-dl' + - Name: python + Summary: Embedded (python) version of %{name} for apps + Group: Applications/Multimedia + AutoDepend: false + Requires: + - python + Files: + - '%{python2_sitelib}/%{int_name}' + - '%{python2_sitelib}/%{int_name}egg-info' + - Name: python3 + Summary: Embedded (python3) version of %{name} for apps + Group: Applications/Multimedia + AutoDepend: false + Requires: + - python3-base + Files: + - '%{python3_sitelib}/%{int_name}' + - '%{python3_sitelib}/%{int_name}egg-info'