CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

xsp: fix build error in gcc-15

Browse Source 
* fix following build error in gcc-15:
../Xsp/Xsp.c:37:9: error: initialization of 'int (*)(Display *, XExtCodes *)' from incompatible pointer type 'int (*)(void)' [-Wincompatible-pointer-types]
   37 |         XSPCloseDisplay,                    /* close_display */
      |         ^~~~~~~~~~~~~~~
../Xsp/Xsp.c:37:9: note: (near initialization for 'xsp_extension_hooks.close_display')
../Xsp/Xsp.c:23:12: note: 'XSPCloseDisplay' declared here
   23 | static int XSPCloseDisplay();
      |            ^~~~~~~~~~~~~~~
In file included from ../Xsp/Xsp.c:6:
../Xsp/Xsp.c:49:37: error: conflicting types for 'XSPCloseDisplay'; have 'int(Display *, XExtCodes *)'
   49 | static XEXT_GENERATE_CLOSE_DISPLAY (XSPCloseDisplay, xsp_info)
      |                                     ^~~~~~~~~~~~~~~
../Xsp/Xsp.c:36:9: error: 'XSPCloseDisplay' undeclared here (not in a function); did you mean 'XCloseDisplay'?
   36 |         XSPCloseDisplay,                    /* close_display */
      |         ^~~~~~~~~~~~~~~
      |         XCloseDisplay

Signed-off-by: mark.yang <mark.yang@lge.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
mark.yang 2025-04-24 18:20:59 +09:00 committed by Khem Raj
parent 2c74a587e8
commit 6a9d7817d8
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta-oe/recipes-multimedia/xsp/xsp/0001-fix-incompatible-pointer-types-build-error-in-gcc-15.patch Normal file
View File

@ -0,0 +1,40 @@
From e001efa4a50e43fca5d8918ee05a3bc37180262d Mon Sep 17 00:00:00 2001
From: "mark.yang" <mark.yang@lge.com>
Date: Thu, 24 Apr 2025 18:10:25 +0900
Subject: [PATCH] fix incompatible-pointer-types build error in gcc 15
../Xsp/Xsp.c:37:9: error: initialization of 'int (*)(Display *, XExtCodes *)' from incompatible pointer type 'int (*)(void)' [-Wincompatible-pointer-types]
37 | XSPCloseDisplay, /* close_display */
| ^~~~~~~~~~~~~~~
../Xsp/Xsp.c:37:9: note: (near initialization for 'xsp_extension_hooks.close_display')
../Xsp/Xsp.c:23:12: note: 'XSPCloseDisplay' declared here
23 | static int XSPCloseDisplay();
| ^~~~~~~~~~~~~~~
In file included from ../Xsp/Xsp.c:6:
../Xsp/Xsp.c:49:37: error: conflicting types for 'XSPCloseDisplay'; have 'int(Display *, XExtCodes *)'
49 | static XEXT_GENERATE_CLOSE_DISPLAY (XSPCloseDisplay, xsp_info)
| ^~~~~~~~~~~~~~~
../Xsp/Xsp.c:36:9: error: 'XSPCloseDisplay' undeclared here (not in a function); did you mean 'XCloseDisplay'?
36 | XSPCloseDisplay, /* close_display */
| ^~~~~~~~~~~~~~~
| XCloseDisplay
Upstream-Status: Inactive-Upstream [seems to be unmaintained]
Signed-off-by: mark.yang <mark.yang@lge.com>
---
Xsp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Xsp.c b/Xsp.c
index 28e2d6e..9bcc958 100644
--- a/Xsp.c
+++ b/Xsp.c
@@ -20,7 +20,7 @@ static XExtensionInfo _xsp_info_data;
static XExtensionInfo *xsp_info = &_xsp_info_data;
static /* const */ char *xsp_extension_name = XSP_NAME;
-static int XSPCloseDisplay();
+static XEXT_CLOSE_DISPLAY_PROTO(XSPCloseDisplay);
static Bool XSPWireToEvent(Display *dpy, XEvent *event, xEvent *wire);
static Status XSPEventToWire(Display *dpy, XEvent *event, xEvent *wire);

4
meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
View File

@ -4,7 +4,9 @@ SECTION = "x11/libs"
DEPENDS = "virtual/libx11 libxext xpext"
LIC_FILES_CHKSUM = "file://COPYING;md5=ea2bda168c508c7cd8afa567b2fcc549"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${BPN}_${PV}.tar.gz \
file://xsp-fix-pc.patch"
file://xsp-fix-pc.patch \
file://0001-fix-incompatible-pointer-types-build-error-in-gcc-15.patch \
"
S = "${WORKDIR}/Xsp"
inherit autotools pkgconfig features_check