[gentoo-commits] repo/gentoo:master commit in: media-libs/libuvc/files/, media-libs/libuvc/

[David Seifert]

commit:     3f342cecfb27a8c9234743ae3f687eea8b289b18
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  5 21:40:16 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 21:40:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f342cec

media-libs/libuvc: port to EAPI 8

Closes: https://bugs.gentoo.org/834310
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch | 36 ++++++++++++++++++++++
 ...buvc-0.0.6-r1.ebuild => libuvc-0.0.6-r2.ebuild} | 27 +++++-----------
 2 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch b/media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch
new file mode 100644
index 000000000000..e7ac5d7268fc
--- /dev/null
+++ b/media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch
@@ -0,0 +1,36 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,7 @@
+ 
+ SET(CMAKE_C_FLAGS_DEBUG "-g -DUVC_DEBUGGING")
+ 
+-SET(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/libuvc" CACHE PATH
++SET(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/libuvc" CACHE PATH
+ 	"Installation directory for CMake files")
+ 
+ SET(SOURCES src/ctrl.c src/ctrl-gen.c src/device.c src/diag.c
+@@ -110,18 +110,18 @@
+ 
+ install(TARGETS ${UVC_TARGETS}
+     EXPORT libuvcTargets
+-  LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}"
+-  ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}"
+-  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_PREFIX}/include/libuvc"
++  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libuvc"
+ )
+ 
+ export(TARGETS ${UVC_TARGETS}
+   FILE "${PROJECT_BINARY_DIR}/libuvcTargets.cmake")
+ export(PACKAGE libuvc)
+ 
+-set(CONF_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include")
+-set(CONF_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-set(CONF_LIBRARY "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/${CMAKE_SHARED_LIBRARY_PREFIX}uvc${CMAKE_SHARED_LIBRARY_SUFFIX}")
++set(CONF_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
++set(CONF_LIBRARY_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
++set(CONF_LIBRARY "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}uvc${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ 
+ configure_file(libuvcConfig.cmake.in ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libuvcConfig.cmake)
+ 

diff --git a/media-libs/libuvc/libuvc-0.0.6-r1.ebuild b/media-libs/libuvc/libuvc-0.0.6-r2.ebuild
similarity index 63%
rename from media-libs/libuvc/libuvc-0.0.6-r1.ebuild
rename to media-libs/libuvc/libuvc-0.0.6-r2.ebuild
index 881b8fc7a2fa..f8266936fe40 100644
--- a/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
+++ b/media-libs/libuvc/libuvc-0.0.6-r2.ebuild
@@ -1,42 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A cross-platform library for USB video devices, built atop libusb"
 HOMEPAGE="https://int80k.com/libuvc/"
 SRC_URI="https://github.com/ktossell/libuvc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	virtual/jpeg:0
 	virtual/libusb:1
-	virtual/udev
-"
+	virtual/udev"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-CMAKE_MIN_VERSION="2.8.0"
-
+PATCHES=( "${FILESDIR}"/${PN}-0.0.6-GNUInstallDirs.patch )
 DOCS=( changelog.txt README.md )
 
-src_prepare() {
-	sed -r -i \
-		-e 's/(\$\{CMAKE_INSTALL_PREFIX\}\/)lib/\1'"$(get_libdir)"'/' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TARGET=Shared
 	)
-
-	cmake-utils_src_configure
+	cmake_src_configure
 }