[Pkg-gtkpod-devel] Bug#230899: gtkpod: patch for src/mp4file.c to allow mp4 support in Debian unstable

[tony mancill]

Package: gtkpod
Version: 0.99.10-3
Followup-For: Bug #230899

I needed mp4 support in gtkpod and noticed that it doesn't compile
against the current version of libmp4v2 in Debian (sid).  Attached
is a patch for src/mp4file that allows the package to compile.

Thanks,
tony

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.23 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/bash

Versions of packages gtkpod depends on:
ii  libart-2.0-2          2.3.19-3           Library of functions for 2D graphi
ii  libatk1.0-0           1.20.0-1           The ATK accessibility toolkit
ii  libc6                 2.6.1-6            GNU C Library: Shared libraries
ii  libcairo2             1.4.10-1           The Cairo 2D vector graphics libra
ii  libcurl3-gnutls       7.17.1-1           Multi-protocol file transfer libra
ii  libdbus-1-3           1.1.1-3            simple interprocess messaging syst
ii  libflac8              1.2.1-1            Free Lossless Audio Codec - runtim
ii  libfontconfig1        2.5.0-1            generic font configuration library
ii  libgconf2-4           2.20.1-1           GNOME configuration database syste
ii  libglade2-0           1:2.6.2-1          library to load .glade files at ru
ii  libglib2.0-0          2.14.3-1           The GLib library of C routines
ii  libgnomecanvas2-0     2.20.1.1-1         A powerful object-oriented display
ii  libgnomevfs2-0        1:2.20.1-1         GNOME Virtual File System (runtime
ii  libgpod2              0.5.2-4            a library to read and write songs 
ii  libgtk2.0-0           2.12.1-1           The GTK+ graphical user interface 
ii  libhal1               0.5.10-2           Hardware Abstraction Layer - share
ii  libid3tag0            0.15.1b-10         ID3 tag reading library from the M
ii  libkrb53              1.6.dfsg.3~beta1-2 MIT Kerberos runtime libraries
ii  liborbit2             1:2.14.7-0.1       libraries for ORBit2 - a CORBA ORB
ii  libpango1.0-0         1.18.3-1           Layout and rendering of internatio
ii  libvorbis0a           1.2.0.dfsg-2       The Vorbis General Audio Compressi
ii  libvorbisfile3        1.2.0.dfsg-2       The Vorbis General Audio Compressi
ii  libx11-6              2:1.0.3-7          X11 client-side library
ii  libxcursor1           1:1.1.9-1          X cursor management library
ii  libxext6              1:1.0.3-2          X11 miscellaneous extension librar
ii  libxfixes3            1:4.0.3-2          X11 miscellaneous 'fixes' extensio
ii  libxi6                2:1.1.3-1          X11 Input extension library
ii  libxinerama1          1:1.0.2-1          X11 Xinerama extension library
ii  libxml2               2.6.30.dfsg-2      GNOME XML library
ii  libxrandr2            2:1.2.2-1          X11 RandR extension library
ii  libxrender1           1:0.9.4-1          X Rendering Extension client libra

gtkpod recommends no packages.

-- no debconf information
-------------- next part --------------
diff -Naur gtkpod-0.99.10.orig/src/mp4file.c gtkpod-0.99.10/src/mp4file.c
--- gtkpod-0.99.10.orig/src/mp4file.c	2007-06-27 12:29:33.000000000 -0700
+++ gtkpod-0.99.10/src/mp4file.c	2007-11-16 23:00:12.000000000 -0800
@@ -149,7 +149,7 @@
     g_return_val_if_fail (mp4File != MP4_INVALID_FILE_HANDLE, FALSE);
 
     if (MP4GetMetadataFreeForm(mp4File, "iTunNORM",
-			       &ppValue, &pValueSize))
+			       &ppValue, &pValueSize, NULL))
     {
 	gchar *str;
 	guint sc1=0, sc2=0;
@@ -171,7 +171,7 @@
     }
 
     if (MP4GetMetadataFreeForm(mp4File, "replaygain_track_gain",
-			       &ppValue, &pValueSize))
+			       &ppValue, &pValueSize, NULL))
     {
 	gchar *str;
 	gdouble rg;
@@ -367,7 +367,7 @@
 		    u_int8_t *image_data;
 		    u_int32_t image_data_len;
 		    if (MP4GetMetadataCoverArt (mp4File,
-						&image_data, &image_data_len))
+						&image_data, &image_data_len, 0))
 		    {
 			if (image_data)
 			{
@@ -452,7 +452,7 @@
 	    MP4GetMetadataAlbum (mp4File, &m_album);
 	    MP4GetMetadataGenre (mp4File, &m_genre);*/
 	    MP4GetMetadataTool (mp4File, &m_tool);
-	    MP4GetMetadataCoverArt (mp4File, &m_covert, &m_size);
+	    MP4GetMetadataCoverArt (mp4File, &m_covert, &m_size, 0);
 	    MP4MetadataDelete (mp4File);
 #endif
 	    value = charset_from_utf8 (track->title);