Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #437 from Palakis/bugfix/takesourcescreenshot-jpg

Browse Source 
Fix JPEG support in TakeSourceScreenshot on Windows
This commit is contained in:
Stéphane Lepin
2020-03-17 22:14:35 +01:00
committed by GitHub
parent 86191aff7f c418cbf4ef
commit c9fa82f073
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CI/package-xenial.sh
View File

@ -13,13 +13,13 @@ fi
cd /root/obs-websocket/build cd /root/obs-websocket/build
PAGER=cat checkinstall -y --type=debian --fstrans=no --nodoc \ PAGER="cat" checkinstall -y --type=debian --fstrans=no --nodoc \
--backup=no --deldoc=yes --install=no \ --backup=no --deldoc=yes --install=no \
--pkgname=obs-websocket --pkgversion="$PKG_VERSION" \ --pkgname=obs-websocket --pkgversion="$PKG_VERSION" \
--pkglicense="GPLv2.0" --maintainer="contact@slepin.fr" \ --pkglicense="GPLv2.0" --maintainer="stephane.lepin@gmail.com" \
--pkggroup="video" \ --pkggroup="video" \
--pkgsource="https://github.com/Palakis/obs-websocket" \ --pkgsource="https://github.com/Palakis/obs-websocket" \
--requires="obs-studio libqt5core5a libqt5widgets5" \ --requires="obs-studio libqt5core5a libqt5widgets5 qt5-image-formats-plugins" \
--pakdir="/package" --pakdir="/package"
chmod ao+r /package/* chmod ao+r /package/*

13
CMakeLists.txt
View File

@ -23,8 +23,7 @@ if (WIN32 OR APPLE)
endif() endif()
find_package(LibObs REQUIRED) find_package(LibObs REQUIRED)
find_package(Qt5Core REQUIRED) find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
find_package(Qt5Widgets REQUIRED)
set(obs-websocket_SOURCES set(obs-websocket_SOURCES
src/obs-websocket.cpp src/obs-websocket.cpp
@ -128,6 +127,16 @@ if(WIN32)
"$<TARGET_FILE:obs-websocket>" "$<TARGET_FILE:obs-websocket>"
"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}") "${RELEASE_DIR}/obs-plugins/${ARCH_NAME}")
# In Release mode, copy Qt image format plugins
COMMAND if $<CONFIG:Release>==1 (
"${CMAKE_COMMAND}" -E copy
"${QTDIR}/plugins/imageformats/qjpeg.dll"
"${RELEASE_DIR}/bin/${ARCH_NAME}/imageformats/qjpeg.dll")
COMMAND if $<CONFIG:RelWithDebInfo>==1 (
"${CMAKE_COMMAND}" -E copy
"${QTDIR}/plugins/imageformats/qjpeg.dll"
"${RELEASE_DIR}/bin/${ARCH_NAME}/imageformats/qjpeg.dll")
# If config is RelWithDebInfo, package release files # If config is RelWithDebInfo, package release files
COMMAND if $<CONFIG:RelWithDebInfo>==1 ( COMMAND if $<CONFIG:RelWithDebInfo>==1 (
"${CMAKE_COMMAND}" -E make_directory "${CMAKE_COMMAND}" -E make_directory