diff options
author | rewine <luhongxu@deepin.org> | 2023-08-23 11:29:17 +0800 |
---|---|---|
committer | rewine <luhongxu@deepin.org> | 2023-08-23 11:32:02 +0800 |
commit | e7fc5b6bec12c5c050f64b7133c89a5cb3b2754d (patch) | |
tree | 56340c5b1d27bad826a40b71467b8208195767f2 /pkgs/desktops/deepin | |
parent | e32c432e0c6fa334b4c1d6c3ebd8fb81645fd0a7 (diff) | |
download | nixlib-e7fc5b6bec12c5c050f64b7133c89a5cb3b2754d.tar nixlib-e7fc5b6bec12c5c050f64b7133c89a5cb3b2754d.tar.gz nixlib-e7fc5b6bec12c5c050f64b7133c89a5cb3b2754d.tar.bz2 nixlib-e7fc5b6bec12c5c050f64b7133c89a5cb3b2754d.tar.lz nixlib-e7fc5b6bec12c5c050f64b7133c89a5cb3b2754d.tar.xz nixlib-e7fc5b6bec12c5c050f64b7133c89a5cb3b2754d.tar.zst nixlib-e7fc5b6bec12c5c050f64b7133c89a5cb3b2754d.zip |
deepin.deepin-camera: 1.4.13 -> 6.0.2
Diffstat (limited to 'pkgs/desktops/deepin')
-rw-r--r-- | pkgs/desktops/deepin/apps/deepin-camera/default.nix | 5 | ||||
-rw-r--r-- | pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff | 35 |
2 files changed, 19 insertions, 21 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix index e55640cbd094..f1b4485354ba 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "deepin-camera"; - version = "1.4.13"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-h4oCxtj9GwaZqioZ4vFx2Cq8a1w7lYQvOhDAd7x9gMU="; + hash = "sha256-GQQFwlJNfdsi0GvDRMIorUnlbXrgbYl9H9aBedOm+ZQ="; }; # QLibrary and dlopen work with LD_LIBRARY_PATH @@ -66,7 +66,6 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good - gst-plugins-bad ]); cmakeFlags = [ "-DVERSION=${version}" ]; diff --git a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff index b4ef86f79b38..f8e005f577a3 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff +++ b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff @@ -1,25 +1,24 @@ +diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp +index c96c8b0..fcc11da 100644 +--- a/src/src/gstvideowriter.cpp ++++ b/src/src/gstvideowriter.cpp +@@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps() + + QString GstVideoWriter::libPath(const QString &strlib) + { ++ return strlib; + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp -index d3c6f5c..4817446 100644 +index d3c6c24..6d313a6 100644 --- a/src/src/mainwindow.cpp +++ b/src/src/mainwindow.cpp -@@ -781,19 +781,7 @@ void CMainWindow::slotPopupSettingsDialog() +@@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog() QString CMainWindow::libPath(const QString &strlib) { -- QDir dir; -- QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); -- dir.setPath(path); -- QStringList list = dir.entryList(QStringList() << (strlib + "*"), QDir::NoDotAndDotDot | QDir::Files); //filter name with strlib -- -- if (list.contains(strlib)) -- return strlib; -- -- list.sort(); -- if (list.size() > 0) -- return list.last(); -- -- return ""; + return strlib; - } - - void CMainWindow::reflushSnapshotLabel() + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); |