gentoo auto-resync : 20:12:2024 - 06:30:59

5 files changed, 30 insertions, 75 deletions

diff --git a/media-libs/libvpl-tools/Manifest b/media-libs/libvpl-tools/Manifest
index 0f58aa1d12b4..863cc334deb4 100644
--- a/media-libs/libvpl-tools/Manifest
+++ b/media-libs/libvpl-tools/Manifest
@@ -1,5 +1,4 @@
-DIST libvpl-tools-1.1.0.tar.gz 1282378 BLAKE2B 4565c5f4c3c7128a925882877f432ac4618ea8d3df05ec308cb6d6b0201fd94953597ce42f1e90dec73ad02612c74afa9deea1a68116436f78204f92ecfeb1e8 SHA512 2aa1e8bca981018bfd09a1500062f468364e7dac51c8643c08103ad3adf791e67b718bec01388143f95e2b1d47eac0cab8a31100574124fae825e8272d4fc87e
+AUX libvpl-tools-1.2.0_do-not-fortify-source.patch 621 BLAKE2B f442e69117e900a7d68c62bd131ed4de0d714f3496eb392d15f0b75b9faa27f05d234a2afe9ce016d29876e5ef3ef8a1bbe55eeac2bb21a8348b36fd7604c1f8 SHA512 3c312dee1360882523dcc9e57290cc3b4857f0361578d289625d0dc7dad73b2618fa83c7a44d387c46bef83bbe7b41d30120e006876621e49d7c089470e17163
 DIST libvpl-tools-1.2.0.tar.gz 1294249 BLAKE2B 8a9e8db303d7b0632c7a0e8b03fa1ebff79dedbe581e185824f731415fb3bb9bc58712551ccea9354d0f8b04755efc222c27d1b1e9f6a34d7fd1982d89bb4dd5 SHA512 e44e752aec48673ff93c7d6eaa9363150607e299008b5df6bed2a6373355c37483d68d703b2e45586ff6062a83ef87fabbd70c034926389873bb3470b1712bc4
-EBUILD libvpl-tools-1.1.0.ebuild 1452 BLAKE2B a0c97021b9c754fc4eb87751a6ad864f860cb4a5cba03bd4cccba32276d2ff3565de5d96e79164f902124e1b5eb84361c00374120debfaf08f9408d2ede3f842 SHA512 825af6d9303878c98c884ee82ae4f36f50a923796ede7f451e22b2600c1a5dfe3716af6572163c961ea546493a846ec7ab36fd976baef68984ddac80601022a8
-EBUILD libvpl-tools-1.2.0.ebuild 1452 BLAKE2B a0c97021b9c754fc4eb87751a6ad864f860cb4a5cba03bd4cccba32276d2ff3565de5d96e79164f902124e1b5eb84361c00374120debfaf08f9408d2ede3f842 SHA512 825af6d9303878c98c884ee82ae4f36f50a923796ede7f451e22b2600c1a5dfe3716af6572163c961ea546493a846ec7ab36fd976baef68984ddac80601022a8
-MISC metadata.xml 393 BLAKE2B 8950d1fc554e555758b5fbfe44d4cdb0e3fbd8259013814bd7a642c37a8856f7b7ffe9080338d029efe01d1a278bab89b115f8c5439324d863431b87b3845e6d SHA512 e1fbbf1b3792876196640507f9c5cb795de0bac5dc91ba2a8291a113146b9b6c599dd53592232573243aed881c1fa3857f3e18f55c7344ab98c08678d368c845
+EBUILD libvpl-tools-1.2.0-r1.ebuild 1519 BLAKE2B 4741a7661f41bd3b80cb1b455bfeb564dab513222434e5f4866f9df7aa310cb7c6eda5498c4bc10eaaa8ef073e123f495ed58e436803c784dfd49541809b5a94 SHA512 bc507d4dcce61c24b786a43caaf537ccc65fdcab0845178cf7b01c446f9a1dcee385ae4b6daca6136b6e1d3db64595ab0e9af2a915ea790768e2e8aba4e85110
+MISC metadata.xml 545 BLAKE2B 1f5a4cc60e452916881733e0798dfb590493cf1243a665cb6e19c1c2be7659bb358d6b2bccafb1829f75e15f38ee267c5892be1674433c864800e77e6832a468 SHA512 16f590f508be56605fa123391b5500f2ed3d42e31a97d39736a040c6400d2d310dfd26aad8b3f26bed7afa27bd16ed9595e71cac9066170cd70684a153fba32f
diff --git a/media-libs/libvpl-tools/files/libvpl-tools-1.2.0_do-not-fortify-source.patch b/media-libs/libvpl-tools/files/libvpl-tools-1.2.0_do-not-fortify-source.patch
new file mode 100644
index 000000000000..94fd05d1a7e8
--- /dev/null
+++ b/media-libs/libvpl-tools/files/libvpl-tools-1.2.0_do-not-fortify-source.patch
@@ -0,0 +1,23 @@
+From: Filip Kobierski <fkobi@pm.me>
+
+---
+ cmake/CompileOptions.cmake | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/cmake/CompileOptions.cmake b/cmake/CompileOptions.cmake
+index 02926c4..bba557d 100644
+--- a/cmake/CompileOptions.cmake
++++ b/cmake/CompileOptions.cmake
+@@ -51,9 +51,6 @@ else()
+   add_compile_options("-Werror=format-security")
+   if(NOT MINGW)
+     string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+-    if(NOT CMAKE_BUILD_TYPE MATCHES debug)
+-      add_definitions("-D_FORTIFY_SOURCE=2")
+-    endif()
+   endif()
+   if(NOT MINGW)
+     add_compile_options("-fstack-protector-strong")
+-- 
+2.45.2
+
diff --git a/media-libs/libvpl-tools/libvpl-tools-1.1.0.ebuild b/media-libs/libvpl-tools/libvpl-tools-1.2.0-r1.ebuild
index 60f9e36be1fe..bb09032dafcc 100644
--- a/media-libs/libvpl-tools/libvpl-tools-1.1.0.ebuild
+++ b/media-libs/libvpl-tools/libvpl-tools-1.2.0-r1.ebuild
@@ -47,6 +47,8 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.2.0_do-not-fortify-source.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
diff --git a/media-libs/libvpl-tools/libvpl-tools-1.2.0.ebuild b/media-libs/libvpl-tools/libvpl-tools-1.2.0.ebuild
deleted file mode 100644
index 60f9e36be1fe..000000000000
--- a/media-libs/libvpl-tools/libvpl-tools-1.2.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Intel Video Processing Library tools"
-HOMEPAGE="https://github.com/intel/libvpl-tools/"
-SRC_URI="https://github.com/intel/libvpl-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="dri +drm opencl test +vaapi wayland X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	dri? ( X )
-	opencl? ( X )
-	vaapi? ( drm )
-	wayland? ( vaapi )
-	X? ( vaapi )
-"
-
-RDEPEND="
-	drm? ( x11-libs/libdrm[video_cards_intel] )
-	opencl? ( virtual/opencl )
-	vaapi? ( media-libs/libva[X?,wayland?,drm(+)?] )
-	wayland? (
-		dev-libs/wayland
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-	x11-libs/libpciaccess
-	>=media-libs/libvpl-2.11.0:=
-"
-
-DEPEND="${RDEPEND}
-	wayland? (
-		dev-libs/wayland-protocols
-	)
-"
-
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTS="$(usex test)"
-
-		-DBUILD_EXPERIMENTAL="$(usex X)"
-		-DTOOLS_ENABLE_X11="$(usex X)"
-		-DTOOLS_ENABLE_SCREEN_CAPTURE="$(usex X)"
-		-DTOOLS_ENABLE_RENDER="$(usex X)"
-		-DTOOLS_ENABLE_OPENCL="$(usex opencl)"
-
-		-DENABLE_DRI3="$(usex dri)"
-		-DENABLE_DRM="$(usex drm)"
-		-DENABLE_VA="$(usex vaapi)"
-		-DENABLE_WAYLAND="$(usex wayland)"
-		-DENABLE_X11="$(usex X)"
-
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/libvpl-tools/metadata.xml b/media-libs/libvpl-tools/metadata.xml
index fa93f977ac83..4cd94fde2649 100644
--- a/media-libs/libvpl-tools/metadata.xml
+++ b/media-libs/libvpl-tools/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Nowa Ammerlaan</name>
 	</maintainer>
 	<upstream>
+		<bugs-to>https://github.com/intel/libvpl-tools/issues</bugs-to>
+		<changelog>https://github.com/intel/libvpl-tools/blob/main/CHANGELOG.md</changelog>
 		<remote-id type="github">intel/libvpl-tools</remote-id>
 	</upstream>
 	<use>