Compare commits
3 Commits
Author | SHA256 | Date | |
---|---|---|---|
42e4982eb9 | |||
4d7a38ddb6 | |||
1c1137c756 |
12
README.md
Normal file
12
README.md
Normal file
@@ -0,0 +1,12 @@
|
||||
|
||||
## Build Results
|
||||
|
||||
Current state of perl in openSUSE:Factory is
|
||||
|
||||

|
||||
|
||||
The current state of perl in the devel project build (devel:languages:perl)
|
||||
|
||||

|
||||
|
||||
|
@@ -16,6 +16,8 @@ patches:
|
||||
https://patch-diff.githubusercontent.com/raw/PerlGameDev/SDL/pull/299.patch: -p1 PATCH-FIX-UPSTREAM 299.patch -- based on PR 299
|
||||
https://patch-diff.githubusercontent.com/raw/PerlGameDev/SDL/pull/304.patch: -p1 PATCH-FIX-UPSTREAM 304.patch -- based on PR 304
|
||||
https://patch-diff.githubusercontent.com/raw/PerlGameDev/SDL/pull/308.patch: -p1 PATCH-FIX-UPSTREAM 308.patch -- based on PR 308
|
||||
perl-SDL-fix-tests.patch: -p1 fix tests for some architectures
|
||||
perl-SDL-gcc15.patch: -p1 https://github.com/PerlGameDev/SDL/pull/309
|
||||
preamble: |-
|
||||
BuildRequires: Mesa-devel
|
||||
BuildRequires: libSDL-devel
|
||||
|
13
perl-SDL-fix-tests.patch
Normal file
13
perl-SDL-fix-tests.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
Index: SDL-2.548/t/core_surface.t
|
||||
===================================================================
|
||||
--- SDL-2.548.orig/t/core_surface.t
|
||||
+++ SDL-2.548/t/core_surface.t
|
||||
@@ -51,7 +51,7 @@ is( $image->h, 32, 'image has height' );
|
||||
|
||||
my $pixel_format = $image->format;
|
||||
isa_ok( $pixel_format, 'SDL::PixelFormat' );
|
||||
-is( $pixel_format->BitsPerPixel, 8, ' BitsPerPixel' );
|
||||
+is( $pixel_format->BitsPerPixel, 4, ' BitsPerPixel' );
|
||||
is( $pixel_format->BytesPerPixel, 1, ' BytesPerPixel' );
|
||||
is( $pixel_format->Rloss, 8, ' Rloss' );
|
||||
is( $pixel_format->Gloss, 8, ' Gloss' );
|
64
perl-SDL-gcc15.patch
Normal file
64
perl-SDL-gcc15.patch
Normal file
@@ -0,0 +1,64 @@
|
||||
From 2a1eb99101a89e46c13b75b08a4c685e0f7425fe Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Tue, 11 Feb 2025 12:14:27 +0100
|
||||
Subject: [PATCH] Fix building in ISO C23
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Building with GCC 15, which defaults to ISO C23, failed like this:
|
||||
|
||||
In file included from lib/SDL_perl.xs:32:
|
||||
lib/SDL_perl.c:654:13: error: conflicting types for ‘boot_SDL’; have ‘void(PerlInterpreter *, CV *)’ {aka ‘void(struct interpreter *, struct cv *)’}
|
||||
654 | XS_EXTERNAL(boot_SDL); /* prototype to pass -Wmissing-prototypes */
|
||||
| ^~~~~~~~
|
||||
/usr/lib64/perl5/CORE/XSUB.h:149:34: note: in definition of macro ‘XS_EXTERNAL’
|
||||
149 | # define XS_EXTERNAL(name) void name(pTHX_ CV* cv __attribute__unused__)
|
||||
| ^~~~
|
||||
lib/SDL_perl.xs:147:6: note: previous declaration of ‘boot_SDL’ with type ‘void(void)’
|
||||
147 | void boot_SDL();
|
||||
| ^~~~~~~~
|
||||
lib/SDL_perl.c:655:13: error: conflicting types for ‘boot_SDL’; have ‘void(PerlInterpreter *, CV *)’ {aka ‘void(struct interpreter *, struct cv *)’}
|
||||
655 | XS_EXTERNAL(boot_SDL)
|
||||
| ^~~~~~~~
|
||||
/usr/lib64/perl5/CORE/XSUB.h:149:34: note: in definition of macro ‘XS_EXTERNAL’
|
||||
149 | # define XS_EXTERNAL(name) void name(pTHX_ CV* cv __attribute__unused__)
|
||||
| ^~~~
|
||||
lib/SDL_perl.xs:147:6: note: previous declaration of ‘boot_SDL’ with type ‘void(void)’
|
||||
147 | void boot_SDL();
|
||||
| ^~~~~~~~
|
||||
|
||||
The cause is a mismatch between how boot_SDL() was declared and used
|
||||
in src/SDL.xs and how Perl generates a boot function for XS packages.
|
||||
This patch fixes it by passing current Perl interpreter and, probably
|
||||
ignored, cv argument.
|
||||
|
||||
Resolves: https://github.com/PerlGameDev/SDL/issues/294
|
||||
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2341036
|
||||
---
|
||||
src/SDL.xs | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/SDL.xs b/src/SDL.xs
|
||||
index a13882c8..5856e3af 100644
|
||||
--- a/src/SDL.xs
|
||||
+++ b/src/SDL.xs
|
||||
@@ -144,7 +144,7 @@ sdl_perl_atexit (void)
|
||||
SDL_Quit();
|
||||
}
|
||||
|
||||
-void boot_SDL();
|
||||
+XS(boot_SDL);
|
||||
void boot_SDL__OpenGL();
|
||||
|
||||
XS(boot_SDL_perl)
|
||||
@@ -155,7 +155,7 @@ XS(boot_SDL_perl)
|
||||
#endif
|
||||
PL_perl_destruct_level = 2;
|
||||
GET_TLS_CONTEXT
|
||||
- boot_SDL();
|
||||
+ boot_SDL(aTHX_ cv);
|
||||
|
||||
#if defined WINDOWS || defined WIN32
|
||||
SDL_RegisterApp ("SDLPerl App", 0, GetModuleHandle (NULL));
|
||||
|
@@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 16 12:09:29 UTC 2025 - pgajdos@suse.com
|
||||
|
||||
- added patches
|
||||
https://github.com/PerlGameDev/SDL/pull/309
|
||||
+ perl-SDL-gcc15.patch
|
||||
+ perl-SDL-fix-tests.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 1 19:55:41 UTC 2024 - munix9@googlemail.com
|
||||
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package perl-SDL
|
||||
#
|
||||
# Copyright (c) 2024 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
|
||||
@@ -26,12 +26,16 @@ URL: https://metacpan.org/release/%{cpan_name}
|
||||
Source0: https://cpan.metacpan.org/authors/id/F/FR/FROGGS/%{cpan_name}-%{version}.tar.gz
|
||||
Source1: perl-SDL.rpmlintrc
|
||||
Source2: cpanspec.yml
|
||||
Source100: README.md
|
||||
# PATCH-FIX-UPSTREAM 299.patch -- based on PR 299
|
||||
Patch0: https://patch-diff.githubusercontent.com/raw/PerlGameDev/SDL/pull/299.patch
|
||||
# PATCH-FIX-UPSTREAM 304.patch -- based on PR 304
|
||||
Patch1: https://patch-diff.githubusercontent.com/raw/PerlGameDev/SDL/pull/304.patch
|
||||
# PATCH-FIX-UPSTREAM 308.patch -- based on PR 308
|
||||
Patch2: https://patch-diff.githubusercontent.com/raw/PerlGameDev/SDL/pull/308.patch
|
||||
# https://github.com/PerlGameDev/SDL/pull/309
|
||||
Patch3: perl-SDL-gcc15.patch
|
||||
Patch4: perl-SDL-fix-tests.patch
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl-macros
|
||||
BuildRequires: perl(Alien::SDL) >= 1.446
|
||||
|
Reference in New Issue
Block a user