diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-09-20 05:23:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-20 05:23:06 +0100 |
| commit | 295483480d7b8ba2fff987fdd32eaa36fe730ce4 (patch) | |
| tree | aec8cd0bd370cff7ad62445d484b1dcea5e8dab6 /media-gfx | |
| parent | 4ae4e74a3a13c7c5aaebf61e650538b005204fcb (diff) | |
gentoo auto-resync : 20:09:2022 - 05:23:06
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/Manifest.gz | bin | 38312 -> 38309 bytes | |||
| -rw-r--r-- | media-gfx/gmic/Manifest | 4 | ||||
| -rw-r--r-- | media-gfx/gmic/gmic-3.0.1-r1.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/gmic/gmic-3.1.6.ebuild | 40 |
4 files changed, 26 insertions, 20 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex df0b5e5921d3..dc76f7760649 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index 2858ab28ce06..d0782f4593e4 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -5,6 +5,6 @@ AUX gmic-3.1.6-makefile_automagic.patch 5327 BLAKE2B 0df03edbba289d327957a2e703b AUX gmic-3.1.6-relative_rpath.patch 400 BLAKE2B 0f457f585d7efde1b05937f1baa240f6fd4590a3c05c2d988e88d8ee62e79c8ac39adb92bee247dcb999ef7654bf9c558802781e9933cb6de4b078cfe7b06ab9 SHA512 1c7da7542005d76f67a553ddec1d9291e34ff99adad3aae6c9761dde8aa93bba8f79eb388072fd43976ae4e45bae066d4726d642698bce36aafbca5dbae009b0 DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775 -EBUILD gmic-3.0.1-r1.ebuild 4192 BLAKE2B b1f7b571f62257356eea906881ad631cd3f8bbb50c46848f7c4cb789210db834596c4a79042e98e9eda439a09c90238c411818abd6e6a32bb77c48aecdf526e5 SHA512 9ac13ce1dfa332573c7fe86aa21782e7035de7131226d5123e7fc3e882e959bd17d52b5b02bf02eabdd04f4602e54521e179a832fba3aad0a5d8f4140b05f9f4 -EBUILD gmic-3.1.6.ebuild 3410 BLAKE2B ad047dfb67351f2dc6eea2345ce9f06f08d27525f9a4f351706f36b5aec7cc1b534a241cc2406c4aec1d9136e0cb18ca39b0d08bab2478707ecbf9182618e837 SHA512 6aafd1b811f82126ddf27b10c4d8f106c60d05aa59848664f0d2a9d8f8b97ad140ad0f8c14b262110d9175d2b7ba5ca2ee01e79ff0ed39e0a9bf0f332e1de59f +EBUILD gmic-3.0.1-r1.ebuild 4204 BLAKE2B 22f74d92190f6e363696be07b0a41c5ee8b70f5523a781da621d6272f6c79647a1f2889c6fd4a4159fe80f34b4993aaf2b59ff1fe664a1bda5f150268d95ecb8 SHA512 7e83067f088b9cbac4949f6ce0dea1c5340a6aa4a8488204e779f0fc4e65e92a7fea2a64053e0a01ee4b002bbd7ba24788308be93e6d553fd861b2aecbbe31d3 +EBUILD gmic-3.1.6.ebuild 3476 BLAKE2B 635124171f3d8800de1254ba3f6c6a09f9fcfc24cbb5f59fbdf6d0b75b80365d6656f545d459158593413178b460cb87d8b076b4b4c6a6c77411e01057724193 SHA512 91e8580cbab1ce93e0a35ebab61fa1932dea8a743af86234bf7b3605a1dfe17bfa1cceef2a3e60de07de4c1ea39411430a19bfa232cda489d845dc2f616378eb MISC metadata.xml 466 BLAKE2B 672259377cf7d693bc2493557b22150ddd3504d5bcb3f7b11c8e7e9a8ff591573503e5c9481d8a81e27757d4ebe205dd51a0fb57c0e691461988bc99fc714fc5 SHA512 62d65a13a3061fb31954fc08d753f6df7d76c262dc1c14304c1473dbe3f3412fb77cf808f0f205dc73d124f6dd1104c13d9dc79194eba702a0acdfb112fe6530 diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild index 1136691482d8..013dbdbdad9b 100644 --- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild +++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild @@ -39,7 +39,7 @@ DEPEND=" ${QT_DEPEND} ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( dev-libs/imath:= diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild index 936aba83276c..da836f3b546c 100644 --- a/media-gfx/gmic/gmic-3.1.6.ebuild +++ b/media-gfx/gmic/gmic-3.1.6.ebuild @@ -80,24 +80,30 @@ pkg_setup() { } gmic_emake() { + local mymakeargs=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + STRIP="/bin/true" + LIB="$(get_libdir)" + OPT_CFLAGS="${CXXFLAGS}" + OPT_LIBS="${LDFLAGS}" + GMIC_USE_CURL=$(usex curl) + GMIC_USE_EXR=$(usex openexr) + GMIC_USE_FFTW=$(usex fftw) + GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick) + GMIC_USE_JPEG=$(usex jpeg) + GMIC_USE_OPENCV=$(usex opencv) + GMIC_USE_OPENMP=$(usex openmp) + GMIC_USE_PNG=$(usex png) + GMIC_USE_TIFF=$(usex tiff) + GMIC_USE_X11=$(usex X) + QMAKE="qmake5" + ) + + tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" ) + emake -j1 -C src \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - STRIP="/bin/true" \ - LIB="$(get_libdir)" \ - OPT_CFLAGS="${CXXFLAGS}" \ - OPT_LIBS="${LDFLAGS}" \ - GMIC_USE_CURL=$(usex curl) \ - GMIC_USE_EXR=$(usex openexr) \ - GMIC_USE_FFTW=$(usex fftw) \ - GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick) \ - GMIC_USE_JPEG=$(usex jpeg) \ - GMIC_USE_OPENCV=$(usex opencv) \ - GMIC_USE_OPENMP=$(usex openmp) \ - GMIC_USE_PNG=$(usex png) \ - GMIC_USE_TIFF=$(usex tiff) \ - GMIC_USE_X11=$(usex X) \ - QMAKE="qmake5" \ + "${mymakeargs[@]}" \ $@ } |