From 23bad6ea0bd3e9f20a83b36d95fd030dda955297 Mon Sep 17 00:00:00 2001
From: Dick Marinus <dick@mrns.nl>
Date: Mar 20 2021 18:17:26 +0000
Subject: Disable v4l2loopback-dc kmod, use v4l2loopback instead


---

diff --git a/droidcam.spec b/droidcam.spec
index a1a403d..1f4b594 100644
--- a/droidcam.spec
+++ b/droidcam.spec
@@ -1,23 +1,26 @@
 Name: droidcam
 Version: 1.7.2
-Release: 3%{?dist}
-Summary: droidcam
+Release: 7%{?dist}
+Summary: Droidcam, use your phone as a webcam
 
 License: GPL-2
 URL: https://dev47apps.com
 Source0: https://github.com/dev47apps/droidcam/archive/v%{version}.tar.gz
-Source1: modules-load-d-v4l2loopback-dc.conf
-Source2: droidcam-16x16.png
-Source3: droidcam-24x24.png
-Source4: droidcam-32x32.png
-Source5: droidcam-48x48.png
-Source6: droidcam-128x128.png
+Source1: droidcam-16x16.png
+Source2: droidcam-24x24.png
+Source3: droidcam-32x32.png
+Source4: droidcam-48x48.png
+Source5: droidcam-128x128.png
+# Source6: modprobe-d-98-v4l2loopback-dc.conf
+# Source7: modules-load-d-v4l2loopback-dc.conf
 
 ExclusiveArch:  x86_64
 
-Requires: %{name}-kmod >= %{version}
-Requires: android-tools
 Provides: %{name}-kmod-common = %{version}
+
+# Requires: %{name}-kmod >= %{version}
+Requires: v4l2loopback
+Requires: android-tools
 Requires: hicolor-icon-theme
 BuildRequires: gcc-c++
 BuildRequires: ffmpeg-devel
@@ -29,7 +32,7 @@ BuildRequires: alsa-lib-devel
 BuildRequires:  desktop-file-utils
 
 %description
-Droidcam
+Droidcam, use your phone as a webcam
 
 %prep
 %autosetup -n droidcam-%{version}
@@ -40,20 +43,24 @@ make JPEG_DIR=/usr
 
 %install
 install -p -m0755 -D -t %{buildroot}/%{_bindir} droidcam droidcam-cli
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_modulesloaddir}/v4l2loopback-dc.conf
+#install -D -m 0644 %{SOURCE6} %{buildroot}%{_modprobedir}/98-v4l2loopback-dc.conf
+#install -D -m 0644 %{SOURCE7} %{buildroot}%{_modulesloaddir}/v4l2loopback-dc.conf
 mkdir -p %{buildroot}%{_datadir}/applications/
 sed -e 's/Icon=.*/Icon=droidcam/' droidcam.desktop > %{buildroot}%{_datadir}/applications/droidcam.desktop
-install -D -m 0644 %{SOURCE2} %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -D -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
-install -D -m 0644 %{SOURCE4} %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -D -m 0644 %{SOURCE6} %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+install -D -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+install -D -m 0644 %{SOURCE2} %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+install -D -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -D -m 0644 %{SOURCE4} %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
+%doc README.md
+%license LICENSE
 %{_bindir}/droidcam
 %{_bindir}/droidcam-cli
-%{_modulesloaddir}/v4l2loopback-dc.conf
+#%{_modprobedir}/98-v4l2loopback-dc.conf
+#%{_modulesloaddir}/v4l2loopback-dc.conf
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/24x24/apps/%{name}.png
@@ -62,6 +69,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 %changelog
+* Sat Mar 20 2021 Dick Marinus <dick@mrns.nl> - 1.7.2-7
+- Disable v4l2loopback-dc kmod, use v4l2loopback instead
+
+* Tue Mar 16 2021 Dick Marinus <dick@mrns.nl> - 1.7.2-6
+- Really fix modprobe config
+
+* Tue Mar 16 2021 Dick Marinus <dick@mrns.nl> - 1.7.2-5
+- Fix modprobe config
+
+* Tue Mar 16 2021 Dick Marinus <dick@mrns.nl> - 1.7.2-4
+- Set module width/height parameters
+
 * Tue Mar 16 2021 Dick Marinus <dick@mrns.nl> - 1.7.2-3
 - Add icons and desktop file
 
diff --git a/modprobe-d-98-v4l2loopback-dc.conf b/modprobe-d-98-v4l2loopback-dc.conf
new file mode 100644
index 0000000..defadff
--- /dev/null
+++ b/modprobe-d-98-v4l2loopback-dc.conf
@@ -0,0 +1 @@
+options v4l2loopback-dc width=1920 height=1080