diff options
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 29 | ||||
-rw-r--r-- | build-fixes.patch | 70 |
3 files changed, 61 insertions, 60 deletions
@@ -1,20 +1,26 @@ -# Generated by makepkg 5.0.1 -# Tue Apr 25 15:52:39 UTC 2017 +# Generated by makepkg 5.0.2 +# Sun Jun 25 11:11:29 UTC 2017 pkgbase = teamspeak3-plugin-rp-soundboard pkgdesc = Plugin for Teamspeak 3. Easy to use soundboard - pkgver = 1.3.3.1622 - pkgrel = 2 + pkgver = 1.3.4.1678 + pkgrel = 1 url = https://github.com/MGraefe/RP-Soundboard - arch = i686 arch = x86_64 license = Unknown makedepends = teamspeak3-pluginsdk>=3.1.0.1 makedepends = qt5.6 + makedepends = python depends = teamspeak3>=3.1.0.1 - source = https://github.com/MGraefe/RP-Soundboard/archive/1.3.3.1622.tar.gz + source = https://github.com/MGraefe/RP-Soundboard/archive/1.3.4.1678.tar.gz + source = 0001-Fixed-linux-compilation.patch::https://github.com/MGraefe/RP-Soundboard/commit/187aaf35b00debdd29a980765df3b64fd17354dd.patch + source = 0002-Fixed-refactoring-error.patch::https://github.com/MGraefe/RP-Soundboard/commit/0e503743b7db748ecd63d53fce80469b75ee2c54.patch + source = 0003-Fixed-potential-memory-leaks.patch::https://github.com/MGraefe/RP-Soundboard/commit/fc07edb336aae5a3f3c79572a186c7b65045aa56.patch source = build-fixes.patch - sha256sums = 1f7cb5436ec0a0bb61b5bfc1589412774717561e0ad1509dade419bfc1e5d5f4 - sha256sums = d23d2c5d4cc58d21593b42a5a85e207021fb4a98085fe73a29d05619fc78833b + sha256sums = 71a6484cf58a5bfea23258d71327256001ac942e55ab44ddea786580a864b7ed + sha256sums = 550ff571a032528bcd934258a3b051a740153c16d10151fde3fc8692e0c22600 + sha256sums = de2fafb177346d1f0f077f634e8e603730651c651a03947bd9bda5ae54386f8e + sha256sums = 5b276b78c55e489be85616e2a0a0c567bc667fe6f6b78b1c3bc093a9abe637e0 + sha256sums = 0341a960209a2b64dddcbb417d3976d6415e41d4f4e61c43a7f372e175327a53 pkgname = teamspeak3-plugin-rp-soundboard @@ -2,30 +2,39 @@ _pkgname=RP-Soundboard pkgname=teamspeak3-plugin-rp-soundboard -pkgver=1.3.3.1622 -pkgrel=2 +pkgver=1.3.4.1678 +pkgrel=1 pkgdesc='Plugin for Teamspeak 3. Easy to use soundboard' -arch=('i686' 'x86_64') +arch=('x86_64') url="https://github.com/MGraefe/${_pkgname}" license=('Unknown') -makedepends=('teamspeak3-pluginsdk>=3.1.0.1' 'qt5.6') +makedepends=('teamspeak3-pluginsdk>=3.1.0.1' 'qt5.6' 'python') depends=('teamspeak3>=3.1.0.1') source=("https://github.com/MGraefe/${_pkgname}/archive/${pkgver}.tar.gz" + '0001-Fixed-linux-compilation.patch::https://github.com/MGraefe/RP-Soundboard/commit/187aaf35b00debdd29a980765df3b64fd17354dd.patch' + '0002-Fixed-refactoring-error.patch::https://github.com/MGraefe/RP-Soundboard/commit/0e503743b7db748ecd63d53fce80469b75ee2c54.patch' + '0003-Fixed-potential-memory-leaks.patch::https://github.com/MGraefe/RP-Soundboard/commit/fc07edb336aae5a3f3c79572a186c7b65045aa56.patch' 'build-fixes.patch') -sha256sums=('1f7cb5436ec0a0bb61b5bfc1589412774717561e0ad1509dade419bfc1e5d5f4' - 'd23d2c5d4cc58d21593b42a5a85e207021fb4a98085fe73a29d05619fc78833b') - +sha256sums=('71a6484cf58a5bfea23258d71327256001ac942e55ab44ddea786580a864b7ed' + '550ff571a032528bcd934258a3b051a740153c16d10151fde3fc8692e0c22600' + 'de2fafb177346d1f0f077f634e8e603730651c651a03947bd9bda5ae54386f8e' + '5b276b78c55e489be85616e2a0a0c567bc667fe6f6b78b1c3bc093a9abe637e0' + '0341a960209a2b64dddcbb417d3976d6415e41d4f4e61c43a7f372e175327a53') prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd "${_pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/0001-Fixed-linux-compilation.patch" + patch -p1 -i "${srcdir}/0002-Fixed-refactoring-error.patch" + patch -p1 -i "${srcdir}/0003-Fixed-potential-memory-leaks.patch" patch -p0 -i "${srcdir}/build-fixes.patch" + cd src/version python version.py } build() { - cd "${srcdir}/${_pkgname}-${pkgver}/qt-linux" + cd "${_pkgname}-${pkgver}/qt-linux" export TS3DIR=/opt/teamspeak3 /opt/qt5.6/bin/qmake ts3soundboard_linux.pro @@ -34,7 +43,7 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd "${_pkgname}-${pkgver}" mkdir -pm0755 ${pkgdir} "$pkgdir/opt/teamspeak3/plugins" install -D -m644 bin/release_lin/librp_soundboard.so "$pkgdir/opt/teamspeak3/plugins/librp_soundboard.so" diff --git a/build-fixes.patch b/build-fixes.patch index 2f9b8f3f8473..fe1bca27e21f 100644 --- a/build-fixes.patch +++ b/build-fixes.patch @@ -1,6 +1,6 @@ ---- qt-linux/ts3soundboard_linux.pro_orig 2017-04-25 08:23:53.644282489 +0200
-+++ qt-linux/ts3soundboard_linux.pro 2017-04-25 08:26:55.262605010 +0200
-@@ -20,7 +20,12 @@
+--- qt-linux/ts3soundboard_linux.pro_orig 2017-06-25 13:04:17.367485782 +0200 ++++ qt-linux/ts3soundboard_linux.pro 2017-06-25 13:05:46.234153803 +0200 +@@ -20,7 +20,12 @@ CONFIG(debug, release|debug):DEFINES += _DEBUG
CONFIG(release, release|debug):DEFINES += NDEBUG
@@ -14,49 +14,35 @@ LIBS += -L$(TS3DIR)
-@@ -29,7 +34,7 @@
+@@ -29,7 +34,7 @@ -lavutil \
-lswresample
-QMAKE_POST_LINK += "cp $${DESTDIR}/lib$${TARGET}.so $(TS3DIR)/plugins"
-+# QMAKE_POST_LINK += "cp $${DESTDIR}/lib$${TARGET}.so $(TS3DIR)/plugins"
++#QMAKE_POST_LINK += "cp $${DESTDIR}/lib$${TARGET}.so $(TS3DIR)/plugins"
include(./ts3soundboard.pri)
---- qt-linux/ts3soundboard.pri_orig 2017-04-16 11:03:52.417682394 +0200
-+++ qt-linux/ts3soundboard.pri 2017-04-16 11:04:47.759031973 +0200
-@@ -22,6 +22,7 @@
- ../src/SampleSource.h \
- ../src/SampleVisualizerThread.h \
- ../src/SoundInfo.h \
-+ ../src/TalkStateManager.h \
- ../src/ts3log.h \
- ../src/version/version.h \
- ../vs2015/resource.h \
-@@ -43,7 +44,7 @@
- ../src/main.cpp \
- ../src/HighResClock.cpp \
- ../src/inputfileffmpeg.cpp \
-- ../src/plugin.c \
-+ ../src/plugin.cpp \
- ../src/SampleBuffer.cpp \
- ../src/SampleProducerThread.cpp \
- ../src/samples.cpp \
-@@ -53,6 +54,7 @@
- ../src/soundsettings_qt.cpp \
- ../src/soundview_qt.cpp \
- ../src/SpeechBubble.cpp \
-+ ../src/TalkStateManager.cpp \
- ../src/ts3log.cpp \
- ../src/UpdateChecker.cpp \
- ../src/updater_qt.cpp
---- src/samples.cpp_orig 2017-04-16 11:05:06.014146183 +0200
-+++ src/samples.cpp 2017-04-16 11:05:27.003276895 +0200
-@@ -18,6 +18,7 @@
- #include <queue>
- #include <vector>
- #include <cassert>
-+#include <math.h>
-
-
- #define USE_SSE2
+--- src/main.cpp_orig 2017-06-25 13:05:05.209847399 +0200 ++++ src/main.cpp 2017-06-25 13:05:22.744978748 +0200 +@@ -169,8 +169,8 @@ + + configModel->notifyAllEvents(); + +- updateChecker = new UpdateChecker(); +- updateChecker->startCheck(); ++// updateChecker = new UpdateChecker(); ++// updateChecker->startCheck(); + } + + +--- src/peakmeter.h_orig 2017-06-25 13:09:23.183737983 +0200 ++++ src/peakmeter.h 2017-06-25 13:10:14.383142304 +0200 +@@ -5,6 +5,7 @@ + // All rights reserved + // Contact: rp_soundboard@mgraefe.de + //---------------------------------- ++#include <math.h> + + #pragma once + #ifndef rpsbsrc__peakmeter_H__ |