From c1b700a932a9be817ae937f63d9da3b0fb82bed3 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 22 Jul 2025 10:07:43 +0200 Subject: [PATCH] assimp, revbump, add missing prefix= for pkg-config (#12615) --- media-libs/assimp/assimp-6.0.2.recipe | 4 +--- .../assimp/patches/assimp-6.0.2.patchset | 21 ++++++++++++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/media-libs/assimp/assimp-6.0.2.recipe b/media-libs/assimp/assimp-6.0.2.recipe index dbf5098a9..16fa0ed55 100644 --- a/media-libs/assimp/assimp-6.0.2.recipe +++ b/media-libs/assimp/assimp-6.0.2.recipe @@ -6,7 +6,7 @@ and is therefore suitable as a general-purpose 3D model converter." HOMEPAGE="https://assimp.org" COPYRIGHT="2006-2025, assimp team" LICENSE="BSD (3-clause)" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/assimp/assimp/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="d1822d9a19c9205d6e8bc533bf897174ddb360ce504680f294170cc1d6319751" SOURCE_DIR="assimp-$portVersion" @@ -61,8 +61,6 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:cmake -# cmd:dot -# cmd:doxygen cmd:gcc$secondaryArchSuffix cmd:ninja cmd:pkg_config$secondaryArchSuffix diff --git a/media-libs/assimp/patches/assimp-6.0.2.patchset b/media-libs/assimp/patches/assimp-6.0.2.patchset index 27816bd6e..18cb7f308 100644 --- a/media-libs/assimp/patches/assimp-6.0.2.patchset +++ b/media-libs/assimp/patches/assimp-6.0.2.patchset @@ -1,4 +1,4 @@ -From f070ee55492d998b367dcbc3f982bbaad1b4e78c Mon Sep 17 00:00:00 2001 +From 5706da3c7976aeed5eea8e56c868a373ccc9564d Mon Sep 17 00:00:00 2001 From: Begasus Date: Wed, 27 Sep 2023 10:04:20 +0200 Subject: Disable failing/crashing tests @@ -20,3 +20,22 @@ index 392951b..27c0249 100644 -- 2.48.1 + +From 7a19ed47db9e9bc3ee9c9588ee16484034719d9f Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Tue, 22 Jul 2025 10:01:27 +0200 +Subject: Add missing prefix for pkg-config + + +diff --git a/assimp.pc.in b/assimp.pc.in +index 555a3a1..280abe6 100644 +--- a/assimp.pc.in ++++ b/assimp.pc.in +@@ -1,3 +1,4 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ + libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + +-- +2.48.1 +