diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-10-27 14:48:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-27 14:48:06 +0100 |
commit | 3529f1bf2739399905cd55b27c7609459bfc069f (patch) | |
tree | 030ac4ab6cc001de1876af06bc97f8d480c911f1 /media-libs | |
parent | 0fcaac21e786bd7911b1e8f436cd885c5e2f6437 (diff) |
gentoo auto-resync : 27:10:2023 - 14:48:06
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/Manifest.gz | bin | 69228 -> 69239 bytes | |||
-rw-r--r-- | media-libs/SoXt/Manifest | 2 | ||||
-rw-r--r-- | media-libs/SoXt/SoXt-1.4.0-r1.ebuild | 47 | ||||
-rw-r--r-- | media-libs/SoXt/files/SoXt-1.4.0-drop-register-keyword.patch | 43 | ||||
-rw-r--r-- | media-libs/libid3tag/Manifest | 2 | ||||
-rw-r--r-- | media-libs/libid3tag/libid3tag-0.16.3.ebuild | 2 | ||||
-rw-r--r-- | media-libs/openimageio/Manifest | 14 | ||||
-rw-r--r-- | media-libs/openimageio/openimageio-2.4.12.0.ebuild | 7 | ||||
-rw-r--r-- | media-libs/openimageio/openimageio-2.4.13.0.ebuild | 7 | ||||
-rw-r--r-- | media-libs/openimageio/openimageio-2.4.14.0.ebuild | 6 | ||||
-rw-r--r-- | media-libs/openimageio/openimageio-2.4.15.0.ebuild | 6 | ||||
-rw-r--r-- | media-libs/openimageio/openimageio-2.4.16.0.ebuild | 6 | ||||
-rw-r--r-- | media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild | 1 | ||||
-rw-r--r-- | media-libs/openimageio/openimageio-2.5.4.0.ebuild | 11 |
14 files changed, 122 insertions, 32 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex dd2f44344ac8..bef2b00c339c 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/SoXt/Manifest b/media-libs/SoXt/Manifest index 31874695739e..a61bea5051dc 100644 --- a/media-libs/SoXt/Manifest +++ b/media-libs/SoXt/Manifest @@ -1,3 +1,5 @@ +AUX SoXt-1.4.0-drop-register-keyword.patch 1253 BLAKE2B 857056775a0cc5959f05377d30ce1dc6f69dd7d6754330f97ffe0008c257a12471fb996d9df16a8bb4205486b40e15a8d621b0cf86fda73acd096d093f694a02 SHA512 748cb1421d549c4641339b3ab1b7b0482118b68d34ef79dcec2d9037ee79c8a221780ac676fd2872ee728a2c04b3f7ff3013d53016f26cb65a8eefcdbbfde6d1 DIST SoXt-1.4.0-src.tar.gz 1369725 BLAKE2B 727c56644878e9d52441ca905558524ccd369de123e8018d7fef4d949aa4e96007fa3a1e9782490b4dc9d50a916686a118d37ec7094dc6a3522ede032b30b6ea SHA512 9c661396ec18c2cba8984be8c0875f51554c8845e1a85d9b202f9a0f4de8203566a46d9b276e20039861dbf7ff3a0ffa474d098866f8a7692b53a01e3f62977d +EBUILD SoXt-1.4.0-r1.ebuild 1029 BLAKE2B 5b1282b98b2feb48b6a1a04994b8b84c6f2086e2c1e92adb3e67b366c49cd943fd7bf5f3c4be5f338f2d3dab6628978e39a1cf19b4ad284df530713eaa433a79 SHA512 fb2701d59e05535f7400db1dcfb8b3c0fc788c360f07c27df7c6ab25a8a5d3930ee5c561ed8fd5958bd8746a91243957905a4c71c923b9336eac2f3047c034bb EBUILD SoXt-1.4.0.ebuild 948 BLAKE2B 439c5b9628d3fc9651a881ffab34682aa4fa94edc9e01a2e825e8ba563606a70de25167c1068401f6afd85a2abaf1fed1c91a12e36d8a44121d0788a4c2d70ba SHA512 8fd543f0b2cb02e37068b0be9eb325c7be02bb4aa2ef3a3fee8050cdad98c668989b5811757f3aaec492320d0c3a1d1d429fbc0c2ed29df4d716fd60aeba6d41 MISC metadata.xml 659 BLAKE2B 3b402f9fa90396baa373a263d4023d24c6099daac86af52a70fa9d48b9570d488a5565676dfb305ed06c817c57248afb50327f4227b206475f5b83b6162eb804 SHA512 5066a6d85c08974474c2cb8d27f328932a402b4e7649f6ac3cb9474beea2721b6e1d0728ba95166a2ca585b1a4e050ca0239acdf8ffe9e769f154a2000b423a2 diff --git a/media-libs/SoXt/SoXt-1.4.0-r1.ebuild b/media-libs/SoXt/SoXt-1.4.0-r1.ebuild new file mode 100644 index 000000000000..64483888e526 --- /dev/null +++ b/media-libs/SoXt/SoXt-1.4.0-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +MY_P=${P/soxt/SoXt} + +HOMEPAGE="https://github.com/coin3d/coin/wiki" +DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif" +SRC_URI="https://github.com/coin3d/soxt/releases/download/${MY_P}/${P}-src.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +SLOT="0" +IUSE="debug doc" + +RDEPEND=" + media-libs/coin + x11-libs/motif:0 + virtual/opengl +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +S="${WORKDIR}/soxt" + +DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO BUGS.txt) + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.0-drop-register-keyword.patch +) + +src_configure() { + use debug && append-cppflags -DSOXT_DEBUG=1 + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -DSOXT_BUILD_DOCUMENTATION=$(usex doc) + -DSOXT_BUILD_INTERNAL_DOCUMENTATION=OFF + -DSOXT_VERBOSE=$(usex debug) + ) + cmake_src_configure +} diff --git a/media-libs/SoXt/files/SoXt-1.4.0-drop-register-keyword.patch b/media-libs/SoXt/files/SoXt-1.4.0-drop-register-keyword.patch new file mode 100644 index 000000000000..fcbfa7dfd357 --- /dev/null +++ b/media-libs/SoXt/files/SoXt-1.4.0-drop-register-keyword.patch @@ -0,0 +1,43 @@ +https://github.com/coin3d/soxt/pull/17 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sat, 16 Sep 2023 07:32:47 +0000 +Subject: [PATCH] Fix C++17 does not allow register storage class specifier + +The register storage class was deprecated in C++14 and completely +removed in C++17. Hence, we cannot use it anymore and would result in a +build error. + +Bug: https://bugs.gentoo.org/896234 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/src/Inventor/Xt/widgets/SoXtGLArea.cpp ++++ b/src/Inventor/Xt/widgets/SoXtGLArea.cpp +@@ -468,7 +468,7 @@ createColormap( + } * cmapCache; + static int cacheEntries = 0; + static int cacheMalloced = 0; +- register int i; ++ int i; + + assert(widget->soxtGLArea.visualInfo); + +@@ -564,7 +564,7 @@ Realize( + Mask * valueMask, + XSetWindowAttributes * attributes) + { +- register SoXtGLAreaWidget glw = (SoXtGLAreaWidget) widget; ++ SoXtGLAreaWidget glw = (SoXtGLAreaWidget) widget; + SoXtGLAreaCallbackStruct cb; + Widget parentShell; + Status status; +@@ -670,7 +670,7 @@ Destroy( + Widget parentShell; + Status status; + int countReturn; +- register int i; ++ int i; + + if (glw->soxtGLArea.myList && glw->soxtGLArea.attribList) + XtFree((char *) glw->soxtGLArea.attribList); +-- +2.42.0 + diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest index def0d0eabce9..0f39a92c5094 100644 --- a/media-libs/libid3tag/Manifest +++ b/media-libs/libid3tag/Manifest @@ -1,5 +1,5 @@ DIST libid3tag-0.16.2.codeberg.tar.gz 53056 BLAKE2B 946e7b4db4faafe77773cefa3c3cf70c3452bc9d2c19503ec6739d255841706995efae3e6092b0b8fbe0be761284a7d74514369d437ee198c37f78fb3d92d4ae SHA512 b093614599ddc4d90072f355659a6d4d7d9fb6fe99509f62273db27291c02fb6cba280bb7ee954e014f4e5cffecc4e7f0258ebd15fcd18bf4e8abf8a02267c4c DIST libid3tag-0.16.3.codeberg.tar.gz 53218 BLAKE2B 58a4ce211aebef4b2f1f0e1a7214e2804e71d2cea805d3c275812978fb702148c5b435c289f9e83fd81fa1970bf83b7b8e772ed24843bcae7519fff455b50c15 SHA512 d49bc637899e4251ed66b5b56aa4c910dcdecd6b03ed197866d74175fc4eadff40f40f336606b23e2505b0e11834c4212a1314feeeaa2c0e9713051fdb56cb45 EBUILD libid3tag-0.16.2.ebuild 616 BLAKE2B b1bd558e77d0ccf530fbf4f27e11ac97396600a526fa6d6c18e6e7bd07c9c2a8dac4e09841b230a306689a60bfc9f0c45119b69d4819a827ad8a534fac941a3a SHA512 b5ef932d26902735237bd80d00763c6684c3a484c1743a79253ba62aa38f486cea675f096b650be2c2f2ccda9916b2a150051e79cc68111e1b966ea349c8c142 -EBUILD libid3tag-0.16.3.ebuild 617 BLAKE2B b4061a5ded555a7e41c8065b52ed88e9f4f1e4a3f049753e38ba2074d12f018ed55941e368715f14564770a93308e6be3223bfe993a8c52a988752b327de9ff8 SHA512 ae13daa53dce76d7209585eae79a89456e1a8394b1363c04211701dcbf05433ce9a01c710af5064d6077869dec1c47f427096e5ab873924078b24287b777fc19 +EBUILD libid3tag-0.16.3.ebuild 616 BLAKE2B b1bd558e77d0ccf530fbf4f27e11ac97396600a526fa6d6c18e6e7bd07c9c2a8dac4e09841b230a306689a60bfc9f0c45119b69d4819a827ad8a534fac941a3a SHA512 b5ef932d26902735237bd80d00763c6684c3a484c1743a79253ba62aa38f486cea675f096b650be2c2f2ccda9916b2a150051e79cc68111e1b966ea349c8c142 MISC metadata.xml 327 BLAKE2B a160fc0168c9b0eef874a76a9b6ad1bfbbb2818750ec2d1b14b76f16fd7659fa401889fb5d19a5abc628ed1a6142c9f9b445c3314b58591409b0a31692156630 SHA512 1b879933bdd99c3cab5e88bb24ed77961ec7d4e9f0890fdf9ccc098ca1a95e6c9fe1a7b55f5f0b6c10909ddcf73af7e176228f615998653fc25d9c888af9f8fa diff --git a/media-libs/libid3tag/libid3tag-0.16.3.ebuild b/media-libs/libid3tag/libid3tag-0.16.3.ebuild index 7fb1f05a82b3..5483790e54d4 100644 --- a/media-libs/libid3tag/libid3tag-0.16.3.ebuild +++ b/media-libs/libid3tag/libid3tag-0.16.3.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0/${PV}" # SOVERSION = ${CMAKE_PROJECT_VERSION} in CMakeLists.txt -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index 32f72a8e811f..9c65a53704f4 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -9,11 +9,11 @@ DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137900826 BLAKE2B e89fd990b5e3ef23a853fc554066804c2a092b74a7ee54e3f1654bf419904ca094fef2703cd2f29d90c6d2bc5b8c8808cf9e66eb858c6d8495fdb7941f5029d7 SHA512 6568d4171c7dbd12d86099fd3dc35bfe2cbd46af84e58884900c5cea6ccea0139eabdb6d2194217ab3cffac56a81d37db4fbae57eb2a05f7916c27fe75a51ee6 DIST openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910473 BLAKE2B 4fb43e1dc0a726fc64085884494b8fef23a824d38e79c5ec33ab4bd9338f5efbb91a6b534b89f37f868838984e22530e8f938436674b0972537fb6b25f3b9d57 SHA512 d7e49efd1ce07364f226318b6572ceb46d654f22d94baa031dea05c6529b51a23a81ae6940136c3f7dd749f65f105c2efcdb5609b21b291110b92419233b2521 -EBUILD openimageio-2.4.12.0.ebuild 6052 BLAKE2B 784a93858a12c4bddcaf0c74bfadd80bfa7a5fa0acf9e06c3a55e3635e6d3278f6379df2d016766f216defc0de368610c521180fded9eac4a7e3ffe1f8ba6ecd SHA512 5f6094fd7fc7b1603140894df33c3003fc7d9d427189af0f5efd71a8a4991932b2b964c6e413285af5ac2a777db92ac118da86b93832f84fad5e9f01acef7fc7 -EBUILD openimageio-2.4.13.0.ebuild 6336 BLAKE2B c17ec51d00b7d3f700e610430cd4e9b87d7c5c73a709eba46b896e202d4b56e941e196e29b526e291c52d09f6096e877e0b4377c3114fc431771b919f8f87ae7 SHA512 7fc966dc163774a97d6c2fc36196876f9e530d7de10f64fb553b8a7a05fc34c9127ffe06d1169bb3ab574a7a76ae8be9e966ae68f284f9e9ca6385825f59cb0d -EBUILD openimageio-2.4.14.0.ebuild 6253 BLAKE2B 9f4dc2a628918fdd68560e24cfd73c991df26c40b48a09e7d4c7b69f971ab72d253fe65598a8d0eb2191884a63910382b18634de14d9d97d6d194129b374df57 SHA512 ef68bf73dbba59c8ff0d88a467097031df1226e0120e766890939a6b56c11d8f6a907b03362f76a11f1da6c061de27df0a328d18638825672520b5d83e47b11f -EBUILD openimageio-2.4.15.0.ebuild 6253 BLAKE2B 9f4dc2a628918fdd68560e24cfd73c991df26c40b48a09e7d4c7b69f971ab72d253fe65598a8d0eb2191884a63910382b18634de14d9d97d6d194129b374df57 SHA512 ef68bf73dbba59c8ff0d88a467097031df1226e0120e766890939a6b56c11d8f6a907b03362f76a11f1da6c061de27df0a328d18638825672520b5d83e47b11f -EBUILD openimageio-2.4.16.0.ebuild 6253 BLAKE2B 9f4dc2a628918fdd68560e24cfd73c991df26c40b48a09e7d4c7b69f971ab72d253fe65598a8d0eb2191884a63910382b18634de14d9d97d6d194129b374df57 SHA512 ef68bf73dbba59c8ff0d88a467097031df1226e0120e766890939a6b56c11d8f6a907b03362f76a11f1da6c061de27df0a328d18638825672520b5d83e47b11f -EBUILD openimageio-2.4.6.0-r1.ebuild 5601 BLAKE2B b32f93d31b28d27735e63823f5b8b81770df031d79b53a3b493ff0d38ca254c3c1c33109fee56be96bfc70498de207e75df27122355c7a0be84be3ebc12c84f5 SHA512 658fddac9f1a55902fbec335d154251d337634113ab42e67221511dd14f18353e59629cd2eefe8e467a7ef514e6f2167e11f8906016b56c7e64ebd3508b133db -EBUILD openimageio-2.5.4.0.ebuild 6253 BLAKE2B 9f4dc2a628918fdd68560e24cfd73c991df26c40b48a09e7d4c7b69f971ab72d253fe65598a8d0eb2191884a63910382b18634de14d9d97d6d194129b374df57 SHA512 ef68bf73dbba59c8ff0d88a467097031df1226e0120e766890939a6b56c11d8f6a907b03362f76a11f1da6c061de27df0a328d18638825672520b5d83e47b11f +EBUILD openimageio-2.4.12.0.ebuild 6051 BLAKE2B 809e70a2ca1b450cf5f9406cca257cae4e26c26695d3e4a4c79e6d4837b291cf707f90a52296710349c7e0844b90f6204fc2e49eb379c1289e5d9f970a976832 SHA512 8baa31375825acf4c7b49ec360a3da6209983a738f901944d9de16c7b084dc2bcfae3f1efab9ec35f97736ff7284d8d96a3cfea761512451687e000a43a85b36 +EBUILD openimageio-2.4.13.0.ebuild 6335 BLAKE2B 7c28df73ce3afc983f819c4e1784a3e02296d36e552775b67cf99378bdabedd15f3e82cd7cc8e61ef68a8ab08e9936ab3fb1ad6a2634fbcd382b42921c0c2fe8 SHA512 897e9cbd1d170d5f134cc22ce44c936be58d70daa5758742dbddf0cdb63facfb0f9efe3f3f5c9996b196c07b4ef4d215a93a4bd330e1becf1c2dfdfb43b0acd2 +EBUILD openimageio-2.4.14.0.ebuild 6278 BLAKE2B 7a743c06728c2346dc9fc2b8973dfe523d611843f6324c052bce58268e5f35cbcb60f4e5833a2fdda72f7a5763d8f1577c7b20ec01b11e1bb328bbe84837241c SHA512 645717bf38a2fe4c0f6fbb26ca761961476d8b2dbc323aef98791f66add0a98beb361ab8212103875571d4381b5acd6d19a1354a57d1b2b129d4becec000bfe6 +EBUILD openimageio-2.4.15.0.ebuild 6278 BLAKE2B 7a743c06728c2346dc9fc2b8973dfe523d611843f6324c052bce58268e5f35cbcb60f4e5833a2fdda72f7a5763d8f1577c7b20ec01b11e1bb328bbe84837241c SHA512 645717bf38a2fe4c0f6fbb26ca761961476d8b2dbc323aef98791f66add0a98beb361ab8212103875571d4381b5acd6d19a1354a57d1b2b129d4becec000bfe6 +EBUILD openimageio-2.4.16.0.ebuild 6278 BLAKE2B 7a743c06728c2346dc9fc2b8973dfe523d611843f6324c052bce58268e5f35cbcb60f4e5833a2fdda72f7a5763d8f1577c7b20ec01b11e1bb328bbe84837241c SHA512 645717bf38a2fe4c0f6fbb26ca761961476d8b2dbc323aef98791f66add0a98beb361ab8212103875571d4381b5acd6d19a1354a57d1b2b129d4becec000bfe6 +EBUILD openimageio-2.4.6.0-r1.ebuild 5654 BLAKE2B 5494b79239fa8fc72c0c0b15cbd31ac5bcf595c395f17652dbaad5c022ed67488a7b79a4c958a1ad5eb391418ecd44839ae2563d1f1d6641622bc604dbaacce0 SHA512 1e21d215775aa4d29d37f535237c7682be2564d6fe3e2141462174499cedfbc088ac87d0de0bf0e7f617a62040dd6413960ea3fb8dfd7f7f1b021cb1439705a2 +EBUILD openimageio-2.5.4.0.ebuild 6240 BLAKE2B 97261101197cd2322cad5333323fb0c8d1d8192851706af0757e5a63bba07b1045c73f077417ae152951315126886a099f03bb3e6b09f39078f662333c5d1eb8 SHA512 e8e4523b344127eb36245ccbba44b26df08e490b5c2e725f40fa68682838086f474cabc8fb25829c2e63b6dd88714a4bcb73ec765f2d7ad0374ac733887da5e4 MISC metadata.xml 890 BLAKE2B 68791f6a441704bacadab7ef0470d89adb0858a169e77d4e4a3840ac2510cd9f19edbeaf23380a87f961cc478ccd3700ef27dacf25b4236133438a89cc3bc9d9 SHA512 da5dda694bda75fc3f216e44056abaae23c3dc41245271c4e48d3df774d011b7d58d26fb2dcf746ef9b73f3773e627ca6082ef89161f54271c3f4dc61d87ebb5 diff --git a/media-libs/openimageio/openimageio-2.4.12.0.ebuild b/media-libs/openimageio/openimageio-2.4.12.0.ebuild index 031e7ea96764..31c4f5904360 100644 --- a/media-libs/openimageio/openimageio-2.4.12.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.12.0.ebuild @@ -17,7 +17,7 @@ SRC_URI+=" test? ( https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz )" -S="${WORKDIR}/oiio-${PV}" +S="${WORKDIR}/OpenImageIO-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" @@ -104,6 +104,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -154,9 +155,7 @@ src_configure() { if use qt5 || use qt6; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.13.0.ebuild b/media-libs/openimageio/openimageio-2.4.13.0.ebuild index 8eedb3eb3558..da733907b3ce 100644 --- a/media-libs/openimageio/openimageio-2.4.13.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.13.0.ebuild @@ -17,7 +17,7 @@ SRC_URI+=" test? ( https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz )" -S="${WORKDIR}/oiio-${PV}" +S="${WORKDIR}/OpenImageIO-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" @@ -104,6 +104,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -158,9 +159,7 @@ src_configure() { if use qt5 || use qt6; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.14.0.ebuild b/media-libs/openimageio/openimageio-2.4.14.0.ebuild index 580024abaa23..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.4.14.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.14.0.ebuild @@ -18,6 +18,7 @@ SRC_URI=" https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz ) " +S="${WORKDIR}/OpenImageIO-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" @@ -107,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -161,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.15.0.ebuild b/media-libs/openimageio/openimageio-2.4.15.0.ebuild index 580024abaa23..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.4.15.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.15.0.ebuild @@ -18,6 +18,7 @@ SRC_URI=" https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz ) " +S="${WORKDIR}/OpenImageIO-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" @@ -107,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -161,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.16.0.ebuild b/media-libs/openimageio/openimageio-2.4.16.0.ebuild index 580024abaa23..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.4.16.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.16.0.ebuild @@ -18,6 +18,7 @@ SRC_URI=" https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz ) " +S="${WORKDIR}/OpenImageIO-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" @@ -107,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -161,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild index 09223e5d244c..79fdf5d96ef7 100644 --- a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild +++ b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild @@ -100,6 +100,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts diff --git a/media-libs/openimageio/openimageio-2.5.4.0.ebuild b/media-libs/openimageio/openimageio-2.5.4.0.ebuild index 580024abaa23..21ac40b86508 100644 --- a/media-libs/openimageio/openimageio-2.5.4.0.ebuild +++ b/media-libs/openimageio/openimageio-2.5.4.0.ebuild @@ -18,6 +18,7 @@ SRC_URI=" https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz ) " +S="${WORKDIR}/OpenImageIO-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" @@ -29,7 +30,7 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) -IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" +IUSE="dicom doc ffmpeg gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )" # Not quite working yet @@ -51,7 +52,7 @@ RDEPEND=" dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= - jpeg? ( media-libs/libjpeg-turbo:= ) + media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= @@ -107,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -145,7 +147,6 @@ src_configure() { "-DUSE_CCACHE=OFF" "-DUSE_DCMTK=$(usex dicom)" "-DUSE_EXTERNAL_PUGIXML=ON" - "-DUSE_JPEGTURBO=ON" "-DUSE_NUKE=OFF" # not in Gentoo "-DUSE_FFMPEG=$(usex ffmpeg)" "-DUSE_GIF=$(usex gif)" @@ -161,9 +162,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else |