From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79344138334 for ; Sun, 16 Dec 2018 16:16:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EFE6E0C4D; Sun, 16 Dec 2018 16:16:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B676E0C4C for ; Sun, 16 Dec 2018 16:16:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 229CB335C47 for ; Sun, 16 Dec 2018 16:16:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E41324DA for ; Sun, 16 Dec 2018 16:16:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1544976799.08c20ef7ae4d7408162732528c3edbae45a69637.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/files/, media-video/obs-studio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch media-video/obs-studio/obs-studio-22.0.3.ebuild X-VCS-Directories: media-video/obs-studio/files/ media-video/obs-studio/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 08c20ef7ae4d7408162732528c3edbae45a69637 X-VCS-Branch: master Date: Sun, 16 Dec 2018 16:16:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9658536c-1c78-4a2b-a4e7-7fb371444aa4 X-Archives-Hash: 9325b6b58628dc86635525d91e6b06c3 commit: 08c20ef7ae4d7408162732528c3edbae45a69637 Author: Jimi Huotari gentoo org> AuthorDate: Wed Dec 12 13:32:51 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 16 16:13:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c20ef7 media-video/obs-studio: fix build with USE="fdk" Upstream: https://github.com/obsproject/obs-studio/commit/cf73fa6d Closes: https://bugs.gentoo.org/672430 Signed-off-by: Jimi Huotari gentoo.org> Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/obs-studio-22.0.3-fdk-build-fix.patch | 52 ++++++++++++++++++++++ media-video/obs-studio/obs-studio-22.0.3.ebuild | 5 ++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch b/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch new file mode 100644 index 00000000000..73329cf8040 --- /dev/null +++ b/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch @@ -0,0 +1,52 @@ +From 5cf2b5fbf925412620e2a40552d6348203851cb3 Mon Sep 17 00:00:00 2001 +From: pkviet +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 + +- + 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/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-22.0.3.ebuild index ba4f33009b6..c15bd0ab071 100644 --- a/media-video/obs-studio/obs-studio-22.0.3.ebuild +++ b/media-video/obs-studio/obs-studio-22.0.3.ebuild @@ -67,7 +67,10 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" + "${FILESDIR}/${PN}-22.0.3-fdk-build-fix.patch" # bug 672430 +) CMAKE_REMOVE_MODULES_LIST=( FindFreetype )