summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2016-12-05 18:59:01 -0600
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-12-24 07:34:19 +0700
commit15706dda080d0ab870caee55acd1d4fa09f65939 (patch)
tree17eb7548597b386cfcab7abf001e2048addced70
parentb674aee736e631d8f7d4ec0ed949f71726ba3462 (diff)
downloadslackbuilds-15706dda080d0ab870caee55acd1d4fa09f65939.tar.gz
multimedia/gnash: Updated build flags, HOMEPAGE, and DOWNLOAD.
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
-rw-r--r--multimedia/gnash/doinst.sh17
-rw-r--r--multimedia/gnash/gnash.SlackBuild34
-rw-r--r--multimedia/gnash/gnash.info4
3 files changed, 25 insertions, 30 deletions
diff --git a/multimedia/gnash/doinst.sh b/multimedia/gnash/doinst.sh
index c2e0f8a9fd..684c6a9486 100644
--- a/multimedia/gnash/doinst.sh
+++ b/multimedia/gnash/doinst.sh
@@ -11,20 +11,9 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
-preserve_perms() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- if [ -e $OLD ]; then
- cp -a $OLD ${NEW}.incoming
- cat $NEW > ${NEW}.incoming
- mv ${NEW}.incoming $NEW
- fi
- config $NEW
-}
-
-preserve_perms etc/gnashpluginrc.new
-preserve_perms etc/gnashthumbnailrc.new
-preserve_perms etc/gnashrc.new
+config etc/gnashpluginrc.new
+config etc/gnashthumbnailrc.new
+config etc/gnashrc.new
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild
index 0032d3006f..99a4c07c84 100644
--- a/multimedia/gnash/gnash.SlackBuild
+++ b/multimedia/gnash/gnash.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for gnash
-# Copyright 2012-2013 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2012-2016 Kyle Guinn <elyk03@gmail.com>, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
PRGNAM=gnash
VERSION=${VERSION:-0.8.10}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
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
@@ -45,6 +45,9 @@ DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO"
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
@@ -78,11 +81,7 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R u+w,go-w,a+rX-st .
# Fix compilation with GCC 4.7.
patch -p1 < $CWD/patch/gcc47.patch
@@ -105,9 +104,7 @@ patch -p1 < $CWD/patch/gnash-boost.patch
# The FFmpeg engine doesn't compile with FFmpeg 0.11.1. Patches welcome.
# In the meantime, set --enable-media=gst to avoid autodetecting FFmpeg.
-autoreconf
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+autoreconf -vif
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -117,21 +114,30 @@ CXXFLAGS="$SLKCFLAGS" \
--infodir=/usr/info \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux \
+ --disable-dependency-tracking \
--enable-media=gst \
+ --enable-python \
+ --enable-ssh \
+ --enable-ssl \
--enable-write \
--without-gconf \
--with-plugins-install=system \
- $KLASH_OPT
+ --with-speexdsp-incl=/usr/include/speex \
+ $KLASH_OPT \
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
make
make install-strip install-plugins DESTDIR=$PKG
# make install-plugins doesn't strip the plugins.
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -exec file {} + | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete
+
find $PKG/etc -type f -exec mv {} {}.new \;
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+find $PKG/usr/man -type f -exec gzip -9 {} +
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/multimedia/gnash/gnash.info b/multimedia/gnash/gnash.info
index 7fe6727ee4..012dd88c5f 100644
--- a/multimedia/gnash/gnash.info
+++ b/multimedia/gnash/gnash.info
@@ -1,7 +1,7 @@
PRGNAM="gnash"
VERSION="0.8.10"
-HOMEPAGE="http://gnashdev.org/"
-DOWNLOAD="ftp://mirrors.kernel.org/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2"
+HOMEPAGE="https://www.gnu.org/software/gnash/"
+DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2"
MD5SUM="63e9f79c41d93d48c5a2fa94856548c4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""