[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/

2024-08-25 Thread Sam James 
commit: ff09c09923f119209970407540201cbdabccde4f
Author: Paul Zander  gmail  com>
AuthorDate: Fri Aug 23 18:31:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 25 15:39:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff09c099

media-video/obs-studio: Fix compilation on GCC 15

Closes: https://bugs.gentoo.org/938326
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38268
Signed-off-by: Sam James  gentoo.org>

 .../obs-studio/files/json11-1.0.0-include-cstdint.patch  | 12 
 media-video/obs-studio/obs-studio-30.2.3.ebuild  |  4 
 media-video/obs-studio/obs-studio-.ebuild|  4 
 3 files changed, 20 insertions(+)

diff --git a/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch 
b/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch
new file mode 100644
index ..29648cf15825
--- /dev/null
+++ b/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch
@@ -0,0 +1,12 @@
+diff --git a/json11.cpp b/json11.cpp
+index 9647846..8266a14 100644
+--- a/json11.cpp
 b/json11.cpp
+@@ -22,6 +22,7 @@
+ #include "json11.hpp"
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/media-video/obs-studio/obs-studio-30.2.3.ebuild 
b/media-video/obs-studio/obs-studio-30.2.3.ebuild
index d0fc789c0edc..043f43465d42 100644
--- a/media-video/obs-studio/obs-studio-30.2.3.ebuild
+++ b/media-video/obs-studio/obs-studio-30.2.3.ebuild
@@ -183,6 +183,10 @@ src_prepare() {
use wayland && filter-lto
 
cmake_src_prepare
+
+   pushd deps/json11 &> /dev/null || die
+   eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch"
+   popd &> /dev/null || die
 }
 
 src_configure() {

diff --git a/media-video/obs-studio/obs-studio-.ebuild 
b/media-video/obs-studio/obs-studio-.ebuild
index efd7033f58ab..f2a746c3d815 100644
--- a/media-video/obs-studio/obs-studio-.ebuild
+++ b/media-video/obs-studio/obs-studio-.ebuild
@@ -185,6 +185,10 @@ src_prepare() {
use wayland && filter-lto
 
cmake_src_prepare
+
+   pushd deps/json11 &> /dev/null || die
+   eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch"
+   popd &> /dev/null || die
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/

2022-01-18 Thread Sam James 
commit: 49e4794474d6d730937ae3649dcca86598f3407e
Author: James Beddek  posteo  de>
AuthorDate: Sun Jan 16 04:14:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 19 01:15:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e47944

media-video/obs-studio: add ffmpeg 5.0 patch

Signed-off-by: James Beddek  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/23821
Signed-off-by: Sam James  gentoo.org>

 .../files/obs-studio-27.1.3-ffmpeg-5.0.patch   | 314 +
 media-video/obs-studio/obs-studio-27.1.3-r1.ebuild |   3 +-
 2 files changed, 316 insertions(+), 1 deletion(-)

diff --git a/media-video/obs-studio/files/obs-studio-27.1.3-ffmpeg-5.0.patch 
b/media-video/obs-studio/files/obs-studio-27.1.3-ffmpeg-5.0.patch
new file mode 100644
index ..a529dca715a9
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-27.1.3-ffmpeg-5.0.patch
@@ -0,0 +1,314 @@
+# 
https://git.exherbo.org/media.git/commit/?id=10c891cb37f4f7e42e95a00b27a5d4636266353e
+# 
https://git.exherbo.org/media.git/commit/?id=e888c31724357431dbd0e73014ca87a552850d45
+
+From 08547a1696fa381d0bda18aed57b9f87a6b1b334 Mon Sep 17 00:00:00 2001
+From: Ryan Foster 
+Date: Sat, 6 Nov 2021 18:57:35 -0400
+Subject: [PATCH] obs-ffmpeg: Include avcodec header for AVCodecContext
+
+FFmpeg commit e67e02d15672 [1] drops avcodec.h from avformat.h includes.
+Therefore we need to include it explicitly.
+
+[1]: 
https://github.com/FFmpeg/FFmpeg/commit/e67e02d15672a87da1b0566e197a1e19dc7e1e33
+ lavf/avformat.h: drop the avcodec.h include
+---
+ plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 1 +
+ plugins/obs-ffmpeg/obs-ffmpeg-formats.h| 2 ++
+ plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c  | 1 +
+ plugins/obs-ffmpeg/obs-ffmpeg-output.h | 1 +
+ 4 files changed, 5 insertions(+)
+
+diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c 
b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
+index 1c160ced4b1f..e4c6cdb9fa2f 100644
+--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
 b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
+@@ -27,6 +27,7 @@
+ #include "ffmpeg-mux.h"
+ 
+ #include 
++#include 
+ #include 
+ 
+ #define ANSI_COLOR_RED "\x1b[0;91m"
+diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-formats.h 
b/plugins/obs-ffmpeg/obs-ffmpeg-formats.h
+index 62e3866d037a..b40ef37293b4 100644
+--- a/plugins/obs-ffmpeg/obs-ffmpeg-formats.h
 b/plugins/obs-ffmpeg/obs-ffmpeg-formats.h
+@@ -1,5 +1,7 @@
+ #pragma once
+ 
++#include 
++
+ static inline int64_t rescale_ts(int64_t val, AVCodecContext *context,
+AVRational new_base)
+ {
+diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c 
b/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
+index f2d93d2def89..e66010ce5f9c 100644
+--- a/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
 b/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
+@@ -24,6 +24,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "obs-ffmpeg-formats.h"
+diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.h 
b/plugins/obs-ffmpeg/obs-ffmpeg-output.h
+index 99f4dcd13b44..72d89dfacc4c 100644
+--- a/plugins/obs-ffmpeg/obs-ffmpeg-output.h
 b/plugins/obs-ffmpeg/obs-ffmpeg-output.h
+@@ -2,6 +2,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+From abf1d609d29196921df8f09ab6e07340b7cf9660 Mon Sep 17 00:00:00 2001
+From: Ryan Foster 
+Date: Sat, 6 Nov 2021 18:58:05 -0400
+Subject: [PATCH] obs-ffmpeg: Include channel_layout.h
+
+avcodec.h stopped including channel_layout.h per FFmpeg commit
+1be3d8a0cb77 [1]. avformat.h stopped including avcodec.h per FFmpeg
+commit e67e02d15672 [2]. As a result, we need to explicitly include
+avutil/channel_layout.h when needed. Fixes compilation error against
+FFmpeg later than the two mentioned commits.
+
+[1]: 
https://github.com/FFmpeg/FFmpeg/commit/1be3d8a0cb77f8d34c1f39b47bf5328fe10c82d7
+[2]: 
https://github.com/FFmpeg/FFmpeg/commit/e67e02d15672a87da1b0566e197a1e19dc7e1e33
+---
+ plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c 
b/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c
+index 2e3899464362..cbcb9ac31bcb 100644
+--- a/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c
 b/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c
+@@ -21,6 +21,7 @@
+ #include 
+ #include 
+ 
++#include 
+ #include 
+ #include 
+
+From ce734366bc0b95ff91930f463e7ebe528cf8eabf Mon Sep 17 00:00:00 2001
+From: Ryan Foster 
+Date: Sat, 6 Nov 2021 18:58:36 -0400
+Subject: [PATCH] obs-ffmpeg: Respect AVFormatContext and AVOutputFormat
+ constness
+
+AVFormatContext::oformat was made const on April 27, 2021 [1]. If we
+respect the constness of AVOutputFormat and do not cast results from
+FFmpeg functions to non-const, we cannot modify the results after the
+fact. Our choices are either to cast them to non-const (and presumably
+have them implicitly casted back to const on later function calls), or
+only try to modify the results

[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/

2021-10-02 Thread Ionen Wolkens 
commit: f4671528d31484f621606681eeaec7d3a9127a06
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Sep 29 20:01:41 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Oct  2 23:58:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4671528

media-video/obs-studio: remove version 26.1.2 and update metadata/files

The 'imagemagick' USE-flag and the '-fix-alsa-crash.patch' are no
longer used after 26.1.2 is gone.

Package-Manager: Portage-3.0.24, Repoman-3.0.3
Signed-off-by: Jimi Huotari  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22444
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-video/obs-studio/Manifest|   1 -
 .../files/obs-studio-26.1.2-fix-alsa-crash.patch   |  30 
 media-video/obs-studio/metadata.xml|   1 -
 media-video/obs-studio/obs-studio-26.1.2-r2.ebuild | 167 -
 4 files changed, 199 deletions(-)

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 99613fc54b2..4c88e779fa6 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,6 +1,5 @@
 DIST cef_binary_4280_linux64.tar.bz2 79740715 BLAKE2B 
c648a9a4205094450f9eae407e98cbc3da2b7cd81b3c19c4f52cfa3efcca01dce40528018996c65f026eb97520d78040165d1906b0d19236a86e76ec39c58c26
 SHA512 
060a5a8716a75b4b96dfb6ac28c132e22b93107915d680311c1b9d4fd12c7712a9e3497338eac6d2b9f4e74f2dc005a75d195c597bba049e4731fe3724f519ba
 DIST obs-browser-2a338b7c76d5dd0a6b23f1d49affefd40213b0e9.tar.gz 89474 BLAKE2B 
ff76a884ffbb7765430a14a7de2955164e9d8823f5dd48bd85e6d0452022b706517e935d813ad78a45adf5eca95fda02e17ae81dbd721145d3ecd169c5a70537
 SHA512 
bcc8e38505b3cabd7c0e3edcd34ed21141efaa09a9bb0af79fefb57e315531f0ee089b79696802fa052659f66e0becf304286ef82afcf16283ed6664cb5cedd4
 DIST obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz 79259 BLAKE2B 
28cfa46928de0b5e626b384673f7b92b3a48cb631066dda06288c51df78f06b913707a1295a5142d4521505b0678a6c639bfbb5b8a066d585fa12849578a382e
 SHA512 
3ecab39bfb36774ac501de087ca70ecde12f408cfd54cdf12539a92e89d0cf531767a066ff77139389158c46beee423cf1848081ed187890b86241aa96f7b179
-DIST obs-studio-26.1.2.tar.gz 16624899 BLAKE2B 
655a6c71d3a0ae6ae1fc2d166a148002bb17d6eaec06d5633a10fdbfe7f42e073526ede83cd36ad21c440debe870b41b43724caa00633733f1e196d918304adc
 SHA512 
cd95fbf587f7edfe415cae75299d65c1d771bb118649fb839ae43d77145d87725c23df3360aa7b8c35ab8b62e5ec7983a8b02f8b102caa78f768eb58b4263417
 DIST obs-studio-27.0.1.tar.gz 15787807 BLAKE2B 
c2ea571f06a81b2e87ce5d9fd010610ea6cc2753223e6373025f0389972d4638a5f3ff1802f9f0af2c631d71ebcf4603e064da804e8c89eb032b1ad5743d1bd4
 SHA512 
c15dda62c1f212f623914e61a90c6b1e035720fb84d64726c14f43d77ae7569777a23d04221db34347ce610e7c3407c29e726ae36412e98e34ea2ddb2072b7f3
 DIST obs-studio-27.1.1.tar.gz 15994581 BLAKE2B 
43ec33b36e9d63636c9b9b750788795cb2e31866e2572d18e405836c569e24a375108b0fda5826b56c9a13839210c8a51cf3fef22d589f816c189c6bb76b826e
 SHA512 
911fec2168ea0d378dfc295e10851ab436fb9f94ea7bb6aef6d00d32ea427b34e4929c955b138973b3f635e55ef17aa9272faaff4f9ba2c1c3c97c082318d59c

diff --git 
a/media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch 
b/media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch
deleted file mode 100644
index 2e52926feba..000
--- a/media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 41367bb2b4732507248f2b3c2e43e2aa46c5ef2a Mon Sep 17 00:00:00 2001
-From: Jimi Huotari 
-Date: Wed, 30 Dec 2020 03:14:34 +0200
-Subject: [PATCH] UI: Fix crash when no audio backends are available
-
-This commit prevents a crash in, for example, Linux configurations
-where PulseAudio is disabled, which leads into 'mod' being 'null',
-which in turn leads into a segmentation fault when an ALSA source
-is selected.
-
-Closes https://github.com/obsproject/obs-studio/issues/3485

- UI/context-bar-controls.cpp | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/UI/context-bar-controls.cpp b/UI/context-bar-controls.cpp
-index 9dff8979a2..9ef850b6d1 100644
 a/UI/context-bar-controls.cpp
-+++ b/UI/context-bar-controls.cpp
-@@ -179,6 +179,10 @@ void AudioCaptureToolbar::Init()
- 
-   obs_module_t *mod =
-   get_os_module("win-wasapi", "mac-capture", "linux-pulseaudio");
-+  if (!mod) {
-+  return;
-+  }
-+
-   const char *device_str =
-   get_os_text(mod, "Device", "CoreAudio.Device", "Device");
-   ui->deviceLabel->setText(device_str);

diff --git a/media-video/obs-studio/metadata.xml 
b/media-video/obs-studio/metadata.xml
index de6926e4749..b16a1b2e5db 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -19,7 +19,6 @@
 Enable browser source support via (precompiled) 
CEF.
 Build the Decklink plugin.
 Build with LibFDK AAC support.
-Use ImageMagick for image loading instead of 
FFmpeg.
 Build with NVENC enco

[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/

2021-05-07 Thread Andreas Sturmlechner 
commit: d15e2b644efa1addd6de1e1c25452e325cbd84ea
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Apr 28 07:06:02 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May  7 20:58:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d15e2b64

media-video/obs-studio: raise python support to 3.8 and 3.9

With a patch.

Closes: https://bugs.gentoo.org/754006
Closes: https://bugs.gentoo.org/784989
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Jimi Huotari  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/20574
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/obs-studio-26.1.2-python-3.8.patch   | 24 ++
 ...dio-.ebuild => obs-studio-26.1.2-r1.ebuild} | 20 +++---
 media-video/obs-studio/obs-studio-.ebuild  | 17 ---
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch 
b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
new file mode 100644
index 000..c4709c65468
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
@@ -0,0 +1,24 @@
+From 413fbe27ee68881f60265f0f2dd670ce42ca220e Mon Sep 17 00:00:00 2001
+From: Matt Gajownik 
+Date: Tue, 25 Aug 2020 19:28:26 +1000
+Subject: [PATCH] libobs/util: Fix loading Python binary modules on *nix
+
+Fixes #
+---
+ libobs/util/platform-nix.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libobs/util/platform-nix.c b/libobs/util/platform-nix.c
+index 26800d52f7c..997b62db1a3 100644
+--- a/libobs/util/platform-nix.c
 b/libobs/util/platform-nix.c
+@@ -71,7 +71,8 @@ void *os_dlopen(const char *path)
+ #ifdef __APPLE__
+   void *res = dlopen(dylib_name.array, RTLD_LAZY | RTLD_FIRST);
+ #else
+-  void *res = dlopen(dylib_name.array, RTLD_LAZY);
++  void *res = dlopen(dylib_name.array,
++ RTLD_LAZY | RTLD_DEEPBIND | RTLD_GLOBAL);
+ #endif
+   if (!res)
+   blog(LOG_ERROR, "os_dlopen(%s->%s): %s\n", path,

diff --git a/media-video/obs-studio/obs-studio-.ebuild 
b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild
similarity index 86%
copy from media-video/obs-studio/obs-studio-.ebuild
copy to media-video/obs-studio/obs-studio-26.1.2-r1.ebuild
index e9173352238..3e12ab881f7 100644
--- a/media-video/obs-studio/obs-studio-.ebuild
+++ b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 LUA_COMPAT=( luajit )
-# Does not work with 3.8+ https://bugs.gentoo.org/754006
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit cmake lua-single python-single-r1 xdg-utils
 
@@ -78,6 +77,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-26.1.2-fix-alsa-crash.patch"
+   "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" # 
https://github.com/obsproject/obs-studio/pull/3335
+)
+
 pkg_setup() {
use lua && lua-single_pkg_setup
use python && python-single-r1_pkg_setup
@@ -148,6 +152,16 @@ pkg_postinst() {
fi
 }
 
+pkg_postinst() {
+   if use python; then
+   ewarn "This ebuild applies a patch that is not yet accepted 
upstream,"
+   ewarn "and while it fixes Python support at least to some 
extent, it"
+   ewarn "may cause other issues."
+   ewarn ""
+   ewarn "Please report any such issues to the Gentoo maintainer."
+   fi
+}
+
 pkg_postrm() {
xdg_icon_cache_update
 }

diff --git a/media-video/obs-studio/obs-studio-.ebuild 
b/media-video/obs-studio/obs-studio-.ebuild
index e9173352238..c6e7b77ff6b 100644
--- a/media-video/obs-studio/obs-studio-.ebuild
+++ b/media-video/obs-studio/obs-studio-.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 LUA_COMPAT=( luajit )
-# Does not work with 3.8+ https://bugs.gentoo.org/754006
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit cmake lua-single python-single-r1 xdg-utils
 
@@ -78,6 +77,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" ) # 
https://github.com/obsproject/obs-studio/pull/3335
+
 pkg_setup() {
use lua && lua-single_pkg_setup
use python && python-single-r1_pkg_setup
@@ -148,6 +149,16 @@ pkg_postinst() {
fi
 }
 
+pkg_postinst() {
+   if use python; then
+   ewarn "This ebuild applies a patch that is not yet accepted 
upstream,"
+   ewarn "and while it fixes Python support at least to some 
extent, it"
+

[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/

2020-05-10 Thread Andreas Sturmlechner 
commit: 2f867c799b979a69bce09868a6a5a55f73566bb2
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sun May 10 07:16:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 10 11:41:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f867c79

media-video/obs-studio: fix build with GCC-10

Bug: https://bugs.gentoo.org/708628
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jimi Huotari  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/15736
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/obs-studio-25.0.8-gcc-10-build.patch | 30 ++
 media-video/obs-studio/obs-studio-25.0.8.ebuild|  2 ++
 2 files changed, 32 insertions(+)

diff --git a/media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch 
b/media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch
new file mode 100644
index 000..352ea2c937c
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch
@@ -0,0 +1,30 @@
+From c7f84f8fc4e90ef779a204ac268f5ee1a962e324 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari 
+Date: Sun, 9 Feb 2020 05:23:55 +0200
+Subject: [PATCH] deps/glad: Fix build with GCC-10
+
+GCC-10 defaults to '-fno-common' [1], which triggers issues with
+defining global variables multiple times.  To fix the build, use
+'extern' to turn the first definition of 'gladGetProcAddressPtr'
+into a declaration.
+
+1. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678
+
+Closes https://github.com/obsproject/obs-studio/issues/2828
+---
+ deps/glad/src/glad_glx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/glad/src/glad_glx.c b/deps/glad/src/glad_glx.c
+index 7c55b9fc01..58086f1039 100644
+--- a/deps/glad/src/glad_glx.c
 b/deps/glad/src/glad_glx.c
+@@ -35,7 +35,7 @@ static void* libGL;
+ 
+ #ifndef __APPLE__
+ typedef void* (APIENTRYP PFNGLXGETPROCADDRESSPROC_PRIVATE)(const char*);
+-PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
++extern PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
+ #endif
+ 
+ static

diff --git a/media-video/obs-studio/obs-studio-25.0.8.ebuild 
b/media-video/obs-studio/obs-studio-25.0.8.ebuild
index 33ca63777c3..a97ec6617d4 100644
--- a/media-video/obs-studio/obs-studio-25.0.8.ebuild
+++ b/media-video/obs-studio/obs-studio-25.0.8.ebuild
@@ -78,6 +78,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-25.0.8-gcc-10-build.patch" )
+
 pkg_setup() {
use python && python-single-r1_pkg_setup
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/

2019-06-22 Thread Andreas Sturmlechner 
commit: 0dbaa3a980de231efcae354207433fd14d148ebb
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Jun 12 12:14:34 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 22 11:44:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbaa3a9

media-video/obs-studio: version bump to 23.2.1

Comes with a patch to correct the 'libdir' for
'libobs.pc'.

Upstream PR: https://github.com/obsproject/obs-studio/pull/1932

Bug: https://bugs.gentoo.org/644538
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Jimi Huotari  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/12246
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/obs-studio/Manifest|   1 +
 .../obs-studio-23.2.1-use-correct-libdir.patch |  50 
 media-video/obs-studio/obs-studio-23.2.1.ebuild| 132 +
 3 files changed, 183 insertions(+)

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 2c408bddf18..b1a53a3d46e 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,2 +1,3 @@
 DIST obs-studio-23.0.1.tar.gz 6223214 BLAKE2B 
c3b65ad9134aefc36a3fa33b8d185a1ee76f76c10edd30d5ad8a7af86605c4e7b3b8d83c5570203d926655131f7c20f4ef11dcbf55c7af745efc2b68d4933c54
 SHA512 
6877d4bf635a9769d634683a85075a5fe3a5de1fcc83882647dfbc379a897eee05b69c2159e290ff73f53aa7c03027ea4ea15e1169de57c2c50f4e504eff410f
 DIST obs-studio-23.1.0.tar.gz 6192139 BLAKE2B 
8c85d21f68b0dc799a8fdfce3ff94d837d0e02bfa55606eec9985d2c2d1c3d9ae78664ba8b17f393abb197f1595fa0f78f314fe474883a81166d9c6a0967682c
 SHA512 
ab4f71430ae314774afbba8b8e39c4eb35ab147d49d6d33b188e7a820b1198ccbb6005fad111502834652b5261b88d07c075094a8303ea7294da3171e8e015bb
+DIST obs-studio-23.2.1.tar.gz 6204515 BLAKE2B 
bd025a1ec2809e8a0b47fba79c6a3d40feb255a03a461725501a9c7cdbc40c04b75ff714fa4b3787f876a3f524f3371119a3ea9666c3aeb003184f1eb2a63123
 SHA512 
aabc23d825c2ca3f40274a8e2c4935939dab4955d929c44b28cebde114e808543c1c0dc05791bb6d9f2611effb0f2cb3e20c9a653154c30a9851ea94e74c8169

diff --git 
a/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch 
b/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch
new file mode 100644
index 000..619c414d6b8
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch
@@ -0,0 +1,50 @@
+From ab67b39257be83eaab87c4a938c4c58b5cccad7e Mon Sep 17 00:00:00 2001
+From: Jimi Huotari 
+Date: Fri, 21 Jun 2019 17:48:32 +0300
+Subject: [PATCH] cmake: Install 'libobs.pc' under the correct 'libdir'
+
+In 'libobs/CMakeLists.txt', use '${CMAKE_INSTALL_LIBDIR}' instead of
+'${CMAKE_INSTALL_PREFIX}/lib', as the latter results into 'libobs.pc'
+being installed under '/lib' when '/lib64' would be more appropriate.
+
+In 'libobs/libobs.pc.in', use '@CMAKE_INSTALL_FULL_LIBDIR@' for
+'libdir', '@CMAKE_INSTALL_FULL_INCLUDEDIR@' for 'includedir',
+and '@CMAKE_INSTALL_PREFIX@' for 'prefix'.
+
+Gentoo-Bug: https://bugs.gentoo.org/644538
+---
+ libobs/CMakeLists.txt | 2 +-
+ libobs/libobs.pc.in   | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
+index fed3e694..86811481 100644
+--- a/libobs/CMakeLists.txt
 b/libobs/CMakeLists.txt
+@@ -454,7 +454,7 @@ if(UNIX AND NOT APPLE)
+   set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
+   endforeach()
+   CONFIGURE_FILE("libobs.pc.in" "libobs.pc" @ONLY)
+-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION 
"${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
++  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION 
"${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ endif()
+ 
+ set_target_properties(libobs PROPERTIES
+diff --git a/libobs/libobs.pc.in b/libobs/libobs.pc.in
+index 03fe4cdd..f6c471ba 100644
+--- a/libobs/libobs.pc.in
 b/libobs/libobs.pc.in
+@@ -1,7 +1,7 @@
+-prefix=@DEST_DIR@
++prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@OBS_LIBRARY_DESTINATION@
+-includedir=${prefix}/include
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: libobs
+ Description: OBS Studio Library
+-- 
+2.22.0
+

diff --git a/media-video/obs-studio/obs-studio-23.2.1.ebuild 
b/media-video/obs-studio/obs-studio-23.2.1.ebuild
new file mode 100644
index 000..2b14f6e8272
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-23.2.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit cmake-utils python-single-r1 xdg-utils
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git";
+   EGIT_SUBMODULES=()
+else
+   SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86

[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/

2019-02-28 Thread Patrice Clement 
commit: a2b062dd635f1aaa21ee81e9e6abd7a1c4e45f79
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Feb 27 00:23:31 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Feb 28 22:49:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b062dd

media-video/obs-studio: remove old version and unused patches.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jimi Huotari  gentoo.org>
Signed-off-by: Patrice Clement  gentoo.org>

 media-video/obs-studio/Manifest|   1 -
 .../obs-studio-21.1.2-use-less-automagic.patch | 167 -
 .../files/obs-studio-22.0.3-fdk-build-fix.patch|  52 ---
 media-video/obs-studio/obs-studio-22.0.3.ebuild| 134 -
 4 files changed, 354 deletions(-)

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 8210c29f369..4e440484dd9 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,2 +1 @@
-DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B 
e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c
 SHA512 
491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04
 DIST obs-studio-23.0.1.tar.gz 6223214 BLAKE2B 
c3b65ad9134aefc36a3fa33b8d185a1ee76f76c10edd30d5ad8a7af86605c4e7b3b8d83c5570203d926655131f7c20f4ef11dcbf55c7af745efc2b68d4933c54
 SHA512 
6877d4bf635a9769d634683a85075a5fe3a5de1fcc83882647dfbc379a897eee05b69c2159e290ff73f53aa7c03027ea4ea15e1169de57c2c50f4e504eff410f

diff --git 
a/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch 
b/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
deleted file mode 100644
index 2c28c8e080d..000
--- a/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From eee6541153cfb6788ee088181781793de100e54c Mon Sep 17 00:00:00 2001
-From: Jimi Huotari 
-Date: Mon, 9 Jul 2018 02:20:10 +0300
-Subject: [PATCH 1/2] deps/obs-scripting: Use less automagic for Lua/Python
- detection
-
-This adds build-time options for disabling the Lua and/or Python
-scripting support in cases where users do not wish to build
-it, but have the required libraries installed.

- deps/obs-scripting/CMakeLists.txt | 73 +++
- 1 file changed, 45 insertions(+), 28 deletions(-)
-
-diff --git a/deps/obs-scripting/CMakeLists.txt 
b/deps/obs-scripting/CMakeLists.txt
-index 835c1b30..46412779 100644
 a/deps/obs-scripting/CMakeLists.txt
-+++ b/deps/obs-scripting/CMakeLists.txt
-@@ -1,6 +1,7 @@
- cmake_minimum_required(VERSION 2.8)
- 
- if(NOT ENABLE_SCRIPTING)
-+  message(STATUS "Scripting plugin disabled")
-   return()
- endif()
- 
-@@ -11,44 +12,60 @@ if(MSVC)
-   w32-pthreads)
- endif()
- 
--find_package(Luajit QUIET)
--find_package(PythonDeps QUIET)
--find_package(SwigDeps QUIET 2)
-+option(DISABLE_LUA "Disable Lua scripting support" OFF)
-+option(DISABLE_PYTHON "Disable Python scripting support" OFF)
- 
- set(COMPILE_PYTHON FALSE CACHE BOOL "" FORCE)
- set(COMPILE_LUA FALSE CACHE BOOL "" FORCE)
- 
--if(NOT SWIG_FOUND)
--  message(STATUS "Scripting: SWIG not found; scripting disabled")
--  return()
--endif()
-+if(NOT DISABLE_LUA)
-+  find_package(Luajit QUIET)
- 
--if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
--  message(STATUS "Scripting: Neither Python 3 nor Luajit was found; 
scripting plugin disabled")
--  return()
--endif()
--
--if(NOT LUAJIT_FOUND)
--  message(STATUS "Scripting: Luajit not found; Luajit support disabled")
-+  if(NOT DISABLE_LUA AND NOT LUAJIT_FOUND)
-+  message(STATUS "Luajit support not found.")
-+  set(LUAJIT_FOUND FALSE)
-+  else()
-+  message(STATUS "Scripting: Luajit supported")
-+  set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
-+  endif()
- else()
--  message(STATUS "Scripting: Luajit supported")
--  set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
-+  message(STATUS "Scripting: Luajit support disabled")
-+  set(LUAJIT_FOUND FALSE)
- endif()
- 
--if(NOT PYTHONLIBS_FOUND)
--  message(STATUS "Scripting: Python 3 not found; Python support disabled")
-+if(NOT DISABLE_PYTHON)
-+  find_package(PythonDeps QUIET)
-+
-+  if(NOT DISABLE_PYTHON AND NOT PYTHONLIBS_FOUND)
-+  message(STATUS "Python support not found.")
-+  set(PYTHON_FOUND FALSE)
-+  set(PYTHONLIBS_FOUND FALSE)
-+  else()
-+  message(STATUS "Scripting: Python 3 supported")
-+  set(PYTHON_FOUND TRUE)
-+  set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
-+
-+  get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
-+  string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
-+
-+  if(WIN32)
-+

[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/

2018-12-16 Thread Andreas Sturmlechner 
commit: 5d26a1edd21338473ace196f549d22a6bd0b6854
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Dec 12 13:19:30 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 16 16:13:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d26a1ed

media-video/obs-studio: clean up older version and a patch with it

Signed-off-by: Jimi Huotari  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Closes: https://github.com/gentoo/gentoo/pull/10621
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/obs-studio/Manifest|   1 -
 .../files/obs-studio-21.0.2-qt-5.11.0.patch|  28 -
 media-video/obs-studio/obs-studio-21.1.2.ebuild| 134 -
 3 files changed, 163 deletions(-)

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 3e83222c92a..656911ba68e 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,2 +1 @@
-DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 
12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7
 SHA512 
5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938
 DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B 
e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c
 SHA512 
491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04

diff --git a/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch 
b/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch
deleted file mode 100644
index 6eb7f7c3ca8..000
--- a/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4fd06b9825465ae5eb2a9b862cdb89098f655f14 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari 
-Date: Sat, 17 Mar 2018 18:16:39 +0200
-Subject: [PATCH] frontend-tools: Include 'QAction' to fix build against Qt
- 5.11
-
-Some headers are no longer unconditionally included, leading to
-build failures.
-
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=748836dae80a7d11901f3f0630168829076d11a8
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=000c76ada5cc21479fc479be16a7507fed6490f8
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f

- UI/frontend-plugins/frontend-tools/scripts.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/UI/frontend-plugins/frontend-tools/scripts.cpp 
b/UI/frontend-plugins/frontend-tools/scripts.cpp
-index d923dcf610..364757e48b 100644
 a/UI/frontend-plugins/frontend-tools/scripts.cpp
-+++ b/UI/frontend-plugins/frontend-tools/scripts.cpp
-@@ -12,6 +12,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include 
- #include 

diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild 
b/media-video/obs-studio/obs-studio-21.1.2.ebuild
deleted file mode 100644
index aa981e49491..000
--- a/media-video/obs-studio/obs-studio-21.1.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit cmake-utils gnome2-utils python-single-r1
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git";
-   EGIT_SUBMODULES=()
-else
-   SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype 
v4l"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-   >=dev-libs/jansson-2.5
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtquickcontrols:5
-   dev-qt/qtsql:5
-   dev-qt/qttest:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtx11extras:5
-   media-video/ffmpeg:=[x264]
-   net-misc/curl
-   x11-libs/libXcomposite
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   alsa? ( media-libs/alsa-lib )
-   fdk? ( media-libs/fdk-aac:= )
-   imagemagick? ( media-gfx/imagemagick:= )
-   jack? ( virtual/jack )
-   luajit? ( dev-lang/luajit:2 )
-   nvenc? (
-   || (
-   =media-video/ffmpeg-4[video_cards_nvidia]
-   )
-   )
-   pulseaudio? ( media-sound/pulseaudio )
-   python? ( ${PYTHON_DEPS} )
-   speex? ( media-libs/speexdsp )
-   truetype? (
-   media-libs/fontconfig
-   media-libs/freetype
-   )
-

[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/

2018-02-18 Thread Patrice Clement 
commit: bb366ed0af82e479f39d9c9e393318a18159280c
Author: Jimi Huotari  gentoo  org>
AuthorDate: Fri Feb 16 23:09:31 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Feb 18 17:15:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb366ed0

media-video/obs-studio: remove older versions and unused patches.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-video/obs-studio/Manifest|   2 -
 .../files/obs-studio-20.0.1-fix-curl-crash.patch   |  46 
 .../files/obs-studio-ImageMagick-header-path.patch |  70 
 media-video/obs-studio/obs-studio-19.0.2.ebuild| 118 
 media-video/obs-studio/obs-studio-20.0.1-r1.ebuild | 121 -
 media-video/obs-studio/obs-studio-20.0.1.ebuild| 118 
 6 files changed, 475 deletions(-)

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index cb00e934454..4eac8d16cff 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,5 +1,3 @@
-DIST obs-studio-19.0.2.tar.gz 5509958 BLAKE2B 
a21ed69dacb982e5f2bf31b62b85622cedb458b5ceb5bb10ccc099725f7d9c7da43c88bf40da432226f1077e036005fb28435643ed365a8a0f374875544b884f
 SHA512 
8e2c720d713f6b3fdfb0ce64252cba3129644155be75e0942250bb616700ba62acdb04265a7a6d0ce9406282fbbf85d662d7bdc36736c36be89fd726c8bbf5a9
-DIST obs-studio-20.0.1.tar.gz 5610534 BLAKE2B 
6db7a2bc591e88dac2f9450f60403095fc7e637f806657b0eb6fc928fd16fcae7a3d4a933b4bcad8b609fbf2197404bd675467a112e6aee84b9f023b9089a388
 SHA512 
891be96bbe18a2de4af8efd2eaeb54c388332ac7d93a66efcc18208af9ef2dfe3981f81ba351bdb16a93b2d66bcfef4f5277d3d8746261f0beb1f324ed9a7534
 DIST obs-studio-20.1.0.tar.gz 5637636 BLAKE2B 
11f42c894af9d8b58ef71eda4c669b557b1b69d8df48d2414ae6d4eda1b8ecb70bb15814a302b87c5b49a43323f772a92ee5dc4a6a58302723b6b1ebf1e35123
 SHA512 
fd0c4b910b9a07644a9ddb72c2622d1fac67878a8bf445d7ab33385aafa23a5207f89971c428a3be01fa851141d9cbb55e86ca81201928783227fc730d12b962
 DIST obs-studio-20.1.3.tar.gz 5638299 BLAKE2B 
8956e0ae444c05bc452284a730ba4cba7be9209d82f8b63f9cd0455ed73411eadc61825773c6ca5fe20435082399c72d3aaf8671c3830454d9237cc92ca4450f
 SHA512 
9d7c6892fe8940df6c1f1686f07722ea554b5996e72b702758d670a75f1220de59295c0a7b8b6445825a86623521061f64b7672bbe7526aefc9a12bab902ed74
 DIST obs-studio-21.0.2.tar.gz 5904469 BLAKE2B 
e4e7c1f2b445f1db6b76df0c7a12dd41ffd95e7ea5669d7efc3387cc0fd15e268d864b5da3da5c07d04bc57692a88a53a67351a370621b1a6ca648405d030454
 SHA512 
a22597ac3a85d4c72b9b1ff886367b158498b6b0141acfd2bdb096a2bd9d29cdfad900dfc00f870eaf0aad66836093579f37b278fa90ccd7b49022e849c1c590

diff --git 
a/media-video/obs-studio/files/obs-studio-20.0.1-fix-curl-crash.patch 
b/media-video/obs-studio/files/obs-studio-20.0.1-fix-curl-crash.patch
deleted file mode 100644
index 178bb2e6715..000
--- a/media-video/obs-studio/files/obs-studio-20.0.1-fix-curl-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 379137d039e8db4a4f5f4dd8b56aaa21600fe962 Mon Sep 17 00:00:00 2001
-From: Thomas De Schampheleire 
-Date: Tue, 19 Sep 2017 15:33:55 +0200
-Subject: [PATCH] file-updater: fix crash due to network timeout
-
-If there is no network connection, OBS crashes after 5 minutes idling
-with following crash:
-
-*** longjmp causes uninitialized stack frame ***: obs terminated
-=== Backtrace: =
-/lib64/libc.so.6(+0x6f1e3)[0x7f8f95f901e3]
-/lib64/libc.so.6(__fortify_fail+0x37)[0x7f8f96018ba7]
-/lib64/libc.so.6(+0xf7add)[0x7f8f96018add]
-/lib64/libc.so.6(__longjmp_chk+0x29)[0x7f8f96018a39]
-/usr/lib64/libcurl.so.4(+0xa5d5)[0x7f8f979b75d5]
-/lib64/libpthread.so.0(+0x10e30)[0x7f8f962cae30]
-/lib64/libc.so.6(__poll+0x2d)[0x7f8f95fff46d]
-/usr/lib64/libglib-2.0.so.0(+0x4a64c)[0x7f8f91b5564c]
-/usr/lib64/libglib-2.0.so.0(g_main_context_iteration+0x2c)[0x7f8f91b5575c]
-/usr/lib64/libQt5Core.so.5(_ZN20QEventDispatcherGlib13processEventsE6QFlagsIN10QEventLoop17ProcessEventsFlagEE+0x5f)[0x7f8f9706c1ff]
-/usr/lib64/libQt5Core.so.5(_ZN10QEventLoop4execE6QFlagsINS_17ProcessEventsFlagEE+0xfa)[0x7f8f9701defa]
-/usr/lib64/libQt5Core.so.5(_ZN16QCoreApplication4execEv+0x9c)[0x7f8f970258fc]
-obs(main+0x5ac)[0x4773dc]
-/lib64/libc.so.6(__libc_start_main+0xf0)[0x7f8f95f41700]
-obs(_start+0x29)[0x478389]
-
-Internet search [1] revealed that this is a libcurl bug that can be worked
-around by asking curl not to install signal handlers.
-
-[1] https://stackoverflow.com/a/10755612

- deps/file-updater/file-updater/file-updater.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/deps/file-updater/file-updater/file-updater.c 
b/deps/file-updater/file-updater/file-updater.c
-index ec639aeee..b8d649e05 100644
 a/deps/file-updater/file-updater/file-updater.c
-+++ b/deps/file-updater/file-updater/file-updater.c
-@@ -117,6 +117,7 @@ static bool do_http_request(struct update_info *info, 
const char *url,
-   curl_easy_setopt(info->curl, CURLOPT_WRITEFUNCTION, http_write);
-   curl_easy_setopt

[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/

2017-10-11 Thread Patrice Clement 
commit: 8434e38d77c3d9b82292c822164a385d9244f8fc
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Aug 31 11:46:07 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Oct 11 21:04:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8434e38d

media-video/obs-studio: fix build against ImageMagick 7.

Since ImageMagick 7, the headers have been under a different
directory, and the build with ImageMagick support will fail when
the old path is used.  This commit patches in detection for the
version being used, while also choosing the path accordingly.

Special thanks to Hu.

Upstream Pull Request: https://github.com/jp9000/obs-studio/pull/1018

Closes: https://bugs.gentoo.org/627520
Closes: https://github.com/gentoo/gentoo/pull/5642
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../files/obs-studio-ImageMagick-header-path.patch | 70 ++
 media-video/obs-studio/obs-studio-18.0.2.ebuild|  2 +
 media-video/obs-studio/obs-studio-19.0.2.ebuild|  2 +
 media-video/obs-studio/obs-studio-20.0.1.ebuild|  2 +
 4 files changed, 76 insertions(+)

diff --git 
a/media-video/obs-studio/files/obs-studio-ImageMagick-header-path.patch 
b/media-video/obs-studio/files/obs-studio-ImageMagick-header-path.patch
new file mode 100644
index 000..ca1de74973b
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-ImageMagick-header-path.patch
@@ -0,0 +1,70 @@
+From affb84f98477bb490554f56bf82ebffcefa0ec42 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari 
+Date: Tue, 5 Sep 2017 23:30:24 +0300
+Subject: [PATCH 1/3] libobs: Fix ImageMagick header path
+
+Since ImageMagick 7, the header path has been changed.  This commit
+implements a check for the version being used, and includes the
+header as is appropriate.
+
+Special thanks to Hu.
+
+Mantis-Bug: https://obsproject.com/mantis/view.php?id=966
+
+Gentoo-Bug: https://bugs.gentoo.org/627520
+---
+ libobs/CMakeLists.txt | 6 ++
+ libobs/graphics/graphics-magick.c | 6 ++
+ libobs/obsconfig.h.in | 3 +++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
+index cd2b80e1..e91f366a 100644
+--- a/libobs/CMakeLists.txt
 b/libobs/CMakeLists.txt
+@@ -31,6 +31,12 @@ option(LIBOBS_PREFER_IMAGEMAGICK "Prefer ImageMagick over 
ffmpeg for image loadi
+ if(NOT FFMPEG_AVCODEC_FOUND OR (ImageMagick_MagickCore_FOUND AND 
LIBOBS_PREFER_IMAGEMAGICK))
+   message(STATUS "Using ImageMagick for image loading in libobs")
+ 
++  if(${ImageMagick_VERSION_STRING} LESS 7)
++  set(LIBOBS_IMAGEMAGICK_DIR_STYLE 
LIBOBS_IMAGEMAGICK_DIR_STYLE_6L)
++  elseif(${ImageMagick_VERSION_STRING} GREATER_EQUAL 7)
++  set(LIBOBS_IMAGEMAGICK_DIR_STYLE 
LIBOBS_IMAGEMAGICK_DIR_STYLE_7GE)
++  endif()
++
+   set(libobs_image_loading_SOURCES
+   graphics/graphics-magick.c)
+   set(libobs_image_loading_LIBRARIES
+diff --git a/libobs/graphics/graphics-magick.c 
b/libobs/graphics/graphics-magick.c
+index c106bfa6..6e4e1e96 100644
+--- a/libobs/graphics/graphics-magick.c
 b/libobs/graphics/graphics-magick.c
+@@ -1,8 +1,14 @@
+ #include "graphics.h"
++#include "obsconfig.h"
+ 
+ #define MAGICKCORE_QUANTUM_DEPTH 16
+ #define MAGICKCORE_HDRI_ENABLE   0
++
++#if LIBOBS_IMAGEMAGICK_DIR_STYLE == LIBOBS_IMAGEMAGICK_DIR_STYLE_6L
+ #include 
++#elif LIBOBS_IMAGEMAGICK_DIR_STYLE == LIBOBS_IMAGEMAGICK_DIR_STYLE_7GE
++#include 
++#endif
+ 
+ void gs_init_image_deps()
+ {
+diff --git a/libobs/obsconfig.h.in b/libobs/obsconfig.h.in
+index f86962d5..cc1f4005 100644
+--- a/libobs/obsconfig.h.in
 b/libobs/obsconfig.h.in
+@@ -17,3 +17,6 @@
+ #define OBS_UNIX_STRUCTURE @OBS_UNIX_STRUCTURE@
+ #define BUILD_CAPTIONS @BUILD_CAPTIONS@
+ #define HAVE_DBUS @HAVE_DBUS@
++#define LIBOBS_IMAGEMAGICK_DIR_STYLE_6L 6
++#define LIBOBS_IMAGEMAGICK_DIR_STYLE_7GE 7
++#define LIBOBS_IMAGEMAGICK_DIR_STYLE @LIBOBS_IMAGEMAGICK_DIR_STYLE@
+-- 
+2.14.1
+

diff --git a/media-video/obs-studio/obs-studio-18.0.2.ebuild 
b/media-video/obs-studio/obs-studio-18.0.2.ebuild
index 07c1a8007eb..40f9313612c 100644
--- a/media-video/obs-studio/obs-studio-18.0.2.ebuild
+++ b/media-video/obs-studio/obs-studio-18.0.2.ebuild
@@ -51,6 +51,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES="${FILESDIR}/${PN}-ImageMagick-header-path.patch"
+
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 src_configure() {

diff --git a/media-video/obs-studio/obs-studio-19.0.2.ebuild 
b/media-video/obs-studio/obs-studio-19.0.2.ebuild
index 07c1a8007eb..40f9313612c 100644
--- a/media-video/obs-studio/obs-studio-19.0.2.ebuild
+++ b/media-video/obs-studio/obs-studio-19.0.2.ebuild
@@ -51,6 +51,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES="${FILESDIR}/${PN}-ImageMagick-header-path.patch"
+
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 src_configure() {

diff --git a/media-video/obs-studio/obs-studio-20.0.1.ebuild 
b/media-video/obs-studio/obs-studio-20.0.1.ebuild
index 07c1a8007eb..40f9