Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
4aab736b by Steve Lhomme at 2026-01-17T11:53:59+00:00
contrib: protobuf: don't use a dummy CMake function to disable protoc
installation
It's properly handled by -Dprotobuf_BUILD_PROTOC_BINARIES=OFF.
- - - - -
1 changed file:
- contrib/src/protobuf/rules.mak
Changes:
=====================================
contrib/src/protobuf/rules.mak
=====================================
@@ -75,17 +75,10 @@ protobuf: protobuf-$(PROTOBUF_PACKAGE).tar.gz .sum-protobuf
$(UNPACK)
$(APPLY)
$(SRC)/protobuf/0001-Fix-9947-make-the-ABI-identical-between-debug-and-no.patch
$(APPLY)
$(SRC)/protobuf/0001-prioritize-internal-include-path-over-zlib-include-d.patch
- # add a dummy install command to disable some installation
- sed -i.old '1s;^;function (noinstall ...)\nendfunction()\n;'
$(UNPACK_DIR)/cmake/install.cmake
# don't build libprotoc
sed -i.orig -e 's,include(libprotoc,#include(libprotoc,'
$(UNPACK_DIR)/cmake/CMakeLists.txt
# don't build protoc
sed -i.orig -e 's,include(protoc,#include(protoc,'
$(UNPACK_DIR)/cmake/CMakeLists.txt
- # don't install libprotoc
- sed -i.orig -e 's, libprotoc protoc, ,'
$(UNPACK_DIR)/cmake/install.cmake
- sed -i.orig -e 's, libprotoc, ,' $(UNPACK_DIR)/cmake/install.cmake
- # don't install protoc
- sed -i.orig -e 's,install(TARGETS protoc,noinstall(TARGETS protoc,'
$(UNPACK_DIR)/cmake/install.cmake
# force include <algorithm>
sed -i.orig 's,#ifdef _MSC_VER,#if 1,'
"$(UNPACK_DIR)/src/google/protobuf/repeated_field.h"
$(MOVE)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/4aab736bff7322c2bfafe457846a0b34821b199e
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/4aab736bff7322c2bfafe457846a0b34821b199e
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
