deepin-screen-recorder: 5.12.1 -> unstable-2023-07-10

2 files changed, 12 insertions, 15 deletions

diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
index 1e41012dfc28..988a9fc615c5 100644
--- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
@@ -24,25 +24,22 @@
 , udev
 , gst_all_1
 }:
+
 stdenv.mkDerivation rec {
   pname = "deepin-screen-recorder";
-  version = "5.12.1";
+  version = "unstable-2023-07-10";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-43jqgiBa77UAes0ekMES6IqVOPVXfzfQQjePdxFkNDM=";
+    rev = "e8ee1e8330e2f3923e22acc952a0bd01bee94ad1";
+    hash = "sha256-QHV3hSALXI4e31YBDXRSRgT8b/J8gwm024bzlPWu2FA=";
   };
 
   patches = [ ./dont_use_libPath.diff ];
 
   postPatch = ''
-    substituteInPlace screen_shot_recorder.pro deepin-screen-recorder.desktop \
-      src/{src.pro,pin_screenshots/pin_screenshots.pro} \
-      src/dde-dock-plugins/{shotstart/shotstart.pro,recordtime/recordtime.pro} \
-      assets/com.deepin.Screenshot.service \
-     --replace "/usr" "$out"
+    find . -type f -regex ".*\\.\\(pro\\|service\\|desktop\\)" -exec sed -i -e "s|/usr/|$out/|g" {} \;
   '';
 
   nativeBuildInputs = [
@@ -80,7 +77,7 @@ stdenv.mkDerivation rec {
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
   qtWrapperArgs = [
     "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ]}"
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ffmpeg ffmpegthumbnailer ]}"
   ];
 
   preFixup = ''
diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff
index 3707ab4c67c2..be3ba3267cbf 100644
--- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff
+++ b/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff
@@ -1,8 +1,8 @@
 diff --git a/src/gstrecord/gstinterface.cpp b/src/gstrecord/gstinterface.cpp
-index b269b01..c075295 100644
+index 165a7ce..e1574a5 100644
 --- a/src/gstrecord/gstinterface.cpp
 +++ b/src/gstrecord/gstinterface.cpp
-@@ -48,6 +48,7 @@ gstInterface::gstInterface()
+@@ -49,6 +49,7 @@ gstInterface::gstInterface()
  }
  QString gstInterface::libPath(const QString &sLib)
  {
@@ -11,10 +11,10 @@ index b269b01..c075295 100644
      QDir dir;
      QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
 diff --git a/src/main_window.cpp b/src/main_window.cpp
-index 7bfc78e..dcbbc2f 100755
+index e0f6bc5..757abad 100755
 --- a/src/main_window.cpp
 +++ b/src/main_window.cpp
-@@ -585,6 +585,7 @@ void MainWindow::initDynamicLibPath()
+@@ -559,6 +559,7 @@ void MainWindow::initDynamicLibPath()
  }
  QString MainWindow::libPath(const QString &strlib)
  {
@@ -23,7 +23,7 @@ index 7bfc78e..dcbbc2f 100755
      QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
      dir.setPath(path);
 diff --git a/src/waylandrecord/avlibinterface.cpp b/src/waylandrecord/avlibinterface.cpp
-index d7942d6..c5cfdf4 100644
+index b4145fa..97a3f5c 100644
 --- a/src/waylandrecord/avlibinterface.cpp
 +++ b/src/waylandrecord/avlibinterface.cpp
 @@ -105,6 +105,7 @@ avlibInterface::avlibInterface()
@@ -31,6 +31,6 @@ index d7942d6..c5cfdf4 100644
  QString avlibInterface::libPath(const QString &sLib)
  {
 +    return sLib;
-     //qDebug() << sLib;
      QDir dir;
      QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+     dir.setPath(path);