ports/116972: Amarok broken due to newer version of mpeg4ip-libmp4v2

[Armin Pirkovitsch]

>Number:         116972
>Category:       ports
>Synopsis:       Amarok broken due to newer version of mpeg4ip-libmp4v2
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 06 09:30:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Armin Pirkovitsch
>Release:        7.0 CURRENT
>Organization:
>Environment:
FreeBSD oh-nbook.local 7.0-CURRENT FreeBSD 7.0-CURRENT #9: Fri Oct  5 13:10:13 CEST 2007     sperber at oh-nbook.local:/usr/obj/usr/src/sys/OH-NBOOK  i386
>Description:
In the previous version of the above mentioned library MP4Close was a bool method.
However it has been changed to void (error handling done internally by exceptions now)
Due to this change amarok won't compile any more because it can't convert void to bool.
>How-To-Repeat:
try to compile amarok with the newest version of mpeg4ip-libmp4v2
>Fix:
The attached file is an altered patch to also fix this problem.

Patch attached with submission follows:

--- amarok/src/metadata/mp4/mp4file.cpp.orig	2007-08-07 19:48:28.000000000 +0200
+++ amarok/src/metadata/mp4/mp4file.cpp	2007-10-06 11:43:10.000000000 +0200
@@ -27,9 +27,8 @@
 
 #include "mp4tag.h"
 #include <tfile.h>
-#include <audioproperties.h>
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #define MP4V2_HAS_WRITE_BUG 1
 
@@ -156,10 +155,8 @@
     }
 #endif
 
-    if(!MP4Close(handle))
-    {
-        fprintf(stderr, "close failed\n");
-    }
+    MP4Close(handle);
+    handle=NULL;
 
     mp4file = MP4Read(name());
     if(mp4file == MP4_INVALID_FILE_HANDLE)


>Release-Note:
>Audit-Trail:
>Unformatted: