build: remove highgui, fixes for ci

- highgui compile problems on mxe, so just remove it. It was used for
some debugging which users never need
- add CV_BUILD environment support for ci

Author: scrubbbbs

cbird.pri

@@ -67,23 +67,40 @@ QTCORE_PRIVATE_HEADERS="$$[QT_INSTALL_HEADERS]/QtCore/$$QT_VERSION"
 INCLUDEPATH += $$QTCORE_PRIVATE_HEADERS
 
 win32 {
-    !exists( ../libs-win32 ) { error("win32 libs missing") }
-    !exists( ../libs-win32/build-opencv ) { error("win32 opencv libs missing") }
-    !exists( ../libs-win32/build-mxe ) { error("win32 mxe libs missing") }
+    # opencv for mingw doesn't use unix-like install
+    CV_BUILD=../libs-win32/build-opencv
+    !equals('',$$(CV_BUILD)) { # take from environment
+        CV_BUILD=$$(CV_BUILD)
+    }
+    !exists( $${CV_BUILD} ) { error("win32 opencv2 build missing, tried <$${CV_BUILD}>") }
 
-    INCLUDEPATH += ../libs-win32/build-opencv/install/include
-    LIBS += -L../libs-win32/build-opencv/install/x64/mingw/lib
+    INCLUDEPATH += $${CV_BUILD}/install/include
+    LIBS += -L$${CV_BUILD}/install/x64/mingw/lib
     OPENCV_VERSION = 2413
-    OPENCV_LIBS *= ml objdetect stitching superres videostab calib3d
-    OPENCV_LIBS *= features2d highgui video photo imgproc flann core
+    OPENCV_LIBS *= core features2d imgproc video flann
+    #OPENCV_LIBS *= highgui video photo imgproc
+    #OPENCV_LIBS *= ml objdetect stitching superres videostab calib3d
     for (CVLIB, OPENCV_LIBS) {
         LIBS *= -lopencv_$${CVLIB}$${OPENCV_VERSION}
     }
 
-    INCLUDEPATH = ../libs-win32/build-mxe/include $$INCLUDEPATH # ensure this precedes mxe
-    LIBS += -L../libs-win32/build-mxe/lib
-   
-    INCLUDEPATH += ../libs-win32/build-mxe/include/QuaZip-Qt6-1.4
+    # install prefix for extra deps (in unix convention) we want to keep out of mxe
+    EXTRA_PREFIX=../libs-win32/build-mxe
+    !equals('',$$(EXTRA_PREFIX)) {
+        EXTRA_PREFIX=$$(EXTRA_PREFIX)
+    }
+    exists( $${EXTRA_PREFIX} ) {
+        INCLUDEPATH = $${EXTRA_PREFIX}/include $$INCLUDEPATH # ensure this precedes mxe
+        LIBS += -L$${EXTRA_PREFIX}/lib
+    }
+  
+    QUAZIP_PATH=$${EXTRA_PREFIX}/include/QuaZip-Qt6-6.1.5
+    !exists( $${QUAZIP_PATH} ) {
+        QUAZIP_PATH=$(MXE_DIR)/usr/$(MXE_TARGET)/include/QuaZip-Qt6-1.5
+    }
+    !exists( $${QUAZIP_PATH} ) { error("quazip missing, tried $${QUAZIP_PATH}") } 
+    
+    INCLUDEPATH += $${QUAZIP_PATH} 
     LIBS += -lquazip1-qt6
 
     LIBS *= -lz -lpsapi -ldwmapi

src/cvutil.cpp

@@ -25,7 +25,10 @@
 #include "ioutil.h"
 #include "profile.h"
 
+#ifdef ENABLE_HIGHGUI
 #include "opencv2/highgui/highgui.hpp"
+#endif
+
 #include "opencv2/imgproc/imgproc.hpp"
 
 #include <QtCore/QMutexLocker>
@@ -159,6 +162,7 @@ void saveMatrix(const cv::Mat& mat, const QString& path) {
   });
 }
 
+#ifdef ENABLE_HIGHGUI
 void showImage(const cv::Mat& img) {
   const char* title = "showImage";
   cv::namedWindow(title, CV_WINDOW_AUTOSIZE);
@@ -167,6 +171,7 @@ void showImage(const cv::Mat& img) {
   cv::waitKey();
   cv::destroyWindow(title);
 }
+#endif
 
 void cImgToCvImg(const CImg<uint8_t>& img, cv::Mat& cvImg) {
   if (img.spectrum() >= 3) {
@@ -824,10 +829,12 @@ void ColorDescriptor::create(const cv::Mat& cvImg, ColorDescriptor& desc) {
   // this only works if pure black is removed
   Q_ASSERT(!histFilter(0, 96, 136));
 
+#ifdef ENABLE_HIGHGUI
   if (debug) {
     cv::imshow("mask", mask);
     cv::moveWindow("mask", mask.cols, 0);
   }
+#endif
 
   // apply mask
   for (int row = 0; row < rgb.rows; row++) {
@@ -1074,6 +1081,7 @@ void ColorDescriptor::create(const cv::Mat& cvImg, ColorDescriptor& desc) {
   }
 
   if (debug) {
+#ifdef ENABLE_HIGHGUI
     cv::cvtColor(luv, rgb, convToRgb);
     cv::cvtColor(graph, graph, convToRgb);
 
@@ -1086,6 +1094,7 @@ void ColorDescriptor::create(const cv::Mat& cvImg, ColorDescriptor& desc) {
     cv::moveWindow("colors", 0, rgb.rows);
     cv::imshow("colors", graph);
     cv::waitKey(0);
+#endif
   }
 }
 

src/cvutil.h

@@ -116,8 +116,10 @@ struct ColorDescriptor {
 void cImgToCvImg(const CImg<uint8_t>& img, cv::Mat& cvImg);
 void cvImgToCImg(const cv::Mat& cvImg, CImg<uint8_t>& cImg);
 
+#ifdef ENABLE_HIGHGUI
 // show image viewer and wait for key press
 void showImage(const cv::Mat& img);
+#endif
 
 // convert QImage to cv::Mat
 // unless QImage is manipulated in some way,

windows/mxe-pkg.sh

@@ -1,16 +1,20 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=$1
 ARCH=$2
 BUILD=_win32
 PKG_DIR=$BUILD/cbird-win
 ZIP=cbird-windows-$VERSION-$ARCH.zip
 MXE_BIN="$MXE_DIR/usr/$MXE_TARGET/bin"
-OPENCV_BIN=../libs-win32/build-opencv/install/x64/mingw/bin
-CROSS_BIN=../libs-win32/build-mxe/bin
+OPENCV_BIN="$CV_BUILD/install/x64/mingw/bin"
 QT_DIR="$MXE_DIR/usr/$MXE_TARGET/qt6"
 QT_BIN="$QT_DIR/bin"
 STRIP="$MXE_DIR/usr/bin/$MXE_TARGET-strip"
 
+CROSS_BIN="$MXE_BIN"
+if [[ ! -d "$EXTRA_PREFIX/bin" ]]; then
+    CROSS_BIN="$EXTRA_PREFIX/bin";
+fi
+
 echo building $VERSION $ARCH in $PKG_DIR
 
 # we need this for dll discovery