Skip to content
This repository was archived by the owner on Jan 26, 2026. It is now read-only.

Commit 70de4de

Browse files
SibrasSibras
committed
Merge commit 'fb1497566c5a05e2babdcf45ef0ab5c7cca2c4ae'
2 parents 27ad133 + fb14975 commit 70de4de

File tree

24 files changed

+169
-180
lines changed

24 files changed

+169
-180
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ endif()
8787
# See docs/release_checklist.md
8888
set(SDL_MAJOR_VERSION 2)
8989
set(SDL_MINOR_VERSION 30)
90-
set(SDL_MICRO_VERSION 2)
90+
set(SDL_MICRO_VERSION 3)
9191
set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")
9292

9393
# Set defaults preventing destination file conflicts
@@ -926,22 +926,6 @@ if(SDL_ASSEMBLY)
926926
endif()
927927
endif()
928928

929-
if(SDL_LASX)
930-
cmake_push_check_state()
931-
set(CMAKE_REQUIRED_FLAGS "-mlasx")
932-
check_c_source_compiles("
933-
#ifndef __loongarch_asx
934-
#error Assembler CPP flag not enabled
935-
#endif
936-
int main(int argc, char **argv) { return 0; }" CPU_SUPPORTS_LASX)
937-
check_include_file("lasxintrin.h" HAVE_LASXINTRIN_H)
938-
cmake_pop_check_state()
939-
if(CPU_SUPPORTS_LASX AND HAVE_LASXINTRIN_H)
940-
list(APPEND EXTRA_CFLAGS "-mlasx")
941-
set(HAVE_LASX TRUE)
942-
endif()
943-
endif()
944-
945929
if(SDL_ARMSIMD)
946930
set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
947931
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -x assembler-with-cpp")

‎Makefile.os2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
LIBNAME = SDL2
1616
MAJOR_VERSION = 2
1717
MINOR_VERSION = 30
18-
MICRO_VERSION = 2
18+
MICRO_VERSION = 3
1919
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
2020
DESCRIPTION = Simple DirectMedia Layer 2
2121

‎Makefile.w32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
LIBNAME = SDL2
77
MAJOR_VERSION = 2
88
MINOR_VERSION = 30
9-
MICRO_VERSION = 2
9+
MICRO_VERSION = 3
1010
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
1111

1212
LIBHOME = .

‎VisualC-GDK/tests/testgamecontroller/testgamecontroller.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
</ResourceCompile>
140140
<Link>
141141
<SubSystem>Windows</SubSystem>
142-
<AdditionalDependencies>xgameruntime.lib;../Microsoft.Xbox.Services.141.GDK.C.Thunks.lib;%(AdditionalDependencies)</AdditionalDependencies>
142+
<AdditionalDependencies>xgameruntime.lib;../Microsoft.Xbox.Services.GDK.C.Thunks.lib;%(AdditionalDependencies)</AdditionalDependencies>
143143
</Link>
144144
</ItemDefinitionGroup>
145145
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Xbox.Scarlett.x64'">
@@ -211,7 +211,7 @@
211211
<Link>
212212
<GenerateDebugInformation>true</GenerateDebugInformation>
213213
<SubSystem>Windows</SubSystem>
214-
<AdditionalDependencies>xgameruntime.lib;../Microsoft.Xbox.Services.141.GDK.C.Thunks.lib;%(AdditionalDependencies)</AdditionalDependencies>
214+
<AdditionalDependencies>xgameruntime.lib;../Microsoft.Xbox.Services.GDK.C.Thunks.lib;%(AdditionalDependencies)</AdditionalDependencies>
215215
</Link>
216216
</ItemDefinitionGroup>
217217
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Xbox.Scarlett.x64'">
@@ -409,7 +409,7 @@
409409
<CopyFileToFolders Include="..\..\logos\Logo480x480.png" />
410410
</ItemGroup>
411411
<ItemGroup>
412-
<CopyFileToFolders Include="$(Console_GRDKExtLibRoot)Xbox.Services.API.C\DesignTime\CommonConfiguration\Neutral\Lib\Release\Microsoft.Xbox.Services.141.GDK.C.Thunks.dll">
412+
<CopyFileToFolders Include="$(Console_GRDKExtLibRoot)Xbox.Services.API.C\DesignTime\CommonConfiguration\Neutral\Lib\Release\Microsoft.Xbox.Services.GDK.C.Thunks.dll">
413413
<FileType>Document</FileType>
414414
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Xbox.Scarlett.x64'">true</ExcludedFromBuild>
415415
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Xbox.XboxOne.x64'">true</ExcludedFromBuild>

‎Xcode/SDL/Info-Framework.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<key>CFBundlePackageType</key>
2020
<string>FMWK</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>2.30.2</string>
22+
<string>2.30.3</string>
2323
<key>CFBundleSignature</key>
2424
<string>SDLX</string>
2525
<key>CFBundleVersion</key>
26-
<string>2.30.2</string>
26+
<string>2.30.3</string>
2727
</dict>
2828
</plist>

‎Xcode/SDL/SDL.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9729,7 +9729,7 @@
97299729
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
97309730
DEPLOYMENT_POSTPROCESSING = YES;
97319731
DYLIB_COMPATIBILITY_VERSION = 3001.0.0;
9732-
DYLIB_CURRENT_VERSION = 3001.2.0;
9732+
DYLIB_CURRENT_VERSION = 3001.3.0;
97339733
DYLIB_INSTALL_NAME_BASE = "@rpath";
97349734
ENABLE_STRICT_OBJC_MSGSEND = YES;
97359735
GCC_ALTIVEC_EXTENSIONS = YES;
@@ -9770,7 +9770,7 @@
97709770
isa = XCBuildConfiguration;
97719771
buildSettings = {
97729772
CLANG_LINK_OBJC_RUNTIME = NO;
9773-
MARKETING_VERSION = 2.30.2;
9773+
MARKETING_VERSION = 2.30.3;
97749774
OTHER_LDFLAGS = "-liconv";
97759775
};
97769776
name = Release;
@@ -9814,7 +9814,7 @@
98149814
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
98159815
DEBUG_INFORMATION_FORMAT = dwarf;
98169816
DYLIB_COMPATIBILITY_VERSION = 3001.0.0;
9817-
DYLIB_CURRENT_VERSION = 3001.2.0;
9817+
DYLIB_CURRENT_VERSION = 3001.3.0;
98189818
DYLIB_INSTALL_NAME_BASE = "@rpath";
98199819
ENABLE_STRICT_OBJC_MSGSEND = YES;
98209820
ENABLE_TESTABILITY = YES;
@@ -9856,7 +9856,7 @@
98569856
isa = XCBuildConfiguration;
98579857
buildSettings = {
98589858
CLANG_LINK_OBJC_RUNTIME = NO;
9859-
MARKETING_VERSION = 2.30.2;
9859+
MARKETING_VERSION = 2.30.3;
98609860
OTHER_LDFLAGS = "-liconv";
98619861
};
98629862
name = Debug;
@@ -10063,7 +10063,7 @@
1006310063
DEFINES_MODULE = YES;
1006410064
DEVELOPMENT_TEAM = "";
1006510065
DYLIB_COMPATIBILITY_VERSION = 3001.0.0;
10066-
DYLIB_CURRENT_VERSION = 3001.2.0;
10066+
DYLIB_CURRENT_VERSION = 3001.3.0;
1006710067
DYLIB_INSTALL_NAME_BASE = "@rpath";
1006810068
GCC_C_LANGUAGE_STANDARD = gnu11;
1006910069
GCC_DYNAMIC_NO_PIC = NO;
@@ -10115,7 +10115,7 @@
1011510115
DEFINES_MODULE = YES;
1011610116
DEVELOPMENT_TEAM = "";
1011710117
DYLIB_COMPATIBILITY_VERSION = 3001.0.0;
10118-
DYLIB_CURRENT_VERSION = 3001.2.0;
10118+
DYLIB_CURRENT_VERSION = 3001.3.0;
1011910119
DYLIB_INSTALL_NAME_BASE = "@rpath";
1012010120
ENABLE_NS_ASSERTIONS = NO;
1012110121
GCC_C_LANGUAGE_STANDARD = gnu11;

‎Xcode/SDL/pkg-support/SDL.info‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Title SDL 2.30.2
1+
Title SDL 2.30.3
22
Version 1
33
Description SDL Library for Mac OS X (http://www.libsdl.org)
44
DefaultLocation /Library/Frameworks

‎android-project/app/src/main/java/org/libsdl/app/SDLActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
6161
private static final String TAG = "SDL";
6262
private static final int SDL_MAJOR_VERSION = 2;
6363
private static final int SDL_MINOR_VERSION = 30;
64-
private static final int SDL_MICRO_VERSION = 2;
64+
private static final int SDL_MICRO_VERSION = 3;
6565
/*
6666
// Display InputType.SOURCE/CLASS of events and devices
6767
//

‎configure‎

Lines changed: 1 addition & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,6 @@ enable_sse2
873873
enable_sse3
874874
enable_altivec
875875
enable_lsx
876-
enable_lasx
877876
enable_oss
878877
enable_alsa
879878
with_alsa_prefix
@@ -1675,7 +1674,6 @@ Optional Features:
16751674
--enable-sse3 use SSE3 assembly routines [default=maybe]
16761675
--enable-altivec use Altivec assembly routines [default=yes]
16771676
--enable-lsx use LSX assembly routines [default=yes]
1678-
--enable-lasx use LASX assembly routines [default=yes]
16791677
--enable-oss support the OSS audio API [default=maybe]
16801678
--enable-alsa support the ALSA audio API [default=yes]
16811679
--disable-alsatest Do not try to compile and run a test Alsa program
@@ -3510,7 +3508,7 @@ orig_CFLAGS="$CFLAGS"
35103508
# See docs/release_checklist.md
35113509
SDL_MAJOR_VERSION=2
35123510
SDL_MINOR_VERSION=30
3513-
SDL_MICRO_VERSION=2
3511+
SDL_MICRO_VERSION=3
35143512
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
35153513

35163514
SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION`
@@ -21112,80 +21110,6 @@ printf "%s\n" "#define HAVE_LSXINTRIN_H 1" >>confdefs.h
2111221110

2111321111
fi
2111421112

21115-
# Check whether --enable-lasx was given.
21116-
if test ${enable_lasx+y}
21117-
then :
21118-
enableval=$enable_lasx;
21119-
else $as_nop
21120-
enable_LASX=yes
21121-
fi
21122-
21123-
if test x$enable_LASX = xyes; then
21124-
save_CFLAGS="$CFLAGS"
21125-
have_gcc_lasx=no
21126-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GCC -mlasx option" >&5
21127-
printf %s "checking for GCC -mlasx option... " >&6; }
21128-
lasx_CFLAGS="-mlasx"
21129-
CFLAGS="$save_CFLAGS $lasx_CFLAGS"
21130-
21131-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21132-
/* end confdefs.h. */
21133-
21134-
#ifndef __loongarch_asx
21135-
#error Assembler CPP flag not enabled
21136-
#endif
21137-
21138-
int
21139-
main (void)
21140-
{
21141-
21142-
;
21143-
return 0;
21144-
}
21145-
_ACEOF
21146-
if ac_fn_c_try_compile "$LINENO"
21147-
then :
21148-
have_gcc_lasx=yes
21149-
fi
21150-
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
21151-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_gcc_lasx" >&5
21152-
printf "%s\n" "$have_gcc_lasx" >&6; }
21153-
CFLAGS="$save_CFLAGS"
21154-
21155-
if test x$have_gcc_lasx = xyes; then
21156-
EXTRA_CFLAGS="$EXTRA_CFLAGS $lasx_CFLAGS"
21157-
SUMMARY_math="${SUMMARY_math} lasx"
21158-
fi
21159-
fi
21160-
21161-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lasxintrin.h" >&5
21162-
printf %s "checking for lasxintrin.h... " >&6; }
21163-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21164-
/* end confdefs.h. */
21165-
#include <lasxintrin.h>
21166-
int
21167-
main (void)
21168-
{
21169-
21170-
;
21171-
return 0;
21172-
}
21173-
_ACEOF
21174-
if ac_fn_c_try_compile "$LINENO"
21175-
then :
21176-
have_lasxintrin_h_hdr=yes
21177-
else $as_nop
21178-
have_lasxintrin_h_hdr=no
21179-
fi
21180-
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
21181-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_lasxintrin_h_hdr" >&5
21182-
printf "%s\n" "$have_lasxintrin_h_hdr" >&6; }
21183-
if test x$have_lasxintrin_h_hdr = xyes; then
21184-
21185-
printf "%s\n" "#define HAVE_LASXINTRIN_H 1" >>confdefs.h
21186-
21187-
fi
21188-
2118921113
CheckOSS()
2119021114
{
2119121115
# Check whether --enable-oss was given.

‎configure.ac‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dnl Set various version strings - taken gratefully from the GTk sources
1313
# See docs/release_checklist.md
1414
SDL_MAJOR_VERSION=2
1515
SDL_MINOR_VERSION=30
16-
SDL_MICRO_VERSION=2
16+
SDL_MICRO_VERSION=3
1717
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
1818

1919
SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION`
@@ -938,38 +938,6 @@ fi
938938
AC_DEFINE(HAVE_LSXINTRIN_H, 1, [ ])
939939
fi
940940

941-
AC_ARG_ENABLE(lasx,
942-
[AS_HELP_STRING([--enable-lasx], [use LASX assembly routines [default=yes]])],
943-
, enable_LASX=yes)
944-
if test x$enable_LASX = xyes; then
945-
save_CFLAGS="$CFLAGS"
946-
have_gcc_lasx=no
947-
AC_MSG_CHECKING(for GCC -mlasx option)
948-
lasx_CFLAGS="-mlasx"
949-
CFLAGS="$save_CFLAGS $lasx_CFLAGS"
950-
951-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
952-
#ifndef __loongarch_asx
953-
#error Assembler CPP flag not enabled
954-
#endif
955-
]], [])], [have_gcc_lasx=yes], [])
956-
AC_MSG_RESULT($have_gcc_lasx)
957-
CFLAGS="$save_CFLAGS"
958-
959-
if test x$have_gcc_lasx = xyes; then
960-
EXTRA_CFLAGS="$EXTRA_CFLAGS $lasx_CFLAGS"
961-
SUMMARY_math="${SUMMARY_math} lasx"
962-
fi
963-
fi
964-
965-
AC_MSG_CHECKING(for lasxintrin.h)
966-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <lasxintrin.h>]])],
967-
[have_lasxintrin_h_hdr=yes],[have_lasxintrin_h_hdr=no])
968-
AC_MSG_RESULT($have_lasxintrin_h_hdr)
969-
if test x$have_lasxintrin_h_hdr = xyes; then
970-
AC_DEFINE(HAVE_LASXINTRIN_H, 1, [ ])
971-
fi
972-
973941
dnl See if the OSS audio interface is supported
974942
CheckOSS()
975943
{

0 commit comments

Comments
 (0)