Skip to content

Commit

Permalink
Updated version to 2.8.0 for release
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Jan 21, 2024
1 parent 6c5283a commit 2c70008
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")

# See docs/release_checklist.md
set(MAJOR_VERSION 2)
set(MINOR_VERSION 7)
set(MICRO_VERSION 2)
set(MINOR_VERSION 8)
set(MICRO_VERSION 0)
set(SDL_REQUIRED_VERSION 2.0.9)

include(PrivateSdlFunctions)
Expand Down
4 changes: 2 additions & 2 deletions Makefile.os2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

LIBNAME = SDL2mix
MAJOR_VERSION = 2
MINOR_VERSION = 7
MICRO_VERSION = 2
MINOR_VERSION = 8
MICRO_VERSION = 0
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)

TITLENAME = $(LIBNAME) $(VERSION)
Expand Down
8 changes: 4 additions & 4 deletions VisualC/Version.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,7,2,0
PRODUCTVERSION 2,7,2,0
FILEVERSION 2,8,0,0
PRODUCTVERSION 2,8,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -46,12 +46,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL_mixer\0"
VALUE "FileVersion", "2, 7, 2, 0\0"
VALUE "FileVersion", "2, 8, 0, 0\0"
VALUE "InternalName", "SDL_mixer\0"
VALUE "LegalCopyright", "Copyright (C) 2024 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_mixer.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
VALUE "ProductVersion", "2, 7, 2, 0\0"
VALUE "ProductVersion", "2, 8, 0, 0\0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions Xcode/Info-Framework.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.7.2</string>
<string>2.8.0</string>
<key>CFBundleVersion</key>
<string>2.7.2</string>
<string>2.8.0</string>
</dict>
</plist>
8 changes: 4 additions & 4 deletions Xcode/SDL_mixer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -844,8 +844,8 @@
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 703.0.0;
DYLIB_CURRENT_VERSION = 703.0.0;
DYLIB_COMPATIBILITY_VERSION = 801.0.0;
DYLIB_CURRENT_VERSION = 801.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
Expand Down Expand Up @@ -893,8 +893,8 @@
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 703.0.0;
DYLIB_CURRENT_VERSION = 703.0.0;
DYLIB_COMPATIBILITY_VERSION = 801.0.0;
DYLIB_CURRENT_VERSION = 801.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\"";
Expand Down
22 changes: 11 additions & 11 deletions configure
View file
Original file line number Diff line number Diff line change
@@ -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.7.2.
# Generated by GNU Autoconf 2.71 for SDL2_mixer 2.8.0.
#
# Report bugs to <https://github.com/libsdl-org/SDL_mixer/issues>.
#
Expand Down Expand Up @@ -760,8 +760,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='SDL2_mixer'
PACKAGE_TARNAME='SDL2_mixer'
PACKAGE_VERSION='2.7.2'
PACKAGE_STRING='SDL2_mixer 2.7.2'
PACKAGE_VERSION='2.8.0'
PACKAGE_STRING='SDL2_mixer 2.8.0'
PACKAGE_BUGREPORT='https://github.com/libsdl-org/SDL_mixer/issues'
PACKAGE_URL=''

Expand Down Expand Up @@ -1591,7 +1591,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.7.2 to adapt to many kinds of systems.
\`configure' configures SDL2_mixer 2.8.0 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1657,7 +1657,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of SDL2_mixer 2.7.2:";;
short | recursive ) echo "Configuration of SDL2_mixer 2.8.0:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1858,7 +1858,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
SDL2_mixer configure 2.7.2
SDL2_mixer configure 2.8.0
generated by GNU Autoconf 2.71

Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2243,7 +2243,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.7.2, which was
It was created by SDL2_mixer $as_me 2.8.0, which was
generated by GNU Autoconf 2.71. Invocation command line was

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -3219,9 +3219,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

MAJOR_VERSION=2

MINOR_VERSION=7
MINOR_VERSION=8

MICRO_VERSION=2
MICRO_VERSION=0


BINARY_AGE=`expr $MINOR_VERSION \* 100 + $MICRO_VERSION`
Expand Down Expand Up @@ -20324,7 +20324,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.7.2, which was
This file was extended by SDL2_mixer $as_me 2.8.0, which was
generated by GNU Autoconf 2.71. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -20383,7 +20383,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.7.2
SDL2_mixer config.status 2.8.0
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"

Expand Down
4 changes: 2 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
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], [7])
m4_define([MICRO_VERSION_MACRO], [2])
m4_define([MINOR_VERSION_MACRO], [8])
m4_define([MICRO_VERSION_MACRO], [0])

AC_INIT([SDL2_mixer],
[MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO],
Expand Down
2 changes: 1 addition & 1 deletion external/libgme
Submodule libgme updated 1 files
+3 −4 gme/Blip_Buffer.h
2 changes: 1 addition & 1 deletion external/wavpack
Submodule wavpack updated 2 files
+1 −4 CMakeLists.txt
+0 −4 src/open_filename.c
4 changes: 2 additions & 2 deletions include/SDL_mixer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ extern "C" {
* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
*/
#define SDL_MIXER_MAJOR_VERSION 2
#define SDL_MIXER_MINOR_VERSION 7
#define SDL_MIXER_PATCHLEVEL 2
#define SDL_MIXER_MINOR_VERSION 8
#define SDL_MIXER_PATCHLEVEL 0

/**
* This macro can be used to fill a version structure with the compile-time
Expand Down
8 changes: 4 additions & 4 deletions version.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,7,2,0
PRODUCTVERSION 2,7,2,0
FILEVERSION 2,8,0,0
PRODUCTVERSION 2,8,0,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
Expand All @@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL_mixer\0"
VALUE "FileVersion", "2, 7, 2, 0\0"
VALUE "FileVersion", "2, 8, 0, 0\0"
VALUE "InternalName", "SDL_mixer\0"
VALUE "LegalCopyright", "Copyright (C) 2024 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_mixer.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
VALUE "ProductVersion", "2, 7, 2, 0\0"
VALUE "ProductVersion", "2, 8, 0, 0\0"
END
END
BLOCK "VarFileInfo"
Expand Down

5 comments on commit 2c70008

@sezero
Copy link
Contributor

@sezero sezero commented on 2c70008 Jan 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to have touched submodules wavpack and libgme, but github interface shows no diff. Huh..

@sezero
Copy link
Contributor

@sezero sezero commented on 2c70008 Jan 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to have touched submodules wavpack and libgme, but github interface shows no diff. Huh..

It seems to have reverted 40b5164 (external/ part only) and 6c5283a

@slouken
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks!

@slouken
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fortunately this only impacts people pulling from git, the release doesn't include the external code and download.sh pulls by tag, not git revision.

@sezero
Copy link
Contributor

@sezero sezero commented on 2c70008 Jan 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK 👍

Please sign in to comment.