ports/128020: [PATCH] www/youtube_dl: fix files/conv2avi.patch

[Sunpoet Po-Chuan Hsieh]

>Number:         128020
>Category:       ports
>Synopsis:       [PATCH] www/youtube_dl: fix files/conv2avi.patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 11 23:00:07 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 7.1-PRERELEASE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #12: Thu Sep  4 10:55:47 CST
>Description:
- Make files/conv2avi.patch available for youtube-dl 2008.08.09

Port maintainer (pankov_p at mail.ru) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
% cd /usr/ports/www/youtube_dl && make WITH_FFMPEG=yes build
===>  Extracting for youtube_dl-2008.08.09
=> MD5 Checksum OK for youtube-dl-2008.08.09.
=> SHA256 Checksum OK for youtube-dl-2008.08.09.
===>  Patching for youtube_dl-2008.08.09
===>  Applying extra patch /usr/ports/www/youtube_dl/files/conv2avi.patch
1 out of 3 hunks failed--saving rejects to youtube-dl.rej
*** Error code 1

Stop in /usr/ports/www/youtube_dl.

>Fix:

--- youtube_dl-2008.08.09.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/youtube_dl/files/conv2avi.patch /usr/ports/sunpoet/youtube_dl/files/conv2avi.patch
--- /usr/ports/www/youtube_dl/files/conv2avi.patch	2008-07-28 13:28:55.645547461 +0800
+++ /usr/ports/sunpoet/youtube_dl/files/conv2avi.patch	2008-10-12 06:04:39.305798045 +0800
@@ -1,10 +1,9 @@
---- youtube-dl.orig	2008-07-27 11:21:44.000000000 +0400
-+++ youtube-dl	2008-07-27 11:24:01.000000000 +0400
-@@ -288,6 +288,22 @@
+--- youtube-dl.orig	2008-10-12 04:04:22.554188553 +0800
++++ youtube-dl	2008-10-12 06:04:25.007306477 +0800
+@@ -303,6 +303,21 @@
  					except (urllib2.URLError, httplib.HTTPException, socket.error), err:
  						retcode = self.trouble('ERROR: unable to download video data: %s' % str(err))
  						continue
-+
 +					# Convert to avi if needed
 +					if self._params['useavi']:
 +						avi_filename = '%s.avi' % filename
@@ -20,10 +19,10 @@
 +						except OSError, e:
 +							retcode = self.trouble('ERROR: unable to remove downloaded file: %s' % e.strerror)
 +
- 				break
- 			if not suitable_found:
- 				retcode = self.trouble('ERROR: no suitable InfoExtractor: %s' % url)
-@@ -773,6 +789,8 @@
+ 					try:
+ 						self.post_process(filename, result)
+ 					except (PostProcessingError), err:
+@@ -859,6 +874,8 @@
  				action='store_true', dest='useliteral', help='use literal title in file name', default=False)
  		parser.add_option('-n', '--netrc',
  				action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
@@ -32,7 +31,7 @@
  		parser.add_option('-g', '--get-url',
  				action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
  		parser.add_option('-e', '--get-title',
-@@ -829,6 +847,7 @@
+@@ -915,6 +932,7 @@
  				or u'%(id)s.%(ext)s'),
  			'ignoreerrors': opts.ignoreerrors,
  			'ratelimit': opts.ratelimit,
--- youtube_dl-2008.08.09.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: