Mise à jour cmake

Author: Paullux

.gitignore

@@ -5,4 +5,6 @@
 /.flatpak/
 /.flatpak-builder/
 /Testing/
-/com.bitscripts.matrix/
+/com.bitscripts.matrix/
+/appimage/
+/CPACK/

AppImageBuilder.yaml

@@ -0,0 +1,107 @@
+# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
+version: 1
+script: |
+  # remove any existent binaries
+  rm -rf AppDir | true
+
+  # compile and install binaries into AppDir
+  cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+  make install DESTDIR=AppDir
+
+  # link plugins
+  mkdir -p $APPDIR/usr/lib/x86_64-linux-gnu/qt6/plugins
+  mkdir -p $APPDIR/usr/bin
+  cd AppDir/usr/bin
+  ln -s ../../usr/lib/x86_64-linux-gnu/qt6/plugins .
+  cd ../..
+
+  # link ressource and translations
+  mkdir -p $APPDIR/usr/share/qt6/resources
+  mkdir -p $APPDIR/usr/share/qt6/translations
+  ln -s usr/share/qt6/resources .
+  ln -s usr/share/qt6/translations .
+  cd ..
+AppDir:
+  path: ./AppDir
+  app_info:
+    id: Matrix
+    name: Matrix
+    icon: Matrix.png
+    version: '1.0.0'
+    exec: usr/bin/Matrix
+    exec_args: $@
+  apt:
+    arch: amd64
+    allow_unauthenticated: true
+    sources:
+      - sourceline: deb http://fr.archive.ubuntu.com/ubuntu/ lunar main restricted
+      - sourceline: deb http://fr.archive.ubuntu.com/ubuntu/ lunar-updates main restricted
+      - sourceline: deb http://fr.archive.ubuntu.com/ubuntu/ lunar universe
+      - sourceline: deb http://fr.archive.ubuntu.com/ubuntu/ lunar-updates universe
+      - sourceline: deb http://fr.archive.ubuntu.com/ubuntu/ lunar multiverse
+      - sourceline: deb http://fr.archive.ubuntu.com/ubuntu/ lunar-updates multiverse
+      - sourceline: deb http://fr.archive.ubuntu.com/ubuntu/ lunar-backports main restricted universe multiverse
+      - sourceline: deb http://security.ubuntu.com/ubuntu lunar-security main restricted
+      - sourceline: deb http://security.ubuntu.com/ubuntu lunar-security universe
+      - sourceline: deb http://security.ubuntu.com/ubuntu lunar-security multiverse
+    include:
+      - libxkbcommon0
+      - libxkbcommon-x11-0
+      - libxcb-icccm4
+      - libxcb-xkb1
+      - libxcb-render-util0
+      - libxcb-randr0
+      - libxcb-keysyms1
+      - libxcb-xinerama0
+      - libxcb-image0
+      - libxcb-util1
+      - libxinerama1
+      - kwayland-data
+      - kwin-wayland-backend-wayland
+      - libqt6widgets6
+      - libqt6core6
+      - libqcoro6core0
+      - libqt6core5compat6
+      - libqt6multimedia6
+      - libqt6multimediaquick6
+      - libqt6multimediawidgets6
+      - libqt6waylandclient6
+      - libqt6waylandcompositor6
+      - libqt6waylandeglclienthwintegration6
+      - libqt6waylandeglcompositorhwintegration6
+      - gstreamer1.0-opencv
+      - libgstreamer-opencv1.0-0
+      - libopencv-apps2d
+      - libopencv-calib3d406
+      - libopencv-contrib406
+      - libopencv-core406
+      - libopencv-dnn406
+      - libopencv-features2d406
+      - libopencv-flann406
+      - libopencv-highgui406
+      - libopencv-imgcodecs406
+      - libopencv-imgproc406
+      - libopencv-ml406
+      - libopencv-objdetect406
+      - libopencv-photo406
+      - libopencv-shape406
+      - libopencv-stitching406
+      - libopencv-superres406
+      - libopencv-video406
+      - libopencv-videoio406
+      - libopencv-viz406
+      - libopencv406-jni
+      - opencv-data
+      - ffmpeg
+      - gstreamer1.0-libav
+  files:
+    exclude:
+      - usr/share/man
+      - usr/share/doc/*/README.*
+      - usr/share/doc/*/changelog.*
+      - usr/share/doc/*/NEWS.*
+      - usr/share/doc/*/TODO.*
+AppImage:
+  arch: x86_64
+  update-information: guess
+  sign-key: None

CMakeLists.txt

@@ -36,7 +36,6 @@ target_link_libraries(${PROJECT_NAME}
         Qt6::Widgets
         Qt6::Multimedia
         ${OpenCV_LIBS}
-        xcb
         )
 
 find_path( AVCODEC_INCLUDE_DIR libavcodec/avcodec.h )
@@ -52,30 +51,50 @@ add_custom_command(
         COMMENT "Copying font directory"
 )
 
-file(COPY ${CMAKE_SOURCE_DIR}/com.bitscripts.matrix.png
-        DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY ${CMAKE_SOURCE_DIR}/Matrix.png
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/share/icons)
+
+file(COPY ${CMAKE_SOURCE_DIR}/Matrix.png
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/matrixresources/icons)
 
 file(COPY ${CMAKE_SOURCE_DIR}/MatrixLogo.png
-        DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/matrixresources/icons)
+
+file(COPY ${CMAKE_SOURCE_DIR}/fonts/mtx.ttf
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/matrixresources/fonts)
 
 INSTALL(TARGETS ${PROJECT_NAME}
         LIBRARY
         DESTINATION lib)
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.bitscripts.matrix.png
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/Matrix.png
         DESTINATION share/icons)
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.bitscripts.matrix.png
-        DESTINATION bin)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/Matrix.png
+        DESTINATION bin/matrixresources/icons)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/MatrixLogo.png
-        DESTINATION bin)
+        DESTINATION bin/matrixresources/icons)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/fonts/mtx.ttf
-        DESTINATION bin/fonts)
+        DESTINATION bin/matrixresources/fonts)
+
+set(APP_DESKTOP_FILE "matrix.desktop")
+configure_file(${CMAKE_SOURCE_DIR}/${APP_DESKTOP_FILE} ${CMAKE_BINARY_DIR}/${APP_DESKTOP_FILE} @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/${APP_DESKTOP_FILE} DESTINATION share/applications)
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.bitscripts.matrix.desktop
-        DESTINATION share/applications)
 
 INSTALL(TARGETS ${PROJECT_NAME}
         DESTINATION bin)
+
+set(CPACK_GENERATOR "DEB")
+set(CPACK_PACKAGE_NAME "Matrix")
+set(CPACK_PACKAGE_VERSION "1.0.0")
+set(CPACK_PACKAGE_VENDOR "Bit-Scripts")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Video processing with Matrix effect")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "Matrix")
+set(CPACK_PACKAGE_CONTACT "Paul WOISARD <paulwoisard@gmail.com>")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6widgets6, libqt6core6, libqt6multimedia6, gstreamer1.0-opencv, libopencv-apps2d, libopencv-core406, libopencv-imgcodecs406, libopencv-imgproc406, libopencv-objdetect406, libopencv-photo406, libopencv-shape406, libopencv-video406, libopencv-videoio406, opencv-data, ffmpeg, gstreamer1.0-libav, v4l2loopback-utils, v4l2loopback-dkms")
+
+# Include CPack module
+include(CPack)        

PKGBUILD

@@ -0,0 +1,24 @@
+pkgname=matrix-app
+pkgver=1.0.13
+pkgrel=1
+pkgdesc="Video processing with Matrix effect"
+arch=('x86_64')
+url="https://github.com/Bit-Scripts/Matrix_CPP"
+license=('MIT')
+depends=('qt6-base' 'opencv' 'ffmpeg' 'v4l2loopback-dkms' 'v4l2loopback-utils')
+makedepends=('cmake')
+source=("v${pkgver}.tar.gz::https://github.com/Bit-Scripts/Matrix_CPP/archive/refs/tags/v${pkgver}.tar.gz")
+sha256sums=('3749c4694908ceca997a460943ae3551f59cc9e87fb8b63ceed6ea08019b01e5')
+
+build() {
+  cd "${srcdir}/v${pkgver}"
+  mkdir -p build
+  cd build
+  cmake ..
+  make
+}
+
+package() {
+  cd "${srcdir}/v${pkgver}/build"
+  make DESTDIR="${pkgdir}/" install
+}

cameracapture.cpp

@@ -64,8 +64,7 @@ void CameraCapture::processFrame()
                     frame.step,
                     QImage::Format_RGB888);
 
-        QString appDir = QCoreApplication::applicationDirPath();
-        QImage logo = QImage(appDir + "/MatrixLogo.png");
+        QImage logo = QImage("/usr/bin/matrixresources/icons/MatrixLogo.png");
 
         QImage resizedLogo = logo.scaled(image.width(), image.height(), Qt::KeepAspectRatio);
 

com.bitscripts.matrix.flatpak

@@ -33,8 +33,8 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://github.com/Bit-Scripts/Matrix_CPP/archive/refs/tags/v1.0.11.tar.gz",
-          "sha256": "864e06b32d9476466ad2a9bf0fd794d7eb62c82b2a0817f2512c13272f5fecdf"
+          "url": "https://github.com/Bit-Scripts/Matrix_CPP/archive/refs/tags/v1.0.12.tar.gz",
+          "sha256": "76e52258ee4f9053af15c3d015c9adfa5d275653fa8537fe26e07d47ab07627f"
         }
       ]
     }

com.bitscripts.matrix.json

@@ -11,15 +11,13 @@ int main(int argc, char *argv[]) {
     translator.load("qt_fr", QLibraryInfo::path(QLibraryInfo::TranslationsPath));
     QApplication::installTranslator(&translator);
 
-    QString appDir = QCoreApplication::applicationDirPath();
-    QIcon icon(appDir + "/com.bitscripts.matrix.png");
+    QIcon icon("/usr/bin/matrixresources/icons/Matrix.png");
 
     MainWindow mainWindow;
     mainWindow.resize(1280,720);
     mainWindow.setWindowTitle("Matrix");
     mainWindow.setWindowIcon(icon);
     mainWindow.show();
 
-
     return app.exec();
 }

com.bitscripts.matrix.png

@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>com.bitscripts.matrix.png</normaloff>com.bitscripts.matrix.png</iconset>
+    <normaloff>Matrix.png</normaloff>Matrix.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget"/>
  </widget>