vokoscreenNG: 3.0.5 -> 3.0.8

This commit is contained in:
SCOTT-HAMILTON 2021-02-03 15:42:14 +01:00
parent 5c7a370a20
commit f01474f4e1
2 changed files with 47 additions and 8 deletions

View file

@ -1,12 +1,12 @@
{ lib { lib
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pkg-config , pkg-config
, qmake , qmake
, qttools , qttools
, gstreamer , gstreamer
, libX11 , libX11
, pulseaudio
, qtbase , qtbase
, qtmultimedia , qtmultimedia
, qtx11extras , qtx11extras
@ -19,21 +19,19 @@
mkDerivation rec { mkDerivation rec {
pname = "vokoscreen-ng"; pname = "vokoscreen-ng";
version = "3.0.5"; version = "3.0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vkohaupt"; owner = "vkohaupt";
repo = "vokoscreenNG"; repo = "vokoscreenNG";
rev = version; rev = version;
sha256 = "1spyqw8h8bkc1prdb9aixiw5h3hk3gp2p0nj934bnwq04kmfp660"; sha256 = "1302663hyp2xxhaavhfky24a2p9gz23i3rykmrc6c1n23h24snri";
}; };
patches = [ patches = [
# Better linux integration # Adaptation of previously used https://github.com/City-busz/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637 patch
(fetchpatch { # used for 3.0.5 but incompatible at least since 3.0.8. The issue is addressed here https://github.com/vkohaupt/vokoscreenNG/issues/139
url = "https://github.com/vkohaupt/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637.patch"; ./linux-support-installation-target.patch
sha256 = "1iibimv8xfxxfk44kkbrkay37ibdndjvs9g53mxr8x8vrsp917bz";
})
]; ];
qmakeFlags = [ "src/vokoscreenNG.pro" ]; qmakeFlags = [ "src/vokoscreenNG.pro" ];
@ -42,6 +40,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
gstreamer gstreamer
libX11 libX11
pulseaudio
qtbase qtbase
qtmultimedia qtmultimedia
qtx11extras qtx11extras

View file

@ -0,0 +1,40 @@
Seulement dans b: patch.patch
Seulement dans b: ..rej
diff --color -ur a/src/vokoscreenNG.pro b/src/vokoscreenNG.pro
--- a/src/vokoscreenNG.pro 2021-02-03 15:00:57.377401016 +0100
+++ b/src/vokoscreenNG.pro 2021-02-03 15:09:18.141905863 +0100
@@ -160,7 +160,32 @@
# systrayAlternative
include(systrayAlternative/systrayAlternative.pri)
+unix:!macx {
+ isEmpty(PREFIX) {
+ PREFIX = /usr/local
+ }
+ isEmpty(BINDIR) {
+ BINDIR = $$PREFIX/bin
+ }
+ isEmpty(DATADIR) {
+ DATADIR = $$PREFIX/share
+ }
+
+ target.path = $$BINDIR
+
+ icon.files = applications/vokoscreenNG.png
+ icon.path = $$DATADIR/icons/hicolor/256x256/apps/
+
+ desktop.files = applications/vokoscreenNG.desktop
+ desktop.path = $$DATADIR/applications/
+
+ appdata.files = applications/vokoscreenNG.appdata.xml
+ appdata.path = $$DATADIR/metainfo/
+
+ INSTALLS += target icon desktop appdata
+}
# ciscoOpenh264
win32:include(ciscoOpenh264/ciscoOpenh264.pri)
-unix:include(wayland/wayland.pri)
\ Pas de fin de ligne à la fin du fichier
+unix:include(wayland/wayland.pri)
+