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

rewine 62ae1155 0dbcf0c1

+12 -15
+6 -9
pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
··· 24 , udev 25 , gst_all_1 26 }: 27 stdenv.mkDerivation rec { 28 pname = "deepin-screen-recorder"; 29 - version = "5.12.1"; 30 31 src = fetchFromGitHub { 32 owner = "linuxdeepin"; 33 repo = pname; 34 - rev = version; 35 - sha256 = "sha256-43jqgiBa77UAes0ekMES6IqVOPVXfzfQQjePdxFkNDM="; 36 }; 37 38 patches = [ ./dont_use_libPath.diff ]; 39 40 postPatch = '' 41 - substituteInPlace screen_shot_recorder.pro deepin-screen-recorder.desktop \ 42 - src/{src.pro,pin_screenshots/pin_screenshots.pro} \ 43 - src/dde-dock-plugins/{shotstart/shotstart.pro,recordtime/recordtime.pro} \ 44 - assets/com.deepin.Screenshot.service \ 45 - --replace "/usr" "$out" 46 ''; 47 48 nativeBuildInputs = [ ··· 80 # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 81 qtWrapperArgs = [ 82 "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 83 - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ]}" 84 ]; 85 86 preFixup = ''
··· 24 , udev 25 , gst_all_1 26 }: 27 + 28 stdenv.mkDerivation rec { 29 pname = "deepin-screen-recorder"; 30 + version = "unstable-2023-07-10"; 31 32 src = fetchFromGitHub { 33 owner = "linuxdeepin"; 34 repo = pname; 35 + rev = "e8ee1e8330e2f3923e22acc952a0bd01bee94ad1"; 36 + hash = "sha256-QHV3hSALXI4e31YBDXRSRgT8b/J8gwm024bzlPWu2FA="; 37 }; 38 39 patches = [ ./dont_use_libPath.diff ]; 40 41 postPatch = '' 42 + find . -type f -regex ".*\\.\\(pro\\|service\\|desktop\\)" -exec sed -i -e "s|/usr/|$out/|g" {} \; 43 ''; 44 45 nativeBuildInputs = [ ··· 77 # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 78 qtWrapperArgs = [ 79 "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 80 + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ffmpeg ffmpegthumbnailer ]}" 81 ]; 82 83 preFixup = ''
+6 -6
pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff
··· 1 diff --git a/src/gstrecord/gstinterface.cpp b/src/gstrecord/gstinterface.cpp 2 - index b269b01..c075295 100644 3 --- a/src/gstrecord/gstinterface.cpp 4 +++ b/src/gstrecord/gstinterface.cpp 5 - @@ -48,6 +48,7 @@ gstInterface::gstInterface() 6 } 7 QString gstInterface::libPath(const QString &sLib) 8 { ··· 11 QDir dir; 12 QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); 13 diff --git a/src/main_window.cpp b/src/main_window.cpp 14 - index 7bfc78e..dcbbc2f 100755 15 --- a/src/main_window.cpp 16 +++ b/src/main_window.cpp 17 - @@ -585,6 +585,7 @@ void MainWindow::initDynamicLibPath() 18 } 19 QString MainWindow::libPath(const QString &strlib) 20 { ··· 23 QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); 24 dir.setPath(path); 25 diff --git a/src/waylandrecord/avlibinterface.cpp b/src/waylandrecord/avlibinterface.cpp 26 - index d7942d6..c5cfdf4 100644 27 --- a/src/waylandrecord/avlibinterface.cpp 28 +++ b/src/waylandrecord/avlibinterface.cpp 29 @@ -105,6 +105,7 @@ avlibInterface::avlibInterface() ··· 31 QString avlibInterface::libPath(const QString &sLib) 32 { 33 + return sLib; 34 - //qDebug() << sLib; 35 QDir dir; 36 QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
··· 1 diff --git a/src/gstrecord/gstinterface.cpp b/src/gstrecord/gstinterface.cpp 2 + index 165a7ce..e1574a5 100644 3 --- a/src/gstrecord/gstinterface.cpp 4 +++ b/src/gstrecord/gstinterface.cpp 5 + @@ -49,6 +49,7 @@ gstInterface::gstInterface() 6 } 7 QString gstInterface::libPath(const QString &sLib) 8 { ··· 11 QDir dir; 12 QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); 13 diff --git a/src/main_window.cpp b/src/main_window.cpp 14 + index e0f6bc5..757abad 100755 15 --- a/src/main_window.cpp 16 +++ b/src/main_window.cpp 17 + @@ -559,6 +559,7 @@ void MainWindow::initDynamicLibPath() 18 } 19 QString MainWindow::libPath(const QString &strlib) 20 { ··· 23 QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); 24 dir.setPath(path); 25 diff --git a/src/waylandrecord/avlibinterface.cpp b/src/waylandrecord/avlibinterface.cpp 26 + index b4145fa..97a3f5c 100644 27 --- a/src/waylandrecord/avlibinterface.cpp 28 +++ b/src/waylandrecord/avlibinterface.cpp 29 @@ -105,6 +105,7 @@ avlibInterface::avlibInterface() ··· 31 QString avlibInterface::libPath(const QString &sLib) 32 { 33 + return sLib; 34 QDir dir; 35 QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); 36 + dir.setPath(path);