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

5 files changed, 31 insertions, 56 deletions

diff --git a/media-libs/libvpl/Manifest b/media-libs/libvpl/Manifest
index 403b9311b489..a9cc63d79cd1 100644
--- a/media-libs/libvpl/Manifest
+++ b/media-libs/libvpl/Manifest
@@ -1,5 +1,4 @@
-DIST libvpl-2.12.0.tar.gz 11398775 BLAKE2B e1f0a59f7261dae399eae39318b0c9c9fc671a013c4b7442af34025dce981112f6d254e39f1de432e4f4f155d00148ec9c89652e05734e1ba9cfd6e14f54d4c0 SHA512 4a9f0272684c896ca8a11c316fe05f7ea60c0cd402b0b474a90523f5aca1a16cffac84d89758c27d837ca6e7ac68b82d6aec028ee7aa237626a2194709f48782
+AUX libvpl-2.13.0_do-not-fortify-source.patch 621 BLAKE2B f442e69117e900a7d68c62bd131ed4de0d714f3496eb392d15f0b75b9faa27f05d234a2afe9ce016d29876e5ef3ef8a1bbe55eeac2bb21a8348b36fd7604c1f8 SHA512 3c312dee1360882523dcc9e57290cc3b4857f0361578d289625d0dc7dad73b2618fa83c7a44d387c46bef83bbe7b41d30120e006876621e49d7c089470e17163
 DIST libvpl-2.13.0.tar.gz 12952887 BLAKE2B e90bb3a99127b07dc29c9bf8ea2411f4b360344e11050c1e5821840eed9a54c0d73d88aabf425dbda7313b95e416f5323ee535b9c5e5f11d76c4e0465e1ca16e SHA512 22b9f409a9b8ed551847e1b5a94d0c48502b5fbf68ec28021ba36d3f851ef83896205977e6b7f52c102f747a8fbc793424181ecd7edaf6058a39dc15b78d19cd
-EBUILD libvpl-2.12.0.ebuild 1255 BLAKE2B 3940c7c58612dc7467bde196e096e5517786779a0707c7bf75d68745dcdf4c8cb778c04c1743be038e450f5b40b66432797d75891cdfedfbfa14ad7c2a80fd21 SHA512 22b4552b91f68069d2549ac23d8b0520723743e3c3d8c14a7119fd4db6a8c2cec22301e8b6bb16ec9489febc57e92998db7a717f6ecfa07639b7763cb1dfda43
-EBUILD libvpl-2.13.0.ebuild 1255 BLAKE2B 3940c7c58612dc7467bde196e096e5517786779a0707c7bf75d68745dcdf4c8cb778c04c1743be038e450f5b40b66432797d75891cdfedfbfa14ad7c2a80fd21 SHA512 22b4552b91f68069d2549ac23d8b0520723743e3c3d8c14a7119fd4db6a8c2cec22301e8b6bb16ec9489febc57e92998db7a717f6ecfa07639b7763cb1dfda43
-MISC metadata.xml 407 BLAKE2B b10280f12819036e677bdbb6dbd0cf7f81a803dbc9fa23d83cbc7e94a5badd50f260b63d435f8d5d9ebb9db27aecccc353b6786e39a6edd0b51f7f295e95e964 SHA512 ed3a0974951e38276959129081740439552d28a791b3ead3f2a86918465a145fdc834536ac87203e379b668b052f4cc8deccb6d491a5f306604a64fb72411e68
+EBUILD libvpl-2.13.0-r1.ebuild 1322 BLAKE2B cbe04b31cc052ac6e5974879ef5dd78914c7c6fcb034444dbdcdaa8f9f8280506b6c8a9bd48807f0ac77fabdc2ced6a2881ebb510fca5a3209ca10f209bd23f8 SHA512 1418264f49209f2873c1f574ee9e0d93453e909ead581e2a8a67d73f1b48d81decbce08876329199ba7c2d1a37bb65e1321c51ba4f18ca1a12a5d85610f22258
+MISC metadata.xml 547 BLAKE2B 92a2d90d5d73f9098394281434bc44090255debcb56b9cbf62922e2725a8411badeddd5066e1d23e008f2c197d5e05cf7d7ec1a332e98c7c8684b9260394ce85 SHA512 782288e953949c7e7d362df567e10ca784473975d470d2f0eca1ebba2fcca13f1521d52711acc3c74dd259a617c95d9c343de87ab8f573595950e26b8638090b
diff --git a/media-libs/libvpl/files/libvpl-2.13.0_do-not-fortify-source.patch b/media-libs/libvpl/files/libvpl-2.13.0_do-not-fortify-source.patch
new file mode 100644
index 000000000000..94fd05d1a7e8
--- /dev/null
+++ b/media-libs/libvpl/files/libvpl-2.13.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/libvpl-2.12.0.ebuild b/media-libs/libvpl/libvpl-2.13.0-r1.ebuild
index a30f50707598..78694b54c476 100644
--- a/media-libs/libvpl/libvpl-2.12.0.ebuild
+++ b/media-libs/libvpl/libvpl-2.13.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake-multilib optfeature flag-o-matic
 
 DESCRIPTION="Intel Video Processing Library dispatcher"
-HOMEPAGE="https://github.com/intel/libvpl/"
+HOMEPAGE="https://github.com/intel/libvpl"
 SRC_URI="https://github.com/intel/libvpl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -22,6 +22,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.13.0_do-not-fortify-source.patch )
+
 src_prepare() {
 	filter-lto
 	cmake_src_prepare
diff --git a/media-libs/libvpl/libvpl-2.13.0.ebuild b/media-libs/libvpl/libvpl-2.13.0.ebuild
deleted file mode 100644
index a30f50707598..000000000000
--- a/media-libs/libvpl/libvpl-2.13.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib optfeature flag-o-matic
-
-DESCRIPTION="Intel Video Processing Library dispatcher"
-HOMEPAGE="https://github.com/intel/libvpl/"
-SRC_URI="https://github.com/intel/libvpl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	x11-libs/libpciaccess[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	filter-lto
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTS="$(usex test)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# Remove these license files
-	rm -r "${ED}/usr/share/vpl/licensing" || die
-}
-
-pkg_postinst() {
-	optfeature_header "This package provides only the dispatcher, to use it install one or more implementations"
-	optfeature "CPUs" media-libs/oneVPL-cpu
-	optfeature "Intel GPUs newer then, and including, Intel Xe" media-libs/vpl-gpu-rt
-	optfeature "Intel GPUs older then Intel Xe" media-libs/intel-mediasdk
-}
diff --git a/media-libs/libvpl/metadata.xml b/media-libs/libvpl/metadata.xml
index cc06f95011b8..6a94d10f5b12 100644
--- a/media-libs/libvpl/metadata.xml
+++ b/media-libs/libvpl/metadata.xml
@@ -9,6 +9,8 @@
 		<name>Nowa Ammerlaan</name>
 	</maintainer>
 	<upstream>
+		<bugs-to>https://github.com/intel/libvpl/issues</bugs-to>
+		<changelog>https://github.com/intel/libvpl/blob/main/CHANGELOG.md</changelog>
 		<remote-id type="github">intel/libvpl</remote-id>
 	</upstream>
 </pkgmetadata>