From jamie@bishopston.net  Sun Nov 21 16:39:58 2010
Return-Path: <jamie@bishopston.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 185A51065697
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Nov 2010 16:39:58 +0000 (UTC)
	(envelope-from jamie@bishopston.net)
Received: from pacha.mail.bishopston.net (pacha.mail.bishopston.net [IPv6:2001:5c0:1100:200::3])
	by mx1.freebsd.org (Postfix) with ESMTP id CE50F8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Nov 2010 16:39:52 +0000 (UTC)
Received: from catflap.bishopston.net (jamie@localhost [127.0.0.1])
	by catflap.bishopston.net (8.14.4/8.14.3) with ESMTP id oALGdkQq022650
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Nov 2010 16:39:46 GMT
	(envelope-from jamie@catflap.bishopston.net)
Received: (from jamie@localhost)
	by catflap.bishopston.net (8.14.4/8.12.9/Submit) id oALGdkC3022649;
	Sun, 21 Nov 2010 16:39:46 GMT
Message-Id: <201011211639.oALGdkC3022649@catflap.bishopston.net>
Date: Sun, 21 Nov 2010 16:39:46 GMT
From: Jamie Landeg Jones <jamie@bishopston.net>
Reply-To: Jamie Landeg Jones <jamie@bishopston.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: www/youtube_dl
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         152452
>Category:       ports
>Synopsis:       Update port: www/youtube_dl
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    araujo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 21 16:40:08 UTC 2010
>Closed-Date:    Sun Dec 05 15:20:23 UTC 2010
>Last-Modified:  Sun Dec  5 15:30:10 UTC 2010
>Originator:     Jamie Landeg Jones
>Release:        FreeBSD 8.1-STABLE i386
>Organization:
http://www.bishopston.com/jamie/
>Environment:
System: FreeBSD catflap.bishopston.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Wed Nov 10 20:48:34 GMT 2010 root@catflap.bishopston.net:/usr/obj/usr/src/sys/CATFLAP i386


	
>Description:
Upgrades youtube-dl to latest version. Of particular note is the fix
to downloading "encoded" rtmp streams with rtmpdump

Please note, on applying this patch, for some reason the file "patch-youtube-dl"
is created in the current directory rather that www/youtube_dl/files, so will
have to be manually moved on applying patch.

Cheers,
jamie
	
>How-To-Repeat:
	
>Fix:

	

--- patch begins here ---
--- www/youtube_dl/Makefile.orig	2010-11-11 23:23:28.000000000 +0000
+++ www/youtube_dl/Makefile	2010-11-21 16:09:50.000000000 +0000
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	youtube_dl
-PORTVERSION=	2010.10.24
+PORTVERSION=	2010.11.19
 CATEGORIES=	www
-MASTER_SITES=	http://bitbucket.org/rg3/youtube-dl/raw/${PORTVERSION}/
+MASTER_SITES=	https://github.com/rg3/youtube-dl/raw/${PORTVERSION}/
 DISTNAME=	youtube-dl
 EXTRACT_SUFX=	# empty
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
@@ -23,6 +23,14 @@
 
 PLIST_FILES=	bin/youtube-dl
 
+OPTIONS=	RTMPDUMP	"Use RTMPDUMP to download rtmp video streams"	on
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_RTMPDUMP)
+RUN_DEPENDS+=	rtmpdump:${PORTSDIR}/multimedia/rtmpdump
+.endif
+
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}/youtube-dl
 
--- www/youtube_dl/distinfo.orig	2010-11-11 23:23:28.000000000 +0000
+++ www/youtube_dl/distinfo	2010-11-21 15:46:30.000000000 +0000
@@ -1,2 +1,2 @@
-SHA256 (youtube_dl/2010.10.24/youtube-dl) = 1ec91cd1d791c62777724fb650fde3d6da1ad5c86b4f46ec0368759ce7a7a381
-SIZE (youtube_dl/2010.10.24/youtube-dl) = 82350
+SHA256 (youtube_dl/2010.11.19/youtube-dl) = 016d9559610e2043ba140de41ad69580dc5510dc9001df7614e1d38d87c40e25
+SIZE (youtube_dl/2010.11.19/youtube-dl) = 84216
--- www/youtube_dl/pkg-descr.orig	2009-05-04 14:27:09.000000000 +0100
+++ www/youtube_dl/pkg-descr	2010-11-21 15:46:30.000000000 +0000
@@ -1,4 +1,5 @@
 youtube-dl is a small command-line program for downloading videos 
-from YouTube.com.
+from YouTube.com, metacafe.com, google video, photobucket videos,
+yahoo videos, dailymotion and others
 
-WWW: http://bitbucket.org/rg3/youtube-dl/
+WWW: http://rg3.github.com/youtube-dl/
--- www/youtube_dl/files/patch-youtube-dl.orig	2010-11-21 16:32:30.000000000 +0000
+++ www/youtube_dl/files/patch-youtube-dl	2010-11-21 16:28:54.000000000 +0000
@@ -0,0 +1,11 @@
+--- youtube-dl.orig	2010-11-21 16:27:42.000000000 +0000
++++ youtube-dl	2010-11-21 16:28:42.000000000 +0000
+@@ -509,7 +509,7 @@
+ 		# Download using rtmpdump. rtmpdump returns exit code 2 when
+ 		# the connection was interrumpted and resuming appears to be
+ 		# possible. This is part of rtmpdump's normal usage, AFAIK.
+-		basic_args = ['rtmpdump', '-q'] + [[], ['-W', player_url]][player_url is not None] + ['-r', url, '-o', filename]
++		basic_args = ['rtmpdump'] + [[], ['-q']][self.params.get('quiet', False)] + [[], ['-W', player_url]][player_url is not None] + ['-r', url, '-o', filename]
+ 		retval = subprocess.call(basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)])
+ 		while retval == 2 or retval == 1:
+ 			prevsize = os.path.getsize(filename)
--- patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->araujo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Nov 21 16:40:15 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152452 
State-Changed-From-To: open->closed 
State-Changed-By: araujo 
State-Changed-When: Sun Dec 5 15:20:22 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152452 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/152452: commit references a PR
Date: Sun,  5 Dec 2010 15:20:16 +0000 (UTC)

 araujo      2010-12-05 15:20:05 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/youtube_dl       Makefile distinfo pkg-descr 
   Added files:
     www/youtube_dl/files patch-youtube-dl 
   Log:
   - Update to 2010.11.19.
   - Fix files downloaded that depends directly of rtmpdump.
   
   PR:             ports/152452
   Submitted by:   Jamie Landeg Jones <jamie@bishopston.net>
   
   Revision  Changes    Path
   1.53      +10 -2     ports/www/youtube_dl/Makefile
   1.43      +2 -2      ports/www/youtube_dl/distinfo
   1.5       +11 -0     ports/www/youtube_dl/files/patch-youtube-dl (new)
   1.3       +3 -2      ports/www/youtube_dl/pkg-descr
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
