From 4fbc45b40bdd36ea4b07b3b648d8b8151d0b15fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 28 Apr 2020 09:34:41 +0200 Subject: [PATCH 1/6] ci(linux): make the deb package require OBS 25.0.7 --- CI/package-ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/package-ubuntu.sh b/CI/package-ubuntu.sh index 367e002c..08323bc0 100755 --- a/CI/package-ubuntu.sh +++ b/CI/package-ubuntu.sh @@ -17,7 +17,7 @@ PAGER="cat" sudo checkinstall -y --type=debian --fstrans=no --nodoc \ --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" \ + --requires="obs-studio>=25.0.7,libqt5core5a,libqt5widgets5,qt5-image-formats-plugins" \ --pakdir="../package" sudo chmod ao+r ../package/* From 5843521cf145dc39f43ad36c0306c6aaa0ff4bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 28 Apr 2020 09:46:45 +0200 Subject: [PATCH 2/6] cmake(linux): use the standard LIBDIR and DATAROOTDIR install locations --- CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3273367c..8a6c3871 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,13 +187,10 @@ if(UNIX AND NOT APPLE) execute_process(COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE UNAME_MACHINE) install(TARGETS obs-websocket - LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/obs-plugins") - # Dirty fix for Ubuntu - install(TARGETS obs-websocket - LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${UNAME_MACHINE}-linux-gnu/obs-plugins") + LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/obs-plugins") install(FILES ${locale_files} - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/obs-websocket/locale") + DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/obs/obs-plugins/obs-websocket/locale") endif() # --- End of section --- From b2d39ab2d7264ce6936db385212f4ee00fb23553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 28 Apr 2020 09:52:11 +0200 Subject: [PATCH 3/6] cmake(linux): include GNUInstallDirs --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a6c3871..5648a963 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,11 +180,12 @@ endif() # --- Linux-specific build settings and tasks --- if(UNIX AND NOT APPLE) + include(GNUInstallDirs) + set_target_properties(obs-websocket PROPERTIES PREFIX "") target_link_libraries(obs-websocket obs-frontend-api) file(GLOB locale_files data/locale/*.ini) - execute_process(COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE UNAME_MACHINE) install(TARGETS obs-websocket LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/obs-plugins") From 645cbf988893a5336a1709e938b19bfc44734e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 28 Apr 2020 10:18:54 +0200 Subject: [PATCH 4/6] ci(linux): fix debian package requires --- CI/package-ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/package-ubuntu.sh b/CI/package-ubuntu.sh index 08323bc0..5f6998d6 100755 --- a/CI/package-ubuntu.sh +++ b/CI/package-ubuntu.sh @@ -17,7 +17,7 @@ PAGER="cat" sudo checkinstall -y --type=debian --fstrans=no --nodoc \ --pkglicense="GPLv2.0" --maintainer="stephane.lepin@gmail.com" \ --pkggroup="video" \ --pkgsource="https://github.com/Palakis/obs-websocket" \ - --requires="obs-studio>=25.0.7,libqt5core5a,libqt5widgets5,qt5-image-formats-plugins" \ + --requires="obs-studio \(\>= 25.0.7\), libqt5core5a, libqt5widgets5, qt5-image-formats-plugins" \ --pakdir="../package" sudo chmod ao+r ../package/* From a7d02a79a96d26e29b60a918d6c649b3fb6de82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 28 Apr 2020 10:29:48 +0200 Subject: [PATCH 5/6] ci(linux): set package summary --- CI/package-ubuntu.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/CI/package-ubuntu.sh b/CI/package-ubuntu.sh index 5f6998d6..0f7f3c6d 100755 --- a/CI/package-ubuntu.sh +++ b/CI/package-ubuntu.sh @@ -14,6 +14,7 @@ cd ./build PAGER="cat" sudo checkinstall -y --type=debian --fstrans=no --nodoc \ --backup=no --deldoc=yes --install=no \ --pkgname=obs-websocket --pkgversion="$PKG_VERSION" \ + --summary="WebSockets Remote Control API for OBS Studio" \ --pkglicense="GPLv2.0" --maintainer="stephane.lepin@gmail.com" \ --pkggroup="video" \ --pkgsource="https://github.com/Palakis/obs-websocket" \ From 1ce0fd643c0070785810e7ceaf9017788d2f77aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 28 Apr 2020 10:29:48 +0200 Subject: [PATCH 6/6] Revert "ci(linux): set package summary" This reverts commit a7d02a79a96d26e29b60a918d6c649b3fb6de82f. --- CI/package-ubuntu.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/CI/package-ubuntu.sh b/CI/package-ubuntu.sh index 0f7f3c6d..5f6998d6 100755 --- a/CI/package-ubuntu.sh +++ b/CI/package-ubuntu.sh @@ -14,7 +14,6 @@ cd ./build PAGER="cat" sudo checkinstall -y --type=debian --fstrans=no --nodoc \ --backup=no --deldoc=yes --install=no \ --pkgname=obs-websocket --pkgversion="$PKG_VERSION" \ - --summary="WebSockets Remote Control API for OBS Studio" \ --pkglicense="GPLv2.0" --maintainer="stephane.lepin@gmail.com" \ --pkggroup="video" \ --pkgsource="https://github.com/Palakis/obs-websocket" \