Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-03 20:04:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

switched video capture to QCamera and removed opencv dependency

Browse source
This commit is contained in:
csoler 2021-05-12 09:40:42 +02:00
parent 4b34c73cf8
commit 0de9c877b8
4 changed files with 98 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

56
plugins/VOIP/VOIP.pro
View file

@ -53,7 +53,6 @@ linux-* {
PKGCONFIG += libavcodec libavutil
PKGCONFIG += speex speexdsp
PKGCONFIG += opencv4
} else {
LIBS += -lspeex -lspeexdsp -lavcodec -lavutil
}
@ -66,37 +65,10 @@ win32 {
INCLUDEPATH += . $$INC_DIR
USE_PRECOMPILED_LIBS =
for(lib, RS_LIB_DIR) {
#message(Scanning $$lib)
isEmpty(USE_PRECOMPILED_LIBS) {
exists($$lib/opencv/libopencv_core.a) {
message(Get pre-compiled opencv libraries here:)
message($$lib/opencv)
LIBS += -L"$$lib/opencv"
USE_PRECOMPILED_LIBS = 1
}
exists($$lib/libopencv_core.dll.a) {
message(Get pre-compiled opencv libraries here:)
message($$lib)
LIBS += -L"$$lib"
USE_PRECOMPILED_LIBS = 1
}
}
}
isEmpty(USE_PRECOMPILED_LIBS) {
message(Use system opencv libraries.)
}
LIBS += -lopencv_core -lopencv_highgui -lopencv_imgproc -lopencv_videoio -lopencv_imgcodecs -llibwebp -llibtiff -llibpng -llibopenjp2 -lIlmImf
# Should we keep these after removing opencv??
LIBS += -lole32 -loleaut32 -luuid -lvfw32
# Check for msys2
!isEmpty(PREFIX_MSYS2) {
message(Use msys2 opencv4.)
INCLUDEPATH += "$${PREFIX_MSYS2}/include/opencv4"
} else {
LIBS += -llibjpeg-turbo -lzlib
}
LIBS += -llibjpeg-turbo -lzlib
}
#################################### MacOSX #####################################
@ -105,30 +77,6 @@ macx {
DEPENDPATH += . $$INC_DIR
INCLUDEPATH += . $$INC_DIR
#OPENCV_VERSION = "249"
USE_PRECOMPILED_LIBS =
for(lib, LIB_DIR) {
#message(Scanning $$lib)
exists( $$lib/opencv/libopencv_core*.dylib) {
isEmpty(USE_PRECOMPILED_LIBS) {
message(Get pre-compiled opencv libraries here:)
message($$lib)
LIBS += -L"$$lib/opencv"
LIBS += -lopencv_core -lopencv_highgui -lopencv_imgproc
USE_PRECOMPILED_LIBS = 1
}
}
exists( $$lib/libopencv_videoio*.dylib) {
message(videoio found in opencv libraries.)
message($$lib)
LIBS += -lopencv_videoio
}
}
isEmpty(USE_PRECOMPILED_LIBS) {
message(Use system opencv libraries.)
LIBS += -lopencv_core -lopencv_highgui -lopencv_imgproc
}
}