[SCM] easytag/master: Add patch to allow compilation of id3lib wrapper

amigadave-guest at users.alioth.debian.org amigadave-guest at users.alioth.debian.org
Fri Feb 6 21:05:12 UTC 2015


The following commit has been merged in the master branch:
commit ee5492667dda57afcd4cd320d1b47c42e53fcb2d
Author: David King <amigadave at amigadave.com>
Date:   Fri Feb 6 21:00:27 2015 +0000

    Add patch to allow compilation of id3lib wrapper

diff --git a/debian/patches/fix-id3lib-wrapper.patch b/debian/patches/fix-id3lib-wrapper.patch
new file mode 100644
index 0000000..a719b07
--- /dev/null
+++ b/debian/patches/fix-id3lib-wrapper.patch
@@ -0,0 +1,58 @@
+Description: Fix compilation of id3lib wrapper
+ Debian carries a patch against id3lib to add the API that EasyTAG also adds in
+ its internal id3lib C wrapper.
+Author: David King <amigadave at amigadave.com>
+Origin: upstream
+Last-Update: 2015-02-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.ac
++++ b/configure.ac
+@@ -277,7 +277,12 @@ AS_IF([test "x$have_mp3" = "xyes" -a "x$enable_id3v23" != "xno"],
+ 
+        AC_SUBST([ID3LIB_LIBS], [$ac_cv_search_ID3Tag_Link])
+        AC_DEFINE([ENABLE_ID3LIB], [], [Define for ID3v2.3 support])
+-       ID3LIB_VERSION="(id3lib-$ID3LIB_MAJOR.$ID3LIB_MINOR.$ID3LIB_PATCH)"],
++       ID3LIB_VERSION="(id3lib-$ID3LIB_MAJOR.$ID3LIB_MINOR.$ID3LIB_PATCH)"
++       AC_CHECK_DECLS([ID3Field_SetEncoding,
++                       ID3Field_GetEncoding,
++                       ID3Field_IsEncodable],
++                       [], [],
++                      [[#include <id3.h>]])],
+       [have_id3lib=no])
+ 
+ 
+diff --git a/src/tags/id3lib/id3_bugfix.h b/src/tags/id3lib/id3_bugfix.h
+index f21f9ed..5eb39cf 100644
+--- a/src/tags/id3lib/id3_bugfix.h
++++ b/src/tags/id3lib/id3_bugfix.h
+@@ -28,13 +28,19 @@
+ 
+ G_BEGIN_DECLS
+ 
+-  ID3_C_EXPORT bool                  CCONV ID3Field_SetEncoding    (ID3Field *field, ID3_TextEnc enc);
+-  ID3_C_EXPORT ID3_TextEnc           CCONV ID3Field_GetEncoding    (const ID3Field *field);
+-  ID3_C_EXPORT bool                  CCONV ID3Field_IsEncodable    (const ID3Field *field);
+-  ID3_C_EXPORT ID3_FieldType         CCONV ID3Field_GetType        (const ID3Field *field);
+-  //ID3_C_EXPORT ID3_FieldID           CCONV ID3Field_GetID          (const ID3Field *field);
+-
+-  ID3_C_EXPORT const Mp3_Headerinfo* CCONV ID3Tag_GetMp3HeaderInfo (ID3Tag *tag);
++#if !HAVE_DECL_ID3FIELD_SETENCODING
++ID3_C_EXPORT bool                  CCONV ID3Field_SetEncoding    (ID3Field *field, ID3_TextEnc enc);
++#endif /* !HAVE_DECL_ID3FIELD_SETENCODING */
++#if !HAVE_DECL_ID3FIELD_GETENCODING
++ID3_C_EXPORT ID3_TextEnc           CCONV ID3Field_GetEncoding    (const ID3Field *field);
++#endif /* !HAVE_DECL_ID3FIELD_GETENCODING */
++#if !HAVE_DECL_ID3FIELD_ISENCODABLE
++ID3_C_EXPORT bool                  CCONV ID3Field_IsEncodable    (const ID3Field *field);
++#endif /* !HAVE_DECL_ID3FIELD_ISENCODABLE */
++ID3_C_EXPORT ID3_FieldType         CCONV ID3Field_GetType        (const ID3Field *field);
++//ID3_C_EXPORT ID3_FieldID           CCONV ID3Field_GetID          (const ID3Field *field);
++
++ID3_C_EXPORT const Mp3_Headerinfo* CCONV ID3Tag_GetMp3HeaderInfo (ID3Tag *tag);
+   
+ G_END_DECLS
+ 
+-- 
+2.2.2
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..6727f42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-id3lib-wrapper.patch

-- 
easytag packaging



More information about the pkg-multimedia-commits mailing list