diff options
| author |   Jimi Huotari <chiitoo@gentoo.org> | 2019-06-12 15:14:34 +0300 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-06-22 13:44:01 +0200 |
| commit | 0dbaa3a980de231efcae354207433fd14d148ebb (patch) | |
| tree | 758d5e6f96aaabab2c1444d7999bd209c435c7b7 /media-video/obs-studio/files | |
| parent | dev-util/lxqt-build-tools: remove version 0.5.0 (diff) | |
| download | gentoo-0dbaa3a980de231efcae354207433fd14d148ebb.tar.gz gentoo-0dbaa3a980de231efcae354207433fd14d148ebb.tar.bz2 gentoo-0dbaa3a980de231efcae354207433fd14d148ebb.zip | |
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 <chiitoo@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/12246
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-video/obs-studio/files')
| -rw-r--r-- | media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch | 50 |
1 files changed, 50 insertions, 0 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 new file mode 100644 index 000000000000..619c414d6b8a --- /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 <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 + |