MP4Close returns void now, adapt.

Patch will be sent upstream shortly.

4 files changed, 44 insertions, 2 deletions

diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 609f637b4b8..0e59d0a1b67 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.30 2007/08/30 00:01:36 wiz Exp $
+$NetBSD: distinfo,v 1.31 2007/11/19 09:54:09 dillo Exp $
 
 SHA1 (amarok-1.4.7.tar.bz2) = ff97ad833159f4be32c0dfe546a6dee944f5339d
 RMD160 (amarok-1.4.7.tar.bz2) = fc5f5182b488f629cc608aee16aa84a0c4978dcd
 Size (amarok-1.4.7.tar.bz2) = 12723499 bytes
+SHA1 (patch-aa) = 55a55cb4e2c3aa7f1efac997036f8104af187b13
 SHA1 (patch-ab) = 91097c1d901fb66c5c8e593005c462b1874f50bf
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
new file mode 100644
index 00000000000..4d7ab406901
--- /dev/null
+++ b/audio/amarok/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.12 2007/11/19 09:54:09 dillo Exp $
+
+--- amarok/src/metadata/mp4/mp4file.cpp.orig	2007-08-07 19:48:28.000000000 +0200
++++ amarok/src/metadata/mp4/mp4file.cpp
+@@ -156,10 +156,7 @@ bool MP4::File::save()
+     }
+ #endif
+ 
+-    if(!MP4Close(handle))
+-    {
+-        fprintf(stderr, "close failed\n");
+-    }
++    MP4Close(handle);
+ 
+     mp4file = MP4Read(name());
+     if(mp4file == MP4_INVALID_FILE_HANDLE)
diff --git a/audio/libtunepimp/distinfo b/audio/libtunepimp/distinfo
index 110f1eddf26..b4386f774e8 100644
--- a/audio/libtunepimp/distinfo
+++ b/audio/libtunepimp/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2006/12/05 09:01:57 wiz Exp $
+$NetBSD: distinfo,v 1.9 2007/11/19 09:53:04 dillo Exp $
 
 SHA1 (libtunepimp-0.5.3.tar.gz) = 1b904cd97ce009588fe57336f40e79b6edf9947e
 RMD160 (libtunepimp-0.5.3.tar.gz) = 6bc312591b98a5b74824fc3103137cbf60d4b012
 Size (libtunepimp-0.5.3.tar.gz) = 1097005 bytes
+SHA1 (patch-aa) = e304cdb6e31fe7824da34b1c820c2dd62bfeddfc
 SHA1 (patch-ab) = 014fa77e2501bdc799287eaf733ecc8fdcbb9cbe
 SHA1 (patch-ac) = cb5049d1b9e4fdda3088e957ff615ff5d9c30734
 SHA1 (patch-ad) = cc78c69249ff733227320f8ca505e10d17354e26
diff --git a/audio/libtunepimp/patches/patch-aa b/audio/libtunepimp/patches/patch-aa
new file mode 100644
index 00000000000..97fa5dfb7e6
--- /dev/null
+++ b/audio/libtunepimp/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.4 2007/11/19 09:53:08 dillo Exp $
+
+--- plugins/mp4/mp4.cpp.orig	2006-11-18 11:51:08.000000000 +0100
++++ plugins/mp4/mp4.cpp
+@@ -231,8 +231,7 @@ mp4ReadMetadata(metadata_t *mdata, const
+   
+   strcpy(mdata->fileFormat, fileName + strlen(fileName) - 3); 
+   
+-  if (!MP4Close(mp4file))
+-    return 0;
++  MP4Close(mp4file);
+   
+   return 1;
+ }
+@@ -315,8 +314,7 @@ mp4WriteMetadata(const metadata_t *mdata
+   sprintf(temp, "%d", mdata->nonAlbum);  
+   MP4SetMetadataFreeForm(mp4file, "MusicBrainz Non-Album", (u_int8_t *)temp, strlen(temp) + 1);
+   
+-  if (!MP4Close(mp4file))
+-    return 0;
++  MP4Close(mp4file);
+ 
+ #ifndef WIN32
+   if (!MP4Optimize(utf8ToEncoding(fileName, encoding).c_str()))