Date: Wed, 6 Feb 2008 02:06:31 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: pankov_p@mail.ru Subject: ports/120298: [PATCH] www/youtube_dl: fix conv2avi.patch Message-ID: <20080205180631.4DCF217020@sunpoet.net> Resent-Message-ID: <200802051810.m15IA2F4071967@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120298
>Category: ports
>Synopsis: [PATCH] www/youtube_dl: fix conv2avi.patch
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 05 18:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 6.3-STABLE i386
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD IRIS.sunpoet.net 6.3-STABLE FreeBSD 6.3-STABLE #12: Sun Jan 20 02:27:29 CST 2008 sunpoet@IRIS.sunpoet.net:/usr/obj/usr/src/sys/sunpoet i386
>Description:
Fix files/conv2avi.patch.
Maintainer is cc'd.
>How-To-Repeat:
% cd /usr/ports/www/youtube_dl
% make
% cd work
% find * -type f
www/youtube_dl/files/conv2avi.patch
www/youtube_dl/files/conv2avi.patch.orig
youtube-dl
youtube-dl.bak
youtube-dl.orig
>Fix:
--- /usr/ports/www/youtube_dl/files/conv2avi.patch 2008-02-04 18:24:47.000000000 +0800
+++ /usr/ports/sunpoet/youtube_dl/files/conv2avi.patch 2008-02-06 01:56:10.000000000 +0800
@@ -1,44 +1,37 @@
-Index: www/youtube_dl/files/conv2avi.patch
-===================================================================
-RCS file: www/youtube_dl/files/conv2avi.patch
-diff -N www/youtube_dl/files/conv2avi.patch
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ www/youtube_dl/files/conv2avi.patch 31 Jan 2008 19:32:45 -0000
-@@ -0,0 +1,37 @@
-+--- youtube-dl.orig Wed Jan 30 14:18:50 2008
-++++ youtube-dl Thu Jan 31 21:36:49 2008
-+@@ -208,6 +208,7 @@
-+ cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name')
-+ cmdl_parser.add_option('-l', '--literal', action='store_true', dest='use_literal', help='use literal title in file name')
-+ cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data')
-++cmdl_parser.add_option('-a', '--avi', action='store_true', dest='use_avi', help='output file in avi format')
-+ cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only')
-+ cmdl_parser.add_option('-2', '--title-too', action='store_true', dest='get_title', help='used with -g, print title too')
-+ (cmdl_opts, cmdl_args) = cmdl_parser.parse_args()
-+@@ -382,6 +383,26 @@
-+
-+ except KeyboardInterrupt:
-+ sys.exit('\n')
-++
-++# Convert to avi if needed
-++if cmdl_opts.use_avi:
-++ if cmdl_opts.outfile is None:
-++ avi_filename = '%s.avi' % video_filename[:-4]
-++ else:
-++ avi_filename = '%s.avi' % video_filename
-++
-++ try:
-++ os.system('%%CONV2AVI_CMD%% "%s" "%s" > %s 2> %s' % (video_filename, avi_filename, os.path.devnull, os.path.devnull))
-++ cond_print('Video file converted to %s\n' % avi_filename)
-++ except OSError:
-++ sys.exit('Error: unable to convert file.\n')
-++ except KeyboardInterrupt:
-++ sys.exit('\n')
-++
-++ try:
-++ os.unlink(video_filename)
-++ except OSError:
-++ sys.exit('Error: unable to remove downloaded file.\n')
-+
-+ # Finish
-+ sys.exit()
+--- youtube-dl.orig Wed Jan 30 14:18:50 2008
++++ youtube-dl Thu Jan 31 21:36:49 2008
+@@ -208,6 +208,7 @@
+ cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name')
+ cmdl_parser.add_option('-l', '--literal', action='store_true', dest='use_literal', help='use literal title in file name')
+ cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data')
++cmdl_parser.add_option('-a', '--avi', action='store_true', dest='use_avi', help='output file in avi format')
+ cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only')
+ cmdl_parser.add_option('-2', '--title-too', action='store_true', dest='get_title', help='used with -g, print title too')
+ (cmdl_opts, cmdl_args) = cmdl_parser.parse_args()
+@@ -382,6 +383,26 @@
+
+ except KeyboardInterrupt:
+ sys.exit('\n')
++
++# Convert to avi if needed
++if cmdl_opts.use_avi:
++ if cmdl_opts.outfile is None:
++ avi_filename = '%s.avi' % video_filename[:-4]
++ else:
++ avi_filename = '%s.avi' % video_filename
++
++ try:
++ os.system('%%CONV2AVI_CMD%% "%s" "%s" > %s 2> %s' % (video_filename, avi_filename, os.path.devnull, os.path.devnull))
++ cond_print('Video file converted to %s\n' % avi_filename)
++ except OSError:
++ sys.exit('Error: unable to convert file.\n')
++ except KeyboardInterrupt:
++ sys.exit('\n')
++
++ try:
++ os.unlink(video_filename)
++ except OSError:
++ sys.exit('Error: unable to remove downloaded file.\n')
+
+ # Finish
+ sys.exit()
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080205180631.4DCF217020>