summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--network/mumble/README2
-rw-r--r--network/mumble/mumble.SlackBuild44
-rw-r--r--network/mumble/mumble.desktop11
-rw-r--r--network/mumble/mumble.info2
-rw-r--r--network/mumble/mumble.xpm43
-rw-r--r--network/mumble/mumble11x.desktop11
-rw-r--r--network/mumble/slack-desc8
7 files changed, 34 insertions, 87 deletions
diff --git a/network/mumble/README b/network/mumble/README
index 325ba49bb0..3505f5c8d2 100644
--- a/network/mumble/README
+++ b/network/mumble/README
@@ -8,6 +8,6 @@ If you have g15tools installed and want mumble to use it:
If you want the mumble overlay:
OVERLAY=yes ./mumble.SlackBuild
-This requires protobuf, speex, and celt.
+This requires: protobuf, speex, and celt.
Note: This does not build the mumble server (murmur).
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 2b2c0019d1..65782e9da1 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=mumble
VERSION=${VERSION:-1.2.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -84,8 +84,8 @@ find . \
-exec chmod 644 {} \;
qmake \
- main.pro \
-recursive \
+ main.pro \
DEFINES*="PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/mumble" \
CONFIG+=no-server \
CONFIG+=no-bundled-celt \
@@ -104,22 +104,34 @@ make release
mkdir -p \
$PKG/usr/bin \
$PKG/usr/lib${LIBDIRSUFFIX}/mumble \
- $PKG/usr/man \
- $PKG/usr/share/applications \
- $PKG/usr/share/pixmaps \
-
-# I don't understand why this is here. That seems like a good reason to
-# leave it alone, so I will, but I'd like an explanation :-) --rworkman
-if [ -e $PKG/usr/lib${LIBDIRSUFFIX}/libmumble.so ]; then
- cp release/libmumble.so* $PKG/usr/lib${LIBDIRSUFFIX}
+ $PKG/usr/man/man1 \
+ $PKG/usr/share/{applications,pixmaps}
+
+install -m 755 \
+ release/mumble release/mumble11x \
+ $PKG/usr/bin
+
+install -m 644 \
+ man/mumble-overlay.1 man/mumble.1 man/mumble11x.1 \
+ $PKG/usr/man/man1
+
+install -m 644 scripts/mumble.desktop $PKG/usr/share/applications
+install -m 644 icons/mumble.xpm $PKG/usr/share/pixmaps
+
+find release/plugins -type f -name *.so \
+ -exec install -m 755 {} $PKG/usr/lib${LIBDIRSUFFIX}/mumble \;
+
+# If the overlay was built, let's install the library for it
+if [ -e release/libmumble.so.$VERSION ]; then
+ install -m 755 release/libmumble.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX}
+
+ cd $PKG/usr/lib${LIBDIRSUFFIX}
+ ln -sf libmumble.so.$VERSION libmumble.so.1.2
+ ln -sf libmumble.so.1.2 libmumble.so.1
+ ln -sf libmumble.so.1 libmumble.so
+ cd -
fi
-cp release/plugins/* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
-cp release/mumble release/mumble11x $PKG/usr/bin
-cp man/mumble*.1 $PKG/usr/man
-cp $CWD/*.desktop $PKG/usr/share/applications
-cp $CWD/mumble.xpm $PKG/usr/share/pixmaps
-
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/network/mumble/mumble.desktop b/network/mumble/mumble.desktop
deleted file mode 100644
index e628978672..0000000000
--- a/network/mumble/mumble.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Mumble
-GenericName=Voice Chat
-Comment=A low-latency, high quality voice chat program for gaming
-Exec=mumble
-Icon=mumble
-Terminal=false
-Type=Application
-StartupNotify=false
-Categories=Network;Chat;Qt;
-Version=1.0
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index 39fa8419b2..0b2091dced 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="James Geboski"
EMAIL="jgeboski@gmail.com"
-APPROVED="rworkman"
+APPROVED="Niels Horn"
diff --git a/network/mumble/mumble.xpm b/network/mumble/mumble.xpm
deleted file mode 100644
index 3715600cf4..0000000000
--- a/network/mumble/mumble.xpm
+++ /dev/null
@@ -1,43 +0,0 @@
-/* XPM */
-static char *mumble[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 5 1",
-" c black",
-". c #808080",
-"X c gray78",
-"o c gray100",
-"O c None",
-/* pixels */
-"OOOOOOOOooooooooooooooooOOOOOOOO",
-"OOOOOOoooo. oooooooo .ooooOOOOOO",
-"OOOOOooo. oooooo .oooOOOOO",
-"OOOOooo. oooooo .oooOOOO",
-"OOOoooo .o XooooX o. ooooOOO",
-"OOooooX Xo .oooo. oX XooooOO",
-"Oooooo. oo .oooo. oo .oooooO",
-"Oooooo .oo .oooo. oo. oooooO",
-"oooooo Xoo .oooo. ooX oooooo",
-"oooooo ooo .oooo. ooo oooooo",
-"oooooo ooo .oooo. ooo oooooo",
-"oooooo ooo .oooo. ooo oooooo",
-"oooooX ooo .... ooo Xooooo",
-"oooo XX. ooo ooo .XX oooo",
-"ooo XX.. oooooooooooo ..XX ooo",
-"ooX .. oooooooooooo .. Xoo",
-"oo X. o o .X oo",
-"oo . o o . oo",
-"oX . o oo o oo o . Xo",
-"o . o o o o o o . o",
-"o . o oo o oo o . o",
-"o o o o o o o o",
-"o o o o o o o o",
-"oo o ooo oooo o oo",
-"oo o o oo",
-"Oo o o oO",
-"Ooo oooooooooooo ooO",
-"OOo oooooooooooo oOO",
-"OOOo oooo. .oooo oOOO",
-"OOOOoo ooooo oooo. ooOOOO",
-"OOOOOooooooooo. XoooOOOOO",
-"OOOOOOOooooooooooooooooooOOOOOOO"
-};
diff --git a/network/mumble/mumble11x.desktop b/network/mumble/mumble11x.desktop
deleted file mode 100644
index f9be5445a9..0000000000
--- a/network/mumble/mumble11x.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Mumble 11x
-GenericName=Voice Chat
-Comment=A low-latency, high quality voice chat program for gaming
-Exec=mumble11x
-Icon=mumble
-Terminal=false
-Type=Application
-StartupNotify=false
-Categories=Network;Chat;Qt;
-Version=1.0
diff --git a/network/mumble/slack-desc b/network/mumble/slack-desc
index c738da3076..e2efc8307c 100644
--- a/network/mumble/slack-desc
+++ b/network/mumble/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
mumble: Mumble (Low-latency voice chat)
mumble:
-mumble: Mumble is a voice chat application for groups. While it can be
-mumble: used for any kind of activity, it is primarily intended for gaming.
-mumble: It can be compared to programs like Ventrilo or TeamSpeak.
+mumble: Mumble is a voice chat application for groups. While it can be used
+mumble: for any kind of activity, it is primarily intended for gaming. It
+mumble: can be compared to programs like Ventrilo or TeamSpeak.
mumble:
-mumble: Homepage: http://mumble.sourceforge.net/
mumble:
mumble:
+mumble: Homepage: http://mumble.sourceforge.net/
mumble:
mumble:
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-22 14:22:50 +0000