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 committed Dec 5, 2023
1 parent dac6ffd commit 859357d
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
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 1)
set(MINOR_VERSION 8)
set(MICRO_VERSION 0)
set(SDL_REQUIRED_VERSION 2.0.9)

include(PrivateSdlFunctions)
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -1597,7 +1597,7 @@ rpm: $(PACKAGE)-$(VERSION).tar.gz
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz

dist-hook:
ls $(distdir)/external | $(FGREP) -v download.sh $(FGREP) -v Get-GitModules.ps1 | while read dir; do rm -rf "$(distdir)/external/$$dir"; done
ls $(distdir)/external | $(FGREP) -v download.sh | $(FGREP) -v Get-GitModules.ps1 | while read dir; do rm -rf "$(distdir)/external/$$dir"; done

install-data-local:
$(MKDIR_P) $(DESTDIR)$(libdir)/cmake/SDL2_image
Expand Down
4 changes: 2 additions & 2 deletions Makefile.os2
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

LIBNAME = SDL2img
MAJOR_VERSION = 2
MINOR_VERSION = 7
MICRO_VERSION = 1
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
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,1,0
PRODUCTVERSION 2,7,1,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_image\0"
VALUE "FileVersion", "2, 7, 1, 0\0"
VALUE "FileVersion", "2, 8, 0, 0\0"
VALUE "InternalName", "SDL_image\0"
VALUE "LegalCopyright", "Copyright (C) 2023 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_image.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
VALUE "ProductVersion", "2, 7, 1, 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
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.1</string>
<string>2.8.0</string>
<key>CFBundleVersion</key>
<string>2.7.1</string>
<string>2.8.0</string>
</dict>
</plist>
8 changes: 4 additions & 4 deletions Xcode/SDL_image.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -626,8 +626,8 @@
buildSettings = {
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 702.0.0;
DYLIB_CURRENT_VERSION = 702.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 Expand Up @@ -717,8 +717,8 @@
buildSettings = {
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 702.0.0;
DYLIB_CURRENT_VERSION = 702.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
24 changes: 12 additions & 12 deletions configure
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_image 2.7.1.
# Generated by GNU Autoconf 2.71 for SDL2_image 2.8.0.
#
# Report bugs to <https://github.com/libsdl-org/SDL_image/issues>.
#
Expand Down Expand Up @@ -760,8 +760,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='SDL2_image'
PACKAGE_TARNAME='SDL2_image'
PACKAGE_VERSION='2.7.1'
PACKAGE_STRING='SDL2_image 2.7.1'
PACKAGE_VERSION='2.8.0'
PACKAGE_STRING='SDL2_image 2.8.0'
PACKAGE_BUGREPORT='https://github.com/libsdl-org/SDL_image/issues'
PACKAGE_URL=''

Expand Down Expand Up @@ -1609,7 +1609,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_image 2.7.1 to adapt to many kinds of systems.
\`configure' configures SDL2_image 2.8.0 to adapt to many kinds of systems.

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

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

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

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

Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2153,7 +2153,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_image $as_me 2.7.1, which was
It was created by SDL2_image $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 @@ -2913,9 +2913,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

MAJOR_VERSION=2

MINOR_VERSION=7
MINOR_VERSION=8

MICRO_VERSION=1
MICRO_VERSION=0


BINARY_AGE=`expr $MINOR_VERSION \* 100 + $MICRO_VERSION`
Expand Down Expand Up @@ -11537,7 +11537,7 @@ fi

# Define the identity of the package.
PACKAGE='SDL2_image'
VERSION='2.7.1'
VERSION='2.8.0'


printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
Expand Down Expand Up @@ -16732,7 +16732,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_image $as_me 2.7.1, which was
This file was extended by SDL2_image $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 @@ -16791,7 +16791,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_image config.status 2.7.1
SDL2_image 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
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 docs/release_checklist.md
m4_define([MAJOR_VERSION_MACRO], [2])
m4_define([MINOR_VERSION_MACRO], [7])
m4_define([MICRO_VERSION_MACRO], [1])
m4_define([MINOR_VERSION_MACRO], [8])
m4_define([MICRO_VERSION_MACRO], [0])

AC_INIT([SDL2_image],
[MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO],
Expand Down
4 changes: 2 additions & 2 deletions include/SDL_image.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ extern "C" {
* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
*/
#define SDL_IMAGE_MAJOR_VERSION 2
#define SDL_IMAGE_MINOR_VERSION 7
#define SDL_IMAGE_PATCHLEVEL 1
#define SDL_IMAGE_MINOR_VERSION 8
#define SDL_IMAGE_PATCHLEVEL 0

/**
* This macro can be used to fill a version structure with the compile-time
Expand Down
8 changes: 4 additions & 4 deletions src/version.rc
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,1,0
PRODUCTVERSION 2,7,1,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_image\0"
VALUE "FileVersion", "2, 7, 1, 0\0"
VALUE "FileVersion", "2, 8, 0, 0\0"
VALUE "InternalName", "SDL_image\0"
VALUE "LegalCopyright", "Copyright (C) 2023 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_image.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
VALUE "ProductVersion", "2, 7, 1, 0\0"
VALUE "ProductVersion", "2, 8, 0, 0\0"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 859357d

Please sign in to comment.