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

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

[Aaron Bauman]

commit:     be6eb5f9cbb20256e170f656689f680e1295f6f3
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 27 15:59:46 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 17:09:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be6eb5f9

media-video/obs-studio: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14139
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../obs-studio-23.2.1-use-correct-libdir.patch     | 50 ----------------------
 1 file changed, 50 deletions(-)

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
deleted file mode 100644
index 619c414d6b8..00000000000
--- a/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ab67b39257be83eaab87c4a938c4c58b5cccad7e Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-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
-

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

[Andreas Sturmlechner]

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