Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
f005565b by Steve Lhomme at 2025-02-26T09:57:17+00:00
configure: test protobuf-lite < 22 with minimum/maximum values
When the protoc version is in the a.b.c format the protobuf version
is in the a.b.c.d format. Some version of pkg-config allow the equality
of the two, but not all.
We can just make sure protobuf is between a.b.c and a.b.(c+1).
Fixes #29066
- - - - -
1 changed file:
- configure.ac
Changes:
=====================================
configure.ac
=====================================
@@ -3957,8 +3957,10 @@ AS_IF([test -n "$PKG_CONFIG"],[
PROTOC_MAJ_VERSION="$(echo ${PROTOC_FULL_VERSION} | cut -d '.' -f -1)"
AS_IF([test "${PROTOC_MAJ_VERSION}" -lt "22" ], [
dnl protoc x.y.z is compatible with protobuf x.y.z
- PROTOBUF_VERSION="$(echo ${PROTOC_FULL_VERSION})"
- PROTOBUF_TEST="protobuf-lite == ${PROTOBUF_VERSION}"
+ PROTOBUF_VERSION="$(echo ${PROTOC_FULL_VERSION} | cut -d '.' -f
-3)"
+ dnl the protoc version is in the x.y.z format but protobuf version
is in the x.y.z.r format
+
PROTOBUF_MAX_VERSION="${PROTOBUF_VERSION%.*}.$((${PROTOBUF_VERSION##*.}+1))"
+ PROTOBUF_TEST="protobuf-lite >= ${PROTOBUF_VERSION} protobuf-lite
< ${PROTOBUF_MAX_VERSION}"
],[
dnl protoc x.y is compatible with protobuf x.y.*
PROTOBUF_VERSION="$(echo ${PROTOC_FULL_VERSION} | cut -d '.' -f
-2)"
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/f005565b91c902b6eefbc5c7b686cb281c97447d
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/f005565b91c902b6eefbc5c7b686cb281c97447d
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
