diff options
| author |   Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2019-12-27 16:59:46 +0100 |
|---|---|---|
| committer |   Aaron Bauman <bman@gentoo.org> | 2019-12-27 12:09:24 -0500 |
| commit | be6eb5f9cbb20256e170f656689f680e1295f6f3 (patch) | |
| tree | cddbd63bfeabdfc78289e938e87ea465e2c222f7 /media-video/obs-studio | |
| parent | sys-libs/efivar: remove unused patch(es) (diff) | |
| download | gentoo-be6eb5f9cbb20256e170f656689f680e1295f6f3.tar.gz gentoo-be6eb5f9cbb20256e170f656689f680e1295f6f3.tar.bz2 gentoo-be6eb5f9cbb20256e170f656689f680e1295f6f3.zip | |
media-video/obs-studio: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14139
Signed-off-by: Aaron Bauman <bman@gentoo.org>
Diffstat (limited to 'media-video/obs-studio')
| -rw-r--r-- | media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch | 50 |
1 files changed, 0 insertions, 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 619c414d6b8a..000000000000 --- 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 - |