Update changelog and library version numbers

8 files changed, 53 insertions, 8 deletions

diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index ec47f248..9694dbe0 100644
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@@ -34,6 +34,13 @@ jobs:
           abi-compliance-checker -l flac -old test/abi/abi-libFLAC-1.4.0.dump -new test/abi/abi-descriptor-libFLAC-1.4.0.xml
           abi-compliance-checker -l flac++ -old test/abi/abi-libFLAC++-1.4.0.dump -new test/abi/abi-descriptor-libFLAC++-1.4.0.xml
 
+      - name: Upload ABI compliance reports
+        uses: actions/upload-artifact@v3
+        with:
+          name: flac-${{ github.sha }}-${{ github.run_id }}-compat
+          path: |
+            ./compat_reports
+
       - name: Upload logs on failure
         uses: actions/upload-artifact@v3
         if: failure()
@@ -41,4 +48,3 @@ jobs:
           name: flac-${{ github.sha }}-${{ github.run_id }}-logs
           path: |
             ./flac-**/**/*.log
-            ./compat_reports
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd0aa0b7..9c8f4ee7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,45 @@
 
 This changelog is not exhaustive, review [the git commit log](https://github.com/xiph/flac/commits) for an exhaustive list of changes.
 
+## git as of 2023-05-28
+
+As there have been additions to the libFLAC interfaces, the libFLAC version number is incremented to 13. The libFLAC++ version number stays at 10.
+
+* General
+	* All PowerPC-specific code has been removed, as it turned out those improvements didn't actually improve anything
+	* Large improvements in encoder speed for all presets. The largest change is for the fastest presets and for 24-bit and 32-bit inputs.
+	* Small improvement in decoder speed for BMI2-capable CPUs
+* flac
+	* A lot of small fixes for bugs found by fuzzing
+	* Various improvements to the --keep-foreign-metadata and --keep-foreign-metadata-if-present options on decoding
+		* The output format (WAV/AIFF/RF64 etc.) is now automatically selected based on what kind of foreign metadata is stored
+		* Decoded file is checked afterwards, to see whether stored foreign format data agrees with FLAC audio properties
+		* AIFF-C sowt data can now be restored
+	* Add --force-legacy-wave-format option, to decode to WAV with WAVEFORMATPCM where WAVE_FORMAT_EXTENSIBLE would be more appropriate
+	* Add --force-aiff-c-none-format and --force-aiff-c-sowt-format to decode to AIFF-C
+	* The storage of WAVEFORMATEXTENSIBLE_CHANNEL_MASK is no longer restricted to known channel orderings
+	* Throw an error when WAV or AIFF files are over 4GiB in length and the --ignore-chunk-sizes option is not set
+	* Warn on testing files when ID3v2 tags are found
+	* Warn when data trails the audio data of a WAV/AIFF/RF64/W64 file
+	* Fix output file not being deleted after error on Windows
+	* Fix compilation on UWP platform
+* metaflac
+	* A lot of small fixes for bugs found by fuzzing
+	* Added options --append and --data-format, which makes it possible to copy metadata blocks from one FLAC file to another
+	* Added option --remove-all-tags-except
+	* Added option --show-all-tags
+* libFLAC
+	* No longer write seektables to Ogg, even when specifically asked for. Seektables in Ogg are not defined
+	* Add functions FLAC__metadata_object_set_raw and FLAC__metadata_object_get_raw to convert between blob and FLAC__StreamMetadata
+* Build system
+	* Autoconf (configure)
+		* The option --enable-64-bit-words is now on by default
+	* CMake
+		* The option ENABLE_64_BIT_WORDS is now on by default
+* Testing/validation
+	* Fuzzers were added for the flac and metaflac command line tools
+	* Fuzzer coverage was improved
+
 ## FLAC 1.4.2 (22-Oct-2022)
 
 Once again, this release only has a few changes. A problem with FLAC playback in GStreamer (and possibly other libFLAC users) was the reason for the short time since the last release
diff --git a/include/FLAC++/export.h b/include/FLAC++/export.h
index 19370fab..3745692b 100644
--- a/include/FLAC++/export.h
+++ b/include/FLAC++/export.h
@@ -92,7 +92,7 @@
  * http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
  */
 #define FLACPP_API_VERSION_CURRENT 10
-#define FLACPP_API_VERSION_REVISION 0 /**< see above */
+#define FLACPP_API_VERSION_REVISION 1 /**< see above */
 #define FLACPP_API_VERSION_AGE 0 /**< see above */
 
 /* \} */
diff --git a/include/FLAC/export.h b/include/FLAC/export.h
index 983f13b1..adbde7b0 100644
--- a/include/FLAC/export.h
+++ b/include/FLAC/export.h
@@ -95,9 +95,9 @@
 /** These \#defines will mirror the libtool-based library version number, see
  * http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
  */
-#define FLAC_API_VERSION_CURRENT 12
+#define FLAC_API_VERSION_CURRENT 13
 #define FLAC_API_VERSION_REVISION 0 /**< see above */
-#define FLAC_API_VERSION_AGE 0 /**< see above */
+#define FLAC_API_VERSION_AGE 1 /**< see above */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/libFLAC++/CMakeLists.txt b/src/libFLAC++/CMakeLists.txt
index 1a2a03ed..51fe4c44 100644
--- a/src/libFLAC++/CMakeLists.txt
+++ b/src/libFLAC++/CMakeLists.txt
@@ -16,7 +16,7 @@ target_include_directories(FLAC++ INTERFACE
 target_link_libraries(FLAC++ PUBLIC FLAC)
 if(BUILD_SHARED_LIBS)
     set_target_properties(FLAC++ PROPERTIES
-        VERSION 10.0.0
+        VERSION 10.1.0
         SOVERSION 10)
     if(NOT WIN32)
         set_target_properties(FLAC++ PROPERTIES CXX_VISIBILITY_PRESET hidden)
diff --git a/src/libFLAC++/version.rc b/src/libFLAC++/version.rc
index 559fcedf..14efba06 100644
--- a/src/libFLAC++/version.rc
+++ b/src/libFLAC++/version.rc
@@ -16,7 +16,7 @@
 #define str(s) #s
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    FLACPP_API_VERSION_CURRENT,0,0,0
+FILEVERSION    FLACPP_API_VERSION_CURRENT,FLACPP_API_VERSION_REVISION,0,0
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS__WINDOWS32
diff --git a/src/libFLAC/CMakeLists.txt b/src/libFLAC/CMakeLists.txt
index 9a43dd33..5e746277 100644
--- a/src/libFLAC/CMakeLists.txt
+++ b/src/libFLAC/CMakeLists.txt
@@ -91,7 +91,7 @@ if(TARGET Ogg::ogg)
 endif()
 if(BUILD_SHARED_LIBS)
     set_target_properties(FLAC PROPERTIES
-        VERSION 12.0.0
+        VERSION 13.0.0
         SOVERSION 12)
     if(NOT WIN32)
         set_target_properties(FLAC PROPERTIES C_VISIBILITY_PRESET hidden)
diff --git a/src/libFLAC/version.rc b/src/libFLAC/version.rc
index 585c3911..019da1dd 100644
--- a/src/libFLAC/version.rc
+++ b/src/libFLAC/version.rc
@@ -16,7 +16,7 @@
 #define str(s) #s
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    FLAC_API_VERSION_CURRENT,0,0,0
+FILEVERSION    FLAC_API_VERSION_CURRENT,FLAC_API_VERSION_REVISION,0,0
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS__WINDOWS32