multimedia/xvidcore: Updated for version 1.1.3

3 files changed, 25 insertions, 24 deletions

diff --git a/multimedia/xvidcore/slack-desc b/multimedia/xvidcore/slack-desc
index 36c670a7b2a1..bb1efcb95d49 100644
--- a/multimedia/xvidcore/slack-desc
+++ b/multimedia/xvidcore/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
 xvidcore: Xvid (MPEG-4 Compliant Video Codec)
 xvidcore:
 xvidcore: Xvid is an ISO MPEG-4 compliant video codec. It is an open source
diff --git a/multimedia/xvidcore/xvidcore.SlackBuild b/multimedia/xvidcore/xvidcore.SlackBuild
index e00174b12e29..38e702bb1ed2 100644
--- a/multimedia/xvidcore/xvidcore.SlackBuild
+++ b/multimedia/xvidcore/xvidcore.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Xvid
 
-# Copyright 2007  MagicMan <MagicMan07@bluebottle.com>
+# Copyright 2007  Frank Caraballo <fecaraballo{at}gmail{dot}com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,24 +22,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit 1
-fi
-
 PRGNAM=xvidcore
-VERSION=1.1.2
+VERSION=1.1.3
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PDOCS="AUTHORS ChangeLog ChangeLog-1.0 CodingStyle LICENSE README TODO doc"
+PDOCS="AUTHORS ChangeLog* CodingStyle LICENSE README TODO doc"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -53,7 +46,6 @@ cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
 tar -xvf $CWD/$PRGNAM-$VERSION.tar.* || exit 1
 cd $PRGNAM-$VERSION || exit 1
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -63,23 +55,24 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --disable-static \
   || exit 1
 
 make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-find $PKG | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find $PKG | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
 
 cd $TMP/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Per doc/INSTALL, let's create some symlinks to the shared object
-# This should be safe, as the maintainers assure that they won't change the 
-# major library number unless there is an incompatible ABI change
+# Per doc/INSTALL, create some symlinks to the shared object. This
+# should be safe, as the maintainers assure that they won't change the
+# major library number unless there is an incompatible ABI change:
 ( cd $PKG/usr/lib
   ln -s libxvidcore.so.4.1 libxvidcore.so.4
   ln -s libxvidcore.so.4.1 libxvidcore.so
diff --git a/multimedia/xvidcore/xvidcore.info b/multimedia/xvidcore/xvidcore.info
index d3f3c7e23259..ac513ceb40ea 100644
--- a/multimedia/xvidcore/xvidcore.info
+++ b/multimedia/xvidcore/xvidcore.info
@@ -1,8 +1,8 @@
 PRGNAM="xvidcore"
-VERSION="1.1.2"
+VERSION="1.1.3"
 HOMEPAGE="http://www.xvid.org/"
-DOWNLOAD="http://downloads.xvid.org/downloads/xvidcore-1.1.2.tar.bz2"
-MD5SUM="f748d835037fbe314a5fae8880c32f29"
-MAINTAINER="MagicMan"
-EMAIL="MagicMan07@bluebottle.com"
-APPROVED="robw810"
+DOWNLOAD="http://downloads.xvid.org/downloads/xvidcore-1.1.3.tar.bz2"
+MD5SUM="29c60d4d991ac18f687a8fd13cfe64b7"
+MAINTAINER="Frank Caraballo"
+EMAIL="fecaraballo{at}gmail{dot}com"
+APPROVED="alien"