remove more old Vimba 6 stuff

strawlab · Oct 14, 2024 · b9fad9b · b9fad9b
1 parent a23901c
commit b9fad9b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 16 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -639,7 +639,6 @@ strand-cam-vimba-ubuntu2404:
     - _packaging/setup-ubuntu-24.04-ipp.sh
     - _packaging/setup-ubuntu-24.04-vimba.sh
     - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-dev libclang-dev clang
-    - export VIMBAC_LIBDIR="/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit"
     - export PATH="$PATH:$CARGO_HOME/bin"
 
     - export RUSTFLAGS="-D warnings"
@@ -653,7 +652,7 @@ strand-cam-vimba-ubuntu2404:
       OPENCV_STATIC=1
       PKG_CONFIG_PATH=/opt/opencv-4.9.0-static/lib/pkgconfig
       IPP_STATIC=1
-      RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit"
+      RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1"
       NUM_JOBS=2
       cargo build --no-default-features --features "strand-cam/bundle_files ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/flydra_feat_detect strand-cam/use_ipp strand-cam/imtrack-absdiff" --release
 
@@ -679,7 +678,6 @@ strand-cam-vimba-ubuntu2004:
     - _packaging/setup-ubuntu-20.04-ipp.sh
     - _packaging/setup-ubuntu-20.04-vimba.sh
     - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-dev libclang-dev clang
-    - export VIMBAC_LIBDIR="/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit"
     - export PATH="$PATH:$CARGO_HOME/bin"
 
     - export RUSTFLAGS="-D warnings"
@@ -693,7 +691,7 @@ strand-cam-vimba-ubuntu2004:
       OPENCV_STATIC=1
       PKG_CONFIG_PATH=/opt/opencv-4.9.0-static/lib/pkgconfig
       IPP_STATIC=1
-      RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit"
+      RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1"
       NUM_JOBS=2
       cargo build --no-default-features --features "strand-cam/bundle_files ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/flydra_feat_detect strand-cam/use_ipp strand-cam/imtrack-absdiff" --release
 
@@ -720,7 +718,6 @@ strand-cam-vimba-ubuntu2204:
     - _packaging/setup-ubuntu-22.04-ipp.sh
     - _packaging/setup-ubuntu-22.04-vimba.sh
     - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-dev libclang-dev clang
-    - export VIMBAC_LIBDIR="/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit"
     - export PATH="$PATH:$CARGO_HOME/bin"
 
     - export RUSTFLAGS="-D warnings"
@@ -734,7 +731,7 @@ strand-cam-vimba-ubuntu2204:
       OPENCV_STATIC=1
       PKG_CONFIG_PATH=/opt/opencv-4.9.0-static/lib/pkgconfig
       IPP_STATIC=1
-      RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit"
+      RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1"
       NUM_JOBS=2
       cargo build --no-default-features --features "strand-cam/bundle_files ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/flydra_feat_detect strand-cam/use_ipp strand-cam/imtrack-absdiff" --release
 

diff --git a/strand-cam/Cargo.toml b/strand-cam/Cargo.toml
@@ -177,7 +177,3 @@ flydra_feat_detect = ["flydra-feature-detector"]
 
 use_ipp = ["flydra-feature-detector?/use_ipp"]
 do_not_use_ipp = ["flydra-feature-detector?/do_not_use_ipp"]
-
-# TODO:
-# fix so this is not needed in linux: `export LD_LIBRARY_PATH=/opt/Vimba_6_0/Tools/Viewer/Bin/x86_64bit`
-# Also this reduces warnings in linux: sudo adduser strawlab video
diff --git a/strand-cam/strand-cam-vimba/build-imops.sh b/strand-cam/strand-cam-vimba/build-imops.sh
@@ -3,7 +3,6 @@ set -o errexit
 
 # Prerequisite: ../yew_frontend/pkg is built. Do this by "build-imops.sh" in yew_frontend.
 
-export VIMBAC_LIBDIR="/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit"
 export PKG_CONFIG_PATH=/opt/opencv-4.5.5-static/lib/pkgconfig
 
 cargo +nightly build --features backtrace,ci2-vimba/backtrace,imops/simd --release
diff --git a/strand-cam/strand-cam-vimba/build-plain.sh b/strand-cam/strand-cam-vimba/build-plain.sh
@@ -3,9 +3,7 @@ set -o errexit
 
 # Prerequisite: ../yew_frontend/pkg is built. Do this by "build.sh" in yew_frontend.
 
-export VIMBAC_LIBDIR="/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit"
-
 PKG_CONFIG_PATH=/opt/libvpx/libvpx-1.8.0/lib/pkgconfig \
-RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit" \
+RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1" \
 NUM_JOBS=2 \
 cargo build --features "strand-cam/imtrack-absdiff strand-cam/bundle_files backtrace" --release
diff --git a/strand-cam/strand-cam-vimba/build.sh b/strand-cam/strand-cam-vimba/build.sh
@@ -3,13 +3,12 @@ set -o errexit
 
 # Prerequisite: ../yew_frontend/pkg is built. Do this by "build-imops.sh" in yew_frontend.
 
-export VIMBAC_LIBDIR="/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit"
 export PKG_CONFIG_PATH=/opt/opencv-4.5.5-static/lib/pkgconfig
 
 source /opt/intel/bin/compilervars.sh -arch intel64 -platform linux && \
 OPENCV_STATIC=1 \
 PKG_CONFIG_PATH=/opt/opencv-4.5.5-static/lib/pkgconfig \
 IPP_STATIC=1 \
-RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/Vimba_6_0/VimbaC/DynamicLib/x86_64bit" \
+RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1" \
 NUM_JOBS=2 \
 cargo build --features "strand-cam/flydra_feat_detect strand-cam/use_ipp strand-cam/imtrack-absdiff strand-cam/bundle_files ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd" --release