public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/files/
Date: Fri, 21 May 2021 14:52:33 +0000 (UTC)	[thread overview]
Message-ID: <1621608735.6a7589ee44ca47f32dbd441b925e48d05d2a38a1.asturm@gentoo> (raw)

commit:     6a7589ee44ca47f32dbd441b925e48d05d2a38a1
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon May 10 15:46:12 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 21 14:52:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7589ee

media-video/obs-studio: remove unused patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20757
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/obs-studio-25.0.8-gcc-10-build.patch     | 30 ----------------------
 1 file changed, 30 deletions(-)

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
deleted file mode 100644
index 352ea2c937c..00000000000
--- a/media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c7f84f8fc4e90ef779a204ac268f5ee1a962e324 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-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


             reply	other threads:[~2021-05-21 14:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-21 14:52 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-12-27 17:10 [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/files/ Aaron Bauman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1621608735.6a7589ee44ca47f32dbd441b925e48d05d2a38a1.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox