[packages/gmerlin] - build fixes (function signature mismatch, compatibility with bool being keyword)
qboosh
qboosh at pld-linux.org
Sun Oct 25 20:59:50 CET 2026
commit 9b490e9dc16c9fa9db239f56808ef9a334dc5cdc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Oct 25 21:00:31 2026 +0100
- build fixes (function signature mismatch, compatibility with bool being keyword)
gmerlin-bool.patch | 41 +++++++++++++++++++++++++++++++++++++++++
gmerlin-types.patch | 11 +++++++++++
gmerlin.spec | 50 +++++++++++++++++++++++++++-----------------------
3 files changed, 79 insertions(+), 23 deletions(-)
---
diff --git a/gmerlin.spec b/gmerlin.spec
index 74c74dd..10838ae 100644
--- a/gmerlin.spec
+++ b/gmerlin.spec
@@ -22,6 +22,8 @@ Patch3: cdio.patch
Patch4: %{name}-am.patch
Patch5: %{name}-pc.patch
Patch6: %{name}-includes.patch
+Patch7: %{name}-types.patch
+Patch8: %{name}-bool.patch
URL: https://gmerlin.sourceforge.net/
BuildRequires: OpenGL-devel
BuildRequires: alsa-lib-devel >= 1.0.0
@@ -62,17 +64,17 @@ BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXtst-devel
BuildRequires: xorg-lib-libXv-devel
BuildRequires: xorg-lib-libX11-devel >= 1.0.0
-Requires: fontconfig-libs >= 2.2.3
-Requires: freetype >= 1:2.1.9
-Requires: gavl >= 1.4.0
-Requires: gtk+2 >= 2:2.8.0
-Requires: libcddb >= 1.0.2
-Requires: libcdio >= 0.76
-Requires: libmusicbrainz >= 2.0.2
-Requires: libquicktime >= 1.2.4
-Requires: libv4l >= 0.5.7
-Requires: libvisual >= 0.4.0
-Requires: libxml2 >= 2.4.0
+Requires: fontconfig-libs%{?_isa} >= 2.2.3
+Requires: freetype%{?_isa} >= 1:2.1.9
+Requires: gavl%{?_isa} >= 1.4.0
+Requires: gtk+2%{?_isa} >= 2:2.8.0
+Requires: libcddb%{?_isa} >= 1.0.2
+Requires: libcdio%{?_isa} >= 0.76
+Requires: libmusicbrainz%{?_isa} >= 2.0.2
+Requires: libquicktime%{?_isa} >= 1.2.4
+Requires: libv4l%{?_isa} >= 0.5.7
+Requires: libvisual%{?_isa} >= 0.4.0
+Requires: libxml2%{?_isa} >= 2.4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -92,18 +94,18 @@ aplikacji.
Summary: Header files for gmerlin libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek gmerlin
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: OpenGL-devel
-Requires: fontconfig-devel >= 2.2.3
-Requires: freetype-devel >= 1:2.1.9
-Requires: gavl-devel >= 1.4.0
-Requires: gtk+2-devel >= 2:2.8.0
-Requires: libvisual-devel >= 0.4.0
-Requires: libxml2-devel >= 2.4.0
-Requires: xorg-lib-libXfixes-devel
-Requires: xorg-lib-libXinerama-devel
-Requires: xorg-lib-libXtst-devel
-Requires: xorg-lib-libXv-devel
+Requires: fontconfig-devel%{?_isa} >= 2.2.3
+Requires: freetype-devel%{?_isa} >= 1:2.1.9
+Requires: gavl-devel%{?_isa} >= 1.4.0
+Requires: gtk+2-devel%{?_isa} >= 2:2.8.0
+Requires: libvisual-devel%{?_isa} >= 0.4.0
+Requires: libxml2-devel%{?_isa} >= 2.4.0
+Requires: xorg-lib-libXfixes-devel%{?_isa}
+Requires: xorg-lib-libXinerama-devel%{?_isa}
+Requires: xorg-lib-libXtst-devel%{?_isa}
+Requires: xorg-lib-libXv-devel%{?_isa}
%description devel
Header files for gmerlin libraries.
@@ -115,7 +117,7 @@ Pliki nagłówkowe bibliotek gmerlin.
Summary: Static gmerlin libraries
Summary(pl.UTF-8): Statyczne biblioteki gmerlin
Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description static
Static gmerlin libraries.
@@ -145,6 +147,8 @@ Dokumentacja API bibliotek gmerlin.
%patch -P4 -p1
%patch -P5 -p1
%patch -P6 -p1
+%patch -P7 -p1
+%patch -P8 -p1
# evil, sets CFLAGS basing on /proc/cpuinfo, overrides our optflags
# (--with-cpuflags=none disables using /proc/cpuinfo, but not overriding)
diff --git a/gmerlin-bool.patch b/gmerlin-bool.patch
new file mode 100644
index 0000000..2510169
--- /dev/null
+++ b/gmerlin-bool.patch
@@ -0,0 +1,41 @@
+--- gmerlin-1.2.0/apps/alsamixer/g_control.c.orig 2012-06-08 13:50:26.000000000 +0200
++++ gmerlin-1.2.0/apps/alsamixer/g_control.c 2026-10-25 20:42:11.843942226 +0100
+@@ -628,7 +628,7 @@ struct control_widget_s
+ struct
+ {
+ widget_array_t buttons;
+- } bool;
++ } bool_field;
+ struct
+ {
+ widget_array_t combos;
+@@ -1199,10 +1199,10 @@ static void init_bool(control_widget_t *
+ int i;
+ GtkWidget * label;
+
+- init_array(&w->priv.bool.buttons, c->ctl,
++ init_array(&w->priv.bool_field.buttons, c->ctl,
+ info, 0);
+
+- w->w = gtk_table_new(w->priv.bool.buttons.num + 1,
++ w->w = gtk_table_new(w->priv.bool_field.buttons.num + 1,
+ 1, 0);
+
+ w->label = bg_strdup(w->label, c->label);
+@@ -1211,13 +1211,13 @@ static void init_bool(control_widget_t *
+ gtk_table_attach(GTK_TABLE(w->w), label, 0, 1, 0, 1,
+ GTK_FILL, GTK_FILL, 0, 0);
+
+- init_array(&w->priv.bool.buttons, c->ctl,
++ init_array(&w->priv.bool_field.buttons, c->ctl,
+ info, 0);
+
+- for(i = 0; i < w->priv.bool.buttons.num; i++)
++ for(i = 0; i < w->priv.bool_field.buttons.num; i++)
+ {
+ gtk_table_attach(GTK_TABLE(w->w),
+- w->priv.bool.buttons.widgets[i].w, 0, 1,
++ w->priv.bool_field.buttons.widgets[i].w, 0, 1,
+ i+1, i+2,
+ GTK_FILL, GTK_FILL, 0, 0);
+ }
diff --git a/gmerlin-types.patch b/gmerlin-types.patch
new file mode 100644
index 0000000..0b6b99a
--- /dev/null
+++ b/gmerlin-types.patch
@@ -0,0 +1,11 @@
+--- gmerlin-1.2.0/lib/transcoder_track.c.orig 2012-06-08 13:50:32.000000000 +0200
++++ gmerlin-1.2.0/lib/transcoder_track.c 2026-10-25 20:24:19.253086283 +0100
+@@ -1434,7 +1434,7 @@ bg_transcoder_track_subtitle_overlay_get
+ }
+
+ const bg_parameter_info_t *
+-bg_transcoder_track_get_general_parameters(bg_transcoder_track_t * t)
++bg_transcoder_track_get_general_parameters()
+ {
+ return parameters_general;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gmerlin.git/commitdiff/9b490e9dc16c9fa9db239f56808ef9a334dc5cdc
More information about the pld-cvs-commit
mailing list