diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /media-libs/libuvc | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'media-libs/libuvc')
| -rw-r--r-- | media-libs/libuvc/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch | 36 | ||||
| -rw-r--r-- | media-libs/libuvc/libuvc-0.0.6-r2.ebuild (renamed from media-libs/libuvc/libuvc-0.0.6-r1.ebuild) | 27 |
3 files changed, 46 insertions, 20 deletions
diff --git a/media-libs/libuvc/Manifest b/media-libs/libuvc/Manifest index 7df9d39c6040..20e2dc8aef9c 100644 --- a/media-libs/libuvc/Manifest +++ b/media-libs/libuvc/Manifest @@ -1,3 +1,4 @@ +AUX libuvc-0.0.6-GNUInstallDirs.patch 1584 BLAKE2B cf4b7c747b1e4d2fb4ed54d7273aca710d9486c9f9348f104ca5ea6c4f2c4ecc7552fa4de2cbda7f64dd41f5d6526d83206f3cc45552c72a2b15be965f19cb3d SHA512 5f7dac19c337708385836a881837832cc1896aec424ef6ee9db1ef5c0f38815bbb75ea07bb29b24d8992686a4000e642cbc55aa72c7e38e48c2e92ac4fc64b14 DIST libuvc-0.0.6.tar.gz 95598 BLAKE2B 8c317068629512a699536d218401a4ab05925e43bb867ddd0c1b3c06f5b26e0291ad4c486a04f16f76ee03cf5d576b7387d4bde726acf105f7297372ec14b1ac SHA512 d8e52f5d062d2b4561562c9dc017d7f8d9d6734c4284e54b7bc58f9fc968cc8aec51dde938e8911a5c71d0c49fca4478c2fe08c9b7041d4fa26d7c6e1e653f1e -EBUILD libuvc-0.0.6-r1.ebuild 789 BLAKE2B 7b54213b0e68a9c660ee0159c012ad7f24eb0025ae91770bd5c8395c842c1dccddf825b47fc35366631cf269b0575f79e9fa1aec46906d472af638314f37b2ee SHA512 476cce36b9c961e877329baec2b56750d631e4d5836cbd8e4d16fbdcc5de57e88a7909aea5a51520a8d0e4e1986c2b029b0b6ccc3093493517118a18d3d3a6d4 +EBUILD libuvc-0.0.6-r2.ebuild 679 BLAKE2B f0022d44d61476528673970b2fc1bd85a8f9683f6351f71099efc26c7c2c453922a072a094a033e3886e2f03b4d2f524f53b0d488bab69a445266972bee85281 SHA512 27404bc76d36de06f3b54e94f0ab9cee421af5404515376a40d1f086146dd69751651d061f1450da249fb68ba4189d134e97340a20f3193473360858ae3c333c MISC metadata.xml 477 BLAKE2B cf7d3f2daa125b52a3399b1a922168ae0ae6a40866ebf77a429082a91d1f339269db810e586e15d7230eb851007759720a7f0787f6d53cd3cff690238e5323b9 SHA512 f24d7b6383a232e336ea32762d425767e96068dfb565a5df4d520da195d94ed0e6dd774323a01b307593229d19bd2af3ea9d7006dae81e1ce9353a542deed6bf 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 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 } |