Merge pull request #8 from Infactum/feature/libtgvoip-update

Feature/libtgvoip update

CMakeLists.txt

@@ -43,6 +43,7 @@ target_include_directories(tg2sip PRIVATE
 
 target_link_libraries(tg2sip PRIVATE
         ${PJSIP_LIBRARIES}
+        ${OPUS_LIBRARIES}
         libtgvoip
         Threads::Threads
         Td::TdStatic)

appveyor.yml

@@ -1,7 +1,7 @@
 version: 1.0.0+{build}
 
 image:
-  - Previous Ubuntu
+  - Ubuntu
 
 services:
   - docker
@@ -27,17 +27,17 @@ environment:
 init:
   - sh: |
       docker login -u "$docker_login" -p "$docker_password"
-      docker pull "$docker_image":"$docker_tag" 
+      docker pull "$docker_image":"$docker_tag"
 
 install:
   - sh: docker build buildenv/ -f buildenv/Dockerfile."$docker_tag" --cache-from "$docker_image":"$docker_tag" -t "$docker_image":"$docker_tag"
 
 build_script: 
   - sh: >- 
       mkdir build;
-      docker run --rm -v "$(pwd)":/src "$docker_image" /bin/bash -c "
+      docker run --rm -v "$(pwd)":/src "$docker_image":"$docker_tag" /bin/bash -c "
         mkdir build && cd build;
-        cmake -DCMAKE_BUILD_TYPE=Release /src;
+        export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig && cmake -DCMAKE_BUILD_TYPE=Release /src
         cmake --build .;
         chmod +x tg2sip;
         chmod +x gen_db;

buildenv/Dockerfile.centos7

@@ -50,4 +50,8 @@ RUN source /opt/rh/devtoolset-7/enable \
     && cmake -DCMAKE_BUILD_TYPE=Release -DSPDLOG_BUILD_EXAMPLES=OFF -DSPDLOG_BUILD_TESTING=OFF .. \
     && cmake --build . --target install \
     && cd / \
-    && rm -rf spdlog
+    && rm -rf spdlog
+
+COPY centos_entrypoint.sh /
+
+ENTRYPOINT ["/centos_entrypoint.sh"]

buildenv/centos_entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+source /opt/rh/devtoolset-7/enable
+
+exec "$@"

libtgvoip/BlockingQueue.h

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <list>
 #include "threading.h"
+#include "utils.h"
 
 using namespace std;
 
@@ -18,6 +19,7 @@ namespace tgvoip{
 template<typename T>
 class BlockingQueue{
 public:
+	TGVOIP_DISALLOW_COPY_AND_ASSIGN(BlockingQueue);
 	BlockingQueue(size_t capacity) : semaphore(capacity, 0){
 		this->capacity=capacity;
 		overflowCallback=NULL;