rpms/taglib-sharp/devel add_extensions_mimetypes_thorough_mpeg_checking.patch, NONE, 1.1 taglib-sharp.spec, 1.3, 1.4

Tom Callaway spot at fedoraproject.org
Mon Nov 10 21:59:49 UTC 2008


Author: spot

Update of /cvs/pkgs/rpms/taglib-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9648/devel

Modified Files:
	taglib-sharp.spec 
Added Files:
	add_extensions_mimetypes_thorough_mpeg_checking.patch 
Log Message:
fix mimetypes

add_extensions_mimetypes_thorough_mpeg_checking.patch:

--- NEW FILE add_extensions_mimetypes_thorough_mpeg_checking.patch ---
Index: src/TagLib/Mpeg/AudioHeader.cs
===================================================================
--- src/TagLib/Mpeg/AudioHeader.cs	(revision 94327)
+++ src/TagLib/Mpeg/AudioHeader.cs	(revision 94328)
@@ -252,7 +252,13 @@
 				throw new CorruptFileException (
 					"First byte did not match MPEG synch.");
 			
-			if (data [1] < 0xE0)
+			// Checking bits from high to low:
+			//
+			// First 3 bits MUST be set. Bits 4 and 5 can
+			// be 00, 10, or 11 but not 01. One or more of
+			// bits 6 and 7 must be set. Bit 8 can be
+			// anything.
+			if ((data [1] & 0xE6) <= 0xE0 || (data [1] & 0x18) == 0x08)
 				throw new CorruptFileException (
 					"Second byte did not match MPEG synch.");
 			
Index: src/TagLib/Ape/File.cs
===================================================================
--- src/TagLib/Ape/File.cs	(revision 117109)
+++ src/TagLib/Ape/File.cs	(working copy)
@@ -40,6 +40,8 @@
 	/// </remarks>
 	[SupportedMimeType("taglib/ape", "ape")]
 	[SupportedMimeType("audio/x-ape")]
+	[SupportedMimeType("audio/ape")]
+	[SupportedMimeType("application/x-ape")]
 	public class File : TagLib.NonContainer.File
 	{
 		#region Private Fields
@@ -275,4 +277,4 @@
 		
 		#endregion
 	}
-}
\ No newline at end of file
+}
Index: src/TagLib/Asf/File.cs
===================================================================
--- src/TagLib/Asf/File.cs	(revision 117109)
+++ src/TagLib/Asf/File.cs	(working copy)
@@ -33,6 +33,7 @@
 	[SupportedMimeType("taglib/wmv", "wmv")]
 	[SupportedMimeType("taglib/asf", "asf")]
 	[SupportedMimeType("audio/x-ms-wma")]
+	[SupportedMimeType("audio/x-ms-asf")]
 	[SupportedMimeType("video/x-ms-asf")]
 	public class File : TagLib.File
 	{
Index: src/TagLib/Ogg/File.cs
===================================================================
--- src/TagLib/Ogg/File.cs	(revision 117109)
+++ src/TagLib/Ogg/File.cs	(working copy)
@@ -35,6 +35,8 @@
 	///    and properties support for Ogg files.
 	/// </summary>
 	[SupportedMimeType("taglib/ogg", "ogg")]
+	[SupportedMimeType("taglib/oga", "oga")]
+	[SupportedMimeType("taglib/ogv", "ogv")]
 	[SupportedMimeType("application/ogg")]
 	[SupportedMimeType("application/x-ogg")]
 	[SupportedMimeType("audio/vorbis")]
@@ -42,6 +44,10 @@
 	[SupportedMimeType("audio/x-vorbis+ogg")]
 	[SupportedMimeType("audio/ogg")]
 	[SupportedMimeType("audio/x-ogg")]
+	[SupportedMimeType("video/ogg")]
+	[SupportedMimeType("video/x-ogm+ogg")]
+	[SupportedMimeType("video/x-theora+ogg")]
+	[SupportedMimeType("video/x-theora")]
 	public class File : TagLib.File
 	{
 #region Private Fields
Index: examples/ReadFromUri.cs
===================================================================
--- examples/ReadFromUri.cs	(revision 117109)
+++ examples/ReadFromUri.cs	(working copy)
@@ -114,7 +114,11 @@
         
         Console.WriteLine ("Total running time:    " + (end - start));
         Console.WriteLine ("Total files read:      " + songs_read);
-        Console.WriteLine ("Average time per file: " + new TimeSpan ((end - start).Ticks / songs_read));
+
+        if (songs_read > 0)
+        {
+            Console.WriteLine ("Average time per file: " + new TimeSpan ((end - start).Ticks / songs_read));
+        }
     }
 }
 


Index: taglib-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-sharp/devel/taglib-sharp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- taglib-sharp.spec	5 Jun 2008 19:14:44 -0000	1.3
+++ taglib-sharp.spec	10 Nov 2008 21:59:19 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:    taglib-sharp
 Version: 2.0.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Provides tag reading and writing for Banshee and other Mono apps
 
 Group:   System Environment/Libraries
@@ -12,6 +12,9 @@
 Patch0:  taglib-sharp-2.0.3.0-fix-xml.patch
 Patch1:  taglib-sharp-2.0.3.0-noInjectMenuItem.patch
 Patch2:  taglib-sharp-2.0.3.0-docsfix.patch
+# from: http://banshee-project.org/~gburt/tmp/add_extensions_mimetypes_thorough_mpeg_checking.patch
+# See http://mail.gnome.org/archives/banshee-list/2008-October/msg00221.html
+Patch3:  add_extensions_mimetypes_thorough_mpeg_checking.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -45,6 +48,7 @@
 # ... it also thinks it needs to embed DESTDIR in an install path.
 %patch1 -p1 -b .noInjectMenuItem
 %patch2 -p1 -b .docsfix
+%patch3 -p0 -b .mimetypes
 
 %build
 %configure
@@ -73,6 +77,9 @@
 %{_libdir}/pkgconfig/taglib-sharp.pc
 
 %changelog
+* Mon Nov 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3.0-7
+- apply mimetypes fix recommended by banshee upstream
+
 * Thu Jun 5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3.0-6
 - fix docs generation
 




More information about the fedora-extras-commits mailing list