Date: Tue, 12 Jan 2010 19:20:21 GMT From: Aragon Gouveia <aragon@phat.za.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/142750: [patch] audio/mumble version upgrade 1.1.8 to 1.2.1 Message-ID: <201001121920.o0CJKLkc063315@www.freebsd.org> Resent-Message-ID: <201001121930.o0CJU22E060149@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142750
>Category: ports
>Synopsis: [patch] audio/mumble version upgrade 1.1.8 to 1.2.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 12 19:30:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Aragon Gouveia
>Release: 8.0-STABLE
>Organization:
>Environment:
FreeBSD igor.geek.sh 8.0-STABLE FreeBSD 8.0-STABLE #4: Fri Dec 4 23:23:17 SAST 2009 root@igor.geek.sh:/usr/obj/usr/src/sys/IGOR amd64
>Description:
Attached patch updates audio/mumble to latest 1.2.1 version and makes some minor improvements.
Please consider committing this.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -uNr mumble.orig/Makefile mumble/Makefile
--- mumble.orig/Makefile 2010-01-09 14:40:11.000000000 +0200
+++ mumble/Makefile 2010-01-11 05:48:18.000000000 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= mumble
-PORTVERSION= 1.1.8
+PORTVERSION= 1.2.1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/Mumble/${PORTVERSION}
@@ -14,23 +14,28 @@
COMMENT= A voice chat software primarily intended for use while gaming
LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex \
- boost_iostreams:${PORTSDIR}/devel/boost-libs
+ celt.0:${PORTSDIR}/audio/celt \
+ sndfile.1:${PORTSDIR}/audio/libsndfile \
+ boost_iostreams:${PORTSDIR}/devel/boost-libs \
+ boost_python:${PORTSDIR}/devel/boost-python-libs
+BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf
USE_GMAKE= yes
USE_QT_VER= 4
-QT_COMPONENTS= gui opengl dbus xml sql network linguist_build l10n \
- moc_build qmake_build rcc_build uic_build
+QT_COMPONENTS= gui svg iconengines xml sql network l10n \
+ linguist_build qmake_build moc_build rcc_build uic_build
USE_XORG= ice
HAS_CONFIGURE= yes
INSTALLS_ICONS= yes
-MAKE_JOBS_SAFE= yes
+CONFIG= no-server no-alsa no-speechd no-bundled-speex no-bundled-celt no-update \
+ no-g15 no-portaudio no-pulseaudio no-xevie no-11x
-CONFIG= no-server no-alsa no-speechd no-bundled-speex no-update no-g15 \
- no-portaudio no-pulseaudio no-xevie
+OPTIONS= DBUS "Enable D-Bus support" on \
+ BONJOUR "Enable Bonjour support" off \
-MAN1= mumble.1 mumble-overlay.1
+MAN1= mumble.1
.include <bsd.port.pre.mk>
@@ -38,27 +43,40 @@
BROKEN= Does not compile on FreeBSD < 7.0
.endif
+.if defined(WITHOUT_DBUS)
+CONFIG+= no-dbus
+.else
+QT_COMPONENTS+= dbus
+.endif
+
+.if defined(WITHOUT_BONJOUR)
+CONFIG+= no-bonjour
+.else
+LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
- @${REINPLACE_CMD} -e 's|qt_ja_jp|qt_ja_JP|' \
- ${WRKSRC}/src/mumble/mumble_qt.qrc ${WRKSRC}/src/mumble/mumble.pro
+ @${REINPLACE_CMD} -E '/qt_[a-z_]+\.qm/I s/qm/ts/g' \
+ ${WRKSRC}/src/mumble11x/mumble11x.pro \
+ ${WRKSRC}/src/mumble11x/mumble_qt.qrc \
+ ${WRKSRC}/src/mumble/mumble.pro \
+ ${WRKSRC}/src/mumble/mumble_qt.qrc
do-configure:
cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mumble-overlay ${PREFIX}/bin
${MKDIR} ${PREFIX}/share/services
${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${PREFIX}/share/services
${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${PREFIX}/share/pixmaps
- for f in 16 32 48 64; do \
- ${MKDIR} ${PREFIX}/share/icons/hicolor/$${f}x$${f}/apps; \
- ${INSTALL_DATA} ${WRKSRC}/icons/mumble.$${f}x$${f}.png ${PREFIX}/share/icons/hicolor/$${f}x$${f}/apps; \
- done
- ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${MANPREFIX}/man/man1/mumble.1
- ${INSTALL_MAN} ${WRKSRC}/man/mumble-overlay.1 ${MANPREFIX}/man/man1/mumble-overlay.1
+ ${MKDIR} ${PREFIX}/share/icons/hicolor/128x128/apps ${PREFIX}/share/icons/hicolor/scalable/apps
+ ${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${PREFIX}/share/icons/hicolor/128x128/apps
+ @${MV} ${PREFIX}/share/icons/hicolor/128x128/apps/mumble.osx.png ${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
+ ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${PREFIX}/share/icons/hicolor/scalable/apps
+ ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${MANPREFIX}/man/man1
.include <bsd.port.post.mk>
diff -uNr mumble.orig/distinfo mumble/distinfo
--- mumble.orig/distinfo 2010-01-09 14:40:11.000000000 +0200
+++ mumble/distinfo 2010-01-09 15:11:18.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (mumble-1.1.8.tar.gz) = a7da012922d39b87c45d9f481d4b5efb
-SHA256 (mumble-1.1.8.tar.gz) = 4cef76457e3178f9d854327f4a02c3521b19ddf64c03947b3ba182f871a81856
-SIZE (mumble-1.1.8.tar.gz) = 1241365
+MD5 (mumble-1.2.1.tar.gz) = 94b59aef3233b91705fa8cfcdd04d3e1
+SHA256 (mumble-1.2.1.tar.gz) = 91267a8511783fea5115137ef6ab4aacc76e363e504ac0f562af5e630d9e68c1
+SIZE (mumble-1.2.1.tar.gz) = 2913120
diff -uNr mumble.orig/files/patch-compiler.pri mumble/files/patch-compiler.pri
--- mumble.orig/files/patch-compiler.pri 1970-01-01 02:00:00.000000000 +0200
+++ mumble/files/patch-compiler.pri 2010-01-09 21:47:38.000000000 +0200
@@ -0,0 +1,11 @@
+--- compiler.pri.orig 2010-01-09 21:47:11.000000000 +0200
++++ compiler.pri 2010-01-09 21:47:19.000000000 +0200
+@@ -99,7 +99,7 @@
+ CONFIG(debug, debug|release) {
+ QMAKE_CFLAGS *= -fstack-protector -fPIE -pie
+ QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie
+- QMAKE_LFLAGS = -Wl,--no-add-needed
++ QMAKE_LFLAGS = -Wl
+ }
+
+ DEFINES *= _FORTIFY_SOURCE=2
diff -uNr mumble.orig/files/patch-main.pro mumble/files/patch-main.pro
--- mumble.orig/files/patch-main.pro 1970-01-01 02:00:00.000000000 +0200
+++ mumble/files/patch-main.pro 2010-01-11 05:30:50.000000000 +0200
@@ -0,0 +1,13 @@
+--- main.pro.orig 2010-01-11 05:30:10.000000000 +0200
++++ main.pro 2010-01-11 05:30:24.000000000 +0200
+@@ -26,10 +26,6 @@
+ }
+ }
+
+- unix:!macx {
+- SUBDIRS *= overlay_gl
+- }
+-
+ macx {
+ SUBDIRS *= overlay_macx
+ !CONFIG(no-g15) {
diff -uNr mumble.orig/files/patch-overlay-overlay.h mumble/files/patch-overlay-overlay.h
--- mumble.orig/files/patch-overlay-overlay.h 2010-01-09 14:40:11.000000000 +0200
+++ mumble/files/patch-overlay-overlay.h 2010-01-09 15:22:36.000000000 +0200
@@ -27,16 +27,3 @@
+
struct TextEntry {
unsigned int color;
-diff -r -C 2 mumble-1.1.8/src/mumble/ServerHandler.cpp src/mumble/ServerHandler.cpp
-*** mumble-1.1.8/src/mumble/ServerHandler.cpp 2009-03-22 16:05:00.000000000 +0100
---- src/mumble/ServerHandler.cpp 2009-08-06 12:50:18.000000000 +0200
-***************
-*** 40,43 ****
---- 40,46 ----
- #include "PacketDataStream.h"
- #include "NetworkConfig.h"
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-+ #include <netinet/in.h>
-
- ServerHandlerMessageEvent::ServerHandlerMessageEvent(QByteArray &msg, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) {
diff -uNr mumble.orig/files/patch-src-Net.cpp mumble/files/patch-src-Net.cpp
--- mumble.orig/files/patch-src-Net.cpp 1970-01-01 02:00:00.000000000 +0200
+++ mumble/files/patch-src-Net.cpp 2010-01-10 23:55:58.000000000 +0200
@@ -0,0 +1,15 @@
+--- src/Net.cpp.orig 2010-01-08 00:37:46.000000000 +0200
++++ src/Net.cpp 2010-01-10 23:55:48.000000000 +0200
+@@ -29,6 +29,12 @@
+ */
+
+ #include "Net.h"
++#ifdef __FreeBSD__
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <netinet/tcp.h>
++#endif
+
+ HostAddress::HostAddress() {
+ addr[0] = addr[1] = 0ULL;
diff -uNr mumble.orig/files/patch-src-mumble-Audio.cpp mumble/files/patch-src-mumble-Audio.cpp
--- mumble.orig/files/patch-src-mumble-Audio.cpp 1970-01-01 02:00:00.000000000 +0200
+++ mumble/files/patch-src-mumble-Audio.cpp 2010-01-11 01:46:10.000000000 +0200
@@ -0,0 +1,27 @@
+--- src/mumble/Audio.cpp.orig 2010-01-08 00:37:46.000000000 +0200
++++ src/mumble/Audio.cpp 2010-01-11 01:24:46.000000000 +0200
+@@ -49,6 +49,7 @@ CodecInit ciInit;
+ void CodecInit::initialize() {
+ CELTCodec *codec = NULL;
+
++#ifndef __FreeBSD__
+ codec = new CELTCodec061(QLatin1String("0.6.1"));
+ if (codec->isValid()) {
+ codec->report();
+@@ -64,6 +65,7 @@ void CodecInit::initialize() {
+ } else {
+ delete codec;
+ }
++#endif
+
+ codec = new CELTCodec070(QLatin1String("0.7.0"));
+ if (codec->isValid()) {
+@@ -105,6 +107,8 @@ CELTCodec::CELTCodec(const QString &vers
+ #if defined(Q_OS_MAC)
+ alternatives << QString::fromLatin1("celt.%1.dylib").arg(version);
+ alternatives << QString::fromLatin1("libcelt.%1.dylib").arg(version);
++#elif defined(__FreeBSD__)
++ alternatives << QString::fromLatin1("libcelt.so.0");
+ #elif defined(Q_OS_UNIX)
+ alternatives << QString::fromLatin1("celt.so.%1").arg(version);
+ alternatives << QString::fromLatin1("libcelt.so.%1").arg(version);
diff -uNr mumble.orig/files/patch-src-mumble-ServerHandler.cpp mumble/files/patch-src-mumble-ServerHandler.cpp
--- mumble.orig/files/patch-src-mumble-ServerHandler.cpp 1970-01-01 02:00:00.000000000 +0200
+++ mumble/files/patch-src-mumble-ServerHandler.cpp 2010-01-11 00:04:18.000000000 +0200
@@ -0,0 +1,15 @@
+--- src/mumble/ServerHandler.cpp.orig 2010-01-08 00:37:46.000000000 +0200
++++ src/mumble/ServerHandler.cpp 2010-01-10 23:57:24.000000000 +0200
+@@ -42,6 +42,12 @@
+ #include "NetworkConfig.h"
+ #include "OSInfo.h"
+ #include "SSL.h"
++#ifdef __FreeBSD__
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <netinet/tcp.h>
++#endif
+
+ ServerHandlerMessageEvent::ServerHandlerMessageEvent(const QByteArray &msg, unsigned int mtype, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) {
+ qbaMsg = msg;
diff -uNr mumble.orig/files/patch-src-mumble-mumble.pro mumble/files/patch-src-mumble-mumble.pro
--- mumble.orig/files/patch-src-mumble-mumble.pro 2010-01-09 14:40:11.000000000 +0200
+++ mumble/files/patch-src-mumble-mumble.pro 2010-01-11 00:01:00.000000000 +0200
@@ -1,25 +1,33 @@
---- src/mumble/mumble.pro.orig 2009-03-22 16:05:00.000000000 +0100
-+++ src/mumble/mumble.pro 2009-12-02 23:09:37.000000000 +0100
-@@ -113,6 +113,13 @@
- SOURCES *= GlobalShortcut_unix.cpp TextToSpeech_unix.cpp Overlay_unix.cpp
- }
+--- src/mumble/mumble.pro.orig 2010-01-08 00:37:46.000000000 +0200
++++ src/mumble/mumble.pro 2010-01-10 23:59:44.000000000 +0200
+@@ -44,7 +44,11 @@
+ }
+ CONFIG(no-bundled-celt) {
+- INCLUDEPATH *= /usr/include/celt
++ contains(UNAME, FreeBSD) {
++ INCLUDEPATH *= /usr/local/include/celt
++ } else {
++ INCLUDEPATH *= /usr/include/celt
++ }
+ }
+
+ !CONFIG(no-bundled-celt) {
+@@ -110,7 +114,16 @@
+
+ CONFIG *= link_pkgconfig
+
+- PKGCONFIG *= openssl sndfile
++ PKGCONFIG *= sndfile
++
+ contains(UNAME, FreeBSD) {
+ CONFIG *= oss
+ HEADERS *= GlobalShortcut_unix.h
+ SOURCES *= GlobalShortcut_unix.cpp TextToSpeech_unix.cpp Overlay_unix.cpp
+ LIBS *= -lssl
++ } else {
++ PKGCONFIG *= openssl
+ }
-+
- macx {
- TARGET = Mumble
- ICON = ../../icons/mumble.icns
-@@ -217,7 +224,7 @@
- QT_TRANSDIR = $$[QT_INSTALL_TRANSLATIONS]/
- QT_TRANSDIR = $$replace(QT_TRANSDIR,/,$${DIR_SEPARATOR})
-
-- QT_TRANSLATION_FILES *= qt_de.qm qt_es.qm qt_fr.qm qt_ru.qm qt_pl.qm qt_ja_jp.qm
-+ QT_TRANSLATION_FILES *= qt_de.ts qt_es.ts qt_fr.ts qt_ru.ts qt_pl.ts qt_ja_JP.ts
- copytrans.output = ${QMAKE_FILE_NAME}
- copytrans.commands = $$QMAKE_COPY $${QT_TRANSDIR}${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
+ contains(UNAME, Linux) {
+ !CONFIG(no-oss) {
diff -uNr mumble.orig/files/patch-src-mumble-mumble_qt.qrc mumble/files/patch-src-mumble-mumble_qt.qrc
--- mumble.orig/files/patch-src-mumble-mumble_qt.qrc 2010-01-09 14:40:11.000000000 +0200
+++ mumble/files/patch-src-mumble-mumble_qt.qrc 1970-01-01 02:00:00.000000000 +0200
@@ -1,19 +0,0 @@
---- src/mumble/mumble_qt.qrc.orig 2009-12-02 23:08:46.000000000 +0100
-+++ src/mumble/mumble_qt.qrc 2009-12-02 23:11:31.000000000 +0100
-@@ -1,10 +1,10 @@
- <!DOCTYPE RCC><RCC version="1.0">
- <qresource>
-- <file>qt_de.qm</file>
-- <file>qt_es.qm</file>
-- <file>qt_fr.qm</file>
-- <file>qt_ru.qm</file>
-- <file>qt_pl.qm</file>
-- <file>qt_ja_jp.qm</file>
-+ <file>qt_de.ts</file>
-+ <file>qt_es.ts</file>
-+ <file>qt_fr.ts</file>
-+ <file>qt_ru.ts</file>
-+ <file>qt_pl.ts</file>
-+ <file>qt_ja_jp.ts</file>
- </qresource>
- </RCC>
diff -uNr mumble.orig/files/patch-src-mumble11x-ServerHandler.cpp mumble/files/patch-src-mumble11x-ServerHandler.cpp
--- mumble.orig/files/patch-src-mumble11x-ServerHandler.cpp 1970-01-01 02:00:00.000000000 +0200
+++ mumble/files/patch-src-mumble11x-ServerHandler.cpp 2010-01-11 00:02:08.000000000 +0200
@@ -0,0 +1,15 @@
+--- src/mumble11x/ServerHandler.cpp.orig 2010-01-08 00:37:46.000000000 +0200
++++ src/mumble11x/ServerHandler.cpp 2010-01-11 00:01:42.000000000 +0200
+@@ -39,6 +39,12 @@
+ #include "Database.h"
+ #include "PacketDataStream.h"
+ #include "NetworkConfig.h"
++#ifdef __FreeBSD__
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <netinet/tcp.h>
++#endif
+
+ ServerHandlerMessageEvent::ServerHandlerMessageEvent(QByteArray &msg, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) {
+ qbaMsg = msg;
diff -uNr mumble.orig/files/patch-src-mumble11x-mumble11x.pro mumble/files/patch-src-mumble11x-mumble11x.pro
--- mumble.orig/files/patch-src-mumble11x-mumble11x.pro 1970-01-01 02:00:00.000000000 +0200
+++ mumble/files/patch-src-mumble11x-mumble11x.pro 2010-01-09 21:27:11.000000000 +0200
@@ -0,0 +1,20 @@
+--- src/mumble11x/mumble11x.pro.orig 2010-01-08 00:37:46.000000000 +0200
++++ src/mumble11x/mumble11x.pro 2010-01-09 21:00:31.000000000 +0200
+@@ -113,7 +113,16 @@
+
+ CONFIG *= link_pkgconfig
+
+- PKGCONFIG *= openssl ogg
++ PKGCONFIG *= ogg
++
++ contains(UNAME, FreeBSD) {
++ CONFIG *= oss
++ HEADERS *= GlobalShortcut_unix.h
++ SOURCES *= GlobalShortcut_unix.cpp TextToSpeech_unix.cpp Overlay_unix.cpp
++ LIBS *= -lssl
++ } else {
++ PKGCONFIG *= openssl
++ }
+
+ contains(UNAME, Linux) {
+ !CONFIG(no-oss) {
diff -uNr mumble.orig/pkg-message mumble/pkg-message
--- mumble.orig/pkg-message 2010-01-09 14:40:11.000000000 +0200
+++ mumble/pkg-message 2010-01-11 05:22:23.000000000 +0200
@@ -1,5 +1,6 @@
-You need to load sem.ko into your kernel otherwise mumble
-won't start and you will get an error message about an invalid system call.
+On FreeBSD versions <8.0 you need to load sem.ko into your kernel
+otherwise mumble won't start and you will get an error message about an
+invalid system call.
To make this persistent over a reboot add
sem_load="YES"
diff -uNr mumble.orig/pkg-plist mumble/pkg-plist
--- mumble.orig/pkg-plist 2010-01-09 14:40:11.000000000 +0200
+++ mumble/pkg-plist 2010-01-11 05:41:53.000000000 +0200
@@ -1,22 +1,12 @@
@comment $FreeBSD: ports/audio/mumble/pkg-plist,v 1.1 2009/03/19 00:22:00 amdmi3 Exp $
bin/mumble
-bin/mumble-overlay
share/applications/mumble.desktop
share/services/mumble.protocol
-share/icons/hicolor/16x16/apps/mumble.16x16.png
-share/icons/hicolor/32x32/apps/mumble.32x32.png
-share/icons/hicolor/48x48/apps/mumble.48x48.png
-share/icons/hicolor/64x64/apps/mumble.64x64.png
+share/icons/hicolor/scalable/apps/mumble.svg
share/pixmaps/mumble.xpm
@dirrmtry share/applications
@dirrmtry share/services
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001121920.o0CJKLkc063315>