From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 media-video/obs-v4l2sink/Manifest                  |  3 +-
 .../obs-v4l2sink-0.1.0_p20181012-installdirs.patch | 22 +++++++++++
 .../obs-v4l2sink-0.1.0_p20181012-r1.ebuild         | 39 --------------------
 .../obs-v4l2sink-0.1.0_p20181012-r2.ebuild         | 43 ++++++++++++++++++++++
 4 files changed, 67 insertions(+), 40 deletions(-)
 create mode 100644 media-video/obs-v4l2sink/files/obs-v4l2sink-0.1.0_p20181012-installdirs.patch
 delete mode 100644 media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r1.ebuild
 create mode 100644 media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild

(limited to 'media-video/obs-v4l2sink')

diff --git a/media-video/obs-v4l2sink/Manifest b/media-video/obs-v4l2sink/Manifest
index dda7efb4beb4..b5700831b39a 100644
--- a/media-video/obs-v4l2sink/Manifest
+++ b/media-video/obs-v4l2sink/Manifest
@@ -1,3 +1,4 @@
+AUX obs-v4l2sink-0.1.0_p20181012-installdirs.patch 676 BLAKE2B acc766c095bc7c3e6b430f4d3da5d5f8ca4fd8317128271ffc63e137dcbca70a466a18ca43c96c6c028b95006e1d861c92056b5e7b05604d48302dc8a4ab5457 SHA512 30c5753eb5335bd13da05f80526b2c634d7f548c126e50efb87c9ac698042f0f00a2b72f3913f4586015f809b0ddf1800cc6334dadb10b1098f148853e00681d
 DIST obs-v4l2sink-0.1.0_p20181012.tar.gz 21392 BLAKE2B 7f024a89c900588a4b3a45d598622e05d25b2eabbd007d5ce701d82ab935fa5a267faaf903925ec19e74071b5f4d32a5f39c810d181c97ea047060bfa69c145c SHA512 c64cff7feff7722e8cfd66f92daa46d8cb189da5adc50dabddd21baaa97e033611b94f1dafb9a9ad9a58504930fb40e05d7e5a4d128ee703b60993be7edc063c
-EBUILD obs-v4l2sink-0.1.0_p20181012-r1.ebuild 899 BLAKE2B b0c1a5d883dce4340248926d1715a76557166bd7677ade92fef6685b63c0f849bf49b92117dd4d6fbf8fdd3ce65f7d7886788cab3f9673697282b54c7c538a9c SHA512 820cb55a1a46177dd4dfaa3d05648d9422c3efb35a6fb01c592aaa454d2b4c45753c2d0725987f9d06f96f4afa370e02557e89e6350349aab768e48820c57284
+EBUILD obs-v4l2sink-0.1.0_p20181012-r2.ebuild 950 BLAKE2B f782a31611d44763f20076e8f24da8f76a0f56a4d26d89a273cf71bd2c813abfe9a03bc6db2dbf8147b0c69956df8cd206c25fe1d34b1b0ea853830e5d25dda3 SHA512 ad43125ae2b8633ab7f8f85ee7a599f1f2ee4584abaf5698489a1b6028165f3e2b490d68f9e8778f823e7d005e6890912038bc37c6f0273c144aac6531126d4a
 MISC metadata.xml 343 BLAKE2B 6d8ec79efa0900dedd95ea0553bf90149d71f20b3b5daac1ad96df17dbc62c338a987b47344674a708f88060ae4210bf3d763b69e310b75437ef8dcc09bb649a SHA512 0d0dceaa03c65f0df6d9aeda0a1ee8972a181305444735395aec2a6d74c3273c27928008fc4a6d6719d5901ece2a0e69473d7c9df137aff9421483b15b65085e
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 000000000000..39af16be2719
--- /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-r1.ebuild
deleted file mode 100644
index 11c55edfea57..000000000000
--- a/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_REMOVE_MODULES_LIST="FindLibObs"
-inherit cmake
-
-DESCRIPTION="obs studio output plugin for Video4Linux2 device"
-HOMEPAGE="https://github.com/CatxFish/obs-v4l2sink"
-COMMIT="1ec3c8ada0e1040d867ce567f177be55cd278378"
-SRC_URI="https://github.com/CatxFish/obs-v4l2sink/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/obs-studio-25.0.8-r1
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-PDEPEND="media-video/v4l2loopback"
-
-src_prepare() {
-	sed -i -e '/include(external\/FindLibObs.cmake)/d' -e 's#../UI#UI#' CMakeLists.txt
-	cmake_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DLIBOBS_INCLUDE_DIR="/usr/include/obs/"
-	)
-	cmake_src_configure
-}
diff --git a/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild b/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild
new file mode 100644
index 000000000000..4b4f0cc3d8fb
--- /dev/null
+++ b/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_REMOVE_MODULES_LIST="FindLibObs"
+inherit cmake
+
+DESCRIPTION="obs studio output plugin for Video4Linux2 device"
+HOMEPAGE="https://github.com/CatxFish/obs-v4l2sink"
+COMMIT="1ec3c8ada0e1040d867ce567f177be55cd278378"
+SRC_URI="https://github.com/CatxFish/obs-v4l2sink/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/obs-studio-25.0.8-r1
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+"
+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
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DLIBOBS_INCLUDE_DIR="/usr/include/obs/"
+	)
+	cmake_src_configure
+}
-- 
cgit v1.2.3