[gentoo-commits] gentoo-x86 commit in media-sound/kid3/files: kid3-2.0.1-mp4v2-1.9.1_p479.patch

[gentoo-commits] gentoo-x86 commit in media-sound/kid3/files: kid3-2.0.1-mp4v2-1.9.1_p479.patch

[Johannes Huber (johu)]

johu        12/04/16 08:03:59

  Added:                kid3-2.0.1-mp4v2-1.9.1_p479.patch
  Log:
  Add upstream patch to fix build with snapshot version of media-libs/libmp4v2, fixes bug #409511.
  
  (Portage version: 2.2.0_alpha100/cvs/Linux i686)

Revision  Changes    Path
1.1                  media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch?rev=1.1&content-type=text/plain

Index: kid3-2.0.1-mp4v2-1.9.1_p479.patch
===================================================================
From e4ab371868f1a23d31f26234ffde6b4cc6594a0a Mon Sep 17 00:00:00 2001
From: Urs Fleisch <ufleisch@users.sourceforge.net>
Date: Sun, 1 Apr 2012 18:04:56 +0200
Subject: [PATCH 1/1] Support building with mp4v2-trunk-r479.

---
 src/core/formats/m4afile.cpp |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/core/formats/m4afile.cpp b/src/core/formats/m4afile.cpp
index 0b79728..bf50beb 100644
--- a/src/core/formats/m4afile.cpp
+++ b/src/core/formats/m4afile.cpp
@@ -57,6 +57,13 @@
 #define MPEG4IP_MAJOR_MINOR_VERSION 0x0009
 #endif
 
+#if MPEG4IP_MAJOR_MINOR_VERSION < 0x0200
+#define MP4TagsSetContentID MP4TagsSetCNID
+#define MP4TagsSetArtistID MP4TagsSetATID
+#define MP4TagsSetPlaylistID MP4TagsSetPLID
+#define MP4TagsSetGenreID MP4TagsSetGEID
+#endif
+
 /**
  * Constructor.
  *
@@ -240,7 +247,9 @@ static Frame::Type getTypeForName(const QString& name,
   return Frame::FT_UnknownFrame;
 }
 
-#ifndef HAVE_MP4V2_MP4GETMETADATABYINDEX_CHARPP_ARG
+#if MPEG4IP_MAJOR_MINOR_VERSION >= 0x0109
+#elif defined HAVE_MP4V2_MP4GETMETADATABYINDEX_CHARPP_ARG
+#else
 /**
  * Check if a name is a free form field.
  *
@@ -649,7 +658,7 @@ bool M4aFile::writeTags(bool force, bool* renamed, bool preserve)
             MP4TagsSetCompilation(tags, &cpl);
           } else if (name == "covr") {
             MP4TagArtwork artwork;
-            artwork.data = value.data();
+            artwork.data = (void *)value.data();
             artwork.size = value.size();
             artwork.type = MP4_ART_UNDEFINED;
             MP4TagsAddArtwork(tags, &artwork);
@@ -722,16 +731,16 @@ bool M4aFile::writeTags(bool force, bool* renamed, bool preserve)
             MP4TagsSetITunesCountry(tags, &val);
           } else if (name == "cnID") {
             uint32_t val = str.toULong();
-            MP4TagsSetCNID(tags, &val);
+            MP4TagsSetContentID(tags, &val);
           } else if (name == "atID") {
             uint32_t val = str.toULong();
-            MP4TagsSetATID(tags, &val);
+            MP4TagsSetArtistID(tags, &val);
           } else if (name == "plID") {
             uint64_t val = str.toULongLong();
-            MP4TagsSetPLID(tags, &val);
+            MP4TagsSetPlaylistID(tags, &val);
           } else if (name == "geID") {
             uint32_t val = str.toULong();
-            MP4TagsSetGEID(tags, &val);
+            MP4TagsSetGenreID(tags, &val);
           } else {
             MP4ItmfItem* item = MP4ItmfItemAlloc("----", 1);
             item->mean = strdup("com.apple.iTunes");
-- 
1.7.4.1

[gentoo-commits] gentoo-x86 commit in media-sound/kid3/files: kid3-2.0.1-mp4v2-1.9.1_p479.patch

[Johannes Huber (johu)]

johu        12/07/10 20:05:43

  Removed:              kid3-2.0.1-mp4v2-1.9.1_p479.patch
  Log:
  Remove old.
  
  (Portage version: 2.2.0_alpha116/cvs/Linux x86_64)