[Pkg-cli-libs-commits] r3887 - in /packages/taglib-sharp/trunk/debian: changelog patches/00list patches/05_add-mimetypes.dpatch patches/06_mp4-itunes-invalid-files.dpatch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Mon Nov  3 10:25:17 2008
New Revision: 3887

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3887
Log:
* debian/patches/06_mp4-itunes-invalid-files.dpatch:
  + Really add this patch and add it to 00list.
* debian/patches/05_add-mimetypes.dpatch:
  + Don't add an Ogg mimetype twice, it will make taglib-sharp
    completely useless.

Added:
    packages/taglib-sharp/trunk/debian/patches/06_mp4-itunes-invalid-files.dpatch
Modified:
    packages/taglib-sharp/trunk/debian/changelog
    packages/taglib-sharp/trunk/debian/patches/00list
    packages/taglib-sharp/trunk/debian/patches/05_add-mimetypes.dpatch

Modified: packages/taglib-sharp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taglib-sharp/trunk/debian/changelog?rev=3887&op=diff
==============================================================================
--- packages/taglib-sharp/trunk/debian/changelog (original)
+++ packages/taglib-sharp/trunk/debian/changelog Mon Nov  3 10:25:17 2008
@@ -1,3 +1,13 @@
+taglib-sharp (2.0.3.0-4) experimental; urgency=low
+
+  * debian/patches/06_mp4-itunes-invalid-files.dpatch:
+    + Really add this patch and add it to 00list.
+  * debian/patches/05_add-mimetypes.dpatch:
+    + Don't add an Ogg mimetype twice, it will make taglib-sharp
+      completely useless.
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 03 Nov 2008 11:24:39 +0100
+
 taglib-sharp (2.0.3.0-3) experimental; urgency=low
 
   * debian/patches/04_mp3-header-checking.dpatch:

Modified: packages/taglib-sharp/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taglib-sharp/trunk/debian/patches/00list?rev=3887&op=diff
==============================================================================
--- packages/taglib-sharp/trunk/debian/patches/00list (original)
+++ packages/taglib-sharp/trunk/debian/patches/00list Mon Nov  3 10:25:17 2008
@@ -3,3 +3,4 @@
 03_file.cs-docs-failure.dpatch
 04_mp3-header-checking.dpatch
 05_add-mimetypes.dpatch
+06_mp4-itunes-invalid-files.dpatch

Modified: packages/taglib-sharp/trunk/debian/patches/05_add-mimetypes.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taglib-sharp/trunk/debian/patches/05_add-mimetypes.dpatch?rev=3887&op=diff
==============================================================================
--- packages/taglib-sharp/trunk/debian/patches/05_add-mimetypes.dpatch (original)
+++ packages/taglib-sharp/trunk/debian/patches/05_add-mimetypes.dpatch Mon Nov  3 10:25:17 2008
@@ -47,7 +47,7 @@
  	[SupportedMimeType("application/ogg")]
  	[SupportedMimeType("application/x-ogg")]
  	[SupportedMimeType("audio/vorbis")]
-@@ -42,6 +44,11 @@
+@@ -42,6 +44,10 @@
  	[SupportedMimeType("audio/x-vorbis+ogg")]
  	[SupportedMimeType("audio/ogg")]
  	[SupportedMimeType("audio/x-ogg")]
@@ -55,7 +55,6 @@
 +	[SupportedMimeType("video/x-ogm+ogg")]
 +	[SupportedMimeType("video/x-theora+ogg")]
 +	[SupportedMimeType("video/x-theora")]
-+	[SupportedMimeType("video/x-ogm+ogg")]
  	public class File : TagLib.File
  	{
  #region Private Fields

Added: packages/taglib-sharp/trunk/debian/patches/06_mp4-itunes-invalid-files.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taglib-sharp/trunk/debian/patches/06_mp4-itunes-invalid-files.dpatch?rev=3887&op=file
==============================================================================
--- packages/taglib-sharp/trunk/debian/patches/06_mp4-itunes-invalid-files.dpatch (added)
+++ packages/taglib-sharp/trunk/debian/patches/06_mp4-itunes-invalid-files.dpatch Mon Nov  3 10:25:17 2008
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- taglib-sharp-2.0.3.0/src/TagLib/Mpeg4/FileParser.cs	2008-01-03 02:24:13.000000000 +0100
++++ taglib-sharp/src/TagLib/Mpeg4/FileParser.cs	2008-08-18 17:54:37.000000000 +0200
+@@ -486,9 +486,13 @@
+ 					stsd_boxes.Add (BoxFactory.CreateBox (
+ 						file, header, handler));
+ 				} else if (type == BoxType.Hdlr) {
++					IsoHandlerBox prevHandler = handler;
+ 					handler = BoxFactory.CreateBox (file,
+-						header, handler) as
+-							IsoHandlerBox;
++							header, handler) as
++								IsoHandlerBox;
++					if (prevHandler != null && (handler.HandlerType != BoxType.Soun && handler.HandlerType != BoxType.Vide)) {
++						handler = prevHandler;
++					}
+ 				} else if (mvhd_box == null &&
+ 					type == BoxType.Mvhd) {
+ 					mvhd_box = BoxFactory.CreateBox (file,
+