Skip to content

protoc: build from the contribs so it always matches the library

Steve Lhomme requested to merge robUx4/vlc:contrib-protoc into master

Use the one from the contribs if it's present. Just like with luac.


v2 built on top of cherry picks from !1257 (merged) and modified !1291 (merged)

  • Force building protoc when using prebuilt contribs, like we do with .luac. A detection of the installed protoc native version might avoid this build phase on all our Docker builds.

Draft until !1257 (merged) and !1291 (merged) are somehow merged/deprecated.


v5 now builds "protoc" rather than HOST-protoc. This avoids collision where the different path when building contrib and VLC and the way configure detects protoc might end up not picking the same thing. Debian uses /usr/bin/protoc for all targets.

If we really want to differentiate between builds for cleaning, we can always put protoc in contrib/HOST/bin rather than contrib/bin. The latter only being used for luac by manual selection.

protoc is now a regular contrib target completely independent of protobuf.

Now sits on top of unmodified !1257 (merged) and !1291 (merged).


v6 is back to installing HOST-protoc in contrib/bin, like HOST-luac. However a lot of build scripts and CI environment don't pick this path to find native tools so I added them where necessary.

Also added the protoc vs protobuf version matching in configure, so if they don't match chromecast is not used.


v7

  • don't force the contrib/bin PATH anymore, it will not work well for all developers. Use the same as luac by checking first the known PATH in configure. Therefore we don't modify the PATH in build/CI scripts.

  • Add protoc to PKGS_ALL.

  • detect protobuf-lite with the exact PROTOBUF_VERSION value, we don't know if 3.1.1 would even work and it simplifies the code. Now we should be able to update with just a version bump.


v8

  • fix ${host} vs ${host_alias} mixup and -luac vs -protoc mixup
  • set the --host when configuring VLC on snap, just like the contribs, so we have the proper host_alias.
  • add a message during configure if we use protoc from the contribs or not
Edited by Steve Lhomme

Merge request reports

Loading