From 73ed8d6e072d5b997a2dda4fd94cf3c32e62fe4e Mon Sep 17 00:00:00 2001 From: Martijn van Beurden Date: Wed, 9 Feb 2022 20:58:00 +0100 Subject: Change version to 1.3.4 and add placeholders for release date Signed-off-by: Ralph Giles --- CMakeLists.txt | 2 +- README | 6 +++++- build/config.mk | 2 +- configure.ac | 2 +- doc/Doxyfile.in | 2 +- doc/html/documentation_bugs.html | 2 +- src/libFLAC/format.c | 2 +- src/libFLAC/libFLAC_dynamic.vcproj | 4 ++-- src/libFLAC/libFLAC_dynamic.vcxproj | 10 +++++----- src/libFLAC/libFLAC_static.vcproj | 4 ++-- src/libFLAC/libFLAC_static.vcxproj | 10 +++++----- test/metaflac-test-files/case07-expect.meta | 2 +- 12 files changed, 26 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96e01aaf..9bcb1076 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ if(NOT (CMAKE_BUILD_TYPE OR CMAKE_CONFIGURATION_TYPES OR DEFINED ENV{CFLAGS} OR set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo") endif() -project(FLAC VERSION 1.3.3) # HOMEPAGE_URL "https://www.xiph.org/flac/") +project(FLAC VERSION 1.3.4) # HOMEPAGE_URL "https://www.xiph.org/flac/") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") diff --git a/README b/README index ed2de3b8..ec8f117e 100644 --- a/README +++ b/README @@ -42,7 +42,7 @@ Documentation License (see COPYING.FDL). =============================================================================== -FLAC - 1.3.3 - Contents +FLAC - 1.3.4 - Contents =============================================================================== - Introduction @@ -211,6 +211,10 @@ not an x86, change -DFLAC__CPU_IA32 to -DFLAC__CPU_UNKNOWN. Building with MSVC =============================================================================== +When building with MSVC, using CMake is preferred, see Building with +CMake for more information. Building with MSVC using solution files +is deprecated and these files will be removed in the future. + There are .vcproj projects and a master FLAC.sln solution to build all the libraries and executables with MSVC 2005 or newer. diff --git a/build/config.mk b/build/config.mk index 09abbbdd..33246779 100644 --- a/build/config.mk +++ b/build/config.mk @@ -97,7 +97,7 @@ all default: $(DEFAULT_BUILD) # GNU makefile fragment for emulating stuff normally done by configure # -VERSION=\"1.3.3\" +VERSION=\"1.3.4\" CONFIG_CFLAGS=$(CUSTOM_CFLAGS) -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 diff --git a/configure.ac b/configure.ac index 4a95cb8b..4d7dc2e4 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ # instead of FLAC__ since autoconf triggers off 'AC_' in strings AC_PREREQ(2.60) -AC_INIT([flac], [1.3.3], [flac-dev@xiph.org], [flac], [https://www.xiph.org/flac/]) +AC_INIT([flac], [1.3.4], [flac-dev@xiph.org], [flac], [https://www.xiph.org/flac/]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/flac/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index cc20991a..7f08673d 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -32,7 +32,7 @@ PROJECT_NAME = FLAC # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.3 +PROJECT_NUMBER = 1.3.4 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/doc/html/documentation_bugs.html b/doc/html/documentation_bugs.html index ad8b211a..90f0a2ab 100644 --- a/doc/html/documentation_bugs.html +++ b/doc/html/documentation_bugs.html @@ -42,7 +42,7 @@
- The following are major known bugs in the current (1.3.3) release: + The following are major known bugs in the current (1.3.4) release:
  • When encoding to Ogg FLAC, the number of seek points is limited to 240. diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c index a62219fa..7aa50342 100644 --- a/src/libFLAC/format.c +++ b/src/libFLAC/format.c @@ -47,7 +47,7 @@ /* PACKAGE_VERSION should come from configure */ FLAC_API const char *FLAC__VERSION_STRING = PACKAGE_VERSION; -FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " PACKAGE_VERSION " 20190804"; +FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " PACKAGE_VERSION " 2022////"; FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' }; FLAC_API const uint32_t FLAC__STREAM_SYNC = 0x664C6143; diff --git a/src/libFLAC/libFLAC_dynamic.vcproj b/src/libFLAC/libFLAC_dynamic.vcproj index 4cae1aa9..d88765d7 100644 --- a/src/libFLAC/libFLAC_dynamic.vcproj +++ b/src/libFLAC/libFLAC_dynamic.vcproj @@ -42,7 +42,7 @@ Optimization="0" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\include;..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION=\"1.3.3\";DEBUG;FLAC__OVERFLOW_DETECT" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION=\"1.3.4\";DEBUG;FLAC__OVERFLOW_DETECT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -124,7 +124,7 @@ OmitFramePointers="true" WholeProgramOptimization="true" AdditionalIncludeDirectories=".\include;..\..\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION=\"1.3.3\";FLaC__INLINE=_inline" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION=\"1.3.4\";FLaC__INLINE=_inline" RuntimeLibrary="0" BufferSecurityCheck="false" UsePrecompiledHeader="0" diff --git a/src/libFLAC/libFLAC_dynamic.vcxproj b/src/libFLAC/libFLAC_dynamic.vcxproj index 3c0c10e3..056df9c0 100644 --- a/src/libFLAC/libFLAC_dynamic.vcxproj +++ b/src/libFLAC/libFLAC_dynamic.vcxproj @@ -82,7 +82,7 @@ /D "_USE_MATH_DEFINES" %(AdditionalOptions) Disabled .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.3";DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.4";DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -104,7 +104,7 @@ /D "_USE_MATH_DEFINES" %(AdditionalOptions) Disabled .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;ENABLE_64_BIT_WORDS;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.3";DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;ENABLE_64_BIT_WORDS;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.4";DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Level3 @@ -127,7 +127,7 @@ true true .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.3";FLaC__INLINE=_inline;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.4";FLaC__INLINE=_inline;%(PreprocessorDefinitions) MultiThreaded false Level3 @@ -155,7 +155,7 @@ true true .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;ENABLE_64_BIT_WORDS;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.3";FLaC__INLINE=_inline;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;ENABLE_64_BIT_WORDS;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.4";FLaC__INLINE=_inline;%(PreprocessorDefinitions) MultiThreaded false Level3 @@ -324,4 +324,4 @@ - \ No newline at end of file + diff --git a/src/libFLAC/libFLAC_static.vcproj b/src/libFLAC/libFLAC_static.vcproj index 77ae97d1..16cdf89a 100644 --- a/src/libFLAC/libFLAC_static.vcproj +++ b/src/libFLAC/libFLAC_static.vcproj @@ -42,7 +42,7 @@ Optimization="0" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\include;..\..\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION=\"1.3.3\";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION=\"1.3.4\";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -112,7 +112,7 @@ OmitFramePointers="true" WholeProgramOptimization="true" AdditionalIncludeDirectories=".\include;..\..\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION=\"1.3.3\";FLAC__NO_DLL;FLaC__INLINE=_inline" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION=\"1.3.4\";FLAC__NO_DLL;FLaC__INLINE=_inline" RuntimeLibrary="0" BufferSecurityCheck="false" UsePrecompiledHeader="0" diff --git a/src/libFLAC/libFLAC_static.vcxproj b/src/libFLAC/libFLAC_static.vcxproj index 5e0443be..7b1aadb7 100644 --- a/src/libFLAC/libFLAC_static.vcxproj +++ b/src/libFLAC/libFLAC_static.vcxproj @@ -74,7 +74,7 @@ /D "_USE_MATH_DEFINES" %(AdditionalOptions) Disabled .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.3";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.4";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -89,7 +89,7 @@ /D "_USE_MATH_DEFINES" %(AdditionalOptions) Disabled .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;ENABLE_64_BIT_WORDS;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.3";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;ENABLE_64_BIT_WORDS;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.4";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Level3 @@ -106,7 +106,7 @@ true true .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.3";FLAC__NO_DLL;FLaC__INLINE=_inline;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.4";FLAC__NO_DLL;FLaC__INLINE=_inline;%(PreprocessorDefinitions) MultiThreaded false Level3 @@ -124,7 +124,7 @@ true true .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;FLAC__HAS_OGG;ENABLE_64_BIT_WORDS;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.3";FLAC__NO_DLL;FLaC__INLINE=_inline;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;FLAC__HAS_OGG;ENABLE_64_BIT_WORDS;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;PACKAGE_VERSION="1.3.4";FLAC__NO_DLL;FLaC__INLINE=_inline;%(PreprocessorDefinitions) MultiThreaded false Level3 @@ -284,4 +284,4 @@ - \ No newline at end of file + diff --git a/test/metaflac-test-files/case07-expect.meta b/test/metaflac-test-files/case07-expect.meta index 5612e04b..11ab2876 100644 --- a/test/metaflac-test-files/case07-expect.meta +++ b/test/metaflac-test-files/case07-expect.meta @@ -1,4 +1,4 @@ -reference libFLAC 1.3.3 20190804 +reference libFLAC 1.3.4 2022---- ARTIST=The_artist_formerly_known_as_the_artist... ARTIST=Chuck_Woolery ARTIST=Vern -- cgit v1.2.1