summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Preksavec <mario@slackware.hr>2017-10-25 00:47:18 +0200
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-10-28 07:07:19 +0700
commit3a1250c13700ca4fadf1bf004ae2f08a2909e97c (patch)
tree5e2c3c930b26bf70dc657654218c81a34f670901
parent5437b601bcc1a89b6de9b47469947a5a7d1f15a7 (diff)
downloadslackbuilds-3a1250c13700ca4fadf1bf004ae2f08a2909e97c.tar.gz
network/qTox: Updated for version 1.12.1.
Signed-off-by: Mario Preksavec <mario@slackware.hr>
-rw-r--r--network/qTox/camerasource.cpp.diff20
-rw-r--r--network/qTox/qTox.SlackBuild5
-rw-r--r--network/qTox/qTox.info6
3 files changed, 27 insertions, 4 deletions
diff --git a/network/qTox/camerasource.cpp.diff b/network/qTox/camerasource.cpp.diff
new file mode 100644
index 0000000000..646a2d7cb8
--- /dev/null
+++ b/network/qTox/camerasource.cpp.diff
@@ -0,0 +1,20 @@
+--- qTox-1.12.1/src/video/camerasource.cpp.orig 2017-10-11 23:49:18.000000000 +0200
++++ qTox-1.12.1/src/video/camerasource.cpp 2017-10-25 00:10:50.632026656 +0200
+@@ -332,6 +332,8 @@
+ emit openFailed();
+ return;
+ }
++
++ cctx->refcounted_frames = 1;
+ #else
+ // Create a context for our codec, using the existing parameters
+ cctx = avcodec_alloc_context3(codec);
+@@ -342,8 +344,6 @@
+ }
+ #endif
+
+- cctx->refcounted_frames = 1;
+-
+ // Open codec
+ if (avcodec_open2(cctx, codec, nullptr) < 0) {
+ qWarning() << "Can't open codec";
diff --git a/network/qTox/qTox.SlackBuild b/network/qTox/qTox.SlackBuild
index 51d095663c..99935e8424 100644
--- a/network/qTox/qTox.SlackBuild
+++ b/network/qTox/qTox.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=qTox
-VERSION=${VERSION:-1.11.0}
+VERSION=${VERSION:-1.12.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -72,6 +72,9 @@ find -L . \
# gcc-7 fix
patch -p1 <$CWD/rawdatabase.h.diff
+# ffmpeg 3.4 fix
+patch -p1 <$CWD/camerasource.cpp.diff
+
mkdir -p build
cd build
cmake \
diff --git a/network/qTox/qTox.info b/network/qTox/qTox.info
index 9936000600..938597e51f 100644
--- a/network/qTox/qTox.info
+++ b/network/qTox/qTox.info
@@ -1,8 +1,8 @@
PRGNAM="qTox"
-VERSION="1.11.0"
+VERSION="1.12.1"
HOMEPAGE="https://github.com/tux3/qTox"
-DOWNLOAD="https://github.com/qTox/qTox/archive/v1.11.0/qTox-1.11.0.tar.gz"
-MD5SUM="748b877696b186e30a9bad3845dbbd01"
+DOWNLOAD="https://github.com/qTox/qTox/archive/v1.12.1/qTox-1.12.1.tar.gz"
+MD5SUM="b7d04876aad6e15c434d04b67317dc50"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="c-toxcore libfilteraudio qt5 ffmpeg qrencode libxkbcommon sqlcipher"