Skip to content

pcsxr: fix build with GCC 14 and PIE crash #61437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rutpiv wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −2
Open

pcsxr: fix build with GCC 14 and PIE crash #61437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions srcpkgs/pcsxr/patches/fix-gcc14-errors.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Fix errors exposed by GCC 14 promoting warnings to errors:
- cfg-gtk.c: SDL_JoystickName() takes SDL_Joystick* in SDL2; use
SDL_JoystickNameForIndex()
- gpu.c: cast Display* to unsigned long (integer), not unsigned long*

--- a/plugins/dfinput/cfg-gtk.c
+++ b/plugins/dfinput/cfg-gtk.c
@@ -607,7 +607,7 @@

n = SDL_NumJoysticks();
for (j = 0; j < n; j++) {
- sprintf(buf, "%d: %s", j + 1, SDL_JoystickName(j));
+ sprintf(buf, "%d: %s", j + 1, SDL_JoystickNameForIndex(j));
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, buf, -1);
}
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -1091,7 +1091,7 @@
#if defined (_MACGL)
*disp = display;
#else
- *disp=(unsigned long *)display; // return display ID to main emu
+ *disp=(unsigned long)display; // return display ID to main emu
#endif
}

9 changes: 7 additions & 2 deletions srcpkgs/pcsxr/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'pcsxr'
pkgname=pcsxr
version=1.9.94
revision=2
revision=3
build_style=gnu-configure
configure_args="--enable-libcdio --enable-opengl"
hostmakedepends="pkg-config automake libtool intltool glib-devel gettext-devel nasm"
Expand All @@ -15,8 +15,13 @@ homepage="http://pcsxr.codeplex.com/"
distfiles="${DEBIAN_SITE}/main/p/pcsxr/pcsxr_${version}.orig.tar.xz"
checksum=8a366b68a7c236443aa75b422bea84b5115f8d8c23e5a78fd6951e643e90f660
lib32disabled=yes
nopie=yes

CFLAGS="-fcommon"
# no real test suite; make check only runs intltool's POTFILES
# completeness lint, which fails on unused macOS sources
make_check=no

CFLAGS="-fcommon -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types"

pre_configure() {
autoreconf -fi
Expand Down