Here is a much simpler and straight forward patch to use the bundled
copy of CELT; not sure why but this didn't work in my first attempt so
the result was the previous diff - please disregard it.
This diff simply switches from CONFIG+=no-bundled-celt to
CONFIG+=bundled-cert and therefore removes a bunch of patches that point
to our audio/celt07 port.
Mumble builds and runs fine without any celt package installed.
OK?
After this, I want to remove audio/celt07 completely; nothing else
uses it and it starts to rot.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/mumble/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile 5 Apr 2020 02:46:58 -0000 1.43
+++ Makefile 5 Apr 2020 20:36:10 -0000
@@ -3,7 +3,7 @@
COMMENT = low-latency voice chat client
DISTNAME = mumble-1.3.0
-REVISION = 3
+REVISION = 4
CATEGORIES = audio
@@ -22,8 +22,7 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES}
MODULES = devel/qmake x11/qt5
-BUILD_DEPENDS = audio/celt07 \
- devel/boost
+BUILD_DEPENDS = devel/boost
LIB_DEPENDS = audio/libsndfile>=1.0.25p0 \
audio/opus \
@@ -32,8 +31,7 @@ LIB_DEPENDS = audio/libsndfile>=1.0.25p
devel/protobuf \
x11/qt5/qtsvg
-RUN_DEPENDS = audio/celt07 \
- devel/desktop-file-utils \
+RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
# CONFIG+=c++11 because of protobuf
@@ -43,7 +41,6 @@ MODQMAKE_ARGS = MUMBLE_PREFIX=${PREFIX}
CONFIG+=no-11x \
CONFIG+=no-alsa \
CONFIG+=no-bonjour \
- CONFIG+=no-bundled-celt \
CONFIG+=no-bundled-opus \
CONFIG+=no-bundled-speex \
CONFIG+=no-crash-report \
@@ -56,6 +53,7 @@ MODQMAKE_ARGS = MUMBLE_PREFIX=${PREFIX}
CONFIG+=no-server \
CONFIG+=no-speechd \
CONFIG+=no-update \
+ CONFIG+=bundled-celt \
CONFIG+=packaged \
CONFIG+=portaudio \
CONFIG+=release \
Index: patches/patch-main_pro
===================================================================
RCS file: patches/patch-main_pro
diff -N patches/patch-main_pro
--- patches/patch-main_pro 25 Feb 2020 05:14:52 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-main_pro,v 1.2 2020/02/25 05:14:52 rsadowski Exp $
-
-Use celt from our ports tree
-
-Index: main.pro
---- main.pro.orig
-+++ main.pro
-@@ -21,7 +21,7 @@ SUBDIRS *= src/mumble_proto
- CONFIG(sbcelt) {
- SUBDIRS *= 3rdparty/celt-0.7.0-build 3rdparty/sbcelt-lib-build
3rdparty/sbcelt-helper-build
- } else {
-- unix:!CONFIG(bundled-celt):system($$PKG_CONFIG --atleast-version=0.7.0
celt) {
-+ unix:!CONFIG(bundled-celt):system($$PKG_CONFIG --atleast-version=0.7.0
celt07) {
- CONFIG *= no-bundled-celt
- }
- !CONFIG(no-bundled-celt) {
Index: patches/patch-plugins_link_link_pro
===================================================================
RCS file: /cvs/ports/audio/mumble/patches/patch-plugins_link_link_pro,v
retrieving revision 1.4
diff -u -p -r1.4 patch-plugins_link_link_pro
--- patches/patch-plugins_link_link_pro 25 Feb 2020 05:14:52 -0000 1.4
+++ patches/patch-plugins_link_link_pro 5 Apr 2020 02:50:12 -0000
@@ -1,4 +1,7 @@
$OpenBSD: patch-plugins_link_link_pro,v 1.4 2020/02/25 05:14:52 rsadowski Exp $
+
+Do not link against nonexistent librt (part of libc).
+
Index: plugins/link/link.pro
--- plugins/link/link.pro.orig
+++ plugins/link/link.pro
Index: patches/patch-src_mumble_AudioOutputSpeech_h
===================================================================
RCS file: patches/patch-src_mumble_AudioOutputSpeech_h
diff -N patches/patch-src_mumble_AudioOutputSpeech_h
--- patches/patch-src_mumble_AudioOutputSpeech_h 25 Feb 2020 05:14:52
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_mumble_AudioOutputSpeech_h,v 1.2 2020/02/25 05:14:52
rsadowski Exp $
-
-Use celt from our ports tree
-
-Index: src/mumble/AudioOutputSpeech.h
---- src/mumble/AudioOutputSpeech.h.orig
-+++ src/mumble/AudioOutputSpeech.h
-@@ -10,7 +10,7 @@
- #include <speex/speex.h>
- #include <speex/speex_resampler.h>
- #include <speex/speex_jitter.h>
--#include <celt.h>
-+#include <celt07/celt.h>
-
- #include <QtCore/QMutex>
-
Index: patches/patch-src_mumble_Audio_cpp
===================================================================
RCS file: patches/patch-src_mumble_Audio_cpp
diff -N patches/patch-src_mumble_Audio_cpp
--- patches/patch-src_mumble_Audio_cpp 25 Feb 2020 05:14:52 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-src_mumble_Audio_cpp,v 1.2 2020/02/25 05:14:52 rsadowski Exp $
-
-Fix loading of CELT plugins; use celt from our tree
-
-Index: src/mumble/Audio.cpp
---- src/mumble/Audio.cpp.orig
-+++ src/mumble/Audio.cpp
-@@ -53,7 +53,7 @@ void CodecInit::initialize() {
- delete codec;
- }
- #else
-- codec = new CELTCodec070(QLatin1String("0.7.0"));
-+ codec = new CELTCodec070(QLatin1String("07"));
- if (codec->isValid()) {
- codec->report();
- g.qmCodecs.insert(codec->bitstreamVersion(), codec);
-@@ -68,19 +68,12 @@ void CodecInit::initialize() {
- }
- }
-
-- codec = new CELTCodec011(QLatin1String("0.11.0"));
-+ codec = new CELTCodec011(QLatin1String("11"));
- if (codec->isValid()) {
- codec->report();
- g.qmCodecs.insert(codec->bitstreamVersion(), codec);
- } else {
- delete codec;
-- codec = new CELTCodec011(QLatin1String("2.0.0"));
-- if (codec->isValid()) {
-- codec->report();
-- g.qmCodecs.insert(codec->bitstreamVersion(), codec);
-- } else {
-- delete codec;
-- }
- }
- #endif
- }
Index: patches/patch-src_mumble_CELTCodec_h
===================================================================
RCS file: patches/patch-src_mumble_CELTCodec_h
diff -N patches/patch-src_mumble_CELTCodec_h
--- patches/patch-src_mumble_CELTCodec_h 25 Feb 2020 05:14:52 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_mumble_CELTCodec_h,v 1.2 2020/02/25 05:14:52 rsadowski Exp
$
-
-Use celt from our ports tree
-
-Index: src/mumble/CELTCodec.h
---- src/mumble/CELTCodec.h.orig
-+++ src/mumble/CELTCodec.h
-@@ -7,7 +7,7 @@
- #define MUMBLE_MUMBLE_CELTCODEC_H_
-
- #include <stdint.h>
--#include <celt.h>
-+#include <celt07/celt.h>
-
- #include <QtCore/QLibrary>
- #include <QtCore/QString>
Index: patches/patch-src_mumble_mumble_pch_hpp
===================================================================
RCS file: patches/patch-src_mumble_mumble_pch_hpp
diff -N patches/patch-src_mumble_mumble_pch_hpp
--- patches/patch-src_mumble_mumble_pch_hpp 25 Feb 2020 05:14:52 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_mumble_mumble_pch_hpp,v 1.3 2020/02/25 05:14:52 rsadowski
Exp $
-
-Use celt from our ports tree
-
-Index: src/mumble/mumble_pch.hpp
---- src/mumble/mumble_pch.hpp.orig
-+++ src/mumble/mumble_pch.hpp
-@@ -55,7 +55,7 @@
- #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
- #endif
- #include <sndfile.h>
--#include <celt.h>
-+#include <celt07/celt.h>
- #ifdef USE_SBCELT
- #include <sbcelt.h>
- #endif
Index: patches/patch-src_mumble_mumble_pro
===================================================================
RCS file: /cvs/ports/audio/mumble/patches/patch-src_mumble_mumble_pro,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_mumble_mumble_pro
--- patches/patch-src_mumble_mumble_pro 5 Apr 2020 02:46:58 -0000 1.6
+++ patches/patch-src_mumble_mumble_pro 5 Apr 2020 20:40:01 -0000
@@ -1,31 +1,11 @@
$OpenBSD: patch-src_mumble_mumble_pro,v 1.6 2020/04/05 02:46:58 kn Exp $
-use celt from our tree
-
Do not include nonexistent librt (part of libc).
Index: src/mumble/mumble.pro
--- src/mumble/mumble.pro.orig
+++ src/mumble/mumble.pro
-@@ -320,16 +320,9 @@ CONFIG(sbcelt) {
- LIBS *= -lcelt -lsbcelt
- DEFINES *= SBCELT_PREFIX_API SBCELT_COMPAT_API USE_SBCELT
- } else {
-- unix:!CONFIG(bundled-celt):system($$PKG_CONFIG --atleast-version=0.7.0
celt) {
-+ unix:!CONFIG(bundled-celt):system($$PKG_CONFIG --atleast-version=0.7.0
celt07) {
- CONFIG *= no-bundled-celt
- }
-- CONFIG(no-bundled-celt) {
-- INCLUDEPATH *= /usr/include/celt
-- unix {
-- QMAKE_CFLAGS *= "-I/usr/include/celt" "-isystem /usr/include/celt"
-- QMAKE_CXXFLAGS *= "-I/usr/include/celt" "-isystem /usr/include/celt"
-- }
-- }
- !CONFIG(no-bundled-celt) {
- INCLUDEPATH *= ../../3rdparty/celt-0.7.0-src/libcelt
- unix {
-@@ -539,9 +532,6 @@ unix {
+@@ -539,9 +539,6 @@ unix {
}
must_pkgconfig(x11)
