* [gentoo-commits] repo/gentoo:master commit in: media-video/obs-v4l2sink/, media-video/obs-v4l2sink/files/
@ 2020-07-13 19:51 Andreas K. Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas K. Hüttel @ 2020-07-13 19:51 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/obs-v4l2sink/, media-video/obs-v4l2sink/files/
@ 2024-04-11 9:27 Matt Jolly
0 siblings, 0 replies; 2+ messages in thread
From: Matt Jolly @ 2024-04-11 9:27 UTC (permalink / raw
To: gentoo-commits
commit: a2e632392bf8a59279e9ea3a44165e30a11d6116
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 07:31:53 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 09:25:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e63239
media-video/obs-v4l2sink: treeclean
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
media-video/obs-v4l2sink/Manifest | 1 -
.../obs-v4l2sink-0.1.0_p20181012-installdirs.patch | 22 -----------
media-video/obs-v4l2sink/metadata.xml | 11 ------
.../obs-v4l2sink-0.1.0_p20181012-r2.ebuild | 43 ----------------------
4 files changed, 77 deletions(-)
diff --git a/media-video/obs-v4l2sink/Manifest b/media-video/obs-v4l2sink/Manifest
deleted file mode 100644
index 9688501c8157..000000000000
--- a/media-video/obs-v4l2sink/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST obs-v4l2sink-0.1.0_p20181012.tar.gz 21392 BLAKE2B 7f024a89c900588a4b3a45d598622e05d25b2eabbd007d5ce701d82ab935fa5a267faaf903925ec19e74071b5f4d32a5f39c810d181c97ea047060bfa69c145c SHA512 c64cff7feff7722e8cfd66f92daa46d8cb189da5adc50dabddd21baaa97e033611b94f1dafb9a9ad9a58504930fb40e05d7e5a4d128ee703b60993be7edc063c
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
deleted file mode 100644
index 39af16be2719..000000000000
--- a/media-video/obs-v4l2sink/files/obs-v4l2sink-0.1.0_p20181012-installdirs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/metadata.xml b/media-video/obs-v4l2sink/metadata.xml
deleted file mode 100644
index fdb0fd9f762b..000000000000
--- a/media-video/obs-v4l2sink/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>zerochaos@gentoo.org</email>
- <name>Rick Farina</name>
- </maintainer>
- <upstream>
- <remote-id type="github">CatxFish/obs-v4l2sink</remote-id>
- </upstream>
-</pkgmetadata>
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
deleted file mode 100644
index 41cb4b07deae..000000000000
--- a/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2023 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() {
- local mycmakeargs=(
- -DLIBOBS_INCLUDE_DIR="/usr/include/obs/"
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-11 9:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-11 9:27 [gentoo-commits] repo/gentoo:master commit in: media-video/obs-v4l2sink/, media-video/obs-v4l2sink/files/ Matt Jolly
-- strict thread matches above, loose matches on Subject: below --
2020-07-13 19:51 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox