Update API version numbers and ABI dumps

xiph · Aug 7, 2023 · 526f351 · 526f351
1 parent c1fc2c9
commit 526f351
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
@@ -35,9 +35,9 @@ jobs:
         run: |
           make
           unxz --keep test/abi/abi-libFLAC-1.4.0.dump.xz
-          unxz --keep test/abi/abi-libFLAC++-1.4.0.dump.xz
-          abi-compliance-checker -l flac -old test/abi/abi-libFLAC-1.4.0.dump -new test/abi/abi-descriptor-libFLAC-1.4.3.xml
-          abi-compliance-checker -l flac++ -old test/abi/abi-libFLAC++-1.4.0.dump -new test/abi/abi-descriptor-libFLAC++-1.4.3.xml
+          unxz --keep test/abi/abi-libFLAC++-1.4.4.dump.xz
+          abi-compliance-checker -l flac -old test/abi/abi-libFLAC-1.4.0.dump -new test/abi/abi-descriptor-libFLAC-1.4.4.xml
+          abi-compliance-checker -l flac++ -old test/abi/abi-libFLAC++-1.4.4.dump -new test/abi/abi-descriptor-libFLAC++-1.4.4.xml
 
       - name: Check with flac test files
         run: ./src/flac/flac -t test-files/subset/*.flac test-files/uncommon/0[5-9]*.flac test-files/uncommon/10*.flac

diff --git a/include/FLAC++/export.h b/include/FLAC++/export.h
@@ -91,8 +91,8 @@
 /** These \#defines will mirror the libtool-based library version number, see
  * http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
  */
-#define FLACPP_API_VERSION_CURRENT 10
-#define FLACPP_API_VERSION_REVISION 1 /**< see above */
+#define FLACPP_API_VERSION_CURRENT 11
+#define FLACPP_API_VERSION_REVISION 0 /**< see above */
 #define FLACPP_API_VERSION_AGE 0 /**< see above */
 
 /* \} */

diff --git 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 13
+#define FLAC_API_VERSION_CURRENT 14
 #define FLAC_API_VERSION_REVISION 0 /**< see above */
-#define FLAC_API_VERSION_AGE 1 /**< see above */
+#define FLAC_API_VERSION_AGE 2 /**< see above */
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/libFLAC++/CMakeLists.txt b/src/libFLAC++/CMakeLists.txt
@@ -16,8 +16,8 @@ target_include_directories(FLAC++ INTERFACE
 target_link_libraries(FLAC++ PUBLIC FLAC)
 if(BUILD_SHARED_LIBS)
     set_target_properties(FLAC++ PROPERTIES
-        VERSION 10.0.1
-        SOVERSION 10)
+        VERSION 11.0.0
+        SOVERSION 11)
     if(NOT WIN32)
         set_target_properties(FLAC++ PROPERTIES CXX_VISIBILITY_PRESET hidden)
     endif()

diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am
@@ -57,7 +57,7 @@ endif
 endif
 
 # see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention
-libFLAC___la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 10:1:0 $(windows_resource_link)
+libFLAC___la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 11:0:0 $(windows_resource_link)
 libFLAC___la_LIBADD = ../libFLAC/libFLAC.la
 libFLAC___la_SOURCES = $(libFLAC___sources)
 

diff --git 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.1.0
+        VERSION 12.2.0
         SOVERSION 12)
     if(NOT WIN32)
         set_target_properties(FLAC PROPERTIES C_VISIBILITY_PRESET hidden)

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
@@ -79,7 +79,7 @@ extra_ogg_sources = \
 endif
 
 # see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention
-libFLAC_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 13:0:1 $(windows_resource_link)
+libFLAC_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 14:0:2 $(windows_resource_link)
 
 libFLAC_sources = \
 	bitmath.c \

diff --git a/test/abi/README b/test/abi/README
@@ -0,0 +1,4 @@
+Dumps are created with for example
+abi-compliance-checker -lib flac++ -dump test/abi/abi-descriptor-libFLAC++-x.y.z.xml -dump-path test/abi/abi-libFLAC++-x.y.z.dump
+
+not with abi-dumper
diff --git a/test/abi/abi-descriptor-libFLAC++-1.4.3.xml → test/abi/abi-descriptor-libFLAC++-1.4.4.xml b/test/abi/abi-descriptor-libFLAC++-1.4.3.xml → test/abi/abi-descriptor-libFLAC++-1.4.4.xml
@@ -7,5 +7,5 @@
 </headers>
 
 <libs>
-    src/libFLAC++/.libs/libFLAC++.so.10.0.1
+    src/libFLAC++/.libs/libFLAC++.so.11.0.0
 </libs>
diff --git a/test/abi/abi-descriptor-libFLAC-1.4.3.xml → test/abi/abi-descriptor-libFLAC-1.4.4.xml b/test/abi/abi-descriptor-libFLAC-1.4.3.xml → test/abi/abi-descriptor-libFLAC-1.4.4.xml
@@ -7,5 +7,5 @@
 </headers>
 
 <libs>
-    src/libFLAC/.libs/libFLAC.so.12.1.0
+    src/libFLAC/.libs/libFLAC.so.12.2.0
 </libs>
diff --git a/test/abi/abi-libFLAC++-1.4.0.dump.xz b/test/abi/abi-libFLAC++-1.4.0.dump.xz
diff --git a/test/abi/abi-libFLAC++-1.4.4.dump.xz b/test/abi/abi-libFLAC++-1.4.4.dump.xz