From e0a25dbf485056ea5924fab625ac7c492b526527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 17 Mar 2020 18:16:26 +0100 Subject: [PATCH 1/7] package(deb): add Qt image formats plugins dependency --- CI/package-xenial.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/package-xenial.sh b/CI/package-xenial.sh index 8986aecd..40b901dc 100755 --- a/CI/package-xenial.sh +++ b/CI/package-xenial.sh @@ -19,7 +19,7 @@ PAGER=cat checkinstall -y --type=debian --fstrans=no --nodoc \ --pkglicense="GPLv2.0" --maintainer="contact@slepin.fr" \ --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/* From fe217ef5df2485b83327a829aaeb1a8d6935edc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 17 Mar 2020 18:43:01 +0100 Subject: [PATCH 2/7] package(deb): fix email address --- CI/package-xenial.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/package-xenial.sh b/CI/package-xenial.sh index 40b901dc..59ed4e49 100755 --- a/CI/package-xenial.sh +++ b/CI/package-xenial.sh @@ -16,7 +16,7 @@ cd /root/obs-websocket/build 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 qt5-image-formats-plugins" \ From a5b6ea6c4c5b274607103b6a3dd4d4f642c1fd40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 17 Mar 2020 19:34:53 +0100 Subject: [PATCH 3/7] cmake(windows): copy qt image format plugins --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 520d4254..b31e98c3 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,11 @@ if(WIN32) "$" "${RELEASE_DIR}/obs-plugins/${ARCH_NAME}") + # In Release mode, copy Qt image format plugins + COMMAND if $==1 ("${CMAKE_COMMAND}" -E copy + "${RELEASE_DIR}/plugins/imageformats/qjpeg.dll" + "${CMAKE_BINARY_DIR}/bin/${ARCH_NAME}$") + # If config is RelWithDebInfo, package release files COMMAND if $==1 ( "${CMAKE_COMMAND}" -E make_directory From a6698526949dab7dc45b4da0819f16c6258eb774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 17 Mar 2020 19:37:39 +0100 Subject: [PATCH 4/7] cmake(windows): oops, fix copy command --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b31e98c3..c9b27deb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,8 +129,8 @@ if(WIN32) # In Release mode, copy Qt image format plugins COMMAND if $==1 ("${CMAKE_COMMAND}" -E copy - "${RELEASE_DIR}/plugins/imageformats/qjpeg.dll" - "${CMAKE_BINARY_DIR}/bin/${ARCH_NAME}$") + "${QTDIR}/plugins/imageformats/qjpeg.dll" + "${RELEASE_DIR}/bin/${ARCH_NAME}/qjpeg.dll") # If config is RelWithDebInfo, package release files COMMAND if $==1 ( From 1ada33a4f02e146900348e516795f0999059932a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 17 Mar 2020 19:41:43 +0100 Subject: [PATCH 5/7] package(deb): fix ambiguous syntax --- CI/package-xenial.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/package-xenial.sh b/CI/package-xenial.sh index 59ed4e49..276584a1 100755 --- a/CI/package-xenial.sh +++ b/CI/package-xenial.sh @@ -13,7 +13,7 @@ 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="stephane.lepin@gmail.com" \ From 3450c6b9a3a59081b671c9d895d8175bbefd8ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 17 Mar 2020 19:52:49 +0100 Subject: [PATCH 6/7] cmake(windows): copy qjpeg on RelWithDebInfo as well --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9b27deb..2682cc89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,7 +128,12 @@ if(WIN32) "${RELEASE_DIR}/obs-plugins/${ARCH_NAME}") # In Release mode, copy Qt image format plugins - COMMAND if $==1 ("${CMAKE_COMMAND}" -E copy + COMMAND if $==1 ( + "${CMAKE_COMMAND}" -E copy + "${QTDIR}/plugins/imageformats/qjpeg.dll" + "${RELEASE_DIR}/bin/${ARCH_NAME}/qjpeg.dll") + COMMAND if $==1 ( + "${CMAKE_COMMAND}" -E copy "${QTDIR}/plugins/imageformats/qjpeg.dll" "${RELEASE_DIR}/bin/${ARCH_NAME}/qjpeg.dll") From c418cbf4efde0ee3ab00469c098eb4a2a49d7d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 17 Mar 2020 20:08:46 +0100 Subject: [PATCH 7/7] cmake(windows): fix qjpeg path --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2682cc89..788960c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,11 +131,11 @@ if(WIN32) COMMAND if $==1 ( "${CMAKE_COMMAND}" -E copy "${QTDIR}/plugins/imageformats/qjpeg.dll" - "${RELEASE_DIR}/bin/${ARCH_NAME}/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}/qjpeg.dll") + "${RELEASE_DIR}/bin/${ARCH_NAME}/imageformats/qjpeg.dll") # If config is RelWithDebInfo, package release files COMMAND if $==1 (