aboutsummaryrefslogtreecommitdiff
path: root/desktop/wmwebcam/wmwebcam.SlackBuild
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2016-08-21 15:59:56 -0400
committerDavid Spencer <idlemoor@slackbuilds.org>2016-08-28 00:30:40 +0100
commitd6f1eaf91dd504ccd76ea6e0e0117471f8a60429 (patch)
tree4bcbe9d7f80bc3bb507121469bfee746567452f9 /desktop/wmwebcam/wmwebcam.SlackBuild
parentf316c650ed5ac234691ad1fbfdafe4df16c5a4b5 (diff)
desktop/wmwebcam: New maintainer, minor fixes.
Diffstat (limited to 'desktop/wmwebcam/wmwebcam.SlackBuild')
-rw-r--r--desktop/wmwebcam/wmwebcam.SlackBuild35
1 files changed, 26 insertions, 9 deletions
diff --git a/desktop/wmwebcam/wmwebcam.SlackBuild b/desktop/wmwebcam/wmwebcam.SlackBuild
index 914b84e870031..9a659b0158f67 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