From c7fc1768e8026f1da84dfefdb5e18db220516392 Mon Sep 17 00:00:00 2001 From: Martijn van Beurden Date: Wed, 21 Jun 2023 17:09:24 +0200 Subject: [PATCH] Fix library version numbers/sonames --- .github/workflows/distcheck.yml | 4 ++-- doc/release_checklist.md | 3 ++- src/libFLAC++/CMakeLists.txt | 2 +- src/libFLAC++/Makefile.am | 2 +- src/libFLAC/CMakeLists.txt | 2 +- src/libFLAC/Makefile.am | 2 +- ...libFLAC++-1.4.0.xml => abi-descriptor-libFLAC++-1.4.3.xml} | 4 ++-- ...tor-libFLAC-1.4.0.xml => abi-descriptor-libFLAC-1.4.3.xml} | 4 ++-- 8 files changed, 12 insertions(+), 11 deletions(-) rename test/abi/{abi-descriptor-libFLAC++-1.4.0.xml => abi-descriptor-libFLAC++-1.4.3.xml} (60%) rename test/abi/{abi-descriptor-libFLAC-1.4.0.xml => abi-descriptor-libFLAC-1.4.3.xml} (62%) diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml index 3bafb225..90daba2d 100644 --- a/.github/workflows/distcheck.yml +++ b/.github/workflows/distcheck.yml @@ -36,8 +36,8 @@ jobs: 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.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 + 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 - 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/doc/release_checklist.md b/doc/release_checklist.md index ca826def..3a5a59d7 100644 --- a/doc/release_checklist.md +++ b/doc/release_checklist.md @@ -11,7 +11,8 @@ 1. Update changelog 1. Check copyright year and update if applicable 1. Check libFLAC and libFLAC++ for interface changes and update - version numbers in include/FLAC/export.h, include/FLAC++/export.h + version numbers in include/FLAC/export.h, include/FLAC++/export.h, + src/libFLAC/Makefile.am, src/libFLAC++/Makefile.am, src/libFLAC/CMakeLists.txt and src/libFLAC++/CMakeLists.txt 1. Prepare and check release tarball by running `git clean -ffxd && ./autogen.sh && ./configure && make distcheck` diff --git a/src/libFLAC++/CMakeLists.txt b/src/libFLAC++/CMakeLists.txt index 51fe4c44..3be43ba1 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.1.0 + VERSION 10.0.1 SOVERSION 10) if(NOT WIN32) set_target_properties(FLAC++ PROPERTIES CXX_VISIBILITY_PRESET hidden) diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am index 692aeaac..0b2853b2 100644 --- 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:0:0 $(windows_resource_link) +libFLAC___la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 10:1: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 index 5e746277..cf7368f6 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 13.0.0 + VERSION 12.1.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 index 1f03f038..618939df 100644 --- 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 12:0:0 $(windows_resource_link) +libFLAC_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 13:0:1 $(windows_resource_link) libFLAC_sources = \ bitmath.c \ diff --git a/test/abi/abi-descriptor-libFLAC++-1.4.0.xml b/test/abi/abi-descriptor-libFLAC++-1.4.3.xml similarity index 60% rename from test/abi/abi-descriptor-libFLAC++-1.4.0.xml rename to test/abi/abi-descriptor-libFLAC++-1.4.3.xml index 4d19b282..18d6ccdd 100644 --- a/test/abi/abi-descriptor-libFLAC++-1.4.0.xml +++ b/test/abi/abi-descriptor-libFLAC++-1.4.3.xml @@ -1,5 +1,5 @@ - 1.4.0 + 1.4.3 @@ -7,5 +7,5 @@ - src/libFLAC++/.libs/libFLAC++.so.10.0.0 + src/libFLAC++/.libs/libFLAC++.so.10.0.1 diff --git a/test/abi/abi-descriptor-libFLAC-1.4.0.xml b/test/abi/abi-descriptor-libFLAC-1.4.3.xml similarity index 62% rename from test/abi/abi-descriptor-libFLAC-1.4.0.xml rename to test/abi/abi-descriptor-libFLAC-1.4.3.xml index 75f9b75a..1b083862 100644 --- a/test/abi/abi-descriptor-libFLAC-1.4.0.xml +++ b/test/abi/abi-descriptor-libFLAC-1.4.3.xml @@ -1,5 +1,5 @@ - 1.4.0 + 1.4.3 @@ -7,5 +7,5 @@ - src/libFLAC/.libs/libFLAC.so.12.0.0 + src/libFLAC/.libs/libFLAC.so.12.1.0