Merge pull request #303 from jeffshuai/release/eagle

feat:   base master into eagle

.github/workflows/backup-to-gitlab.yml

@@ -8,10 +8,8 @@ concurrency:
 jobs:
   backup-to-gitlabwh:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitlabwh.yml@master
-    secrets:
-      BRIDGETOKEN: ${{ secrets.BRIDGETOKEN }}
+    secrets: inherit
 
   backup-to-gitee:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitee.yml@master
-    secrets:
-      GITEE_SYNC_TOKEN: ${{ secrets.GITEE_SYNC_TOKEN }}
+    secrets: inherit

.github/workflows/call-build-distribution.yml

@@ -10,8 +10,4 @@ on:
 jobs:
   check_job:
     uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master
-    secrets:
-      BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }}
-      BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }}
-      WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }}
-      WEBDAV_USER: ${{ secrets.WEBDAV_USER }}
+    secrets: inherit

.github/workflows/call-chatOps.yml

@@ -6,5 +6,4 @@ on:
 jobs:
   chatopt:
     uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit

.github/workflows/call-clacheck.yml

@@ -12,5 +12,4 @@ concurrency:
 jobs:
   clacheck:
     uses: linuxdeepin/.github/.github/workflows/cla-check.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit

.github/workflows/cppcheck.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: export
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false

.obs/workflows.yml

@@ -0,0 +1,43 @@
+test_build:
+  steps:
+    - link_package:
+        source_project: deepin:Develop:dde
+        source_package: %{SCM_REPOSITORY_NAME}
+        target_project: deepin:CI
+
+    - configure_repositories:
+        project: deepin:CI
+        repositories:
+          - name: deepin_develop
+            paths:
+              - target_project: deepin:CI
+                target_repository: deepin_develop
+            architectures:
+              - x86_64
+              - aarch64
+
+          - name: debian
+            paths:
+              - target_project: deepin:CI
+                target_repository: debian_sid
+            architectures:
+              - x86_64
+
+  filters:
+    event: pull_request
+
+tag_build:
+  steps:
+    - trigger_services:
+        project: deepin:Unstable:dde
+        package: %{SCM_REPOSITORY_NAME}
+  filters:
+    event: tag_push
+
+commit_build:
+  steps:
+    - trigger_services:
+        project: deepin:Develop:dde
+        package: %{SCM_REPOSITORY_NAME}
+  filters:
+    event: push

.reuse/dep5

@@ -4,7 +4,7 @@ Upstream-Contact: UnionTech Software Technology Co., Ltd. <>
 Source: https://github.com/linuxdeepin/deepin-camera
 
 # ci
-Files: .github/*
+Files: .github/* .obs/workflows.yml
 Copyright: None
 License: CC0-1.0
 
@@ -23,6 +23,11 @@ Files: debian/*
 Copyright: None
 License: CC0-1.0
 
+# patchs
+Files: patches/*
+Copyright: None
+License: CC0-1.0
+
 # selinux
 Files: selinux/*
 Copyright: None

debian/changelog

@@ -1,50 +1,81 @@
-deepin-camera (1.4.16) unstable; urgency=medium
+deepin-camera (6.0.12) unstable; urgency=medium
 
-  * New version 1.4.16
+  * tag 6.0.12
 
- -- xiepengfei <xiepengfei@uniontech.com>  Fri, 04 Aug 2023 16:05:28 +0800
+ -- shuaijie <shuaijie@uniontech.com>  Mon, 19 Aug 2024 15:32:02 +0800
 
-deepin-camera (1.4.15) unstable; urgency=medium
+deepin-camera (6.0.11) unstable; urgency=medium
 
-  * New version 1.4.15
+  * tag 6.0.11 
 
- -- xiepengfei <xiepengfei@uniontech.com>  Wed, 19 Jul 2023 16:05:28 +0800
+ -- zhanghongyuan <zhanghongyuan@uniontech.com>  Thu, 08 Aug 2024 13:56:32 +0800
 
-deepin-camera (1.4.14) unstable; urgency=medium
+deepin-camera (6.0.10) unstable; urgency=medium
 
-  * New version 1.4.14
+  * tag 6.0.10
 
- -- xiepengfei <xiepengfei@uniontech.com>  Wed, 12 Jul 2023 14:47:36 +0800
+ -- shuaijie <shuaijie@uniontech.com>  Sun, 28 Apr 2024 10:41:02 +0800
 
-deepin-camera (1.4.13) unstable; urgency=medium
+deepin-camera (6.0.9) unstable; urgency=medium
 
-  * New version 1.4.13
+  * Update version to 6.0.9(No code changes!)
 
- -- xiepengfei <xiepengfei@uniontech.com>  Tues, 30 May 2023 17:41:09 +0800
+ -- lijiaxuan <lijiaxuan@uniontech.com>  Fri, 12 Apr 2024 15:26:02 +0800
 
-deepin-camera (1.4.12) unstable; urgency=medium
+deepin-camera (6.0.8) unstable; urgency=medium
 
-  * New version 1.4.12
+  * tag 6.0.8
 
- -- fengli <fengli@uniontech.com>  Mon, 08 May 2023 15:15:09 +0800
+ -- shuaijie <shuaijie@uniontech.com>  Tue, 09 Apr 2024 16:12:13 +0800
 
-deepin-camera (1.4.11) unstable; urgency=medium
+deepin-camera (6.0.7) unstable; urgency=medium
 
-  * New version 1.4.11
+  * fix: Fix the issue of crashing when connecting to a USB camera or a laptop with a built-in camera in v23 and starting the camera(Bug: 238775)
+  * fix: modify the default video format for recording to webm 2nd(Bug: 237059)
 
- -- fengli <feng@uniontech.com>  Tue, 21 Mar 2023 17:41:33 +0800
+ -- houchengqiu <houchengqiu@uniontech.com>  Tue, 27 Feb 2024 13:54:19 +0800
 
-deepin-camera (1.4.10) UNSTABLE; urgency=medium
+deepin-camera (6.0.6) unstable; urgency=medium
 
-  * New version 1.4.10
+  * tag 6.0.6 
 
- -- fengli <[email protected]>  Thu, 23 Feb 2023 10:50:31 +0800
+ -- fengli <[email protected]>  Wed, 03 Jan 2024 16:12:13 +0800
 
-deepin-camera (1.4.9) unstable; urgency=medium
+deepin-camera (6.0.5) unstable; urgency=medium
 
-  * New version 1.4.9
+  * fix: modify the default video format for recording to webm
+  * fix: Resolve the issue of camera icons not being visible in the
+    help manual
 
- -- xiepengfei <[email protected]>  Tue, 07 Feb 2023 17:56:54 +0800
+ -- fengli <[email protected]>  Fri, 22 Dec 2023 10:16:55 +0800
+
+deepin-camera (6.0.4) unstable; urgency=medium
+
+  * fix: static image appears blow when opening the camera
+  * fix: quick click on satrt/end button during high-resolution recording
+    causing crash
+  * fix: determine single instance execution through DTK interface 
+
+ -- fengli <[email protected]>  Wed, 06 Dec 2023 13:22:50 +0800
+
+deepin-camera (6.0.3) unstable; urgency=medium
+
+  * Merge release/eagle branch changes into the master branch.
+  * Fix some bugs: 198571 198939 200273 207319 217973
+
+ -- renbin <[email protected]>  Fri, 13 Oct 2023 16:18:50 +0800
+
+deepin-camera (6.0.2) unstable; urgency=medium
+
+  * New version 6.0.2
+
+ -- shuaijie <[email protected]>  Fri, 10 March 2023 16:21:00 +0800
+
+deepin-camera (6.0.1) unstable; urgency=medium
+
+  * New version 6.0.1 
+
+ -- muyuankai <[email protected]>  Mon, 13 Jun 2022 10:40:00 +0800
 
 deepin-camera (1.0.0-1) unstable; urgency=medium
 

debian/control

@@ -6,11 +6,13 @@ Build-Depends:
  debhelper (>=9),cmake,
  pkg-config,qtbase5-dev,libdtkgui-dev,libdtkwidget-dev,qtmultimedia5-dev,
  libavutil-dev, libavformat-dev, libavcodec-dev,libavfilter-dev,qttools5-dev,
- qttools5-dev-tools,deepin-gettext-tools,libdframeworkdbus-dev,
- libv4l-dev,libsdl2-dev,portaudio19-dev,libpng-dev,libasound2-dev,
- libkf5wayland-dev,
+ qttools5-dev-tools,deepin-gettext-tools,
+ libv4l-dev,libsdl2-dev,portaudio19-dev,libpng-dev,libasound2-dev,libpciaccess-dev,
  libusb-1.0-0-dev,zlib1g-dev,libudev-dev,libswscale-dev,libswresample-dev,libffmpegthumbnailer-dev,
- libx11-dev,libva-dev,libimageeditor-dev,libgstreamer1.0-dev,libgstreamer-plugins-base1.0-dev,gstreamer1.0-plugins-good
+ libx11-dev,libva-dev,libimageeditor-dev,
+ libdwayland-dev | libkf5wayland-dev,
+ libwayland-dev,
+ libgstreamer1.0-dev,libgstreamer-plugins-base1.0-dev,gstreamer1.0-plugins-good
 Standards-Version: 4.1.2
 Homepage: http://www.deepin.org
 
@@ -19,7 +21,11 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- libasound2 (>= 1.0.16), libavcodec58 (>= 7:4.0), libavformat58 (>= 7:4.1), libavutil56 (>= 7:4.0), libdtkcore5, libdtkgui5, libdtkwidget5, libffmpegthumbnailer4v5, libgl1, libpng16-16 (>= 1.6.2-1), libportaudio2 (>= 19+svn20101113), libqt5concurrent5 (>= 5.0.2), libqt5core5a (>= 5.11.0~rc1), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.8.0), libqt5network5 (>= 5.0.2), libqt5printsupport5 (>= 5.0.2), libqt5widgets5 (>= 5.2.0~alpha1), libqt5x11extras5 (>= 5.6.0), libqt5xml5 (>= 5.0.2), libsdl2-2.0-0 (>= 2.0.9), libstdc++6 (>= 7), libswresample3 (>= 7:4.0), libswscale5 (>= 7:4.0), libudev1 (>= 183), libusb-1.0-0 (>= 2:1.0.8), libv4l-0 (>= 0.5.0), zlib1g (>= 1:1.1.4), , libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), dde-api
+ libavcodec58 (>= 7:4.0) | libavcodec60, libavformat58 (>= 7:4.1) | libavformat60, libavutil56 (>= 7:4.0) | libavutil58, libswresample3 (>= 7:4.0) | libswresample4, libswscale5 (>= 7:4.0) | libswscale7,
+ libdtkcore5, libdtkgui5, libdtkwidget5,  libffmpegthumbnailer4v5, libgl1, libpng16-16 (>= 1.6.2-1), libportaudio2 (>= 19+svn20101113), libqt5concurrent5 (>= 5.0.2), libqt5core5a (>= 5.11.0~rc1),
+ libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.8.0), libqt5network5 (>= 5.0.2), libqt5printsupport5 (>= 5.0.2), libqt5widgets5 (>= 5.2.0~alpha1), libqt5x11extras5 (>= 5.6.0), libasound2 (>= 1.0.16),
+ libqt5xml5 (>= 5.0.2), libsdl2-2.0-0 (>= 2.0.9), libstdc++6 (>= 7),  libudev1 (>= 183), libusb-1.0-0 (>= 2:1.0.8), libv4l-0 (>= 0.5.0), zlib1g (>= 1:1.1.4), libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), dde-api,
+ libdwaylandclient5 | libkf5waylandclient5,  libdwaylandserver5 | libkf5waylandserver5
 Recommends: libimageeditor, uos-reporter, deepin-event-log
 Description:this package software for  UOS
  deepin-camera is a tool to view camera, and also a smart take photo and video in life.

debian/deepin-camera.lintian-overrides

@@ -1,2 +1,2 @@
 # Maintainer scripts create plugins.dat there.
-deepin-camera: non-standard-toplevel-dir temp/
+# deepin-camera: non-standard-toplevel-dir temp/

debian/rules

@@ -2,21 +2,14 @@
 include /usr/share/dpkg/default.mk
 export QT_SELECT=5
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-SELINUX_DEV ?= $(shell dpkg -l | grep "ii  selinux-policy-dev")
 
 MODULE_NAME=deepin-camera
-SELINUX_PP_TEMP_DIR=temp/${MODULE_NAME}
+
 %:
 	dh $@ --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	  -DCMAKE_BUILD_TYPE=Release \
 	  -DCMAKE_INSTALL_PREFIX=/usr \
-      -DAPP_VERSION=$(DEB_VERSION_UPSTREAM) -DVERSION=$(DEB_VERSION_UPSTREAM) LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) 
-
-
-override_dh_install:
-	mkdir -pv debian/${MODULE_NAME}/${SELINUX_PP_TEMP_DIR} > /dev/null 2>&1
-	cp selinux/*.pp* debian/${MODULE_NAME}/${SELINUX_PP_TEMP_DIR}/ > /dev/null 2>&1
-	dh_install
+      -DAPP_VERSION=$(DEB_VERSION_UPSTREAM) -DVERSION=$(DEB_VERSION_UPSTREAM) LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)