From 1808c88c79f7f19bd3cce1bebd9832bb8e0aac28 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Sun, 13 Apr 2014 04:26:54 -0700 Subject: [PATCH 1/2] toxav/Makefile.inc: add LIBSODIUM_* variables to flags These are needed if libsodium paths are discovered by 'configure'. Most systems don't need this just because libsodium is already on the header/library search paths, but on e.g. Mac OS X this is required. Signed-off-by: Steven Noonan --- toxav/Makefile.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc index 0cad1840..ab9352d2 100644 --- a/toxav/Makefile.inc +++ b/toxav/Makefile.inc @@ -18,15 +18,18 @@ libtoxav_la_SOURCES = ../toxav/event.h \ libtoxav_la_CFLAGS = -I../toxcore \ -I../toxav \ + $(LIBSODIUM_CFLAGS) \ $(NACL_CFLAGS) \ $(AV_CFLAGS) \ $(PTHREAD_CFLAGS) libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ + $(LIBSODIUM_LDFLAGS) \ $(NACL_LDFLAGS) \ $(EXTRA_LT_LDFLAGS) libtoxav_la_LIBADD = libtoxcore.la \ + $(LIBSODIUM_LIBS) \ $(NACL_LIBS) \ $(PTHREAD_LIBS) \ $(AV_LIBS) From 20336c007690d92740e48f3c4fcad562fbaaa6e9 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Sun, 13 Apr 2014 04:27:53 -0700 Subject: [PATCH 2/2] media.h: include 'opus.h' instead of 'opus/opus.h' The current 'opus/opus.h' works if your opus.h is in /usr/include/opus, as /usr/include is already in the header search path. If your opus header search path is found via pkg-config, however, you will get something like this: $ pkg-config --cflags opus -I/usr/local/Cellar/opus/1.1/include/opus Since this is pointing directly to include/opus, the 'opus/' prefix on the header include directive will break. Since 'opus.h' should work in both cases (as in both cases it will be discovered via pkg-config), just use the simpler 'opus.h'. Signed-off-by: Steven Noonan --- toxav/media.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toxav/media.h b/toxav/media.h index f5c5fbe4..57817516 100644 --- a/toxav/media.h +++ b/toxav/media.h @@ -36,7 +36,7 @@ #define VIDEO_CODEC_ENCODER_INTERFACE (vpx_codec_vp8_cx()) /* Audio encoding/decoding */ -#include +#include typedef enum _Capabilities {