diff options
| -rw-r--r-- | network/murmur/README | 2 | ||||
| -rw-r--r-- | network/murmur/murmur.SlackBuild | 7 | ||||
| -rw-r--r-- | network/murmur/murmur.info | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/network/murmur/README b/network/murmur/README index a040fdd8b1ec..04d71e391fe1 100644 --- a/network/murmur/README +++ b/network/murmur/README @@ -9,5 +9,3 @@ To run murmur at boot, add the following to /etc/rc.d/rc.local: if [ -x /etc/rc.d/rc.murmur ]; then /etc/rc.d/rc.murmur start fi - -Murmur requires qt4 (available on SlackBuilds.org). diff --git a/network/murmur/murmur.SlackBuild b/network/murmur/murmur.SlackBuild index d618f0fb8015..d5702284b431 100644 --- a/network/murmur/murmur.SlackBuild +++ b/network/murmur/murmur.SlackBuild @@ -16,10 +16,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -37,7 +40,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -qmake-qt4 \ +qmake \ main.pro \ CONFIG+=no-client @@ -66,4 +69,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/rc.murmur > $PKG/etc/rc.d/rc.murmur.new cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/murmur/murmur.info b/network/murmur/murmur.info index 4a39c7325cdb..e03b588b9d29 100644 --- a/network/murmur/murmur.info +++ b/network/murmur/murmur.info @@ -2,7 +2,9 @@ PRGNAM="murmur" VERSION="1.1.4" HOMEPAGE="http://mumble.sourceforge.net/" DOWNLOAD="http://downloads.sourceforge.net/mumble/mumble-1.1.4.tar.gz" +DOWNLOAD_x86_64="" MD5SUM="06fdd23043fd987b2eb6b56913fac181" +MD5SUM_x86_64="" MAINTAINER="adev" EMAIL="adev@linuxmail.org" -APPROVED="David Somero" +APPROVED="David Somero,pprkut" |