diff --git a/CI/package-xenial.sh b/CI/package-xenial.sh index 8986aecd..276584a1 100755 --- a/CI/package-xenial.sh +++ b/CI/package-xenial.sh @@ -13,13 +13,13 @@ fi 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 \ --pkgname=obs-websocket --pkgversion="$PKG_VERSION" \ - --pkglicense="GPLv2.0" --maintainer="contact@slepin.fr" \ + --pkglicense="GPLv2.0" --maintainer="stephane.lepin@gmail.com" \ --pkggroup="video" \ --pkgsource="https://github.com/Palakis/obs-websocket" \ - --requires="obs-studio libqt5core5a libqt5widgets5" \ + --requires="obs-studio libqt5core5a libqt5widgets5 qt5-image-formats-plugins" \ --pakdir="/package" chmod ao+r /package/* diff --git a/CMakeLists.txt b/CMakeLists.txt index 520d4254..788960c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,7 @@ if (WIN32 OR APPLE) endif() find_package(LibObs REQUIRED) -find_package(Qt5Core REQUIRED) -find_package(Qt5Widgets REQUIRED) +find_package(Qt5 REQUIRED COMPONENTS Core Widgets) set(obs-websocket_SOURCES src/obs-websocket.cpp @@ -128,6 +127,16 @@ if(WIN32) "$" "${RELEASE_DIR}/obs-plugins/${ARCH_NAME}") + # In Release mode, copy Qt image format plugins + COMMAND if $==1 ( + "${CMAKE_COMMAND}" -E copy + "${QTDIR}/plugins/imageformats/qjpeg.dll" + "${RELEASE_DIR}/bin/${ARCH_NAME}/imageformats/qjpeg.dll") + COMMAND if $==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 COMMAND if $==1 ( "${CMAKE_COMMAND}" -E make_directory