summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/droidcam/Droidcam.desktop10
-rw-r--r--multimedia/droidcam/README27
-rw-r--r--multimedia/droidcam/README.SLACKWARE43
-rw-r--r--multimedia/droidcam/dkms.conf5
-rw-r--r--multimedia/droidcam/doinst.sh25
-rw-r--r--multimedia/droidcam/douninst.sh7
-rw-r--r--multimedia/droidcam/droidcam.SlackBuild32
-rw-r--r--multimedia/droidcam/droidcam.info10
-rw-r--r--multimedia/droidcam/rc.droidcam.new34
9 files changed, 82 insertions, 111 deletions
diff --git a/multimedia/droidcam/Droidcam.desktop b/multimedia/droidcam/Droidcam.desktop
deleted file mode 100644
index b8c1f92f9c..0000000000
--- a/multimedia/droidcam/Droidcam.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=DroidCam
-Comment=Use your phone as a webcam
-TryExec=/usr/bin/droidcam
-Exec=/usr/bin/droidcam
-Icon=icon2.png
-Terminal=false
-Type=Application
-Categories=Video;AudioVideo;
diff --git a/multimedia/droidcam/README b/multimedia/droidcam/README
index 2547a40615..354a218a76 100644
--- a/multimedia/droidcam/README
+++ b/multimedia/droidcam/README
@@ -1,18 +1,21 @@
DroidCam
-DroidCam turns your phone/tablet into a webcam for your PC.
-Use it with chat programs like Zoom, MS Teams, and Skype.
+DroidCam turns your phone/tablet into a webcam for your PC. Use
+ it with chat programs like Zoom, MS Teams, and Skype.
Main Features:
-- Chat using "DroidCam Webcam" on your computer, with Sound and Picture
-- Connect over WiFi or USB cable
-- Unlimited free usage with standard definition
-- Keep using your phone while DroidCam is in background (Android)
-- Simple, safe, efficient, and trusted by millions of people worldwide
+– Chat using “DroidCam Webcam” on your computer, including Sound
+and Picture.
+– Connect over WiFi or USB cable.
+– Unlimited free usage with standard definition.
+– Keep using your phone while DroidCam is in background (Android).
+– Simple, safe, efficient, and trusted by millions of people
+worldwide.
-The GNU/Linux client is a combination an executable app that connects
-to the phone, and Video4Linux and ALSA loopback drivers.
+The GNU/Linux client is a combination an executable app that
+connects to the phone, and Video4Linux and ALSA loopback drivers.
+
+It’s assumed you are somewhat familiar with the system and how to
+use the Terminal. Please keep in mind other posts on the site are
+Windows oriented.
-It's assumed you are somewhat familiar with the system and how to use
-the Terminal. Please keep in mind other posts on the site are Windows
-oriented.
diff --git a/multimedia/droidcam/README.SLACKWARE b/multimedia/droidcam/README.SLACKWARE
index c4c7f8ca08..a91a930ff9 100644
--- a/multimedia/droidcam/README.SLACKWARE
+++ b/multimedia/droidcam/README.SLACKWARE
@@ -1,41 +1,24 @@
Droidcam Slackware
-After installing the package, a file to load the video audio modules will be
-created in "/etc/rc.d" called "rc.droidcam",
+Probably the camera and microphone modules of the cell
+phone will not be loaded at startup, being necessary to
+add the following lines in the file "rc.modules.local".
-If the module responsible for functional the camera is not working the
-file is already with execution permission, only need run.
+/sbin/modprobe v4l2loopback-dc
+/sbin/modprobe snd-aloop
-chmod +x /etc/rc.d/rc.droidcam
-/etc/rc.d/rc.droidcam start
-Probably the camera and microphone modules of the cell phone will not be
-loaded at startup, being necessary to add the
-following lines in the file "rc.local".
+It is important to install the dkms package because it
+manages the v412loopback-dc video module. to compile the
+module automatically when the kernel is updated.
+Added this lines in rc.modules.local.
-if [-x /etc/rc.d/rc.droidcam]; then
- /etc/rc.d/rc.droidcam start &> / dev / null
-fi
-
-If you prefer to add in rc.shutdown.
+# Enable DKMS module rebuilding
-if [-x /etc/rc.d/rc.droidcam]; then
- /etc/rc.d/rc.droidcam stop &> / dev / null
+if [ -x /usr/lib/dkms/dkms_autoinstaller ]; then
+ echo "Running DKMS autoinstaller"
+ /usr/lib/dkms/dkms_autoinstaller start
fi
-Whenever you upgrade the kernel you need to reinstall the package so that the
-module is recompiled on the new kernel.
-
-
-When you need to uninstall the package The camera video driver will still be
-installed and you need to remove manually if you can.
-
-Login as root.
-
-rmmod -f v4l2loopback_dc
-rm -f /lib/modules/`uname -r`/kernel/drivers/media/video/v4l2loopback-dc.ko
-
-For more informations.
-https://www.dev47apps.com/droidcam/linux/
diff --git a/multimedia/droidcam/dkms.conf b/multimedia/droidcam/dkms.conf
new file mode 100644
index 0000000000..6a926bc32c
--- /dev/null
+++ b/multimedia/droidcam/dkms.conf
@@ -0,0 +1,5 @@
+PACKAGE_NAME="v4l2loopback-dc"
+PACKAGE_VERSION="1.8.2"
+BUILT_MODULE_NAME[0]="v4l2loopback-dc"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/media/video/v4l2loopback-dc"
+AUTOINSTALL="yes" \ No newline at end of file
diff --git a/multimedia/droidcam/doinst.sh b/multimedia/droidcam/doinst.sh
index 02d9e036da..4c9ca03538 100644
--- a/multimedia/droidcam/doinst.sh
+++ b/multimedia/droidcam/doinst.sh
@@ -1,3 +1,6 @@
+VERSION="1.8.2"
+MODULE="v4l2loopback-dc"
+
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
@@ -6,10 +9,22 @@ if [ -x /usr/bin/update-mime-database ]; then
/usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
-if [ -d /opt/droidcam-1.7.2 ]; then
- cd /opt/droidcam-1.7.2 && ./install-video >/dev/null 2>&1
-fi
+_installModule(){
+
+ cp -r /tmp/SBo/$MODULE-$VERSION /usr/src/
+ dkms add -m $MODULE -v $VERSION
+ dkms build -m $MODULE -v $VERSION
+ dkms install -m $MODULE -v $VERSION
+ /sbin/modprobe $MODULE
+ /sbin/modprobe snd-aloop
+}
+
+if [ "lsmod | grep v4l2loopback_dc" ]; then
+
+ _installModule
+
+else
+
+ echo "Module v4l2loopback_dc installed"
-if [ -d /opt/droidcam-1.7.2 ]; then
- cd /opt/droidcam-1.7.2 && ./install-sound >/dev/null 2>&1
fi
diff --git a/multimedia/droidcam/douninst.sh b/multimedia/droidcam/douninst.sh
new file mode 100644
index 0000000000..4406ab4609
--- /dev/null
+++ b/multimedia/droidcam/douninst.sh
@@ -0,0 +1,7 @@
+
+ VERSION="1.8.2"
+ MODULE="v4l2loopback-dc"
+
+dkms remove -m $MODULE/$VERSION --all >/dev/null 2>&1
+rm -rf /usr/src/$MODULE-$VERSION >/dev/null 2>&1
+rmmod -f v4l2loopback-dc >/dev/null 2>&1
diff --git a/multimedia/droidcam/droidcam.SlackBuild b/multimedia/droidcam/droidcam.SlackBuild
index e6f8c1a6c4..4c006de11f 100644
--- a/multimedia/droidcam/droidcam.SlackBuild
+++ b/multimedia/droidcam/droidcam.SlackBuild
@@ -23,10 +23,8 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-cd $(dirname $0) ; CWD=$(pwd)
-
PRGNAM=droidcam
-VERSION=${VERSION:-1.7.2}
+VERSION=${VERSION:-1.8.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -47,6 +45,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
+
+CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -84,32 +84,34 @@ find -L . \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
+
+MODULE="v4l2loopback-dc"
+
#Prepare folder to install
-mkdir -p $PKG/etc/modprobe.d
+mkdir -p $PKG/usr/src/$MODULE-$VERSION
+cp -r $TMP/$PRGNAM-$VERSION/v4l2loopback $TMP/$MODULE-$VERSION
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
mkdir -p $PKG/usr/share/icons
mkdir -p $PKG/usr/share/applications
mkdir -p $PKG/usr/bin
-mkdir -p $PKG/opt
-touch $PKG/etc/modprobe.d/$PRGNAM.conf
-cp -r $TMP/$PRGNAM-$VERSION $PKG/opt/$PRGNAM-$VERSION
-cat $TMP/$PRGNAM-$VERSION/uninstall > $PKG/opt/$PRGNAM-uninstall
-cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM $PKG/usr/bin/$PRGNAM
-cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM-cli $PKG/usr/bin/$PRGNAM-cli
-cp -a $TMP/$PRGNAM-$VERSION/icon2.png $PKG/usr/share/icons/icon2.png
-cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+cat $CWD/dkms.conf > $TMP/$MODULE-$VERSION/dkms.conf
+cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM $PKG/usr/bin/$PRGNAM
+strip -s $PKG/usr/bin/$PRGNAM
+cp -a $TMP/$PRGNAM-$VERSION/icon2.png $PKG/usr/share/icons/droidcam.png
+cp -a $TMP/$PRGNAM-$VERSION/droidcam.desktop $PKG/usr/share/applications/Droidcam.desktop
+
+sed -i "5,6s/local\///" $PKG/usr/share/applications/Droidcam.desktop
+sed -i "7s/.*/Icon=\/usr\/share\/icons\/droidcam.png/" $PKG/usr/share/applications/Droidcam.desktop
#Documentation
cp -a $CWD/README* $PKG/usr/doc/$PRGNAM-$VERSION/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-#Script for run modules
-cp $CWD/rc.$PRGNAM.new /etc/rc.d/rc.$PRGNAM
-
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/multimedia/droidcam/droidcam.info b/multimedia/droidcam/droidcam.info
index 99a351fca8..3849af8446 100644
--- a/multimedia/droidcam/droidcam.info
+++ b/multimedia/droidcam/droidcam.info
@@ -1,10 +1,10 @@
PRGNAM="droidcam"
-VERSION="1.7.2"
+VERSION="1.8.2"
HOMEPAGE="https://www.dev47apps.com/"
-DOWNLOAD="https://files.dev47apps.net/linux/droidcam_1.7.2.zip"
-MD5SUM="fada5d691f7f358cd66182ae2214b25f"
+DOWNLOAD="https://files.dev47apps.net/linux/droidcam_1.8.2.zip"
+MD5SUM="af019ca66198c501e2ffa813d1c81471"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="android-tools"
-MAINTAINER="Andreo F. Rissardo"
+REQUIRES="android-tools dkms"
+MAINTAINER="Andreo Rissardo"
EMAIL="andreotec@gmail.com"
diff --git a/multimedia/droidcam/rc.droidcam.new b/multimedia/droidcam/rc.droidcam.new
deleted file mode 100644
index e6d244fece..0000000000
--- a/multimedia/droidcam/rc.droidcam.new
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-
-
-
-
-
-case $1 in
-start)
- modprobe snd-aloop && modprobe v4l2loopback_dc
-
-
-;;
-
-stop)
- rmmod -f snd-aloop && rmmod -f v4l2loopback_dc
-
-;;
-
-
-
-restart)
-
- $0 stop
-
-
- $0 start
-;;
-
-
-*)
- echo 'Run only "/etc/rc.d/rc.droidcam start | stop| restart"'
- ;;
-esac