4 files changed, 74 insertions, 42 deletions
diff --git a/libraries/opal/README b/libraries/opal/README
index fcb859f9f57e9..42f1fa6ae7061 100644
--- a/libraries/opal/README
+++ b/libraries/opal/README
@@ -1,5 +1,8 @@
-OPAL is an Open Source class library for the development of
-applications that use SIP / H.323 protocols for multimedia
-communications over packet based networks.
+The Open Phone Abstraction Library (OPAL) is a C++ multi-platform,
+multi-protocol library for Fax, Video & Voice over IP and other
+networks.
 
-This requires pwlib (also available at SlackBuilds.org)
+Opal requires ptlib and swig, which are also available at SlackBuilds.org.
+Speex from SBo is recommended, even though Opal ships with its own version.
+libavcodec, x264, and ffmpeg are optional, but highly recommended, for 
+video support.
diff --git a/libraries/opal/opal.SlackBuild b/libraries/opal/opal.SlackBuild
index fcdb771183fcf..a18d2df8c8974 100644
--- a/libraries/opal/opal.SlackBuild
+++ b/libraries/opal/opal.SlackBuild
@@ -1,12 +1,29 @@
 #!/bin/sh
 
-# Slackware build script for opal
+# Slackware build script for Opal
 
-# Written by Olivier Esser (olive001@tele2allin.be), based on
-# the template available at slackbuilds.org (public domain)
+# Copyright 2008-2009 Mauro Giachero (mauro dot giachero at gmail dot com)
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opal
-VERSION=2.2.11
+VERSION=${VERSION:-3.6.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -16,13 +33,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Upstream uses -Os, so we won't define -O2 here
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-fPIC"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -31,33 +50,43 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared \
   --build=$ARCH-slackware-linux
 
-make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+make
 make install DESTDIR=$PKG
+# Remove static library
+rm $PKG/usr/lib${LIBDIRSUFFIX}/libopal_s.a
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+( 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
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a mpl-1.0.htm $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Change* mpl-1.0.htm docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/libraries/opal/opal.info b/libraries/opal/opal.info
index 3ae5f41a03368..ee7fd6b9fa118 100644
--- a/libraries/opal/opal.info
+++ b/libraries/opal/opal.info
@@ -1,8 +1,8 @@
 PRGNAM="opal"
-VERSION="2.2.11"
-HOMEPAGE="http://ekiga.org"
-DOWNLOAD="http://www.ekiga.org/admin/downloads/latest/sources/sources/opal-2.2.11.tar.gz"
-MD5SUM="eb4a9c0c9ea93ec95c876aaeadf83936"
-MAINTAINER="Olivier Esser"
-EMAIL="olive001@tele2allin.be"
+VERSION="3.6.2"
+HOMEPAGE="http://www.opalvoip.org/"
+DOWNLOAD="http://downloads.sourceforge.net/opalvoip/opal-3.6.2.tar.bz2"
+MD5SUM="88076eeadee1351704afb2aeb3532c17"
+MAINTAINER="Mauro Giachero"
+EMAIL="mauro dot giachero at gmail dot com"
 APPROVED="rworkman"
diff --git a/libraries/opal/slack-desc b/libraries/opal/slack-desc
index 01629ec797cba..6cc8f4a6fc350 100644
--- a/libraries/opal/slack-desc
+++ b/libraries/opal/slack-desc
@@ -1,19 +1,19 @@
 # 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 ':'.
+# 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-------------------------------------------------------|
+    |-----handy-ruler------------------------------------------------------|
 opal: OPAL (Open Phone Abstraction Library)
-opal: 
-opal: OPAL is an Open Source class library for the development of
-opal: applications that use SIP / H.323 protocols for multimedia
-opal: communications over packet based networks.
-opal: 
-opal: Homepage: http://ekiga.org
-opal: 
-opal: 
-opal: 
-opal: 
+opal:
+opal: The Open Phone Abstraction Library is a C++ multi-platform,
+opal: multi-protocol library for Fax, Video & Voice over IP and other
+opal: networks.
+opal:
+opal: Homepage: http://www.opalvoip.org/
+opal:
+opal:
+opal:
+opal: