sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master games grimoire by Ismael Luceno (6738cd576fd6a031b2efc07e0fcd9292673b5f1b)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master games grimoire by Ismael Luceno (6738cd576fd6a031b2efc07e0fcd9292673b5f1b)
Date: Fri, 23 Sep 2016 11:15:08 +0000

GIT changes to master games grimoire by Ismael Luceno <ismael AT sourcemage.org>:

games-utils/mumble/BUILD | 12 ++++++++---
games-utils/mumble/DEPENDS | 45
+++++++++++++++++++++++++++++++++++--------
games-utils/mumble/DETAILS | 6 ++---
games-utils/mumble/HISTORY | 7 ++++++
games-utils/mumble/PRE_BUILD | 22 +++++++++++++++++----
5 files changed, 74 insertions(+), 18 deletions(-)

New commits:
commit 6738cd576fd6a031b2efc07e0fcd9292673b5f1b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mumble: Fix build configuration and flags

commit d0462c22cf03a6fac55558158d6d79a74b401ee5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mumble: Update and order dependencies

commit ab73e963300ad2ab46de85b12a42b9b4084b406e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mumble 1.2.16

commit cccd2235691a59d67b94d7d0ce16800f6673c3b6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mumble: Add generic code to remove missing translations

diff --git a/games-utils/mumble/BUILD b/games-utils/mumble/BUILD
index 851fdc8..2b113e8 100755
--- a/games-utils/mumble/BUILD
+++ b/games-utils/mumble/BUILD
@@ -1,4 +1,4 @@
-OPTS="$OPTS CONFIG+=no-update CONFIG+=no-embed-qt-transaltions
CONFIG+=no-g15 CONFIG+=no-bundled-speex"
+OPTS+=" CONFIG+=no-update CONFIG+=no-embed-qt-transaltions CONFIG+=no-g15"

if [[ "$MUMBLE_SERVER" == 'n' ]]; then
OPTS="$OPTS CONFIG+=no-server"
@@ -13,5 +13,11 @@ if [[ "$MUMBLE_OVERLAY" == 'n' ]]; then
fi

PATH=/usr/bin/qt4:$PATH &&
-qmake main.pro $OPTS &&
-make
+qmake main.pro $OPTS \
+ QMAKE_CFLAGS="$CFLAGS" \
+ QMAKE_CXXFLAGS="$CXXFLAGS" \
+ QMAKE_CXXFLAGS+=-DCELT_SET_VBR_RATE=CELT_SET_BITRATE &&
+# XXX -DCELT_SET_VBR_RATE=... is needed to compile against celt 0.11
+make_single &&
+make &&
+make_normal
diff --git a/games-utils/mumble/DEPENDS b/games-utils/mumble/DEPENDS
index 2cfe5af..1852eea 100755
--- a/games-utils/mumble/DEPENDS
+++ b/games-utils/mumble/DEPENDS
@@ -1,17 +1,46 @@
depends -sub CXX gcc &&
depends boost &&
-depends protobuf &&
+
+# UI
depends -sub SQLITE qt4 &&
depends libxevie &&
-depends speex &&
-depends libsndfile &&
-depends alsa-lib &&
+optional_depends dbus \
+ '' \
+ CONFIG+=no-dbus \
+ 'for dbus support' &&
+optional_depends speech-dispatcher \
+ "" \
+ "CONFIG+=no-speechd" \
+ "for Text-to-Speech support" &&
+
+# Network / Crypto
+depends protobuf &&
depends openssl &&
optional_depends -sub COMPAT_LIBDNS_SD avahi \
"" \
"CONFIG+=no-bonjour" \
"for DNS-SD support" &&
-optional_depends speech-dispatcher \
- "" \
- "CONFIG+=no-speechd" \
- "for speech dispatcher support"
+
+# Audio I/O
+depends libsndfile &&
+optional_depends alsa-lib \
+ '' \
+ CONFIG+=no-alsa \
+ 'for ALSA support' &&
+optional_depends pulseaudio \
+ '' \
+ CONFIG+=no-pulseaudio \
+ 'for PulseAudio support' &&
+optional_depends portaudio19 \
+ '' \
+ CONFIG+=no-portaudio \
+ 'for PortAudio support' &&
+
+# Codecs
+depends speex CONFIG+=no-bundled-speex &&
+depends speexdsp &&
+depends celt CONFIG+=no-bundled-celt &&
+optional_depends opus \
+ CONFIG+=no-bundled-opus \
+ CONFIG+=no-opus \
+ 'for Opus audio codec support (recommended)'
diff --git a/games-utils/mumble/DETAILS b/games-utils/mumble/DETAILS
index f1b635e..c476c5f 100755
--- a/games-utils/mumble/DETAILS
+++ b/games-utils/mumble/DETAILS
@@ -1,9 +1,9 @@
SPELL=mumble
- VERSION=1.2.3
+ VERSION=1.2.16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:a50a9d93adf66de243f1fbcee4ed635681f8030965c7c23e0f5ee46eb4b5214d4e1ee7f1ba5201bd4b7e775d32df5cc95783721b0a325e3c49808ca1ffd88fe4
+
SOURCE_URL[0]=https://github.com/mumble-voip/$SPELL/releases/download/$VERSION/$SOURCE
+
SOURCE_HASH=sha512:8624d4db8ae135dae780bd5743f50d3a4740c5b983d18da6a19803e340fbac939204bac81b34d55a114e963b33eddefc292bc3cfea3827431ded5cad5284e565
WEB_SITE=http://mumble.sourceforge.net
ENTERED=20080626
LICENSE[0]=GPL
diff --git a/games-utils/mumble/HISTORY b/games-utils/mumble/HISTORY
index 5130c4e..2857251 100644
--- a/games-utils/mumble/HISTORY
+++ b/games-utils/mumble/HISTORY
@@ -1,3 +1,10 @@
+2016-09-23 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Added code to remove any missing translations
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 1.2.16
+ * DEPENDS: Updated dependencies
+ * BUILD: Fixed build configuration and flags
+
2015-03-29 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Switch dependency on g++ to gcc

diff --git a/games-utils/mumble/PRE_BUILD b/games-utils/mumble/PRE_BUILD
index 3c01a00..ca84575 100755
--- a/games-utils/mumble/PRE_BUILD
+++ b/games-utils/mumble/PRE_BUILD
@@ -1,6 +1,20 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sedit s/qt_ja_JP.qm// ./src/mumble/mumble.pro &&
-sedit s/qt_ja_JP.qm// ./src/mumble11x/mumble11x.pro &&
-sedit /qt_ja_JP.qm/d ./src/mumble/mumble_qt.qrc &&
-sedit /qt_ja_JP.qm/d ./src/mumble11x/mumble_qt.qrc
+
+# Remove missing translations
+tmp=$(mktemp) &&
+f=src/mumble/mumble_qt.qrc &&
+awk -F'[\t ]*<[^>]*>' '
+ function exists(f, r, t) {
+ r = getline t < f
+ close(f)
+ return r != -1
+ }
+ />qt_[^.]*\.qm</ {
+ src = $2
+ sub(/qm$/, "ts", src)
+ if (!exists(src)) next
+ }
+ {print}
+' "$f" > "$tmp" &&
+mv -f "$tmp" "$f"

[SM-Commit] GIT changes to master games grimoire by Ismael Luceno (6738cd576fd6a031b2efc07e0fcd9292673b5f1b), Ismael Luceno, 09/23/2016