Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/22'
Browse files Browse the repository at this point in the history
* origin/pr/22:
  Add missing dependencies
  • Loading branch information
marmarek committed Jun 2, 2024
2 parents 454c223 + 0f06263 commit 7ae9bf7
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile.builder
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
RPM_SPEC_FILES := rpm_spec/qubes-video-companion.spec

ifeq ($(PACKAGE_SET),dom0)
RPM_SPEC_FILES += rpm_spec/qubes-video-companion-dom0.spec
RPM_SPEC_FILES := rpm_spec/qubes-video-companion-dom0.spec
endif

DEBIAN_BUILD_DIRS := debian
3 changes: 3 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ Depends: gir1.2-ayatanaappindicator3-0.1,
python3,
v4l-utils,
acl,
libnotify-bin,
libnotify4,
notification-daemon,
${misc:Depends},
Suggests:
v4l2loopback-dkms (>= 0.12.5-1),
Expand Down
10 changes: 9 additions & 1 deletion rpm_spec/qubes-video-companion-dom0.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Release: @REL@%{?dist}
Summary: Securely stream webcams and share screens across virtual machines

License: MIT
URL: https://github.com/elliotkillick/qubes-video-companion
URL: https://github.com/QubesOS/qubes-video-companion
Source0: %{vm_name}-%{version}.tar.gz

BuildArch: noarch
Expand All @@ -19,6 +19,14 @@ BuildRequires: python3-setuptools
BuildRequires: python3-devel

Requires: gstreamer1-plugins-good
Requires: v4l-utils
%if 0%{?fedora} <= 37
Requires: libappindicator-gtk3
%else
Requires: libayatana-appindicator-gtk3
%endif
Requires: desktop-notification-daemon
Requires: libnotify

%description
Qubes Video Companion is a tool for securely streaming webcams and sharing
Expand Down
9 changes: 7 additions & 2 deletions rpm_spec/qubes-video-companion.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Release: @REL@%{?dist}
Summary: Securely stream webcams and share screens across virtual machines

License: MIT
URL: https://github.com/elliotkillick/qubes-video-companion
URL: https://github.com/QubesOS/qubes-video-companion
Source0: %{name}-%{version}.tar.gz

BuildArch: noarch
Expand Down Expand Up @@ -37,6 +37,9 @@ BuildArch: noarch
Requires: gstreamer1-plugins-good
Requires: python3
Requires: v4l-utils
Requires: libayatana-appindicator-gtk3
Requires: desktop-notification-daemon
Requires: libnotify
Requires: qubes-video-companion-license

%description sender
Expand Down Expand Up @@ -73,8 +76,10 @@ BuildArch: noarch
BuildRequires: pandoc
Requires: gstreamer1-plugins-good
Requires: python3
Requires: qubes-video-companion-license
Requires: acl
Requires: desktop-notification-daemon
Requires: libnotify
Requires: qubes-video-companion-license

%description receiver
Qubes Video Companion is a tool for securely streaming webcams and sharing
Expand Down

0 comments on commit 7ae9bf7

Please sign in to comment.