pool/id3lib
SHA256
17
0
Fork 1
Code Issues Pull Requests Activity

Compare commits

merge into: pool:leap-16.1
Branches Tags
pool:factory pool:leap-16.0 pool:leap-16.1
...
pull from: pool:factory
Branches Tags
pool:factory pool:leap-16.0 pool:leap-16.1

5 Commits
leap-16.1 ... factory

Author SHA256 Message Date
Ana Guerrero
75f6c526e2 Accepting request 1289957 from multimedia:libs 
- Modify patch id3lib-3.8.3-fix-c23.patch:
  Also move ID3Field_SetEncoding and ID3Field_IsEncodable to my_bool
  typedef as otherwise grip fails at build

OBS-URL: https://build.opensuse.org/request/show/1289957
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/id3lib?expand=0&rev=36
 2025-07-02 16:17:27 +00:00
Takashi Iwai
da7f194986 Fix comment in spec to pass source_validator check 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/id3lib?expand=0&rev=33
 2025-07-02 12:23:40 +00:00
Takashi Iwai
14b3131fc9 - Modify patch id3lib-3.8.3-fix-c23.patch: 
Also move ID3Field_SetEncoding and ID3Field_IsEncodable to my_bool
  typedef as otherwise grip fails at build

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/id3lib?expand=0&rev=32
 2025-06-26 15:45:36 +00:00
Ana Guerrero
ce92f9fb82 Accepting request 1266768 from multimedia:libs 
OBS-URL: https://build.opensuse.org/request/show/1266768
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/id3lib?expand=0&rev=35
 2025-04-03 14:50:19 +00:00
Takashi Iwai
84007aa850 - Add id3lib-3.8.3-fix-c23.patch: Import C23 patch from Gentoo. 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/id3lib?expand=0&rev=30
 2025-04-03 06:32:24 +00:00
3 changed files with 149 additions and 1 deletions
Expand all files Collapse all files

131
id3lib-3.8.3-fix-c23.patch Normal file
View File

@@ -0,0 +1,131 @@
From a52d71d202f6e45cab766c83c16366ca5561a9f2 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Tue, 4 Feb 2025 15:43:28 +0000
Subject: [PATCH] Fix C23 compatibility as best as we can
The situation here is complicated. With C23, 'bool' is exposed properly
out of the box (as the same type as '_Bool'). But this is problematic
when it comes to C++ where 'bool' was always '_Bool' (or near-enough
guaranteed), and where we have existing C applications that we don't
want to break ABI for.
For C++, id3tag was always using native C++ 'bool', so we don't want to change
that now when looking at C23 compat. This means the ABI issues between
C and C++ remain: typedef bool my_bool.
For C, continue using the old 'int bool' that the project did before
C23. This doesn't solve the pre-existing C/C++ ABI issue here where
C++ always had "good _Bool-as-bool", unfortunately: typedef int my_bool.
Bug: https://bugs.gentoo.org/949086
Signed-off-by: Sam James <sam@gentoo.org>
---
include/id3.h | 22 +++++++++++-----------
include/id3/globals.h | 25 ++++++++++++++++---------
2 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/include/id3.h b/include/id3.h
--- a/include/id3.h
+++ b/include/id3.h
@@ -47,12 +47,12 @@ extern "C"
ID3_C_EXPORT ID3Tag* CCONV ID3Tag_New (void);
ID3_C_EXPORT void CCONV ID3Tag_Delete (ID3Tag *tag);
ID3_C_EXPORT void CCONV ID3Tag_Clear (ID3Tag *tag);
- ID3_C_EXPORT bool CCONV ID3Tag_HasChanged (const ID3Tag *tag);
- ID3_C_EXPORT void CCONV ID3Tag_SetUnsync (ID3Tag *tag, bool unsync);
- ID3_C_EXPORT void CCONV ID3Tag_SetExtendedHeader (ID3Tag *tag, bool ext);
- ID3_C_EXPORT void CCONV ID3Tag_SetPadding (ID3Tag *tag, bool pad);
+ ID3_C_EXPORT my_bool CCONV ID3Tag_HasChanged (const ID3Tag *tag);
+ ID3_C_EXPORT void CCONV ID3Tag_SetUnsync (ID3Tag *tag, my_bool unsync);
+ ID3_C_EXPORT void CCONV ID3Tag_SetExtendedHeader (ID3Tag *tag, my_bool ext);
+ ID3_C_EXPORT void CCONV ID3Tag_SetPadding (ID3Tag *tag, my_bool pad);
ID3_C_EXPORT void CCONV ID3Tag_AddFrame (ID3Tag *tag, const ID3Frame *frame);
- ID3_C_EXPORT bool CCONV ID3Tag_AttachFrame (ID3Tag *tag, ID3Frame *frame);
+ ID3_C_EXPORT my_bool CCONV ID3Tag_AttachFrame (ID3Tag *tag, ID3Frame *frame);
ID3_C_EXPORT void CCONV ID3Tag_AddFrames (ID3Tag *tag, const ID3Frame *frames, size_t num);
ID3_C_EXPORT ID3Frame* CCONV ID3Tag_RemoveFrame (ID3Tag *tag, const ID3Frame *frame);
ID3_C_EXPORT ID3_Err CCONV ID3Tag_Parse (ID3Tag *tag, const uchar header[ID3_TAGHEADERSIZE], const uchar *buffer);
@@ -66,7 +66,7 @@ extern "C"
ID3_C_EXPORT ID3Frame* CCONV ID3Tag_FindFrameWithASCII (const ID3Tag *tag, ID3_FrameID id, ID3_FieldID fld, const char *data);
ID3_C_EXPORT ID3Frame* CCONV ID3Tag_FindFrameWithUNICODE (const ID3Tag *tag, ID3_FrameID id, ID3_FieldID fld, const unicode_t *data);
ID3_C_EXPORT size_t CCONV ID3Tag_NumFrames (const ID3Tag *tag);
- ID3_C_EXPORT bool CCONV ID3Tag_HasTagType (const ID3Tag *tag, ID3_TagType);
+ ID3_C_EXPORT my_bool CCONV ID3Tag_HasTagType (const ID3Tag *tag, ID3_TagType);
ID3_C_EXPORT ID3TagIterator* CCONV ID3Tag_CreateIterator (ID3Tag *tag);
ID3_C_EXPORT ID3TagConstIterator* CCONV ID3Tag_CreateConstIterator (const ID3Tag *tag);
@@ -83,8 +83,8 @@ extern "C"
ID3_C_EXPORT void CCONV ID3Frame_SetID (ID3Frame *frame, ID3_FrameID id);
ID3_C_EXPORT ID3_FrameID CCONV ID3Frame_GetID (const ID3Frame *frame);
ID3_C_EXPORT ID3Field* CCONV ID3Frame_GetField (const ID3Frame *frame, ID3_FieldID name);
- ID3_C_EXPORT void CCONV ID3Frame_SetCompression (ID3Frame *frame, bool comp);
- ID3_C_EXPORT bool CCONV ID3Frame_GetCompression (const ID3Frame *frame);
+ ID3_C_EXPORT void CCONV ID3Frame_SetCompression (ID3Frame *frame, my_bool comp);
+ ID3_C_EXPORT my_bool CCONV ID3Frame_GetCompression (const ID3Frame *frame);
/* field wrappers */
ID3_C_EXPORT void CCONV ID3Field_Clear (ID3Field *field);
@@ -104,9 +104,9 @@ extern "C"
ID3_C_EXPORT void CCONV ID3Field_GetBINARY (const ID3Field *field, uchar *buffer, size_t buffLength);
ID3_C_EXPORT void CCONV ID3Field_FromFile (ID3Field *field, const char *fileName);
ID3_C_EXPORT void CCONV ID3Field_ToFile (const ID3Field *field, const char *fileName);
- ID3_C_EXPORT bool CCONV ID3Field_SetEncoding (ID3Field *field, ID3_TextEnc enc);
+ ID3_C_EXPORT my_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 my_bool CCONV ID3Field_IsEncodable (const ID3Field *field);
/* field-info wrappers */
ID3_C_EXPORT char* CCONV ID3FrameInfo_ShortName (ID3_FrameID frameid);
@@ -119,7 +119,7 @@ extern "C"
ID3_C_EXPORT flags_t CCONV ID3FrameInfo_FieldFlags (ID3_FrameID frameid, int fieldnum);
/* Deprecated */
- ID3_C_EXPORT void CCONV ID3Tag_SetCompression (ID3Tag *tag, bool comp);
+ ID3_C_EXPORT void CCONV ID3Tag_SetCompression (ID3Tag *tag, my_bool comp);
#ifdef __cplusplus
}
diff --git a/include/id3/globals.h b/include/id3/globals.h
--- a/include/id3/globals.h
+++ b/include/id3/globals.h
@@ -82,12 +82,19 @@
#define ID3_C_VAR extern
-#ifndef __cplusplus
-
-typedef int bool;
-# define false (0)
-# define true (!false)
-
+#if __cplusplus
+/* id3tag was always using native C++ 'bool', so we don't want to change
+ that now when looking at C23 compat. This means the ABI issues between
+ C and C++ remain. */
+#include <stdbool.h>
+typedef bool my_bool;
+#else
+/* For C, continue using the old 'int bool' that the project did before
+ C23. This doesn't solve the pre-existing C/C++ ABI issue here where
+ C++ always had "good _Bool-as-bool", unfortunately. */
+typedef int my_bool;
+#define false (0)
+#define true (!false)
#endif /* __cplusplus */
ID3_C_VAR const char * const ID3LIB_NAME;
@@ -532,9 +539,9 @@ ID3_STRUCT(Mp3_Headerinfo)
uint32 framesize;
uint32 frames; // nr of frames
uint32 time; // nr of seconds in song
- bool privatebit;
- bool copyrighted;
- bool original;
+ my_bool privatebit;
+ my_bool copyrighted;
+ my_bool original;
};
#define ID3_NR_OF_V1_GENRES 148

12
id3lib.changes
View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Jun 26 13:22:44 UTC 2025 - Dr. Werner Fink <werner@suse.de>
- Modify patch id3lib-3.8.3-fix-c23.patch:
Also move ID3Field_SetEncoding and ID3Field_IsEncodable to my_bool
typedef as otherwise grip fails at build
-------------------------------------------------------------------
Wed Apr 2 12:56:27 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
- Add id3lib-3.8.3-fix-c23.patch: Import C23 patch from Gentoo.
-------------------------------------------------------------------
Thu Feb 22 13:34:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

7
id3lib.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package id3lib
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -42,6 +42,8 @@ Patch13: id3lib-%{version}-fix-stack-overrun.patch
Patch14: id3lib-3.8.3-fix-utf16-stringlists.patch
Patch15: add-c-wrapper-functions.patch
Patch16: id3lib-missing-nullpointer-check.patch
# taken from https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/id3lib/files/id3lib-3.8.3-fix-c23.patch
Patch17: id3lib-3.8.3-fix-c23.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: dos2unix
@@ -105,6 +107,9 @@ id3lib, a software library for ID3v1 and ID3v2 tag manipulation.
%patch -P 14 -p1
%patch -P 15 -p1
%patch -P 16 -p1
%if %{pkg_vcmp gcc >= 15}
%patch -P 17 -p1 -b .c23
%endif
for i in doc/id3v2.3.0{.txt,.html}; do
dos2unix $i
done