multimedia/obs-studio: Updated for version 23.0.1

Signed-off-by: Christoph Willing <chris.willing@linux.com>

3 files changed, 6 insertions, 59 deletions

diff --git a/multimedia/obs-studio/libfdk-new-api.patch b/multimedia/obs-studio/libfdk-new-api.patch
deleted file mode 100644
index 73329cf804..0000000000
--- a/multimedia/obs-studio/libfdk-new-api.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5cf2b5fbf925412620e2a40552d6348203851cb3 Mon Sep 17 00:00:00 2001
-From: pkviet <pkv.stream@gmail.com>
-Date: Thu, 29 Nov 2018 21:10:45 +0100
-Subject: [PATCH] obs-libfdk: Compatibility fix for new API
-
-fdk-aac v2.0.0 (aacenc 4.0.0) changes the AACENC_InfoStruct:
-the encoderDelay parameter is replaced by two, nDelay and
-nDelayCore. This patch checks the lib version and adjust the parameter
-accordingly.
----
- plugins/obs-libfdk/obs-libfdk.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/obs-libfdk/obs-libfdk.c b/plugins/obs-libfdk/obs-libfdk.c
-index d6eb496184..94b139de57 100644
---- a/plugins/obs-libfdk/obs-libfdk.c
-+++ b/plugins/obs-libfdk/obs-libfdk.c
-@@ -9,7 +9,6 @@
- 
- #include <fdk-aac/aacenc_lib.h>
- 
--
- static const char *libfdk_get_error(AACENC_ERROR err)
- {
- 	switch(err) {
-@@ -224,7 +223,7 @@ static bool libfdk_encode(void *data, struct encoder_frame *frame,
- 	void *in_ptr;
- 	void *out_ptr;
- 	AACENC_ERROR err;
--
-+	int64_t encoderDelay;
- 
- 	in_ptr = frame->data[0];
- 	in_size = enc->frame_size_bytes;
-@@ -261,10 +260,13 @@ static bool libfdk_encode(void *data, struct encoder_frame *frame,
- 	}
- 
- 	*received_packet = true;
--
--	packet->pts  = enc->total_samples -
--	               enc->info.encoderDelay; // TODO: Just a guess, find out if that's actualy right
--	packet->dts  = enc->total_samples - enc->info.encoderDelay;
-+#if (AACENCODER_LIB_VL0 >= 4)
-+	encoderDelay= enc->info.nDelay;
-+#else
-+	encoderDelay= enc->info.encoderDelay;
-+#endif
-+	packet->pts  = enc->total_samples - encoderDelay;
-+	packet->dts  = enc->total_samples - encoderDelay;
- 	packet->data = enc->packet_buffer;
- 	packet->size = out_args.numOutBytes;
- 	packet->type = OBS_ENCODER_AUDIO;
diff --git a/multimedia/obs-studio/obs-studio.SlackBuild b/multimedia/obs-studio/obs-studio.SlackBuild
index e1f06990ac..cf6d8437aa 100644
--- a/multimedia/obs-studio/obs-studio.SlackBuild
+++ b/multimedia/obs-studio/obs-studio.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Open Broadcaster Software
 #
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
-# Copyright 2016-2018 Christoph Willing,  Brisbane Australia
+# Copyright 2016-2019 Christoph Willing,  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=obs-studio
-VERSION=${VERSION:-22.0.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-23.0.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -63,7 +63,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xf $CWD/$PRGNAM-$VERSION.tar.gz || tar xf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-patch -p1 < $CWD/libfdk-new-api.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/multimedia/obs-studio/obs-studio.info b/multimedia/obs-studio/obs-studio.info
index 2609b2d873..30775a311f 100644
--- a/multimedia/obs-studio/obs-studio.info
+++ b/multimedia/obs-studio/obs-studio.info
@@ -1,8 +1,8 @@
 PRGNAM="obs-studio"
-VERSION="22.0.3"
+VERSION="23.0.1"
 HOMEPAGE="https://obsproject.com/"
-DOWNLOAD="https://github.com/obsproject/obs-studio/archive/22.0.3/obs-studio-22.0.3.tar.gz"
-MD5SUM="112877ab7677eaa35dcbf8bc18d3a10d"
+DOWNLOAD="https://github.com/obsproject/obs-studio/archive/23.0.1/obs-studio-23.0.1.tar.gz"
+MD5SUM="c45d4053ccd89a315baf4fd8f9d9667c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faac ffmpeg jansson qt5 rtmpdump x264 jack-audio-connection-kit libfdk-aac"