From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 1 18:20:04 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3386B106566C for ; Wed, 1 Apr 2009 18:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0E6358FC19 for ; Wed, 1 Apr 2009 18:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n31IK3s8005234 for ; Wed, 1 Apr 2009 18:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n31IK3Bp005233; Wed, 1 Apr 2009 18:20:03 GMT (envelope-from gnats) Resent-Date: Wed, 1 Apr 2009 18:20:03 GMT Resent-Message-Id: <200904011820.n31IK3Bp005233@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, bf Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E74811065673 for ; Wed, 1 Apr 2009 18:14:55 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id D55298FC1C for ; Wed, 1 Apr 2009 18:14:55 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n31IEtVm023963 for ; Wed, 1 Apr 2009 18:14:55 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n31IEtmu023962; Wed, 1 Apr 2009 18:14:55 GMT (envelope-from nobody) Message-Id: <200904011814.n31IEtmu023962@www.freebsd.org> Date: Wed, 1 Apr 2009 18:14:55 GMT From: bf To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/133283: [PATCH]multimedia/cclive: enable youtube high-definition mp4 downloads X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2009 18:20:04 -0000 >Number: 133283 >Category: ports >Synopsis: [PATCH]multimedia/cclive: enable youtube high-definition mp4 downloads >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: Wed Apr 01 18:20:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: bf >Release: 8-CURRENT i386 >Organization: - >Environment: >Description: Enable requests for youtube high-definition mp4 files. Perhaps the default naming scheme should be changed as well to give a .mp4 suffix to downloaded files, rather than .mp4_hd. I forgot to include a PORTREVISION bump in the corresponding PR ports/133278 for multimedia/clive. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN cclive.orig/Makefile cclive/Makefile --- cclive.orig/Makefile 2009-04-01 14:00:05.534461018 -0400 +++ cclive/Makefile 2009-04-01 14:13:37.122896141 -0400 @@ -7,6 +7,7 @@ PORTNAME= cclive PORTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= multimedia net MASTER_SITES= GOOGLE_CODE diff -ruN cclive.orig/files/patch-cclive.1 cclive/files/patch-cclive.1 --- cclive.orig/files/patch-cclive.1 1969-12-31 19:00:00.000000000 -0500 +++ cclive/files/patch-cclive.1 2009-04-01 14:13:37.122896141 -0400 @@ -0,0 +1,23 @@ +--- cclive.1.orig 2009-03-27 06:47:16.000000000 -0400 ++++ cclive.1 2009-04-01 14:11:56.638193197 -0400 +@@ -179,7 +179,7 @@ + .IP "\fB\-f, \-\-download=\fR\fI\s-1FORMAT\s0\fR" 4 + .IX Item "-f, --download=FORMAT" + Extract \fIformat\fR instead of the default \*(L"flv\*(R". Possible values are \*(L"flv\*(R" +-(default), \*(L"mp4\*(R", \*(L"3gpp\*(R", \*(L"xflv\*(R", \*(L"spark\*(R", \*(L"vp6\-hq\*(R", \*(L"vp6\-hd\*(R", \*(L"vp6\*(R", ++(default), \*(L"mp4\*(R", \*(L"mp4_hd\*(R", \*(L"3gpp\*(R", \*(L"xflv\*(R", \*(L"spark\*(R", \*(L"vp6\-hq\*(R", \*(L"vp6\-hd\*(R", \*(L"vp6\*(R", + \&\*(L"h264\*(R", \*(L"spak\-mini\*(R". Note that only certain hosts support only certain + formats. See the \*(L"\s-1FORMATS\s0\*(R" section for more on this. + .IP "\fB\-O, \-\-output\-video=\fR\fI\s-1FILE\s0\fR" 4 +@@ -279,9 +279,9 @@ + .IX Header "FORMATS" + .Vb 4 + \& youtube.com +-\& * flv/mp4/3gpp/xflv ++\& * flv/mp4/mp4_hd/3gpp/xflv + \& * Resuming flv with --continue does not work +-\& * 3gpp and xflv formats may not always be available ++\& * 3gpp, mp4_hd, and xflv formats may not always be available + .Ve + .PP + .Vb 5 diff -ruN cclive.orig/files/patch-cmdline.c cclive/files/patch-cmdline.c --- cclive.orig/files/patch-cmdline.c 1969-12-31 19:00:00.000000000 -0500 +++ cclive/files/patch-cmdline.c 2009-04-01 14:13:37.122896141 -0400 @@ -0,0 +1,20 @@ +--- cmdline.c.orig 2009-04-01 17:48:07.000000000 +0000 ++++ cmdline.c 2009-04-01 17:51:18.000000000 +0000 +@@ -37,7 +37,7 @@ + " --title-cclass=CCLASS character class for filtering page titles", + " -n, --no-extract do not extract video", + " -c, --continue resume partially downloaded file", +- " -f, --download=FORMAT download format (possible values=\"flv\", \n \"mp4\", \"3gpp\", \"xflv\", \"spark\", \n \"spak-mini\", \"vp6-hq\", \"vp6-hd\", \n \"vp6\", \"h264\" default=`flv')", ++ " -f, --download=FORMAT download format (possible values=\"flv\", \n \"mp4\", \"mp4_hd\", \"3gpp\", \"xflv\", \"spark\", \n \"spak-mini\", \"vp6-hq\", \"vp6-hd\", \n \"vp6\", \"h264\" default=`flv')", + " -O, --output-video=FILE write video to file", + " -N, --number-videos number extracted videos", + " --emit-csv emit video details as csv to stdout", +@@ -95,7 +95,7 @@ + } + + +-char *cmdline_parser_download_values[] = {"flv", "mp4", "3gpp", "xflv", "spark", "spak-mini", "vp6-hq", "vp6-hd", "vp6", "h264", 0} ; /* Possible values for download. */ ++char *cmdline_parser_download_values[] = {"flv", "mp4", "mp4_hd", "3gpp", "xflv", "spark", "spak-mini", "vp6-hq", "vp6-hd", "vp6", "h264", 0} ; /* Possible values for download. */ + + static char * + gengetopt_strdup (const char *s); diff -ruN cclive.orig/files/patch-host.c cclive/files/patch-host.c --- cclive.orig/files/patch-host.c 1969-12-31 19:00:00.000000000 -0500 +++ cclive/files/patch-host.c 2009-04-01 14:13:37.122896141 -0400 @@ -0,0 +1,11 @@ +--- host.c.orig 2009-04-01 17:43:06.000000000 +0000 ++++ host.c 2009-04-01 17:46:26.000000000 +0000 +@@ -62,6 +62,8 @@ + + if (!strcmp(cc.gi.download_arg, "mp4")) + strlcat(xurl, "&fmt=18", sizeof(xurl)); ++ else if (!strcmp(cc.gi.download_arg, "mp4_hd")) ++ strlcat(xurl, "&fmt=22", sizeof(xurl)); + else if (!strcmp(cc.gi.download_arg, "3gpp")) + strlcat(xurl, "&fmt=17", sizeof(xurl)); + else if (!strcmp(cc.gi.download_arg, "xflv")) >Release-Note: >Audit-Trail: >Unformatted: