Bug#596355: unblock: mt-daapd/0.9~r1696.dfsg-16

[Julien BLACHE]

Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Hi,

Please unblock package mt-daapd

This would fix #596250 and restore compatibility with iTunes, which is a major
feature.

Full changelog:

mt-daapd (0.9~r1696.dfsg-16) unstable; urgency=low

  * debian/patches/18_itunes10_fix.dpatch:
    + Added; handle aeMK tag, mandatory for iTunes 10 (closes: #596250).

 -- Julien BLACHE <jbla...@debian.org>  Thu, 09 Sep 2010 19:50:24 +0200

Patch is attached.

unblock mt-daapd/0.9~r1696.dfsg-16

Thanks,

JB.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.35 (SMP w/2 CPU cores)
Locale: LANG=C, lc_ctype=fr...@euro (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash

#! /bin/sh /usr/share/dpatch/dpatch-run
## 18_itunes10_fix.dpatch by  <jbla...@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Handle aeMK tag, mandatory with iTunes 10

@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mt-daapd-0.9~r1696.dfsg~/src/plugins/out-daap-proto.c mt-daapd-0.9~r1696.dfsg/src/plugins/out-daap-proto.c
--- mt-daapd-0.9~r1696.dfsg~/src/plugins/out-daap-proto.c	2007-08-10 06:07:23.000000000 +0200
+++ mt-daapd-0.9~r1696.dfsg/src/plugins/out-daap-proto.c	2010-09-09 19:52:33.525712967 +0200
@@ -141,6 +141,8 @@
     { 0x05, "aeES", "com.apple.itunes.episode-sort" },
     { 0x05, "aeSU", "com.apple.itunes.season-num" },
 
+    { 0x01, "aeMK", "com.apple.itunes.mediakind" },
+
     /* mt-daapd specific */
     { 0x09, "MSPS", "org.mt-daapd.smart-playlist-spec" },
     { 0x01, "MPTY", "org.mt-daapd.playlist-type" },
@@ -216,6 +218,8 @@
     /* iTunes 6.0.2+ */
     { "com.apple.itunes.has-video",        metaItunesHasVideo },
 
+    { "com.apple.itunes.mediakind",        metaItunesMediaKind },
+
     /* mt-daapd specific */
     { "org.mt-daapd.smart-playlist-spec",  metaMPlaylistSpec },
     { "org.mt-daapd.playlist-type",        metaMPlaylistType },
@@ -588,6 +592,9 @@
         if(daap_wantsmeta(pinfo->meta, metaSongDataKind))
             /* asdk */
             size += 9;
+        if(daap_wantsmeta(pinfo->meta, metaItunesMediaKind))
+            /* aeMK */
+            size += 9;
         if(daap_wantsmeta(pinfo->meta, metaSongDataURL))
             /* asul */
             size += DMAPLEN(valarray[SG_URL]);
@@ -777,6 +784,8 @@
         if(daap_wantsmeta(pinfo->meta, metaSongDataKind))
             current += dmap_add_char(current,"asdk",
                                         (char)atoi(valarray[SG_DATA_KIND]));
+        if(daap_wantsmeta(pinfo->meta, metaItunesMediaKind))
+	    current += dmap_add_char(current,"aeMK", 1);
         if(EMIT(valarray[13]) && daap_wantsmeta(pinfo->meta, metaSongDataURL))
             current += dmap_add_string(current,"asul",valarray[SG_URL]);
         if(EMIT(valarray[5]) && daap_wantsmeta(pinfo->meta, metaSongAlbum))
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mt-daapd-0.9~r1696.dfsg~/src/plugins/out-daap.h mt-daapd-0.9~r1696.dfsg/src/plugins/out-daap.h
--- mt-daapd-0.9~r1696.dfsg~/src/plugins/out-daap.h	2007-08-10 06:07:23.000000000 +0200
+++ mt-daapd-0.9~r1696.dfsg/src/plugins/out-daap.h	2010-09-09 19:52:56.657559287 +0200
@@ -73,6 +73,8 @@
     /* iTunes 6.0.2+ */
     metaItunesHasVideo,
 
+    metaItunesMediaKind,
+
     /* mt-daapd specific */
     metaMPlaylistSpec,
     metaMPlaylistType