[vlc-devel] [PATCH] Fixes the extras/tools/bootstrap that was broken when ProtoBuf 3.1 was installed system-wide.

Pyry Kontio pyry.kontio at drasa.eu
Fri Oct 21 21:32:07 CEST 2016


The bootstrap script that outputs which binary tools need to be installed, incorrectly
detects that Protocol Buffers 3.1 is a compatible version with 2.6. I changed the
check on the major version number to require it to be same, not just bigger,
since changes on the major version numbers might be breaking changes, as was the case
here.
---
 extras/tools/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 9666436..95870fa 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -60,7 +60,7 @@ else
     needminor=`echo $2|cut -d. -f2`
     needmicro=`echo $2|cut -d. -f3`
     [ -z "$needmicro" ] && needmicro=0
-    if [ "$needmajor" -gt "$gotmajor" \
+    if [ "$needmajor" -ne "$gotmajor" \
          -o "$needmajor" -eq "$gotmajor" -a "$needminor" -gt "$gotminor" \
          -o "$needmajor" -eq "$gotmajor" -a "$needminor" -eq "$gotminor" -a "$needmicro" -gt "$gotmicro" ]
     then
-- 
2.10.1



More information about the vlc-devel mailing list