From 8e5171edfd1a2442b611e86ca845da6ce1282468 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 16 Jun 2022 18:19:32 -0700
Subject: [PATCH] Updated version to 2.5.2 for RC build
---
CMakeLists.txt | 2 +-
Makefile.os2 | 2 +-
VisualC/Version.rc | 8 ++---
Xcode/Info-Framework.plist | 4 +--
Xcode/SDL_mixer.xcodeproj/project.pbxproj | 4 +--
configure | 36 +++++++++++------------
configure.ac | 2 +-
include/SDL_mixer.h | 2 +-
version.rc | 8 ++---
9 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be4a2a69..a88dc294 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
# See docs/release_checklist.md
set(MAJOR_VERSION 2)
set(MINOR_VERSION 5)
-set(MICRO_VERSION 1)
+set(MICRO_VERSION 2)
set(SDL_REQUIRED_VERSION 2.0.9)
# For historical reasons this is 3.0.0 rather than the expected 1.0.0
diff --git a/Makefile.os2 b/Makefile.os2
index 888923a3..01fdc9a8 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -7,7 +7,7 @@
LIBNAME = SDL2mix
MAJOR_VERSION = 2
MINOR_VERSION = 5
-MICRO_VERSION = 1
+MICRO_VERSION = 2
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
TITLENAME = $(LIBNAME) $(VERSION)
diff --git a/VisualC/Version.rc b/VisualC/Version.rc
index dc037152..88a1e39f 100644
--- a/VisualC/Version.rc
+++ b/VisualC/Version.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,12 +46,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL_mixer\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "SDL_mixer\0"
VALUE "LegalCopyright", "Copyright 2022 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_mixer.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Xcode/Info-Framework.plist b/Xcode/Info-Framework.plist
index 0f89ad6b..b9457442 100644
--- a/Xcode/Info-Framework.plist
+++ b/Xcode/Info-Framework.plist
@@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.1</string>
+ <string>2.5.2</string>
<key>CFBundleVersion</key>
- <string>2.5.1</string>
+ <string>2.5.2</string>
</dict>
</plist>
diff --git a/Xcode/SDL_mixer.xcodeproj/project.pbxproj b/Xcode/SDL_mixer.xcodeproj/project.pbxproj
index a680e556..90acb55a 100644
--- a/Xcode/SDL_mixer.xcodeproj/project.pbxproj
+++ b/Xcode/SDL_mixer.xcodeproj/project.pbxproj
@@ -749,7 +749,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 3.0.0;
- DYLIB_CURRENT_VERSION = 502.0.0;
+ DYLIB_CURRENT_VERSION = 503.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -798,7 +798,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 3.0.0;
- DYLIB_CURRENT_VERSION = 502.0.0;
+ DYLIB_CURRENT_VERSION = 503.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\"";
diff --git a/configure b/configure
index a5ec053e..14ddea90 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for SDL2_mixer 2.5.1.
+# Generated by GNU Autoconf 2.71 for SDL2_mixer 2.5.2.
#
# Report bugs to <https://github.com/libsdl-org/SDL_mixer/issues>.
#
@@ -760,8 +760,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='SDL2_mixer'
PACKAGE_TARNAME='SDL2_mixer'
-PACKAGE_VERSION='2.5.1'
-PACKAGE_STRING='SDL2_mixer 2.5.1'
+PACKAGE_VERSION='2.5.2'
+PACKAGE_STRING='SDL2_mixer 2.5.2'
PACKAGE_BUGREPORT='https://github.com/libsdl-org/SDL_mixer/issues'
PACKAGE_URL=''
@@ -1573,7 +1573,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures SDL2_mixer 2.5.1 to adapt to many kinds of systems.
+\`configure' configures SDL2_mixer 2.5.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1639,7 +1639,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of SDL2_mixer 2.5.1:";;
+ short | recursive ) echo "Configuration of SDL2_mixer 2.5.2:";;
esac
cat <<\_ACEOF
@@ -1826,7 +1826,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-SDL2_mixer configure 2.5.1
+SDL2_mixer configure 2.5.2
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2211,7 +2211,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by SDL2_mixer $as_me 2.5.1, which was
+It was created by SDL2_mixer $as_me 2.5.2, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3189,7 +3189,7 @@ MAJOR_VERSION=2
MINOR_VERSION=5
-MICRO_VERSION=1
+MICRO_VERSION=2
BINARY_AGE=`expr $MINOR_VERSION \* 100 + $MICRO_VERSION`
@@ -12193,11 +12193,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
+if test ${ac_cv_prog_cxx_11+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_cxx11=no
+ ac_cv_prog_cxx_11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12239,11 +12239,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
+if test ${ac_cv_prog_cxx_98+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_cxx98=no
+ ac_cv_prog_cxx_98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12563,11 +12563,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
+if test ${ac_cv_prog_cxx_11+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_cxx11=no
+ ac_cv_prog_cxx_11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12609,11 +12609,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
+if test ${ac_cv_prog_cxx_98+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_cxx98=no
+ ac_cv_prog_cxx_98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -19507,7 +19507,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by SDL2_mixer $as_me 2.5.1, which was
+This file was extended by SDL2_mixer $as_me 2.5.2, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19566,7 +19566,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-SDL2_mixer config.status 2.5.1
+SDL2_mixer config.status 2.5.2
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index b1c6f352..8d4e5de2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Set various version strings - taken gratefully from the GTk sources
# See release_checklist.md
m4_define([MAJOR_VERSION_MACRO], [2])
m4_define([MINOR_VERSION_MACRO], [5])
-m4_define([MICRO_VERSION_MACRO], [1])
+m4_define([MICRO_VERSION_MACRO], [2])
AC_INIT([SDL2_mixer],
[MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO],
diff --git a/include/SDL_mixer.h b/include/SDL_mixer.h
index 22b012d9..34280a62 100644
--- a/include/SDL_mixer.h
+++ b/include/SDL_mixer.h
@@ -38,7 +38,7 @@ extern "C" {
*/
#define SDL_MIXER_MAJOR_VERSION 2
#define SDL_MIXER_MINOR_VERSION 5
-#define SDL_MIXER_PATCHLEVEL 1
+#define SDL_MIXER_PATCHLEVEL 2
/* This macro can be used to fill a version structure with the compile-time
* version of the SDL_mixer library.
diff --git a/version.rc b/version.rc
index 67224c19..15e961fd 100644
--- a/version.rc
+++ b/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL_mixer\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 5, 2, 0\0"
VALUE "InternalName", "SDL_mixer\0"
VALUE "LegalCopyright", "Copyright 2022 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_mixer.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductVersion", "2, 5, 2, 0\0"
END
END
BLOCK "VarFileInfo"