Re: [Gtkpod-devel] [PATCH] Exclude MP4Tags* functions from builds with older libmp4v2 headers

[P.G. R. <p.g...@ph...>]

> Joel Smith wrote:
>> Fix the problem reported by Riccardo Merlotti and on the bug tracker at
>> http://sourceforge.net/tracker/?func=detail&aid=2991744&group_id=67873&atid=519273

<snip>

>>
>> @@ -435,9 +439,11 @@ void mp4_init()
>>      MP4SetMetadataCoverArt = (MP4SetMetadataCoverArt_t)
>> dlsym(mp4v2_handle, "MP4SetMetadataCoverArt");
>>      MP4Modify = (MP4Modify_t) dlsym(mp4v2_handle, "MP4Modify");
>>      MP4MetadataDelete = (MP4MetadataDelete_t) dlsym(mp4v2_handle,
>> "MP4MetadataDelete");
>> +#if HAVE_MP4V2_ITMF_TAGS_H
>>      MP4TagsAllocFunc = (MP4TagsAlloc_t) dlsym(mp4v2_handle,
>> "MP4TagsAlloc");
>>      MP4TagsFetchFunc = (MP4TagsFetch_t) dlsym(mp4v2_handle,
>> "MP4TagsFetch");
>>      MP4TagsFreeFunc = (MP4TagsFree_t) dlsym(mp4v2_handle,
>> "MP4TagsFree");
>> +#endif
>>
>>      /* alternate names for HAVE_LIBMP4V2_2 */
>>
>> --
>> 1.6.3.3
>
> Let me try this again... I swear I wrote a reply last time...
>
> This was _so_ close to applying with git am.  It failed because
> somewhere along the way the trailing spaces on the line following the
> '/* alternate names for HAVE_LIBMP4V2_2 */' comment went missing.
>
> (That's probably one more good reason to find and remove such useless
> whitespace whenever it is found. ;)

That might explain why the patch would not apply with 'git apply' and why
patch would only apply the 3rd hunk with a fuzz.

PGR

-- 
Laws are partly formed for the sake of good men, in order to instruct them
how they may live on friendly terms with one another, and partly for the
sake of those who refuse to be instructed, whose spirit cannot be subdued,
or softened, or hindered from plunging into evil. [The Laws, Plato]