desktop/wmwebcam: New maintainer, minor fixes.

4 files changed, 50 insertions, 19 deletions

diff --git a/desktop/wmwebcam/README b/desktop/wmwebcam/README
index 0ba4ec57dbe2..5cf998f8c28a 100644
--- a/desktop/wmwebcam/README
+++ b/desktop/wmwebcam/README
@@ -1,10 +1,13 @@
-wmwebcam is a dockapp that grabs an image from your webcam every second and displays the captured
-image. Original written years ago, it was updated by eukara to work with the newer V4L2. Credits go to
-him for the fix.
+wmwebcam is a dockapp that grabs an image from your webcam every second
+and displays the captured image. Original written years ago, it was
+updated by eukara to work with the newer V4L2. Credits go to him for
+the fix.
 
-You can customize the device location, webcam delay, and size. However, this must be done in the source
-before compile. To make this easier a patch is included, just open it in your favorite editor, read the
-comments, and edit the variables to your liking (make sure it's the lines with the "+" in front).
+You can customize the device location, webcam delay, and size. However,
+this must be done in the source before compile. To make this easier
+a patch is included, just open it in your favorite editor, read the
+comments, and edit the variables to your liking (make sure it's the
+lines with the "+" in front).
 
-There is also a default perl script that can upload the captured images to a FTP, this is also
-configurable in the patch.
+There is also a default perl script that can upload the captured images
+to a FTP, this is also configurable in the patch.
diff --git a/desktop/wmwebcam/compilefix.diff b/desktop/wmwebcam/compilefix.diff
new file mode 100644
index 000000000000..44679c9987df
--- /dev/null
+++ b/desktop/wmwebcam/compilefix.diff
@@ -0,0 +1,11 @@
+diff -Naur wmwebcam-0.3.5-fixed/minirgb.c wmwebcam-0.3.5-fixed.patched/minirgb.c
+--- wmwebcam-0.3.5-fixed/minirgb.c	2001-01-25 08:46:46.000000000 -0500
++++ wmwebcam-0.3.5-fixed.patched/minirgb.c	2016-08-21 15:51:12.317174450 -0400
+@@ -17,6 +17,7 @@
+  */
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include "minirgb.h"
diff --git a/desktop/wmwebcam/wmwebcam.SlackBuild b/desktop/wmwebcam/wmwebcam.SlackBuild
index 914b84e87003..9a659b0158f6 100644
--- a/desktop/wmwebcam/wmwebcam.SlackBuild
+++ b/desktop/wmwebcam/wmwebcam.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wmwebcam-fixed
 #
-# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2015 Gethyn ThomasQuail <email removed>
 # All rights reserved.
 #
 # Based on:
@@ -25,14 +25,25 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# 20160821 bkw:
+# - take over maintenance
+# - BUILD=2
+# - i486 => i586
+# - fix a (probably harmless) compiler warning
+# - actually use SLKCFLAGS
+# - install binary stripped
+# - TODO: find a new maintainer, as I don't own a webcam!
+
 PRGNAM=wmwebcam
 VERSION=${VERSION:-0.3.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -43,8 +54,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,14 +83,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Customization patch
+# probably unnecessary, paranoia says memcpy() needs a prototype.
+patch -p1 < $CWD/compilefix.diff
+
+# Customization patch. By default this doesn't actually change anything,
+# it's up to the user to edit the patch manually (!) if desired. (This
+# wasn't my idea -- B.)
 patch -p1 < $CWD/customize.patch
 
-make
+sed -i "s,-O2,$SLKCFLAGS," Makefile
 
+make
 mkdir -p $PKG/usr/bin
-mv wmwebcam $PKG/usr/bin
-mv wmwebcam.pl $PKG/usr/bin
+install -s -m0755 $PRGNAM $PKG/usr/bin
+install -m0755 $PRGNAM.pl $PKG/usr/bin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README COPYING Changelog $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/wmwebcam/wmwebcam.info b/desktop/wmwebcam/wmwebcam.info
index f0bea6ab87ad..be748e2e7fbd 100644
--- a/desktop/wmwebcam/wmwebcam.info
+++ b/desktop/wmwebcam/wmwebcam.info
@@ -6,5 +6,5 @@ MD5SUM="e0a65c02d9743f38c8639d8035bb13b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Gethyn ThomasQuail"
-EMAIL="gethyn@bloodbathsoftworks.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"