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

["Andreas K. Hüttel" <dilfridge@gentoo.org>]

commit:     e25cd60ac4a446d637b0889170c1d9c0b2d2e9f7
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 19:50:37 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 19:51:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25cd60a

media-video/obs-v4l2sink: Fix plugin install directory. Bug 723210.

Tested, works.

Closes: https://bugs.gentoo.org/723210
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 .../obs-v4l2sink-0.1.0_p20181012-installdirs.patch | 22 ++++++++++++++++++++++
 ...uild => obs-v4l2sink-0.1.0_p20181012-r2.ebuild} |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/media-video/obs-v4l2sink/files/obs-v4l2sink-0.1.0_p20181012-installdirs.patch b/media-video/obs-v4l2sink/files/obs-v4l2sink-0.1.0_p20181012-installdirs.patch
new file mode 100644
index 00000000000..39af16be271
--- /dev/null
+++ b/media-video/obs-v4l2sink/files/obs-v4l2sink-0.1.0_p20181012-installdirs.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 75d85f0..15e6bc1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ cmake_minimum_required(VERSION 3.5)
+ project(obs-v4l2sink)
++include(GNUInstallDirs)
+ 
+ 
+ include(external/FindLibObs.cmake)
+@@ -44,8 +45,8 @@ endif()
+ set_target_properties(v4l2sink PROPERTIES PREFIX "")
+ 
+ install(TARGETS v4l2sink
+-	LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins)
++	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/obs-plugins)
+ 
+ install(DIRECTORY locale/
+-	DESTINATION "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/v4l2sink/locale")
++	DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/obs/obs-plugins/v4l2sink/locale")
+ 

diff --git a/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r1.ebuild b/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild
similarity index 94%
rename from media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r1.ebuild
rename to media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild
index 11c55edfea5..4b4f0cc3d8f 100644
--- a/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r1.ebuild
+++ b/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild
@@ -26,6 +26,10 @@ RDEPEND="${DEPEND}"
 BDEPEND=""
 PDEPEND="media-video/v4l2loopback"
 
+PATCHES=(
+	"${FILESDIR}/${P}-installdirs.patch"
+)
+
 src_prepare() {
 	sed -i -e '/include(external\/FindLibObs.cmake)/d' -e 's#../UI#UI#' CMakeLists.txt
 	cmake_src_prepare