Merge pull request #250892 from wineee/deepin-camera
deepin-camera: 1.4.13 -> 6.0.2
This commit is contained in:
commit
638ab6a3b1
|
@ -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}" ];
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue