mirrors
/
flac
mirror of https://github.com/xiph/flac
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix library version numbers/sonames

This commit is contained in:
Martijn van Beurden 2023-06-21 17:09:24 +02:00 committed by GitHub
parent 08f8af0845
commit c7fc1768e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/distcheck.yml vendored
View File

@ -36,8 +36,8 @@ jobs:
make make
unxz --keep test/abi/abi-libFLAC-1.4.0.dump.xz unxz --keep test/abi/abi-libFLAC-1.4.0.dump.xz
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.3.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
- name: Check with flac test files - 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 run: ./src/flac/flac -t test-files/subset/*.flac test-files/uncommon/0[5-9]*.flac test-files/uncommon/10*.flac

3
doc/release_checklist.md
View File

@ -11,7 +11,8 @@
1. Update changelog 1. Update changelog
1. Check copyright year and update if applicable 1. Check copyright year and update if applicable
1. Check libFLAC and libFLAC++ for interface changes and update 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 src/libFLAC/CMakeLists.txt and src/libFLAC++/CMakeLists.txt
1. Prepare and check release tarball by running 1. Prepare and check release tarball by running
`git clean -ffxd && ./autogen.sh && ./configure && make distcheck` `git clean -ffxd && ./autogen.sh && ./configure && make distcheck`

2
src/libFLAC++/CMakeLists.txt
View File

@ -16,7 +16,7 @@ target_include_directories(FLAC++ INTERFACE
target_link_libraries(FLAC++ PUBLIC FLAC) target_link_libraries(FLAC++ PUBLIC FLAC)
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
set_target_properties(FLAC++ PROPERTIES set_target_properties(FLAC++ PROPERTIES
VERSION 10.1.0 VERSION 10.0.1
SOVERSION 10) SOVERSION 10)
if(NOT WIN32) if(NOT WIN32)
set_target_properties(FLAC++ PROPERTIES CXX_VISIBILITY_PRESET hidden) set_target_properties(FLAC++ PROPERTIES CXX_VISIBILITY_PRESET hidden)

2
src/libFLAC++/Makefile.am
View File

@ -57,7 +57,7 @@ endif
endif endif
# see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention # 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_LIBADD = ../libFLAC/libFLAC.la
libFLAC___la_SOURCES = $(libFLAC___sources) libFLAC___la_SOURCES = $(libFLAC___sources)

2
src/libFLAC/CMakeLists.txt
View File

@ -91,7 +91,7 @@ if(TARGET Ogg::ogg)
endif() endif()
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
set_target_properties(FLAC PROPERTIES set_target_properties(FLAC PROPERTIES
VERSION 13.0.0 VERSION 12.1.0
SOVERSION 12) SOVERSION 12)
if(NOT WIN32) if(NOT WIN32)
set_target_properties(FLAC PROPERTIES C_VISIBILITY_PRESET hidden) set_target_properties(FLAC PROPERTIES C_VISIBILITY_PRESET hidden)

2
src/libFLAC/Makefile.am
View File

@ -79,7 +79,7 @@ extra_ogg_sources = \
endif endif
# see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention # 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 = \ libFLAC_sources = \
bitmath.c \ bitmath.c \

4
test/abi/abi-descriptor-libFLAC++-1.4.0.xml → test/abi/abi-descriptor-libFLAC++-1.4.3.xml
View File

@ -1,5 +1,5 @@
<version> <version>
1.4.0 1.4.3
</version> </version>
<headers> <headers>
@ -7,5 +7,5 @@
</headers> </headers>
<libs> <libs>
src/libFLAC++/.libs/libFLAC++.so.10.0.0 src/libFLAC++/.libs/libFLAC++.so.10.0.1
</libs> </libs>

4
test/abi/abi-descriptor-libFLAC-1.4.0.xml → test/abi/abi-descriptor-libFLAC-1.4.3.xml
View File

@ -1,5 +1,5 @@
<version> <version>
1.4.0 1.4.3
</version> </version>
<headers> <headers>
@ -7,5 +7,5 @@
</headers> </headers>
<libs> <libs>
src/libFLAC/.libs/libFLAC.so.12.0.0 src/libFLAC/.libs/libFLAC.so.12.1.0
</libs> </libs>