From: Rogério Brito <rbrito@ime.usp.br>
Date: Sat, 29 May 2010 16:11:43 +0000 (-0300)
Subject: Imported Debian patch 2010.04.04-2
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/cc1fba069a27d401b8370e6f0bff250d8e269c7c

Imported Debian patch 2010.04.04-2
---

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..cd404f4
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,16 @@
+youtube-dl (2010.04.04-2) unstable; urgency=low
+
+  For the time being, you can play WebM files (which are VP8 for video and
+  Vorbis for audio, enclosed in a Matroska container) with gst123, which
+  was just uploaded to Debian.
+  
+  Other gstreamer-based players should support those files right away, as
+  long as you have gstreamer0.10-plugins-bad version at least 0.10.18.3-2
+  installed.
+  
+  Videos in those formats, where available, are taken automatically with
+  the use of the '-b' switch or with the specification of formats 43 (for
+  360p videos) or 45 (for 720p videos).
+
+ -- Rogério Brito <rbrito@ime.usp.br>  Sat, 29 May 2010 13:14:02 -0300
+
diff --git a/debian/changelog b/debian/changelog
index a8d7133..24b1b2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+youtube-dl (2010.04.04-2) unstable; urgency=low
+
+  * Add support to webm (vp8 + vorbis) format:
+    + debian/patches/01-add-support-to-webm.patch: the code
+    + debian/NEWS: the documentation
+    + debian/control: the suggests field
+
+ -- Rogério Brito <rbrito@ime.usp.br>  Sat, 29 May 2010 13:11:43 -0300
+
 youtube-dl (2010.04.04-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index c3d0839..d69e60e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: http://bitbucket.org/rg3/youtube-dl/
 Package: youtube-dl
 Architecture: all
 Depends: python (>= 2.4), ${misc:Depends}
-Suggests: rtmpdump
+Suggests: rtmpdump, gstreamer0.10-plugins-bad (>= 0.10.18.3-2)
 Description: download videos from youtube
  youtube-dl is a small command-line program to download videos from
  YouTube.com and other sites that don't provide direct links to the
diff --git a/debian/patches/01-add-support-to-webm.patch b/debian/patches/01-add-support-to-webm.patch
new file mode 100644
index 0000000..e1e9a39
--- /dev/null
+++ b/debian/patches/01-add-support-to-webm.patch
@@ -0,0 +1,24 @@
+Description: Add support for webm (VP8 video + Vorbis audio)
+Author: Rogério Brito <rbrito@ime.usp.br>
+Forwarded: no
+Last-Update: 2010-05-29
+
+--- a/youtube-dl
++++ b/youtube-dl
+@@ -649,13 +649,15 @@
+ 	_LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
+ 	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
+ 	_NETRC_MACHINE = 'youtube'
+-	_available_formats = ['37', '22', '35', '18', '34', '5', '17', '13', None] # listed in order of priority for -b flag
++	_available_formats = ['45', '43', '37', '22', '35', '18', '34', '5', '17', '13', None] # listed in order of priority for -b flag
+ 	_video_extensions = {
+ 		'13': '3gp',
+ 		'17': 'mp4',
+ 		'18': 'mp4',
+ 		'22': 'mp4',
+ 		'37': 'mp4',
++		'43': 'webm',
++		'45': 'webm'
+ 	}
+ 
+ 	@staticmethod
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4c05f0a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-add-support-to-webm.patch