From b302c77f20e3b439d665cec3261639778c8456d9 Mon Sep 17 00:00:00 2001 From: Milan Nikolic Date: Tue, 30 Jan 2024 16:15:24 +0100 Subject: [PATCH] Use fork --- camera/camera_cv2.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- make.bash | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/camera/camera_cv2.go b/camera/camera_cv2.go index ef958eb..d5112fc 100644 --- a/camera/camera_cv2.go +++ b/camera/camera_cv2.go @@ -12,7 +12,7 @@ import ( "time" "github.com/disintegration/imaging" - "github.com/go-opencv/go-opencv/opencv" + "github.com/gen2brain/go-opencv/opencv" "github.com/pbnjay/pixfont" ) diff --git a/go.mod b/go.mod index c8eb38e..2b63fd7 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/antonini/golibjpegturbo v0.0.0-20141208033414-c03a2fa1e89a github.com/disintegration/imaging v1.6.2 github.com/gen2brain/base64 v0.0.0-20221015184129-317a5c93030c - github.com/go-opencv/go-opencv v0.0.0-20190115070742-a4fe8ec027cc + github.com/gen2brain/go-opencv v0.0.0-20191005190506-bf186fc94f7a github.com/jamiealquiza/envy v1.1.0 github.com/korandiz/v4l v1.1.0 github.com/pbnjay/pixfont v0.0.0-20200714042608-33b744692567 diff --git a/go.sum b/go.sum index 29f19e0..ebbf112 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= github.com/gen2brain/base64 v0.0.0-20221015184129-317a5c93030c h1:TUjjeJ2rV4KZxH6hIEi/boEQB3v6aKvwdakUJR3AwiE= github.com/gen2brain/base64 v0.0.0-20221015184129-317a5c93030c/go.mod h1:VG58IUyxPWojCtGwqwoZ/6LLXwClu1tssqa5ktOxI9o= -github.com/go-opencv/go-opencv v0.0.0-20190115070742-a4fe8ec027cc h1:4FHjtvOsr1M3WwN6sRm6Iuvxa9gtu2cwAI/vMXK+7rs= -github.com/go-opencv/go-opencv v0.0.0-20190115070742-a4fe8ec027cc/go.mod h1:CJDlJ8IGjqEnaJZE1MaUF3eL0EWayFGwM0Eqb6i9l3I= +github.com/gen2brain/go-opencv v0.0.0-20191005190506-bf186fc94f7a h1:0arrt5Ke40opD5glNdh9ltrkZ0jaqPWsquGPSE3ukug= +github.com/gen2brain/go-opencv v0.0.0-20191005190506-bf186fc94f7a/go.mod h1:pOLh42huXUuMoJWvD2K+EeXzvQ9GZ5HN6gdFk5ZwIuU= github.com/hybridgroup/mjpeg v0.0.0-20140228234708-4680f319790e/go.mod h1:eagM805MRKrioHYuU7iKLUyFPVKqVV6um5DAvCkUtXs= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= diff --git a/make.bash b/make.bash index 0924b4b..966fa6c 100755 --- a/make.bash +++ b/make.bash @@ -10,17 +10,17 @@ ANDROID="/usr/arm-linux-androideabi" mkdir -p build -LIBRARY_PATH="$CHROOT/usr/lib:$CHROOT/lib" \ -PKG_CONFIG_PATH="$CHROOT/usr/lib/pkgconfig" \ -PKG_CONFIG_LIBDIR="$CHROOT/usr/lib/pkgconfig" \ -CGO_LDFLAGS="-L$CHROOT/usr/lib -L$CHROOT/lib" \ +LIBRARY_PATH="$CHROOT/usr/lib64:$CHROOT/lib64" \ +PKG_CONFIG_PATH="$CHROOT/usr/lib64/pkgconfig" \ +PKG_CONFIG_LIBDIR="$CHROOT/usr/lib64/pkgconfig" \ +CGO_LDFLAGS="-L$CHROOT/usr/lib64 -L$CHROOT/lib" \ CGO_CFLAGS="-I$CHROOT/usr/include" \ CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags cv2,turbo -o build/cam2ip.linux.amd64.cv2 -ldflags "-linkmode external -s -w" github.com/gen2brain/cam2ip/cmd/cam2ip -LIBRARY_PATH="$CHROOT/usr/lib:$CHROOT/lib" \ -PKG_CONFIG_PATH="$CHROOT/usr/lib/pkgconfig" \ -PKG_CONFIG_LIBDIR="$CHROOT/usr/lib/pkgconfig" \ -CGO_LDFLAGS="-L$CHROOT/usr/lib -L$CHROOT/lib" \ +LIBRARY_PATH="$CHROOT/usr/lib64:$CHROOT/lib64" \ +PKG_CONFIG_PATH="$CHROOT/usr/lib64/pkgconfig" \ +PKG_CONFIG_LIBDIR="$CHROOT/usr/lib64/pkgconfig" \ +CGO_LDFLAGS="-L$CHROOT/usr/lib64 -L$CHROOT/lib64" \ CGO_CFLAGS="-I$CHROOT/usr/include" \ CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o build/cam2ip.linux.amd64 -ldflags "-linkmode external -s -w" github.com/gen2brain/cam2ip/cmd/cam2ip