From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- media-gfx/Manifest.gz | Bin 38126 -> 37835 bytes media-gfx/ahoviewer/Manifest | 2 +- media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild | 2 +- media-gfx/alembic/Manifest | 4 +- media-gfx/alembic/alembic-1.8.0.ebuild | 2 +- media-gfx/alembic/alembic-1.8.1.ebuild | 54 +++ media-gfx/asymptote/Manifest | 4 +- media-gfx/asymptote/asymptote-2.69-r1.ebuild | 236 ------------- media-gfx/asymptote/asymptote-2.69-r2.ebuild | 236 +++++++++++++ media-gfx/asymptote/asymptote-2.70-r1.ebuild | 236 +++++++++++++ media-gfx/asymptote/asymptote-2.70.ebuild | 236 ------------- media-gfx/blender/Manifest | 25 +- media-gfx/blender/blender-2.83.10.ebuild | 320 ----------------- media-gfx/blender/blender-2.83.12.ebuild | 328 ------------------ media-gfx/blender/blender-2.83.15.ebuild | 374 ++++++++++++++++++++ media-gfx/blender/blender-2.83.4-r1.ebuild | 320 ----------------- media-gfx/blender/blender-2.90.1-r1.ebuild | 321 ----------------- media-gfx/blender/blender-2.91.0.ebuild | 335 ------------------ media-gfx/blender/blender-2.91.2.ebuild | 334 ------------------ media-gfx/blender/blender-2.93.0.ebuild | 384 +++++++++++++++++++++ media-gfx/blender/blender-9999.ebuild | 384 +++++++++++++++++++++ .../blender/files/blender-2.83.13-ffmpeg-4_4.patch | 27 ++ .../files/blender-2.83.6-constraints_test.patch | 13 + .../files/blender-2.83.6-fix_opevdb_abi.patch | 21 ++ .../blender-2.83.6-libmv_eigen_alignment.patch | 219 ++++++++++++ media-gfx/blender/metadata.xml | 23 +- media-gfx/cura/Manifest | 4 +- media-gfx/cura/cura-4.8.0.ebuild | 67 ---- media-gfx/cura/cura-4.9.1.ebuild | 71 ++++ media-gfx/curaengine/Manifest | 4 +- media-gfx/curaengine/curaengine-4.8.0.ebuild | 85 ----- media-gfx/curaengine/curaengine-4.9.1.ebuild | 85 +++++ media-gfx/darktable/Manifest | 5 - media-gfx/darktable/darktable-2.6.2.ebuild | 132 ------- .../files/darktable-2.6.2-exiv2-0.27.patch | 21 -- media-gfx/digikam/Manifest | 4 +- media-gfx/digikam/digikam-7.1.0-r1.ebuild | 147 -------- media-gfx/digikam/digikam-7.2.0.ebuild | 2 +- media-gfx/eog/Manifest | 2 + media-gfx/eog/eog-40.2.ebuild | 71 ++++ media-gfx/fbida/Manifest | 2 +- media-gfx/fbida/fbida-2.14-r2.ebuild | 4 +- media-gfx/fdm-materials/Manifest | 4 +- media-gfx/fdm-materials/fdm-materials-4.8.0.ebuild | 26 -- media-gfx/fdm-materials/fdm-materials-4.9.1.ebuild | 26 ++ media-gfx/flam3/Manifest | 5 +- media-gfx/flam3/files/flam3-3.1.1-slibtool.patch | 53 +++ media-gfx/flam3/flam3-3.1.1.ebuild | 12 +- media-gfx/flam3/metadata.xml | 5 +- media-gfx/fotoxx/Manifest | 2 + media-gfx/fotoxx/fotoxx-21.41.ebuild | 81 +++++ media-gfx/freecad/Manifest | 6 +- media-gfx/freecad/freecad-0.19.1.ebuild | 5 +- media-gfx/freecad/freecad-0.19.2.ebuild | 6 +- media-gfx/freecad/freecad-9999.ebuild | 6 +- media-gfx/gimageview/Manifest | 7 - .../files/gimageview-0.2.27-gtk12_fix.diff | 11 - .../gimageview/files/gimageview-0.2.27-gtk2.patch | 24 -- .../files/gimageview-0.2.27-libpng15.patch | 24 -- .../files/gimageview-0.2.27-sort_fix.diff | 30 -- media-gfx/gimageview/gimageview-0.2.27-r4.ebuild | 76 ---- media-gfx/gimageview/metadata.xml | 8 - media-gfx/gmic/Manifest | 4 +- media-gfx/gmic/gmic-2.9.5.ebuild | 174 ---------- media-gfx/gmic/gmic-2.9.7.ebuild | 2 +- media-gfx/gnome-screenshot/Manifest | 2 + .../files/gnome-screenshot-40.0-fix-hidpi.patch | 40 +++ .../gnome-screenshot-40.0-r1.ebuild | 66 ++++ media-gfx/gtkam/Manifest | 4 - .../files/gtkam-0.1.18-desktop-validation.patch | 15 - media-gfx/gtkam/gtkam-1.0-r1.ebuild | 46 --- media-gfx/gtkam/metadata.xml | 11 - media-gfx/hydrus/Manifest | 9 +- media-gfx/hydrus/files/test-exitcode.patch | 36 ++ media-gfx/hydrus/files/upnpc.patch | 40 +++ media-gfx/hydrus/hydrus-441-r1.ebuild | 136 ++++++++ media-gfx/hydrus/hydrus-441.ebuild | 156 --------- media-gfx/hydrus/hydrus-442.ebuild | 136 ++++++++ media-gfx/hydrus/hydrus-443.ebuild | 144 ++++++++ media-gfx/hydrus/hydrus-9999.ebuild | 144 ++++++++ media-gfx/icoutils/Manifest | 2 +- media-gfx/icoutils/metadata.xml | 5 +- media-gfx/imagemagick/Manifest | 6 +- media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild | 262 ++++++++++++++ media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild | 269 +++++++++++++++ media-gfx/imagemagick/imagemagick-9999.ebuild | 6 +- media-gfx/imv/Manifest | 2 +- media-gfx/imv/metadata.xml | 8 +- media-gfx/inkscape/Manifest | 2 +- media-gfx/inkscape/inkscape-9999.ebuild | 2 +- media-gfx/krita/Manifest | 4 +- media-gfx/krita/krita-4.4.2.ebuild | 128 ------- media-gfx/krita/krita-4.4.3.ebuild | 2 +- media-gfx/libimagequant/Manifest | 2 +- .../libimagequant/libimagequant-2.15.1.ebuild | 2 +- media-gfx/mcomix/Manifest | 2 +- media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild | 4 +- media-gfx/meshlab/Manifest | 2 +- media-gfx/meshlab/meshlab-2020.12-r1.ebuild | 2 +- media-gfx/netpaint/Manifest | 2 +- media-gfx/netpaint/netpaint-1.1.2.ebuild | 18 +- media-gfx/openvdb/Manifest | 4 +- media-gfx/openvdb/metadata.xml | 3 + media-gfx/openvdb/openvdb-8.0.1.ebuild | 122 +++++++ media-gfx/optipng/Manifest | 2 +- media-gfx/optipng/optipng-0.7.7-r1.ebuild | 2 +- media-gfx/plantuml/Manifest | 4 +- media-gfx/plantuml/plantuml-1.2020.0.ebuild | 32 -- media-gfx/plantuml/plantuml-1.2021.5.ebuild | 2 +- media-gfx/prusaslicer/Manifest | 5 +- .../prusaslicer-2.3.1-gcc11-missing-include.patch | 24 ++ media-gfx/prusaslicer/metadata.xml | 1 + media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild | 87 +++++ media-gfx/ristretto/Manifest | 2 + media-gfx/ristretto/ristretto-0.11.0.ebuild | 39 +++ media-gfx/slic3r/Manifest | 2 +- media-gfx/slic3r/metadata.xml | 1 + media-gfx/solvespace/Manifest | 3 +- .../solvespace-2.3-gcc11-missing-limits-inc.patch | 19 + media-gfx/solvespace/solvespace-2.3.ebuild | 7 +- media-gfx/tintii/Manifest | 2 +- media-gfx/tintii/tintii-2.10.0-r1.ebuild | 6 +- media-gfx/waifu2x-ncnn-vulkan/Manifest | 4 +- media-gfx/waifu2x-ncnn-vulkan/metadata.xml | 4 +- .../waifu2x-ncnn-vulkan-20210210.ebuild | 51 --- media-gfx/zbar/Manifest | 10 +- media-gfx/zbar/files/zbar-0.10-errors.patch | 10 - media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch | 120 ------- .../zbar/files/zbar-0.23.1_python_tp_print.patch | 55 +++ ...create_correct_pkconfig_file_for_zbar-qt5.patch | 71 ---- ...3_fix_detection_of_errors_in_the_v4l_read.patch | 29 -- ...3_reset_conversion_descriptor_after_close.patch | 25 -- media-gfx/zbar/zbar-0.23-r1.ebuild | 217 ------------ media-gfx/zbar/zbar-0.23.1.ebuild | 1 + 134 files changed, 4111 insertions(+), 4315 deletions(-) create mode 100644 media-gfx/alembic/alembic-1.8.1.ebuild delete mode 100644 media-gfx/asymptote/asymptote-2.69-r1.ebuild create mode 100644 media-gfx/asymptote/asymptote-2.69-r2.ebuild create mode 100644 media-gfx/asymptote/asymptote-2.70-r1.ebuild delete mode 100644 media-gfx/asymptote/asymptote-2.70.ebuild delete mode 100644 media-gfx/blender/blender-2.83.10.ebuild delete mode 100644 media-gfx/blender/blender-2.83.12.ebuild create mode 100644 media-gfx/blender/blender-2.83.15.ebuild delete mode 100644 media-gfx/blender/blender-2.83.4-r1.ebuild delete mode 100644 media-gfx/blender/blender-2.90.1-r1.ebuild delete mode 100644 media-gfx/blender/blender-2.91.0.ebuild delete mode 100644 media-gfx/blender/blender-2.91.2.ebuild create mode 100644 media-gfx/blender/blender-2.93.0.ebuild create mode 100644 media-gfx/blender/blender-9999.ebuild create mode 100644 media-gfx/blender/files/blender-2.83.13-ffmpeg-4_4.patch create mode 100644 media-gfx/blender/files/blender-2.83.6-constraints_test.patch create mode 100644 media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch create mode 100644 media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch delete mode 100644 media-gfx/cura/cura-4.8.0.ebuild create mode 100644 media-gfx/cura/cura-4.9.1.ebuild delete mode 100644 media-gfx/curaengine/curaengine-4.8.0.ebuild create mode 100644 media-gfx/curaengine/curaengine-4.9.1.ebuild delete mode 100644 media-gfx/darktable/darktable-2.6.2.ebuild delete mode 100644 media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch delete mode 100644 media-gfx/digikam/digikam-7.1.0-r1.ebuild create mode 100644 media-gfx/eog/eog-40.2.ebuild delete mode 100644 media-gfx/fdm-materials/fdm-materials-4.8.0.ebuild create mode 100644 media-gfx/fdm-materials/fdm-materials-4.9.1.ebuild create mode 100644 media-gfx/flam3/files/flam3-3.1.1-slibtool.patch create mode 100644 media-gfx/fotoxx/fotoxx-21.41.ebuild delete mode 100644 media-gfx/gimageview/Manifest delete mode 100644 media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff delete mode 100644 media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch delete mode 100644 media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch delete mode 100644 media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff delete mode 100644 media-gfx/gimageview/gimageview-0.2.27-r4.ebuild delete mode 100644 media-gfx/gimageview/metadata.xml delete mode 100644 media-gfx/gmic/gmic-2.9.5.ebuild create mode 100644 media-gfx/gnome-screenshot/files/gnome-screenshot-40.0-fix-hidpi.patch create mode 100644 media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild delete mode 100644 media-gfx/gtkam/Manifest delete mode 100644 media-gfx/gtkam/files/gtkam-0.1.18-desktop-validation.patch delete mode 100644 media-gfx/gtkam/gtkam-1.0-r1.ebuild delete mode 100644 media-gfx/gtkam/metadata.xml create mode 100644 media-gfx/hydrus/files/test-exitcode.patch create mode 100644 media-gfx/hydrus/files/upnpc.patch create mode 100644 media-gfx/hydrus/hydrus-441-r1.ebuild delete mode 100644 media-gfx/hydrus/hydrus-441.ebuild create mode 100644 media-gfx/hydrus/hydrus-442.ebuild create mode 100644 media-gfx/hydrus/hydrus-443.ebuild create mode 100644 media-gfx/hydrus/hydrus-9999.ebuild create mode 100644 media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild create mode 100644 media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild delete mode 100644 media-gfx/krita/krita-4.4.2.ebuild create mode 100644 media-gfx/openvdb/openvdb-8.0.1.ebuild delete mode 100644 media-gfx/plantuml/plantuml-1.2020.0.ebuild create mode 100644 media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch create mode 100644 media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild create mode 100644 media-gfx/ristretto/ristretto-0.11.0.ebuild create mode 100644 media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch delete mode 100644 media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210210.ebuild delete mode 100644 media-gfx/zbar/files/zbar-0.10-errors.patch delete mode 100644 media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch create mode 100644 media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch delete mode 100644 media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch delete mode 100644 media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch delete mode 100644 media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch delete mode 100644 media-gfx/zbar/zbar-0.23-r1.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 30919e96f33a..b77d6dd439cb 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest index 93b3036a4b6d..aaa8036678e7 100644 --- a/media-gfx/ahoviewer/Manifest +++ b/media-gfx/ahoviewer/Manifest @@ -1,5 +1,5 @@ DIST ahoviewer-1.6.5.tar.gz 227653 BLAKE2B 691a9eaa62b55d91b2d215d41ce402c39ca7490a44506a489061aaadd97fac2ac84aa1b28a7d1b4c097d69153ffe146fac105e9b086adc6b66b9f459e6b98eb5 SHA512 30309cff22008d444eec113bd5d79bdc0e9ff1bbc1b117bd3ecefabfdef79773fd17347766115bb0a192db76dbb24f30c853b27123f0a333c8625b94dc2a8775 DIST ahoviewer-2.0.0_beta.tar.gz 488564 BLAKE2B 325d9689e13fc2847d00be3e77eb5cd8234c98d0c516d3427d4275beaf6cc08ba8a054dfa047ec5e00e4693f8b14f730694358dc22a15e8d503bf67f232c1772 SHA512 6a38da0810c93886233a41d1fdc3f9779158c54b328c13cb2eea9e921057913fd3bb48370b95526f2bc8635ca4ba0967e7edeb95052ea689b05fb8555d826cf0 EBUILD ahoviewer-1.6.5-r3.ebuild 1774 BLAKE2B c78b47185467f18bed89a39f2faa7c435b4e493207d6fdf004f984d34780d05ce410e16603dcf1a55a79d8af1b29e53b5b3356c59a3d5324111bec2ead1144e6 SHA512 56f9f6370203be73749c6e552e448a0cb8f2e4c50096b880024a7fd682823a0e4ec0600b36010cac2ff91ed5ca0f74dad57fc42dd090d40640af21de43751118 -EBUILD ahoviewer-2.0.0_beta.ebuild 1977 BLAKE2B 73cb2144e77e359598ae2a7f9ae592a7e88abfd23e545cf6b828436d921f35a5b38aa0c4e8697d60ba0e4128e1ac5c62872d78e181047263fbb118bfc7f71ad2 SHA512 1802b94c813ee6311061579e43699f18c4c5ab9438b630bc855c51d9b81236da125c1c630f76bf8904654d869837169ccb119c9ff4f337dd5719563f6efe656f +EBUILD ahoviewer-2.0.0_beta.ebuild 1975 BLAKE2B f4ded42ed2acce53d6d72872e5f108f76bb58be7ac884b8b4db2943c949d2da3c270d956beb290f3fcebaf1e59466a7a2997a25bdb03f2ead3d4e7f1d874b92d SHA512 20eaa9a7b32ace00b176cf197cc2ed6da64268ba4f083512a7753bf32b3305a9922dbdf70e3b97792462830ff40cb1267ac2b496d0958dbc857082c15b895c5e MISC metadata.xml 431 BLAKE2B d3fd17228e1676a9075e20f035d842a7a09c5eb149f4487c8b5070ae76853993f11ae647f2b8832cb5c0cfab68f8326370ec0a8d03bb39588b00ccd9d7392041 SHA512 85583bbec83da4404fe986940b6151afb8e864189b3d225bb9a6d804676a3e972113408eb039fa7a95f79e52346b35da9a6b60cb9050e4440ff891601dddbfd4 diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild b/media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild index 87f344f7cc51..a1ed34a9932e 100644 --- a/media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild +++ b/media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/refs/tags/${MY_PV}.tar.g LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnome-keyring gnutls +gstreamer plugins +rar +ssl +zip" DEPEND="dev-cpp/glibmm:= diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest index a1bdf92900ce..2b49aeab7df2 100644 --- a/media-gfx/alembic/Manifest +++ b/media-gfx/alembic/Manifest @@ -2,6 +2,8 @@ AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58 AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02 DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1 DIST alembic-1.8.0.tar.gz 860886 BLAKE2B eccb1c74e90094a9b473ecb66260714a519110c20b18248c4fc5ecff5edf2b424b303764f80ee76333e588e85a92499d75a8104b972ccd142cc26532fd89df30 SHA512 23fc881863741f7fd081342f5c53c1ec3d00ab300ba8cd10e4a659ee820a9ed1244cf7cf2fd40482f6be32b9d7df44128363246e942bd03c802f3a2a81533b57 +DIST alembic-1.8.1.tar.gz 861482 BLAKE2B fd23e6b080dbfd689fe0d63e1cf815cd26dda0624181b4b536e81a59c497d4f22481db1206d8fb140734d90a24f06f2892b6fbd9c57cb81c5fa2d700f3bd4aab SHA512 895493f36c895aef0675e1300ee3bbbf1b8819b4978b842c48810078e51219423500f74014eafe357a318a755ffa8c5c17c2c806b4216bab6cd334908bf684a4 EBUILD alembic-1.7.16.ebuild 1252 BLAKE2B e05bd0776543434d0375db0574660f939b9e8a30da1066b4399775554dadce0e9cfe06abc571357c373bb3176b6d07dd8d0566ab2558fc9456686e7e678fbf58 SHA512 4c24d13e574f8ff4572e61bf6de62eccdf07a3cfa7f5887b18a170c55fde542a9dac3dea9bdab733ca0ddd1f53961e971c18a2d4e52e5ed30c7f5472b6597c0a -EBUILD alembic-1.8.0.ebuild 1298 BLAKE2B 1c72261f78f6043de44d269e64acd6475d27d1842d635e9a7cea2f0cbae76fd43bab9c83275810aa81e34848d3e15c4af21e27e7e91d8335ad3f018796bad8a2 SHA512 7c3cce2cb5651d7e0f380694b1cc7e8582e0620e5a1fb7634328d4f35e9983d952002bc36ebd51ee2d4f77fb195f6be25dbf88d42a56c4db78a66573c27b0de8 +EBUILD alembic-1.8.0.ebuild 1297 BLAKE2B 532e1266cc1bc0be96e2c8951d6f54bca5ee55bf6ad822529361bf98c5cb254fc7c7b08ad1881f292d8da58d82b0ddf740942a2d12dbf4387542747eef161672 SHA512 49699ced65a5a8d40613e8d0af72bd4d42309dcea2acd0474298a5ede4422fef27adc5fbe0443042405dda2af7611d92ab2b4163d7f1c40650e270558efbb14f +EBUILD alembic-1.8.1.ebuild 1235 BLAKE2B 0ba9f4f0d4b59b5f6cf9f94522ab3d1c18dd426c4124c4e95c19db8067d742c2ebce0260705b7d0b5de883df1f7ad5671f8949d94d694cddcd8fb603f8d3c027 SHA512 93f4f680498c5e1c291c8647e80624e4f3915090201667d4c1100c9bf1f1362914fd2510608e8b6d459341b43fd166cf42b0579863f65c36b095d55449f29290 MISC metadata.xml 895 BLAKE2B 4529e89d7ecc7b70e768104a6200fffbbcb42786f15c963aba54a3697d78cfe7006d7d2e7063a1efe2958ac651c5c2175b1aae2e2c3f6cb29c7eaba7de9d6b1c SHA512 5677c55df82cabd36468d0dc458dda3684304168bbe5eb9d229bba98e58e17e4f24db12ae56a8844f4dce87fe38bf42159d73e96c3e62a96f77f3ead15db851d diff --git a/media-gfx/alembic/alembic-1.8.0.ebuild b/media-gfx/alembic/alembic-1.8.0.ebuild index dedaae796d04..8a71d3328dc0 100644 --- a/media-gfx/alembic/alembic-1.8.0.ebuild +++ b/media-gfx/alembic/alembic-1.8.0.ebuild @@ -13,7 +13,7 @@ LICENSE="BSD" SLOT="0" # arm{,64} either pyilmbase needs to be keyworded or imath merged and keyworded # to re-add python / pyalembic support -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="examples hdf5 test" RESTRICT="!test? ( test )" diff --git a/media-gfx/alembic/alembic-1.8.1.ebuild b/media-gfx/alembic/alembic-1.8.1.ebuild new file mode 100644 index 000000000000..d6553f86e84f --- /dev/null +++ b/media-gfx/alembic/alembic-1.8.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Open framework for storing and sharing scene data" +HOMEPAGE="https://www.alembic.io/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +# either pyilmbase or imath need to be keyworded for arm{,64} to re-add +# python / pyalembic support +IUSE="examples hdf5 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + || ( + >=dev-libs/imath-3.0.1 + >=media-libs/ilmbase-2.5.5 + ) + hdf5? ( + >=sci-libs/hdf5-1.10.2:=[zlib(+)] + >=sys-libs/zlib-1.2.11-r1 + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-1.8.0-0001-set-correct-libdir.patch" ) + +DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt ) + +src_configure() { + local mycmakeargs=( + -DALEMBIC_BUILD_LIBS=ON + -DALEMBIC_SHARED_LIBS=ON + # currently does nothing but require doxygen + -DDOCS_PATH=OFF + -DUSE_ARNOLD=OFF + -DUSE_BINARIES=ON + -DUSE_EXAMPLES=$(usex examples) + -DUSE_HDF5=$(usex hdf5) + -DUSE_MAYA=OFF + -DUSE_PRMAN=OFF + # TODO: needs imath keyworded for arm{,64} + -DUSE_PYALEMBIC=OFF + -DUSE_TESTS=$(usex test) + ) + + cmake_src_configure +} diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 0696025bbc1f..2ccd55ad3e3c 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -5,6 +5,6 @@ AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102 AUX asymptote-2.70-xdg-utils.patch 791 BLAKE2B 971b2f1c6a4db7e39cc2d4bac0e3e6cc951733fb0718ace6e6807f63585fe8f4aa6f8519c6e03ed75f0176dca87e705d1b7175e0c1c7a1e79eb6c15dc4f2df76 SHA512 f78359aa71adfcea4ba31e3cae4c30aca47e39337b647f6fb2ad5264bd318a45071fcc47b1bbe5cc4c59c6b707b7b17461af62add2ee2477027d95d369f29994 DIST asymptote-2.69.src.tgz 4673601 BLAKE2B 9734ffec10c9c0b8053598402a4eb81a3ed8a48f8ce8e58d1720442be26e25fe7778d6d47cd2d29dae61183d15aaa456bca430ab98e951844c8210484226e67f SHA512 a1b746600b4e6880350e57adeb3a3228d10b1b0c1db11ee0e750545cf8023716eec92253c0cd0980747f72c16fd0097f25ee688657168f24a0def106260e0791 DIST asymptote-2.70.src.tgz 4674495 BLAKE2B 126b2e99222e6ae438aaef89df00b8eae19118c3ef42d2fab0b0117f343911939e680d22e903b784213186a5d2eeeecb112afba1467562e7127c34de4bc66773 SHA512 24d60af361e3f0309a896ce8163da6fc0a9d6587efe726c5acf874dcb74f4d51b4bad8146a615ff54173ef06dac53117fd1cc09c77940271adc9f64cac6bcfe6 -EBUILD asymptote-2.69-r1.ebuild 5394 BLAKE2B a27ece88ae76bfd52f81536a569040f377617419bcc28771121908e1658c0ad1547eefb4370a0846b9b52b0be1e38d4245345a34f6b148d8869732504d4776f7 SHA512 a6d9ac4a6a69aca723938c2fdd6128b3312bc3c612573864ea479bf5f8c38bda65440e9c14c99d7f17bb531f769c8dc9010fc756c11439ba1e4df6ed4fef450d -EBUILD asymptote-2.70.ebuild 5392 BLAKE2B 236300d0b1ceb9ea8d9114e4c49100513b7e2bacd98976144f9205cc00f010a0ddba7a3ae8b43530956345cb53d8e6a9b6609597333bdae317f928af97d54422 SHA512 a0c571bbb3870ddbe6655e8e93bf93b9528071725f490eeabc15ae5b642d581b755e602349e96b5c2ecb3f2646f4bb3fa272a83498b9491f8496bb0fa44998a8 +EBUILD asymptote-2.69-r2.ebuild 5398 BLAKE2B 0c393d1865b2c73bcc746bcb42cb5b6d821bfd15d66383544094d6f06d14b8d9d0fe69cb698edaa389aa16c77017b35f08ee6eeaf88fcdb7bf519604a8c9be96 SHA512 3085e7f9649ea366885282f1467da7a4a5725300700c7f429ac7439387073a3459db96234d29e49f117132c4ae538ecc71f2335fb31a4a5f4a302b75c9176a5b +EBUILD asymptote-2.70-r1.ebuild 5396 BLAKE2B a0ddbc6ab5c2df0ed2c484d3f98ef137057da13b2e5ab7122ae6e004ac38fd7299b552a505891042282998b31783038b505099bd04aa0783d96871ffd8d025a1 SHA512 96573f6fed8b5bb97ccd8cb3577a759f09a2318fbf1f762f25a69382db05cfd318de353b73c4a19295b643cb2b1616c7c192f138a5a636170b2b251a44f403e9 MISC metadata.xml 1363 BLAKE2B d1ff4a713593a568879201c3d7165a633af6446844bc2128396a8f2cfc4ebc0764aef67b61bd0b0c2bcc9cad5ae442dd35b4c1610239f047f4baf3de225cda3f SHA512 e3c7c10ca9c129e0f988235a2f4ad7c8d306517e7a1966e1f4cb734d1c4d30bb143f9178bc744a85012ccc031fa453177d18452ed7991c8ae18a86bbb88283fc diff --git a/media-gfx/asymptote/asymptote-2.69-r1.ebuild b/media-gfx/asymptote/asymptote-2.69-r1.ebuild deleted file mode 100644 index 11723a29a480..000000000000 --- a/media-gfx/asymptote/asymptote-2.69-r1.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common latex-package python-r1 - -DESCRIPTION="A vector graphics language that provides a framework for technical drawing" -HOMEPAGE="https://asymptote.sourceforge.io/" -SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - offscreen? ( opengl ) - doc? ( boehm-gc )" - -RDEPEND=" - >=sys-libs/ncurses-5.4-r5:0= - >=sys-libs/readline-4.3-r5:0= - net-libs/libtirpc - imagemagick? ( media-gfx/imagemagick[png] ) - opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) - offscreen? ( media-libs/mesa[osmesa] ) - svg? ( app-text/dvisvgm ) - sigsegv? ( dev-libs/libsigsegv ) - boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) - fftw? ( >=sci-libs/fftw-3.0.1 ) - gsl? ( sci-libs/gsl ) - python? ( ${PYTHON_DEPS} ) - curl? ( net-misc/curl ) - X? ( - ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] - dev-python/numpy - dev-python/pycson - >=gnome-base/librsvg-2.40 - ) - latex? ( - virtual/latex-base - >=dev-texlive/texlive-latexextra-2013 - ) - context? ( dev-texlive/texlive-context ) - emacs? ( >=app-editors/emacs-23.1:* ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" -DEPEND="${RDEPEND} - dev-lang/perl - doc? ( - media-gfx/imagemagick[png] - virtual/texi2dvi - virtual/latex-base - app-text/ghostscript-gpl ) - test? ( app-text/ghostscript-gpl )" - -TEXMF=/usr/share/texmf-site - -PATCHES=( - # Changing pdf, ps, image viewers to xdg-open - "${FILESDIR}/${P}-xdg-utils.patch" - - # Bug #322473 - "${FILESDIR}/${P}-info.patch" -) - -src_prepare() { - sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ - -i configure.ac \ - || die "sed configure.ac failed" - - default - eautoreconf -} - -src_configure() { - # for the CPPFLAGS see - # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 - econf \ - CPPFLAGS=-DHAVE_SYS_TYPES_H \ - CFLAGS="${CXXFLAGS}" \ - --disable-gc-debug \ - --disable-gc-full-debug \ - --with-latex=/usr/share/texmf-site/tex/latex \ - --with-context=/usr/share/texmf-site/tex/context \ - $(use_enable boehm-gc gc system) \ - $(use_enable curl) \ - $(use_enable fftw) \ - $(use_enable gsl) \ - $(use_enable opengl gl) \ - $(use_enable offscreen) \ - $(use_enable sigsegv) -} - -src_compile() { - default - - cd doc || die - emake asy.1 - einfo "Making info" - cd png || die - emake ${PN}.info - cd .. || die - if use doc; then - cd FAQ || die - emake - cd .. || die - # pdf - einfo "Making pdf docs" - export VARTEXFONTS="${T}"/fonts - # see bug #260606 - emake -j1 asymptote.pdf - emake CAD.pdf asy-latex.pdf asyRefCard.pdf - fi - cd .. || die - - if use emacs; then - einfo "Compiling emacs lisp files" - elisp-compile base/*.el - fi -} - -src_install() { - # the program - dobin asy - - # .asy files - insinto /usr/share/${PN} - doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl - chmod 755 "${D}"/usr/share/${PN}/shaders/* - - # documentation - dodoc README ReleaseNotes ChangeLog - cd doc || die - doman asy.1 - doinfo png/${PN}.info - if use doc; then - dodoc FAQ/asy-faq.ascii - dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf - fi - cd .. || die - - # asymptote.py - if use python; then - python_moduleinto ${PN} - python_foreach_impl python_domodule aspy.py - python_foreach_impl python_domodule base/${PN}.py - fi - - # X GUI - if use X; then - cd GUI || die - python_setup - sed -e 1d -i xasy.py - echo "#!/usr/bin/env ${EPYTHON}" > xasy1 - cat xasy1 xasy.py > xasy - rm xasy1 xasy.py - mv xasy xasy.py - cd .. || die - python_domodule GUI - chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py" - dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy - doman doc/xasy.1x - fi - - # examples - if use examples; then - docinto examples - dodoc \ - examples/*.asy \ - examples/*.views \ - examples/*.dat \ - examples/*.bib \ - examples/*.png \ - examples/*.pdb1 \ - doc/*.asy \ - doc/*.csv \ - doc/*.dat \ - doc/pixel.pdf \ - doc/extra/*.asy - docinto examples/animations - dodoc examples/animations/*.asy - fi - - # LaTeX style - if use latex; then - cd doc || die - insinto "${TEXMF}"/tex/latex/${PN} - doins *.sty latexmkrc - if use examples; then - docinto examples - dodoc latexusage.tex externalprc.tex - docinto examples/animations - dodoc ../examples/animations/*.tex - fi - cd .. || die - fi - - # ConTeXt - if use context; then - insinto /usr/share/texmf-site/tex/context - doins doc/colo-asy.tex - fi - - # emacs mode - if use emacs; then - elisp-install ${PN} base/*.el base/*.elc asy-keywords.el - elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el - fi - - # vim syntax - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins base/asy.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins base/asy_filetype.vim - fi -} - -pkg_postinst() { - use latex && latex-package_rehash - use emacs && elisp-site-regen - - elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' - elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' -} - -pkg_postrm() { - use latex && latex-package_rehash - use emacs && elisp-site-regen -} diff --git a/media-gfx/asymptote/asymptote-2.69-r2.ebuild b/media-gfx/asymptote/asymptote-2.69-r2.ebuild new file mode 100644 index 000000000000..b603beb6086f --- /dev/null +++ b/media-gfx/asymptote/asymptote-2.69-r2.ebuild @@ -0,0 +1,236 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools elisp-common latex-package python-r1 + +DESCRIPTION="A vector graphics language that provides a framework for technical drawing" +HOMEPAGE="https://asymptote.sourceforge.io/" +SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + offscreen? ( opengl ) + doc? ( boehm-gc )" + +RDEPEND=" + >=sys-libs/ncurses-5.4-r5:0= + >=sys-libs/readline-4.3-r5:0= + net-libs/libtirpc:= + imagemagick? ( media-gfx/imagemagick[png] ) + opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) + offscreen? ( media-libs/mesa[osmesa] ) + svg? ( app-text/dvisvgm ) + sigsegv? ( dev-libs/libsigsegv ) + boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) + fftw? ( >=sci-libs/fftw-3.0.1:= ) + gsl? ( sci-libs/gsl:= ) + python? ( ${PYTHON_DEPS} ) + curl? ( net-misc/curl ) + X? ( + ${PYTHON_DEPS} + dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] + dev-python/numpy + dev-python/pycson + >=gnome-base/librsvg-2.40 + ) + latex? ( + virtual/latex-base + >=dev-texlive/texlive-latexextra-2013 + ) + context? ( dev-texlive/texlive-context ) + emacs? ( >=app-editors/emacs-23.1:* ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" +DEPEND="${RDEPEND} + dev-lang/perl + doc? ( + media-gfx/imagemagick[png] + virtual/texi2dvi + virtual/latex-base + app-text/ghostscript-gpl ) + test? ( app-text/ghostscript-gpl )" + +TEXMF=/usr/share/texmf-site + +PATCHES=( + # Changing pdf, ps, image viewers to xdg-open + "${FILESDIR}/${P}-xdg-utils.patch" + + # Bug #322473 + "${FILESDIR}/${P}-info.patch" +) + +src_prepare() { + sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ + -i configure.ac \ + || die "sed configure.ac failed" + + default + eautoreconf +} + +src_configure() { + # for the CPPFLAGS see + # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 + econf \ + CPPFLAGS=-DHAVE_SYS_TYPES_H \ + CFLAGS="${CXXFLAGS}" \ + --disable-gc-debug \ + --disable-gc-full-debug \ + --with-latex=/usr/share/texmf-site/tex/latex \ + --with-context=/usr/share/texmf-site/tex/context \ + $(use_enable boehm-gc gc system) \ + $(use_enable curl) \ + $(use_enable fftw) \ + $(use_enable gsl) \ + $(use_enable opengl gl) \ + $(use_enable offscreen) \ + $(use_enable sigsegv) +} + +src_compile() { + default + + cd doc || die + emake asy.1 + einfo "Making info" + cd png || die + emake ${PN}.info + cd .. || die + if use doc; then + cd FAQ || die + emake + cd .. || die + # pdf + einfo "Making pdf docs" + export VARTEXFONTS="${T}"/fonts + # see bug #260606 + emake -j1 asymptote.pdf + emake CAD.pdf asy-latex.pdf asyRefCard.pdf + fi + cd .. || die + + if use emacs; then + einfo "Compiling emacs lisp files" + elisp-compile base/*.el + fi +} + +src_install() { + # the program + dobin asy + + # .asy files + insinto /usr/share/${PN} + doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl + chmod 755 "${D}"/usr/share/${PN}/shaders/* + + # documentation + dodoc README ReleaseNotes ChangeLog + cd doc || die + doman asy.1 + doinfo png/${PN}.info + if use doc; then + dodoc FAQ/asy-faq.ascii + dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf + fi + cd .. || die + + # asymptote.py + if use python; then + python_moduleinto ${PN} + python_foreach_impl python_domodule aspy.py + python_foreach_impl python_domodule base/${PN}.py + fi + + # X GUI + if use X; then + cd GUI || die + python_setup + sed -e 1d -i xasy.py + echo "#!/usr/bin/env ${EPYTHON}" > xasy1 + cat xasy1 xasy.py > xasy + rm xasy1 xasy.py + mv xasy xasy.py + cd .. || die + python_domodule GUI + chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py" + dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy + doman doc/xasy.1x + fi + + # examples + if use examples; then + docinto examples + dodoc \ + examples/*.asy \ + examples/*.views \ + examples/*.dat \ + examples/*.bib \ + examples/*.png \ + examples/*.pdb1 \ + doc/*.asy \ + doc/*.csv \ + doc/*.dat \ + doc/pixel.pdf \ + doc/extra/*.asy + docinto examples/animations + dodoc examples/animations/*.asy + fi + + # LaTeX style + if use latex; then + cd doc || die + insinto "${TEXMF}"/tex/latex/${PN} + doins *.sty latexmkrc + if use examples; then + docinto examples + dodoc latexusage.tex externalprc.tex + docinto examples/animations + dodoc ../examples/animations/*.tex + fi + cd .. || die + fi + + # ConTeXt + if use context; then + insinto /usr/share/texmf-site/tex/context + doins doc/colo-asy.tex + fi + + # emacs mode + if use emacs; then + elisp-install ${PN} base/*.el base/*.elc asy-keywords.el + elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el + fi + + # vim syntax + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins base/asy.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins base/asy_filetype.vim + fi +} + +pkg_postinst() { + use latex && latex-package_rehash + use emacs && elisp-site-regen + + elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' + elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' +} + +pkg_postrm() { + use latex && latex-package_rehash + use emacs && elisp-site-regen +} diff --git a/media-gfx/asymptote/asymptote-2.70-r1.ebuild b/media-gfx/asymptote/asymptote-2.70-r1.ebuild new file mode 100644 index 000000000000..e69b83cc7bae --- /dev/null +++ b/media-gfx/asymptote/asymptote-2.70-r1.ebuild @@ -0,0 +1,236 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools elisp-common latex-package python-r1 + +DESCRIPTION="A vector graphics language that provides a framework for technical drawing" +HOMEPAGE="https://asymptote.sourceforge.io/" +SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + offscreen? ( opengl ) + doc? ( boehm-gc )" + +RDEPEND=" + >=sys-libs/ncurses-5.4-r5:0= + >=sys-libs/readline-4.3-r5:0= + net-libs/libtirpc:= + imagemagick? ( media-gfx/imagemagick[png] ) + opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) + offscreen? ( media-libs/mesa[osmesa] ) + svg? ( app-text/dvisvgm ) + sigsegv? ( dev-libs/libsigsegv ) + boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) + fftw? ( >=sci-libs/fftw-3.0.1:= ) + gsl? ( sci-libs/gsl:= ) + python? ( ${PYTHON_DEPS} ) + curl? ( net-misc/curl ) + X? ( + ${PYTHON_DEPS} + dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] + dev-python/numpy + dev-python/pycson + >=gnome-base/librsvg-2.40 + ) + latex? ( + virtual/latex-base + >=dev-texlive/texlive-latexextra-2013 + ) + context? ( dev-texlive/texlive-context ) + emacs? ( >=app-editors/emacs-23.1:* ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" +DEPEND="${RDEPEND} + dev-lang/perl + doc? ( + media-gfx/imagemagick[png] + virtual/texi2dvi + virtual/latex-base + app-text/ghostscript-gpl ) + test? ( app-text/ghostscript-gpl )" + +TEXMF=/usr/share/texmf-site + +PATCHES=( + # Changing pdf, ps, image viewers to xdg-open + "${FILESDIR}/${P}-xdg-utils.patch" + + # Bug #322473 + "${FILESDIR}/${P}-info.patch" +) + +src_prepare() { + sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ + -i configure.ac \ + || die "sed configure.ac failed" + + default + eautoreconf +} + +src_configure() { + # for the CPPFLAGS see + # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 + econf \ + CPPFLAGS=-DHAVE_SYS_TYPES_H \ + CFLAGS="${CXXFLAGS}" \ + --disable-gc-debug \ + --disable-gc-full-debug \ + --with-latex=/usr/share/texmf-site/tex/latex \ + --with-context=/usr/share/texmf-site/tex/context \ + $(use_enable boehm-gc gc system) \ + $(use_enable curl) \ + $(use_enable fftw) \ + $(use_enable gsl) \ + $(use_enable opengl gl) \ + $(use_enable offscreen) \ + $(use_enable sigsegv) +} + +src_compile() { + default + + cd doc || die + emake asy.1 + einfo "Making info" + cd png || die + emake ${PN}.info + cd .. || die + if use doc; then + cd FAQ || die + emake + cd .. || die + # pdf + einfo "Making pdf docs" + export VARTEXFONTS="${T}"/fonts + # see bug #260606 + emake -j1 asymptote.pdf + emake CAD.pdf asy-latex.pdf asyRefCard.pdf + fi + cd .. || die + + if use emacs; then + einfo "Compiling emacs lisp files" + elisp-compile base/*.el + fi +} + +src_install() { + # the program + dobin asy + + # .asy files + insinto /usr/share/${PN} + doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl + chmod 755 "${D}"/usr/share/${PN}/shaders/* + + # documentation + dodoc README ReleaseNotes ChangeLog + cd doc || die + doman asy.1 + doinfo png/${PN}.info + if use doc; then + dodoc FAQ/asy-faq.ascii + dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf + fi + cd .. || die + + # asymptote.py + if use python; then + python_moduleinto ${PN} + python_foreach_impl python_domodule aspy.py + python_foreach_impl python_domodule base/${PN}.py + fi + + # X GUI + if use X; then + cd GUI || die + python_setup + sed -e 1d -i xasy.py + echo "#!/usr/bin/env ${EPYTHON}" > xasy1 + cat xasy1 xasy.py > xasy + rm xasy1 xasy.py + mv xasy xasy.py + cd .. || die + python_domodule GUI + chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py" + dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy + doman doc/xasy.1x + fi + + # examples + if use examples; then + docinto examples + dodoc \ + examples/*.asy \ + examples/*.views \ + examples/*.dat \ + examples/*.bib \ + examples/*.png \ + examples/*.pdb1 \ + doc/*.asy \ + doc/*.csv \ + doc/*.dat \ + doc/pixel.pdf \ + doc/extra/*.asy + docinto examples/animations + dodoc examples/animations/*.asy + fi + + # LaTeX style + if use latex; then + cd doc || die + insinto "${TEXMF}"/tex/latex/${PN} + doins *.sty latexmkrc + if use examples; then + docinto examples + dodoc latexusage.tex externalprc.tex + docinto examples/animations + dodoc ../examples/animations/*.tex + fi + cd .. || die + fi + + # ConTeXt + if use context; then + insinto /usr/share/texmf-site/tex/context + doins doc/colo-asy.tex + fi + + # emacs mode + if use emacs; then + elisp-install ${PN} base/*.el base/*.elc asy-keywords.el + elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el + fi + + # vim syntax + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins base/asy.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins base/asy_filetype.vim + fi +} + +pkg_postinst() { + use latex && latex-package_rehash + use emacs && elisp-site-regen + + elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' + elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' +} + +pkg_postrm() { + use latex && latex-package_rehash + use emacs && elisp-site-regen +} diff --git a/media-gfx/asymptote/asymptote-2.70.ebuild b/media-gfx/asymptote/asymptote-2.70.ebuild deleted file mode 100644 index 494c8467ccbf..000000000000 --- a/media-gfx/asymptote/asymptote-2.70.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common latex-package python-r1 - -DESCRIPTION="A vector graphics language that provides a framework for technical drawing" -HOMEPAGE="https://asymptote.sourceforge.io/" -SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - offscreen? ( opengl ) - doc? ( boehm-gc )" - -RDEPEND=" - >=sys-libs/ncurses-5.4-r5:0= - >=sys-libs/readline-4.3-r5:0= - net-libs/libtirpc - imagemagick? ( media-gfx/imagemagick[png] ) - opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) - offscreen? ( media-libs/mesa[osmesa] ) - svg? ( app-text/dvisvgm ) - sigsegv? ( dev-libs/libsigsegv ) - boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) - fftw? ( >=sci-libs/fftw-3.0.1 ) - gsl? ( sci-libs/gsl ) - python? ( ${PYTHON_DEPS} ) - curl? ( net-misc/curl ) - X? ( - ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] - dev-python/numpy - dev-python/pycson - >=gnome-base/librsvg-2.40 - ) - latex? ( - virtual/latex-base - >=dev-texlive/texlive-latexextra-2013 - ) - context? ( dev-texlive/texlive-context ) - emacs? ( >=app-editors/emacs-23.1:* ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" -DEPEND="${RDEPEND} - dev-lang/perl - doc? ( - media-gfx/imagemagick[png] - virtual/texi2dvi - virtual/latex-base - app-text/ghostscript-gpl ) - test? ( app-text/ghostscript-gpl )" - -TEXMF=/usr/share/texmf-site - -PATCHES=( - # Changing pdf, ps, image viewers to xdg-open - "${FILESDIR}/${P}-xdg-utils.patch" - - # Bug #322473 - "${FILESDIR}/${P}-info.patch" -) - -src_prepare() { - sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ - -i configure.ac \ - || die "sed configure.ac failed" - - default - eautoreconf -} - -src_configure() { - # for the CPPFLAGS see - # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 - econf \ - CPPFLAGS=-DHAVE_SYS_TYPES_H \ - CFLAGS="${CXXFLAGS}" \ - --disable-gc-debug \ - --disable-gc-full-debug \ - --with-latex=/usr/share/texmf-site/tex/latex \ - --with-context=/usr/share/texmf-site/tex/context \ - $(use_enable boehm-gc gc system) \ - $(use_enable curl) \ - $(use_enable fftw) \ - $(use_enable gsl) \ - $(use_enable opengl gl) \ - $(use_enable offscreen) \ - $(use_enable sigsegv) -} - -src_compile() { - default - - cd doc || die - emake asy.1 - einfo "Making info" - cd png || die - emake ${PN}.info - cd .. || die - if use doc; then - cd FAQ || die - emake - cd .. || die - # pdf - einfo "Making pdf docs" - export VARTEXFONTS="${T}"/fonts - # see bug #260606 - emake -j1 asymptote.pdf - emake CAD.pdf asy-latex.pdf asyRefCard.pdf - fi - cd .. || die - - if use emacs; then - einfo "Compiling emacs lisp files" - elisp-compile base/*.el - fi -} - -src_install() { - # the program - dobin asy - - # .asy files - insinto /usr/share/${PN} - doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl - chmod 755 "${D}"/usr/share/${PN}/shaders/* - - # documentation - dodoc README ReleaseNotes ChangeLog - cd doc || die - doman asy.1 - doinfo png/${PN}.info - if use doc; then - dodoc FAQ/asy-faq.ascii - dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf - fi - cd .. || die - - # asymptote.py - if use python; then - python_moduleinto ${PN} - python_foreach_impl python_domodule aspy.py - python_foreach_impl python_domodule base/${PN}.py - fi - - # X GUI - if use X; then - cd GUI || die - python_setup - sed -e 1d -i xasy.py - echo "#!/usr/bin/env ${EPYTHON}" > xasy1 - cat xasy1 xasy.py > xasy - rm xasy1 xasy.py - mv xasy xasy.py - cd .. || die - python_domodule GUI - chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py" - dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy - doman doc/xasy.1x - fi - - # examples - if use examples; then - docinto examples - dodoc \ - examples/*.asy \ - examples/*.views \ - examples/*.dat \ - examples/*.bib \ - examples/*.png \ - examples/*.pdb1 \ - doc/*.asy \ - doc/*.csv \ - doc/*.dat \ - doc/pixel.pdf \ - doc/extra/*.asy - docinto examples/animations - dodoc examples/animations/*.asy - fi - - # LaTeX style - if use latex; then - cd doc || die - insinto "${TEXMF}"/tex/latex/${PN} - doins *.sty latexmkrc - if use examples; then - docinto examples - dodoc latexusage.tex externalprc.tex - docinto examples/animations - dodoc ../examples/animations/*.tex - fi - cd .. || die - fi - - # ConTeXt - if use context; then - insinto /usr/share/texmf-site/tex/context - doins doc/colo-asy.tex - fi - - # emacs mode - if use emacs; then - elisp-install ${PN} base/*.el base/*.elc asy-keywords.el - elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el - fi - - # vim syntax - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins base/asy.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins base/asy_filetype.vim - fi -} - -pkg_postinst() { - use latex && latex-package_rehash - use emacs && elisp-site-regen - - elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' - elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' -} - -pkg_postrm() { - use latex && latex-package_rehash - use emacs && elisp-site-regen -} diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 81b1a20dc8bf..39840073e9da 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,13 +1,12 @@ -DIST blender-2.83.10.tar.xz 38624904 BLAKE2B e52597b3acce875943dff75575c42c8c1fdeb19cb74b4f3609e56730e8fb6d5bbc94a6215a1e9da52b46e45c48c9a46dc4f3ed0d22e16186d9e7434b27eef70f SHA512 96b252176d867b3cac76a99cbee95313b60935a34edc44f27c67a1f75f20b353f0894288df2696718e95a03a07a1630797a431b752ffb4dd14692739d714a589 -DIST blender-2.83.12.tar.xz 39132904 BLAKE2B 175e8c5ab9324421f23357bc367b2e70ee8c391130d376d6d53eefbf90529d09921395cd11e7b1709aaa4d24ec6f8df64050869e41bbe211229126db08f22089 SHA512 f313c92e311e852742e74934504fcd3ccd296bcea2499f605cef568e3c615ececd9d70dec5025e4d4ff19f03803c148a8b03a4b68b7ca978554f5b1122c9890b -DIST blender-2.83.4.tar.xz 38528352 BLAKE2B 54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d SHA512 061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5 -DIST blender-2.90.1.tar.xz 38836408 BLAKE2B 42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34 SHA512 e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992 -DIST blender-2.91.0.tar.xz 41528920 BLAKE2B f28bce92b0b63e380c7ce2c9dae0ae4235792ae7c7dff52c2c9c0c5baa81b4d540f853f49d7622f6feca8c7f403b254b55f200758a64e4d95bd43709e5509c1d SHA512 a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa -DIST blender-2.91.2.tar.xz 42057100 BLAKE2B f10f838ad6d56135fddf9e9171473e1e589f511a38112845d650436a1eb4da94ea0777571dffc6446f4217dce647b087cf5a18841d7dde2086d187bb8f7d3654 SHA512 9a3bae01bd09b1d665af4882f53e8a88d85ff44678233c90788a7801ce0d551a3cc1f71026b71ea1c77d7eaedf7ab6fc8709104c22b564f4fc6cc0d5b3b76f5e -EBUILD blender-2.83.10.ebuild 8591 BLAKE2B 6bc59e2d14777961500476e70b09bb4cd32387157409cc5e15970c0291a9e9acaeffadd4e515aad745ff7968f0be36c0d254dd91588ac89b43b3d5a860100a19 SHA512 ca8c18a4a23f2fde3cf057734b56e5d1258b7cf584c7fb5372db836bdad79458564a1131f4fc3c9ae8dc56e1f8b5534dc7ee6d8da5ae2a06862ca546974cede1 -EBUILD blender-2.83.12.ebuild 8903 BLAKE2B d9e87b1e4e73e679b6a83214790123226a3131749bbcb328de5c2f3395e9b7baf2bb25eddb231c1ff1abccd39181b46f86077eb23f3a6b1d7016117be183df73 SHA512 6ebcf0d2ac317d2b07089683fe7d11bf87287b15c067951b9d0d29ebaa8ea5e4b521b74876c564635f074b0f38ba1d24e4720c4040dbe79eb854aee9f8b0e173 -EBUILD blender-2.83.4-r1.ebuild 8590 BLAKE2B d1f5765922114878d629e653248491878f1ae7003f0ad8dad49713e083d28b5133b2e1a0b1ba6b9a2600a7f9512c9a98aa0a551e9e368aa2cfe46346ed5c7914 SHA512 36f33f65151a8c98a42a2f014209d2bf0552779c8b5e52513fc8063c5202ba77c1cf3c744e3e818387ada59a3ec88805f35f96bcefcc3c000da331b73a756780 -EBUILD blender-2.90.1-r1.ebuild 8628 BLAKE2B 6f432315a7bf13dc3635ab915e9c72668aef526358f74b324067ebe4d5a34c5fa6daa207fdb753adaa756be9d53617896ec5545071755459ed0799a56618d18b SHA512 1b4bc3de4447577cd062283fde8ef091c0800968a0129a833b4d3c9acf8992e143a204bbc32b887254cdf4977ea083cb262e47242b5b2f1d581cf183339374a7 -EBUILD blender-2.91.0.ebuild 9056 BLAKE2B 8d797eebeba043fe2b1d8d74b6d5aa7ef8483efc9b9ea748766d95ddb89e805daa129b2c0515945b4ee89648119812bd2b7dec4a86398c905d2f085ddcbed8f8 SHA512 84ff05f097fdeaa37c795ac11aaf01ecca1063f126b08ada97063a15f5de1f14e9823dc6431c94a4497e09eab7b2932fcdbf661f0a1866fac2fafd24a8a0bd83 -EBUILD blender-2.91.2.ebuild 9062 BLAKE2B bd6a1673c0530c363808b102b53cc66266cdfba9d35897ecf1e2a43368f3428d3244cfa12c6f8006d8a59c1b7bed03b138fee29f2c7ca8da8278ff3651a18b5f SHA512 53e707329532bb29acd6436a1096f7dc65d9315cdd562c78fb05da171eedb087e09a8cc4c92849de30a9b834cd4b2393f1271789dc6bae2c8bc49e851268fca7 -MISC metadata.xml 2763 BLAKE2B 233d1caced71f79aef161db337bc02ce80089d9eff96a0dff058660a01557dd91877d1a99e10ce20bd1a2637cee4cd43fb3f87868d2fb20aff751830b8d1bfef SHA512 13e4a08f83744aec7de708f0c4d1c8f9c7b96823ec5ab14600e16bef48fa682b565605d52701d1ca60b07329653e42da6b5a42fea0e13e68c4af707fe9390527 +AUX blender-2.83.13-ffmpeg-4_4.patch 1102 BLAKE2B e035eab495dbbfc539f852619775f0be6c35cc3b120060fcea9839911404d2c2c11e54cacfd5dd1a4ef531f9ebff478ff7af3f3e35b387f1970dce9cb5063cc5 SHA512 28ad54493bb5385b9c116c349ffe2002997f88a70e1f30548ff57c9052fbb1398efcc82d031c3dbfd6cefdbdb8e24ada545ac5fd0717bdfb1be59b9928859299 +AUX blender-2.83.6-constraints_test.patch 706 BLAKE2B 13f31c98b537a09807fcd9bf7ca6033ebb6db36690fe08c71df726d67468eb747e9817306d434ec8b007f158b7670f00de6ac16a2d9c693d054627632c2eeb64 SHA512 96a660878dd65ea00bd263bd022d3c4b95a4c2dd5533d6bae55c87294296e794fa4e0a16f341d666ef62a2c09bef06fa4dc262792222a80b12e39e394bc2403f +AUX blender-2.83.6-fix_opevdb_abi.patch 587 BLAKE2B 90f22c522f2626442b68e2cb89e6129988a66d5c775d4eaaa217be0b424ec5f2ce1f72eae277e0fad5d8f979b75d0b4a4c1c4956c16793339b0455ea30a8346b SHA512 08c452e1d05aca8c67aeb925388f23f1f2c3ebad3efe501f9c69758a70dfdd8132575e344012ae2a468d0ad7330d820bc8c77df61c38c42b0e97befaf8eec705 +AUX blender-2.83.6-libmv_eigen_alignment.patch 6777 BLAKE2B 5a7cc33dc599a58f15fcda2110d1c7be9dd3bab4427f5f0ab09a5645248e4585b4e183dcd38e5a39b0827a8ef529e74e59126bc7dcecf2c208b428b5ad264e26 SHA512 8b52ab1bdeaa585b2211aa4b3e9e9c2384867e4011ac20cc1fa712b3c8823c5f42359d5728a094e509a7f40cc166f308cd020da1d35f9e2b0bc20e7bb7e5a461 +DIST blender-2.83.1-tests.tar.bz2 266633785 BLAKE2B 8d8102c3107480de95dfd9ef9dabba1cd82893aad553af2ff5ef1afadc831dc5ccf5553c41466511ecb2a1435bc79c936ad64a78bdd4375e3e30af85b69807c6 SHA512 3ffba6fa8401bba3e2bdbccf7067761114d516371c7778a2f6604a243fd8610e26a30b88a32728c26f7e6274182d298752f32b5e76abf8216be0ec4b3ce38cd9 +DIST blender-2.83.15.tar.xz 39125740 BLAKE2B 687097b45b76b474b1c172c9b8ccf5da1bfc24539d0db894d04c7837572b16c1f552757fd1482219d58afa56c573229878fb43bbecd95e3d61314f2ab05efafa SHA512 2836533691bae0a7942197e67232b396b892cd95c0f07ab561f7de8458b354fe4045453855585484dd533ae76588ea3888f880763b042a264fb813a43933fc25 +DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe +DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3 SHA512 660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d +EBUILD blender-2.83.15.ebuild 11453 BLAKE2B e95cfea18c8cf7ca90bc3608fca0b279f595d44bb15f22347cde1c4ce5fd0eee63247fdc0b4455b245981c1140f9a1097faf991e5b331c94f6d1958353340d6b SHA512 6bacb4102f897590c214436dd6fe1625abd8ef8ebfa445cdb13d90ea91d8a8626ef7853f587f58a7385f20e24c06ab1238b39956ccb16baf9b0f2bff224d5705 +EBUILD blender-2.93.0.ebuild 11609 BLAKE2B c0f39d9ebabef9ac788d3e8ae5303b90048b17d4b32b5f49e9cadbac66ff8ff127d669049246f78c44966ccaadcf4c90583ad7b917f95367902f551b270c5879 SHA512 071cafc9d4f3ff0548de6f1ece1bfd7ef2ad6fc736eeec5d1a8ca27efaa650225d3b46c7ce39e7daa2ad8e9e6eb9d79c20595aa60dcaf20bdfe19b1fd59427da +EBUILD blender-9999.ebuild 11663 BLAKE2B 4402772729d606cdb63eb468c9d06235b8ab00f75ca8e465f7501e14d620cc375d890beafdc953b2d269741ae89f16a4185a2d5e42b3950c0da23b61d5f21b2a SHA512 09cafd404aec69c9bbcbc8527e3ef1b3c3eac9ed45a65348ae584f512b517e3bfc4be3fe7d571002955d071fa84d0a6c435026fa17738ac81b15ed7335bfb681 +MISC metadata.xml 2959 BLAKE2B 943ad3fcee54211bbf5a18bfe52229820559b16728a3bc162d55dbf9c142970e918355b68bef7e894115cb1c8ff8f3e0cc0be0dfaa0102667d9c93f43bd32963 SHA512 a1c334bdc815bb1459adc5c2fe55b445f1dd6d92a860d53f06c93f22ca10bf62e4b6e8f6eab9b1221b0e239675a2782e11aa4da977d33fd5ee9da1ac2af351d5 diff --git a/media-gfx/blender/blender-2.83.10.ebuild b/media-gfx/blender/blender-2.83.10.ebuild deleted file mode 100644 index abed89a6644b..000000000000 --- a/media-gfx/blender/blender-2.83.10.ebuild +++ /dev/null @@ -1,320 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \ - toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -SRC_URI="https://download.blender.org/source/${P}.tar.xz" - -# Blender can have letters in the version string, -# so strip off the letter if it exists. -MY_PV="$(ver_cut 1-2)" - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \ - abi6-compat abi7-compat alembic collada color-management cuda cycles \ - debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \ - man ndof nls openal opencl openimageio openmp opensubdiv \ - openvdb osl sdl sndfile standalone test tiff valgrind" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - elbeem? ( tbb ) - opencl? ( cycles ) - openvdb? ( - ^^ ( abi6-compat abi7-compat ) - tbb - ) - osl? ( cycles llvm ) - standalone? ( cycles )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?,threads(+)] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:= - media-libs/glew:* - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/opencolorio ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) - fftw? ( sci-libs/fftw:3.0= ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - llvm? ( sys-devel/llvm:= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - opencl? ( virtual/opencl ) - openimageio? ( media-libs/openimageio:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr:= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) - openvdb? ( - ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] - dev-libs/c-blosc:= - ) - osl? ( media-libs/osl:= ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb ) - tiff? ( media-libs/tiff ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) -" - -CMAKE_BUILD_TYPE="Release" - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # we don't want static glew, but it's scattered across - # multiple files that differ from version to version - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - local file - while IFS="" read -d $'\0' -r file ; do - sed -i -e '/-DGLEW_STATIC/d' "${file}" || die - done < <(find . -type f -name "CMakeLists.txt") - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - if use openvdb; then - local version - if use abi6-compat; then - version=6; - elif use abi7-compat; then - version=7; - else - die "Openvdb abi version not compatible" - fi - append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version} - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) - -DWITH_CYCLES_STANDALONE=$(usex standalone) - -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GTESTS=$(usex test) - -DWITH_HEADLESS=$(usex headless) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_LLVM=$(usex llvm) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex elbeem) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) - -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - -DWITH_X11=$(usex !headless) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { - if use test; then - einfo "Running Blender Unit Tests ..." - cd "${BUILD_DIR}"/bin/tests || die - local f - for f in *_test; do - ./"${f}" || die - done - fi -} - -src_install() { - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - if use standalone; then - dobin "${BUILD_DIR}"/bin/cycles - fi - - if use doc; then - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - cmake_src_install - - # fix doc installdir - docinto "html" - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py" - python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts" -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - ewarn - ewarn "This ebuild does not unbundle the massive amount of 3rd party" - ewarn "libraries which are shipped with blender. Note that" - ewarn "these have caused security issues in the past." - ewarn "If you are concerned about security, file a bug upstream:" - ewarn " https://developer.blender.org/" - ewarn - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${MY_PV}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-2.83.12.ebuild b/media-gfx/blender/blender-2.83.12.ebuild deleted file mode 100644 index e2e135cd1626..000000000000 --- a/media-gfx/blender/blender-2.83.12.ebuild +++ /dev/null @@ -1,328 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \ - toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" -SRC_URI="https://download.blender.org/source/${P}.tar.xz" - -# Blender can have letters in the version string, -# so strip off the letter if it exists. -MY_PV="$(ver_cut 1-2)" - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="amd64 ~x86" -IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \ - abi6-compat abi7-compat alembic collada color-management cuda cycles \ - debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \ - man ndof nls openal opencl openimageio openmp opensubdiv \ - openvdb osl sdl sndfile standalone test tiff valgrind" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - elbeem? ( tbb ) - opencl? ( cycles ) - openvdb? ( - ^^ ( abi6-compat abi7-compat ) - tbb - ) - osl? ( cycles llvm ) - standalone? ( cycles )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?,threads(+)] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:= - media-libs/glew:* - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/opencolorio ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) - fftw? ( sci-libs/fftw:3.0= ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - llvm? ( sys-devel/llvm:= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - opencl? ( virtual/opencl ) - openimageio? ( media-libs/openimageio:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr:= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) - openvdb? ( - ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] - dev-libs/c-blosc:= - ) - osl? ( media-libs/osl:= ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb ) - tiff? ( media-libs/tiff ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) -" - -CMAKE_BUILD_TYPE="Release" - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # we don't want static glew, but it's scattered across - # multiple files that differ from version to version - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - local file - while IFS="" read -d $'\0' -r file ; do - sed -i -e '/-DGLEW_STATIC/d' "${file}" || die - done < <(find . -type f -name "CMakeLists.txt") - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - if use openvdb; then - local version - if use abi6-compat; then - version=6; - elif use abi7-compat; then - version=7; - else - die "Openvdb abi version not compatible" - fi - append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version} - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) - -DWITH_CYCLES_STANDALONE=$(usex standalone) - -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GTESTS=$(usex test) - -DWITH_HEADLESS=$(usex headless) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_LLVM=$(usex llvm) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex elbeem) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) - -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - -DWITH_X11=$(usex !headless) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { - if use test; then - einfo "Running Blender Unit Tests ..." - cd "${BUILD_DIR}"/bin/tests || die - local f - for f in *_test; do - ./"${f}" || die - done - fi -} - -src_install() { - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - if use standalone; then - dobin "${BUILD_DIR}"/bin/cycles - fi - - if use doc; then - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - cmake_src_install - - # fix doc installdir - docinto "html" - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py" - python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts" -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - ewarn - ewarn "This ebuild does not unbundle the massive amount of 3rd party" - ewarn "libraries which are shipped with blender. Note that" - ewarn "these have caused security issues in the past." - ewarn "If you are concerned about security, file a bug upstream:" - ewarn " https://developer.blender.org/" - ewarn - - if use python_single_target_python3_8; then - elog "You've enabled python-3.8 support for blender, which is still experimental." - elog "If you experience breakages with e.g. plugins, please switch to" - elog "python_single_target_python3_7 instead." - elog "Bug: https://bugs.gentoo.org/737388" - elog - fi - - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${MY_PV}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-2.83.15.ebuild b/media-gfx/blender/blender-2.83.15.ebuild new file mode 100644 index 000000000000..ccb67825bbd5 --- /dev/null +++ b/media-gfx/blender/blender-2.83.15.ebuild @@ -0,0 +1,374 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="https://www.blender.org" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.blender.org/blender.git" +else + SRC_URI="https://download.blender.org/source/${P}.tar.xz" + SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.83.1-tests.tar.bz2 )" + KEYWORDS="~amd64 ~x86" +fi + +SLOT="${PV%.*}" +LICENSE="|| ( GPL-3 BL )" +IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ + alembic collada +color-management cuda cycles \ + debug doc ffmpeg fftw headless jack jemalloc jpeg2k \ + man ndof nls openal opencl openimageio openmp opensubdiv \ + openvdb osl sdl sndfile standalone test tiff valgrind" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + alembic? ( openexr ) + cuda? ( cycles ) + cycles? ( openexr tiff openimageio ) + fluid? ( tbb ) + opencl? ( cycles ) + openvdb? ( tbb ) + osl? ( cycles ) + standalone? ( cycles ) + test? ( color-management osl )" + +# Library versions for official builds can be found in the blender source directory in: +# build_files/build_environment/install_deps.sh +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:=[nls?,threads(+)] + dev-libs/lzo:2= + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + media-libs/freetype:= + media-libs/glew:* + media-libs/libpng:= + media-libs/libsamplerate + sys-libs/zlib:= + virtual/glu + virtual/jpeg + virtual/libintl + virtual/opengl + alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) + collada? ( >=media-libs/opencollada-1.6.68 ) + color-management? ( =media-libs/openimageio-2.2.13.1:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) + openvdb? ( + >=media-gfx/openvdb-7.0.0 + dev-libs/c-blosc:= + ) + osl? ( /cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/blender-2.83.4-r1.ebuild b/media-gfx/blender/blender-2.83.4-r1.ebuild deleted file mode 100644 index f28ba088062c..000000000000 --- a/media-gfx/blender/blender-2.83.4-r1.ebuild +++ /dev/null @@ -1,320 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \ - toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -SRC_URI="https://download.blender.org/source/${P}.tar.xz" - -# Blender can have letters in the version string, -# so strip off the letter if it exists. -MY_PV="$(ver_cut 1-2)" - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="amd64 ~x86" -IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \ - abi6-compat abi7-compat alembic collada color-management cuda cycles \ - debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \ - man ndof nls openal opencl openimageio openmp opensubdiv \ - openvdb osl sdl sndfile standalone test tiff valgrind" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - elbeem? ( tbb ) - opencl? ( cycles ) - openvdb? ( - ^^ ( abi6-compat abi7-compat ) - tbb - ) - osl? ( cycles llvm ) - standalone? ( cycles )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?,threads(+)] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:= - media-libs/glew:* - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/opencolorio ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) - fftw? ( sci-libs/fftw:3.0= ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - llvm? ( sys-devel/llvm:= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - opencl? ( virtual/opencl ) - openimageio? ( media-libs/openimageio:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr:= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) - openvdb? ( - ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] - dev-libs/c-blosc:= - ) - osl? ( media-libs/osl:= ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb ) - tiff? ( media-libs/tiff ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) -" - -CMAKE_BUILD_TYPE="Release" - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # we don't want static glew, but it's scattered across - # multiple files that differ from version to version - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - local file - while IFS="" read -d $'\0' -r file ; do - sed -i -e '/-DGLEW_STATIC/d' "${file}" || die - done < <(find . -type f -name "CMakeLists.txt") - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - if use openvdb; then - local version - if use abi6-compat; then - version=6; - elif use abi7-compat; then - version=7; - else - die "Openvdb abi version not compatible" - fi - append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version} - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) - -DWITH_CYCLES_STANDALONE=$(usex standalone) - -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GTESTS=$(usex test) - -DWITH_HEADLESS=$(usex headless) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_LLVM=$(usex llvm) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex elbeem) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) - -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - -DWITH_X11=$(usex !headless) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { - if use test; then - einfo "Running Blender Unit Tests ..." - cd "${BUILD_DIR}"/bin/tests || die - local f - for f in *_test; do - ./"${f}" || die - done - fi -} - -src_install() { - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - if use standalone; then - dobin "${BUILD_DIR}"/bin/cycles - fi - - if use doc; then - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - cmake_src_install - - # fix doc installdir - docinto "html" - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py" - python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts" -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - ewarn - ewarn "This ebuild does not unbundle the massive amount of 3rd party" - ewarn "libraries which are shipped with blender. Note that" - ewarn "these have caused security issues in the past." - ewarn "If you are concerned about security, file a bug upstream:" - ewarn " https://developer.blender.org/" - ewarn - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${MY_PV}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-2.90.1-r1.ebuild b/media-gfx/blender/blender-2.90.1-r1.ebuild deleted file mode 100644 index 8c7494285e83..000000000000 --- a/media-gfx/blender/blender-2.90.1-r1.ebuild +++ /dev/null @@ -1,321 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \ - toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -SRC_URI="https://download.blender.org/source/${P}.tar.xz" - -# Blender can have letters in the version string, -# so strip off the letter if it exists. -MY_PV="$(ver_cut 1-2)" - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \ - abi6-compat abi7-compat alembic collada color-management cuda cycles \ - debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \ - man ndof nls openal opencl openimageio openmp opensubdiv \ - openvdb osl sdl sndfile standalone test tiff valgrind" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tbb tiff openimageio ) - elbeem? ( tbb ) - opencl? ( cycles ) - openvdb? ( - ^^ ( abi6-compat abi7-compat ) - tbb - ) - osl? ( cycles llvm ) - standalone? ( cycles )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?,threads(+)] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:= - media-libs/glew:* - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/opencolorio ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) - fftw? ( sci-libs/fftw:3.0= ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - llvm? ( sys-devel/llvm:= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - opencl? ( virtual/opencl ) - openimageio? ( media-libs/openimageio:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr:= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) - openvdb? ( - ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] - dev-libs/c-blosc:= - ) - osl? ( media-libs/osl:= ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb ) - tiff? ( media-libs/tiff ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) -" - -CMAKE_BUILD_TYPE="Release" - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # we don't want static glew, but it's scattered across - # multiple files that differ from version to version - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - local file - while IFS="" read -d $'\0' -r file ; do - sed -i -e '/-DGLEW_STATIC/d' "${file}" || die - done < <(find . -type f -name "CMakeLists.txt") - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - if use openvdb; then - local version - if use abi6-compat; then - version=6; - elif use abi7-compat; then - version=7; - else - die "Openvdb abi version not compatible" - fi - append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version} - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) - -DWITH_CYCLES_EMBREE=OFF - -DWITH_CYCLES_STANDALONE=$(usex standalone) - -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GHOST_X11=$(usex !headless) - -DWITH_GTESTS=$(usex test) - -DWITH_HEADLESS=$(usex headless) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_LLVM=$(usex llvm) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex elbeem) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) - -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { - if use test; then - einfo "Running Blender Unit Tests ..." - cd "${BUILD_DIR}"/bin/tests || die - local f - for f in *_test; do - ./"${f}" || die - done - fi -} - -src_install() { - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - if use standalone; then - dobin "${BUILD_DIR}"/bin/cycles - fi - - if use doc; then - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - cmake_src_install - - # fix doc installdir - docinto "html" - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py" - python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts" -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - ewarn - ewarn "This ebuild does not unbundle the massive amount of 3rd party" - ewarn "libraries which are shipped with blender. Note that" - ewarn "these have caused security issues in the past." - ewarn "If you are concerned about security, file a bug upstream:" - ewarn " https://developer.blender.org/" - ewarn - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${MY_PV}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-2.91.0.ebuild b/media-gfx/blender/blender-2.91.0.ebuild deleted file mode 100644 index bedb7cf42832..000000000000 --- a/media-gfx/blender/blender-2.91.0.ebuild +++ /dev/null @@ -1,335 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \ - toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -SRC_URI="https://download.blender.org/source/${P}.tar.xz" - -# Blender can have letters in the version string, -# so strip off the letter if it exists. -MY_PV="$(ver_cut 1-2)" - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \ - abi6-compat abi7-compat alembic collada color-management cuda cycles \ - debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \ - man ndof nls openal opencl openimageio openmp opensubdiv \ - openvdb osl sdl sndfile standalone test tiff valgrind" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tbb tiff openimageio ) - elbeem? ( tbb ) - opencl? ( cycles ) - openvdb? ( - ^^ ( abi6-compat abi7-compat ) - tbb - ) - osl? ( cycles llvm ) - standalone? ( cycles )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?,threads(+)] - dev-libs/gmp - dev-libs/pugixml - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-gfx/potrace - media-libs/fontconfig:= - media-libs/freetype:= - media-libs/glew:* - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/opencolorio ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - cycles? ( media-libs/freeglut ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) - fftw? ( sci-libs/fftw:3.0= ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - llvm? ( sys-devel/llvm:= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - opencl? ( virtual/opencl ) - openimageio? ( media-libs/openimageio:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr:= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) - openvdb? ( - ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] - dev-libs/c-blosc:= - ) - osl? ( media-libs/osl:= ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb ) - tiff? ( media-libs/tiff ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) -" - -CMAKE_BUILD_TYPE="Release" - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # we don't want static glew, but it's scattered across - # multiple files that differ from version to version - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - local file - while IFS="" read -d $'\0' -r file ; do - sed -i -e '/-DGLEW_STATIC/d' "${file}" || die - done < <(find . -type f -name "CMakeLists.txt") - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - if use openvdb; then - local version - if use abi6-compat; then - version=6; - elif use abi7-compat; then - version=7; - else - die "Openvdb abi version not compatible" - fi - append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version} - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) - -DWITH_CYCLES_EMBREE=OFF - -DWITH_CYCLES_STANDALONE=$(usex standalone) - -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GHOST_X11=$(usex !headless) - -DWITH_GTESTS=$(usex test) - -DWITH_HEADLESS=$(usex headless) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_LLVM=$(usex llvm) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex elbeem) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) - -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { - if use test; then - einfo "Running Blender Unit Tests ..." - cd "${BUILD_DIR}"/bin/tests || die - local f - for f in *_test; do - ./"${f}" || die - done - fi -} - -src_install() { - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - if use standalone; then - dobin "${BUILD_DIR}"/bin/cycles - fi - - if use doc; then - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - cmake_src_install - - # fix doc installdir - docinto "html" - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py" - python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts" -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - ewarn - ewarn "This ebuild does not unbundle the massive amount of 3rd party" - ewarn "libraries which are shipped with blender. Note that" - ewarn "these have caused security issues in the past." - ewarn "If you are concerned about security, file a bug upstream:" - ewarn " https://developer.blender.org/" - ewarn - - if use python_single_target_python3_8; then - elog "You've enabled python-3.8 support for blender, which is still experimental." - elog "If you experience breakages with e.g. plugins, please switch to" - elog "python_single_target_python3_7 instead." - elog "Bug: https://bugs.gentoo.org/737388" - elog - fi - - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${MY_PV}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-2.91.2.ebuild b/media-gfx/blender/blender-2.91.2.ebuild deleted file mode 100644 index 069fa30267f2..000000000000 --- a/media-gfx/blender/blender-2.91.2.ebuild +++ /dev/null @@ -1,334 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \ - toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" -SRC_URI="https://download.blender.org/source/${P}.tar.xz" - -# Blender can have letters in the version string, -# so strip off the letter if it exists. -MY_PV="$(ver_cut 1-2)" - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \ - abi6-compat abi7-compat alembic collada color-management cuda cycles \ - debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \ - man ndof nls openal opencl openimageio openmp opensubdiv \ - openvdb osl sdl sndfile standalone test tiff valgrind" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tbb tiff openimageio ) - elbeem? ( tbb ) - opencl? ( cycles ) - openvdb? ( - ^^ ( abi6-compat abi7-compat ) - tbb - ) - osl? ( cycles llvm ) - standalone? ( cycles )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?,threads(+)] - dev-libs/gmp - dev-libs/pugixml - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-gfx/potrace - media-libs/fontconfig:= - media-libs/freetype:= - media-libs/glew:* - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/opencolorio ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - cycles? ( media-libs/freeglut ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) - fftw? ( sci-libs/fftw:3.0= ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - llvm? ( sys-devel/llvm:= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - opencl? ( virtual/opencl ) - openimageio? ( media-libs/openimageio:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr:= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) - openvdb? ( - ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] - dev-libs/c-blosc:= - ) - osl? ( media-libs/osl:= ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb ) - tiff? ( media-libs/tiff ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) -" - -CMAKE_BUILD_TYPE="Release" - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # we don't want static glew, but it's scattered across - # multiple files that differ from version to version - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - local file - while IFS="" read -d $'\0' -r file ; do - sed -i -e '/-DGLEW_STATIC/d' "${file}" || die - done < <(find . -type f -name "CMakeLists.txt") - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - if use openvdb; then - local version - if use abi6-compat; then - version=6; - elif use abi7-compat; then - version=7; - else - die "Openvdb abi version not compatible" - fi - append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version} - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) - -DWITH_CYCLES_EMBREE=OFF - -DWITH_CYCLES_STANDALONE=$(usex standalone) - -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GHOST_X11=$(usex !headless) - -DWITH_GTESTS=$(usex test) - -DWITH_HEADLESS=$(usex headless) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_LLVM=$(usex llvm) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex elbeem) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) - -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { - if use test; then - einfo "Running Blender Unit Tests ..." - cd "${BUILD_DIR}"/bin/tests || die - local f - for f in *_test; do - ./"${f}" || die - done - fi -} - -src_install() { - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - if use standalone; then - dobin "${BUILD_DIR}"/bin/cycles - fi - - if use doc; then - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - cmake_src_install - - # fix doc installdir - docinto "html" - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py" - python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts" -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - ewarn - ewarn "This ebuild does not unbundle the massive amount of 3rd party" - ewarn "libraries which are shipped with blender. Note that" - ewarn "these have caused security issues in the past." - ewarn "If you are concerned about security, file a bug upstream:" - ewarn " https://developer.blender.org/" - ewarn - - if use python_single_target_python3_8; then - elog "You've enabled python-3.8 support for blender, which is still experimental." - elog "If you experience breakages with e.g. plugins, please switch to" - elog "python_single_target_python3_7 instead." - elog "Bug: https://bugs.gentoo.org/737388" - elog - fi - - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${MY_PV}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-2.93.0.ebuild b/media-gfx/blender/blender-2.93.0.ebuild new file mode 100644 index 000000000000..8a23be813239 --- /dev/null +++ b/media-gfx/blender/blender-2.93.0.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_9 ) + +inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="https://www.blender.org" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.blender.org/blender.git" +else + SRC_URI="https://download.blender.org/source/${P}.tar.xz" + SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.93.0-tests.tar.bz2 )" + KEYWORDS="~amd64" +fi + +SLOT="${PV%.*}" +LICENSE="|| ( GPL-3 BL )" +IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ + alembic collada +color-management cuda +cycles \ + debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ + man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \ + +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + alembic? ( openexr ) + cuda? ( cycles ) + cycles? ( openexr tiff openimageio ) + fluid? ( tbb ) + opencl? ( cycles ) + openvdb? ( tbb ) + osl? ( cycles ) + standalone? ( cycles ) + test? ( color-management )" + +# Library versions for official builds can be found in the blender source directory in: +# build_files/build_environment/install_deps.sh +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:=[nls?,threads(+)] + dev-libs/lzo:2= + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + media-libs/freetype:= + media-libs/glew:* + media-libs/libpng:= + media-libs/libsamplerate + sys-libs/zlib:= + virtual/glu + virtual/jpeg + virtual/libintl + virtual/opengl + alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) + collada? ( >=media-libs/opencollada-1.6.68 ) + color-management? ( >=media-libs/opencolorio-2.0.0 ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + embree? ( >=media-libs/embree-3.10.0[raymask] ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] ) + fftw? ( sci-libs/fftw:3.0= ) + gmp? ( dev-libs/gmp ) + !headless? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + opencl? ( virtual/opencl ) + oidn? ( >=media-libs/oidn-1.3.0 ) + openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) + openvdb? ( + >=media-gfx/openvdb-7.1.0 + dev-libs/c-blosc:= + ) + osl? ( >=media-libs/osl-1.11.10.0 ) + pdf? ( media-libs/libharu ) + potrace? ( media-gfx/potrace ) + pugixml? ( dev-libs/pugixml ) + pulseaudio? ( media-sound/pulseaudio ) + sdl? ( media-libs/libsdl2[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tbb? ( dev-cpp/tbb ) + test? ( dev-vcs/subversion ) + tiff? ( media-libs/tiff ) + valgrind? ( dev-util/valgrind ) +" + +DEPEND="${RDEPEND} + dev-cpp/eigen:= +" + +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen[dot] + dev-python/sphinx[latex] + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + nls? ( sys-devel/gettext ) +" + +blender_check_requirements() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +blender_get_version() { + # Get blender version from blender itself. + BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) + if ((${BV:0:1} < 3)) ; then + # Add period (290 -> 2.90). + BV=${BV:0:1}.${BV:1} + else + # Add period and strip last number (300 -> 3.0) + BV=${BV:0:1}.${BV:1:1} + fi +} + +pkg_pretend() { + blender_check_requirements +} + +pkg_setup() { + blender_check_requirements + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + git-r3_src_unpack + else + default + fi + + if use test; then + mkdir -p lib/tests || die + mv "${WORKDIR}"/blender*tests* lib/tests || die + fi +} + +src_prepare() { + cmake_src_prepare + + blender_get_version + + # Disable MS Windows help generation. The variable doesn't do what it + # it sounds like. + sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ + -i doc/doxygen/Doxyfile || die + + # Prepare icons and .desktop files for slotting. + sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i source/creator/CMakeLists.txt || die + + sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die + + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die + mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || die + + if use test; then + # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die + fi +} + +src_configure() { + append-lfs-flags + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_VERSION="${EPYTHON/python/}" + -DWITH_ALEMBIC=$(usex alembic) + -DWITH_ASSERT_ABORT=$(usex debug) + -DWITH_BOOST=ON + -DWITH_BULLET=$(usex bullet) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg) + -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CXX_GUARDEDALLOC=$(usex debug) + -DWITH_CYCLES=$(usex cycles) + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) + -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) + -DWITH_CYCLES_EMBREE=$(usex embree) + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_CYCLES_STANDALONE=$(usex standalone) + -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_FFTW3=$(usex fftw) + -DWITH_GMP=$(usex gmp) + -DWITH_GTESTS=$(usex test) + -DWITH_HARU=$(usex pdf) + -DWITH_HEADLESS=$(usex headless) + -DWITH_INSTALL_PORTABLE=OFF + -DWITH_IMAGE_DDS=$(usex dds) + -DWITH_IMAGE_OPENEXR=$(usex openexr) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) + -DWITH_IMAGE_TIFF=$(usex tiff) + -DWITH_INPUT_NDOF=$(usex ndof) + -DWITH_INTERNATIONAL=$(usex nls) + -DWITH_JACK=$(usex jack) + -DWITH_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + -DWITH_MOD_FLUID=$(usex fluid) + -DWITH_MOD_OCEANSIM=$(usex fftw) + -DWITH_NANOVDB=OFF + -DWITH_OPENAL=$(usex openal) + -DWITH_OPENCOLLADA=$(usex collada) + -DWITH_OPENCOLORIO=$(usex color-management) + -DWITH_OPENIMAGEDENOISE=$(usex oidn) + -DWITH_OPENIMAGEIO=$(usex openimageio) + -DWITH_OPENMP=$(usex openmp) + -DWITH_OPENSUBDIV=$(usex opensubdiv) + -DWITH_OPENVDB=$(usex openvdb) + -DWITH_OPENVDB_BLOSC=$(usex openvdb) + -DWITH_POTRACE=$(usex potrace) + -DWITH_PUGIXML=$(usex pugixml) + -DWITH_PULSEAUDIO=$(usex pulseaudio) + -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) + -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) + -DWITH_SDL=$(usex sdl) + -DWITH_STATIC_LIBS=OFF + -DWITH_SYSTEM_EIGEN3=ON + -DWITH_SYSTEM_GLEW=ON + -DWITH_SYSTEM_LZO=ON + -DWITH_TBB=$(usex tbb) + -DWITH_USD=OFF + -DWITH_XR_OPENXR=OFF + ) + if ! use debug ; then + append-flags -DNDEBUG + else + append-flags -DDEBUG + fi + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + # Workaround for binary drivers. + addpredict /dev/ati + addpredict /dev/dri + addpredict /dev/nvidiactl + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile || die + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + fi +} + +src_test() { + # A lot of tests needs to have access to the installed data files. + # So install them into the image directory now. + cmake_src_install + + blender_get_version + # Define custom blender data/script file paths not be able to find them otherwise during testing. + # (Because the data is in the image directory and it will default to look in /usr/share) + export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts + export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + + cmake_src_test + + # Clean up the image directory for src_install + rm -fr ${ED}/* || die +} + +src_install() { + blender_get_version + + # Pax mark blender for hardened support. + pax-mark m "${BUILD_DIR}"/bin/blender + + if use standalone; then + dobin "${BUILD_DIR}"/bin/cycles + fi + + if use doc; then + docinto "html/API/python" + dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. + + docinto "html/API/blender" + dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. + fi + + cmake_src_install + + # fix doc installdir + docinto "html" + dodoc "${CMAKE_USE_DIR}"/release/text/readme.html + rm -r "${ED}"/usr/share/doc/blender || die + + python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py" + python_optimize "${ED}/usr/share/blender/${BV}/scripts" + + mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" +} + +pkg_postinst() { + elog + elog "Blender uses python integration. As such, may have some" + elog "inherent risks with running unknown python scripts." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "changing the 'Temporary Files' directory in Blender preferences." + elog + ewarn + ewarn "This ebuild does not unbundle the massive amount of 3rd party" + ewarn "libraries which are shipped with blender. Note that" + ewarn "these have caused security issues in the past." + ewarn "If you are concerned about security, file a bug upstream:" + ewarn " https://developer.blender.org/" + ewarn + + if ! use python_single_target_python3_9; then + elog "You are building Blender with a newer python version than" + elog "supported by this version upstream." + elog "If you experience breakages with e.g. plugins, please switch to" + elog "python_single_target_python3_9 instead." + elog "Bug: https://bugs.gentoo.org/737388" + elog + fi + + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update + + ewarn "" + ewarn "You may want to remove the following directory." + ewarn "~/.config/${PN}//cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild new file mode 100644 index 000000000000..801ddf0af3a3 --- /dev/null +++ b/media-gfx/blender/blender-9999.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_9 ) + +inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs subversion xdg-utils + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="https://www.blender.org" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.blender.org/blender.git" +else + SRC_URI="https://download.blender.org/source/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +SLOT="${PV%.*}" +LICENSE="|| ( GPL-3 BL )" +IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ + alembic collada +color-management cuda +cycles \ + debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ + man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \ + +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + alembic? ( openexr ) + cuda? ( cycles ) + cycles? ( openexr tiff openimageio ) + fluid? ( tbb ) + opencl? ( cycles ) + openvdb? ( tbb ) + osl? ( cycles ) + standalone? ( cycles ) + test? ( color-management )" + +# Library versions for official builds can be found in the blender source directory in: +# build_files/build_environment/install_deps.sh +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:=[nls?,threads(+)] + dev-libs/lzo:2= + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + media-libs/freetype:= + media-libs/glew:* + media-libs/libpng:= + media-libs/libsamplerate + sys-libs/zlib:= + virtual/glu + virtual/jpeg + virtual/libintl + virtual/opengl + alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) + collada? ( >=media-libs/opencollada-1.6.68 ) + color-management? ( >=media-libs/opencolorio-2.0.0 ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + embree? ( >=media-libs/embree-3.10.0[raymask] ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] ) + fftw? ( sci-libs/fftw:3.0= ) + gmp? ( dev-libs/gmp ) + !headless? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + opencl? ( virtual/opencl ) + oidn? ( >=media-libs/oidn-1.3.0 ) + openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) + openvdb? ( + >=media-gfx/openvdb-7.1.0 + dev-libs/c-blosc:= + ) + osl? ( >=media-libs/osl-1.11.10.0 ) + pdf? ( media-libs/libharu ) + potrace? ( media-gfx/potrace ) + pugixml? ( dev-libs/pugixml ) + pulseaudio? ( media-sound/pulseaudio ) + sdl? ( media-libs/libsdl2[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tbb? ( dev-cpp/tbb ) + test? ( dev-vcs/subversion ) + tiff? ( media-libs/tiff ) + valgrind? ( dev-util/valgrind ) +" + +DEPEND="${RDEPEND} + dev-cpp/eigen:= +" + +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen[dot] + dev-python/sphinx[latex] + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + nls? ( sys-devel/gettext ) +" + +blender_check_requirements() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +blender_get_version() { + # Get blender version from blender itself. + BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) + if ((${BV:0:1} < 3)) ; then + # Add period (290 -> 2.90). + BV=${BV:0:1}.${BV:1} + else + # Add period and strip last number (300 -> 3.0) + BV=${BV:0:1}.${BV:1:1} + fi +} + +pkg_pretend() { + blender_check_requirements +} + +pkg_setup() { + blender_check_requirements + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests + git-r3_src_unpack + else + default + TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests + fi + + if use test; then + subversion_fetch ${TESTS_SVN_URL} ../lib/tests + fi +} + +src_prepare() { + cmake_src_prepare + + blender_get_version + + # Disable MS Windows help generation. The variable doesn't do what it + # it sounds like. + sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ + -i doc/doxygen/Doxyfile || die + + # Prepare icons and .desktop files for slotting. + sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i source/creator/CMakeLists.txt || die + + sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die + + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die + mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || die + + if use test; then + # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die + fi +} + +src_configure() { + append-lfs-flags + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_VERSION="${EPYTHON/python/}" + -DWITH_ALEMBIC=$(usex alembic) + -DWITH_ASSERT_ABORT=$(usex debug) + -DWITH_BOOST=ON + -DWITH_BULLET=$(usex bullet) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg) + -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CXX_GUARDEDALLOC=$(usex debug) + -DWITH_CYCLES=$(usex cycles) + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) + -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) + -DWITH_CYCLES_EMBREE=$(usex embree) + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_CYCLES_STANDALONE=$(usex standalone) + -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_FFTW3=$(usex fftw) + -DWITH_GMP=$(usex gmp) + -DWITH_GTESTS=$(usex test) + -DWITH_HARU=$(usex pdf) + -DWITH_HEADLESS=$(usex headless) + -DWITH_INSTALL_PORTABLE=OFF + -DWITH_IMAGE_DDS=$(usex dds) + -DWITH_IMAGE_OPENEXR=$(usex openexr) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) + -DWITH_IMAGE_TIFF=$(usex tiff) + -DWITH_INPUT_NDOF=$(usex ndof) + -DWITH_INTERNATIONAL=$(usex nls) + -DWITH_JACK=$(usex jack) + -DWITH_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + -DWITH_MOD_FLUID=$(usex fluid) + -DWITH_MOD_OCEANSIM=$(usex fftw) + -DWITH_NANOVDB=OFF + -DWITH_OPENAL=$(usex openal) + -DWITH_OPENCOLLADA=$(usex collada) + -DWITH_OPENCOLORIO=$(usex color-management) + -DWITH_OPENIMAGEDENOISE=$(usex oidn) + -DWITH_OPENIMAGEIO=$(usex openimageio) + -DWITH_OPENMP=$(usex openmp) + -DWITH_OPENSUBDIV=$(usex opensubdiv) + -DWITH_OPENVDB=$(usex openvdb) + -DWITH_OPENVDB_BLOSC=$(usex openvdb) + -DWITH_POTRACE=$(usex potrace) + -DWITH_PUGIXML=$(usex pugixml) + -DWITH_PULSEAUDIO=$(usex pulseaudio) + -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) + -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) + -DWITH_SDL=$(usex sdl) + -DWITH_STATIC_LIBS=OFF + -DWITH_SYSTEM_EIGEN3=ON + -DWITH_SYSTEM_GLEW=ON + -DWITH_SYSTEM_LZO=ON + -DWITH_TBB=$(usex tbb) + -DWITH_USD=OFF + -DWITH_XR_OPENXR=OFF + ) + if ! use debug ; then + append-flags -DNDEBUG + else + append-flags -DDEBUG + fi + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + # Workaround for binary drivers. + addpredict /dev/ati + addpredict /dev/dri + addpredict /dev/nvidiactl + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile || die + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + fi +} + +src_test() { + # A lot of tests needs to have access to the installed data files. + # So install them into the image directory now. + cmake_src_install + + blender_get_version + # Define custom blender data/script file paths not be able to find them otherwise during testing. + # (Because the data is in the image directory and it will default to look in /usr/share) + export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts + export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + + cmake_src_test + + # Clean up the image directory for src_install + rm -fr ${ED}/* || die +} + +src_install() { + blender_get_version + + # Pax mark blender for hardened support. + pax-mark m "${BUILD_DIR}"/bin/blender + + if use standalone; then + dobin "${BUILD_DIR}"/bin/cycles + fi + + if use doc; then + docinto "html/API/python" + dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. + + docinto "html/API/blender" + dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. + fi + + cmake_src_install + + # fix doc installdir + docinto "html" + dodoc "${CMAKE_USE_DIR}"/release/text/readme.html + rm -r "${ED}"/usr/share/doc/blender || die + + python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py" + python_optimize "${ED}/usr/share/blender/${BV}/scripts" + + mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" +} + +pkg_postinst() { + elog + elog "Blender uses python integration. As such, may have some" + elog "inherent risks with running unknown python scripts." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "changing the 'Temporary Files' directory in Blender preferences." + elog + ewarn + ewarn "This ebuild does not unbundle the massive amount of 3rd party" + ewarn "libraries which are shipped with blender. Note that" + ewarn "these have caused security issues in the past." + ewarn "If you are concerned about security, file a bug upstream:" + ewarn " https://developer.blender.org/" + ewarn + + if ! use python_single_target_python3_9; then + elog "You are building Blender with a newer python version than" + elog "supported by this version upstream." + elog "If you experience breakages with e.g. plugins, please switch to" + elog "python_single_target_python3_9 instead." + elog "Bug: https://bugs.gentoo.org/737388" + elog + fi + + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update + + ewarn "" + ewarn "You may want to remove the following directory." + ewarn "~/.config/${PN}//cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/files/blender-2.83.13-ffmpeg-4_4.patch b/media-gfx/blender/files/blender-2.83.13-ffmpeg-4_4.patch new file mode 100644 index 000000000000..bf8579675886 --- /dev/null +++ b/media-gfx/blender/files/blender-2.83.13-ffmpeg-4_4.patch @@ -0,0 +1,27 @@ +From 9cdf11676ecd753fd86c3d8057c2375174ef0a70 Mon Sep 17 00:00:00 2001 +From: Sebastian Parborg +Date: Fri, 7 May 2021 16:51:28 +0200 +Subject: [PATCH] Fix: No sound is exported with ffmpeg 4.4 + +We were not assigning the amount of sound channels to the output frames. +Newer ffmpeg releases has sanity checks in place and doesn't fall back +to two channels anymore. +--- + source/blender/blenkernel/intern/writeffmpeg.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c +index 7fc9e8cc0ef..e5550cee124 100644 +--- a/source/blender/blenkernel/intern/writeffmpeg.c ++++ b/source/blender/blenkernel/intern/writeffmpeg.c +@@ -164,6 +164,7 @@ static int write_audio_frame(FFMpegContext *context) + frame->pts = context->audio_time / av_q2d(c->time_base); + frame->nb_samples = context->audio_input_samples; + frame->format = c->sample_fmt; ++ frame->channels = c->channels; + # ifdef FFMPEG_HAVE_FRAME_CHANNEL_LAYOUT + frame->channel_layout = c->channel_layout; + # endif +-- +2.26.3 + diff --git a/media-gfx/blender/files/blender-2.83.6-constraints_test.patch b/media-gfx/blender/files/blender-2.83.6-constraints_test.patch new file mode 100644 index 000000000000..ab1e9a6d2d4a --- /dev/null +++ b/media-gfx/blender/files/blender-2.83.6-constraints_test.patch @@ -0,0 +1,13 @@ +diff --git a/tests/python/bl_constraints.py b/tests/python/bl_constraints.py +index 323dd874ac0..7cbc46d680a 100644 +--- a/tests/python/bl_constraints.py ++++ b/tests/python/bl_constraints.py +@@ -44,7 +44,7 @@ class AbstractConstraintTests(unittest.TestCase): + collection = top_collection.children[self.layer_collection] + collection.exclude = False + +- def assert_matrix(self, actual_matrix, expect_matrix, object_name: str, places=6, delta=None): ++ def assert_matrix(self, actual_matrix, expect_matrix, object_name: str, places=None, delta=1e-6): + """Asserts that the matrices almost equal.""" + self.assertEqual(len(actual_matrix), 4, 'Expected a 4x4 matrix') + diff --git a/media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch b/media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch new file mode 100644 index 000000000000..b7537f97fc09 --- /dev/null +++ b/media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1552,7 +1552,7 @@ + CMAKE_C_COMPILER_ID MATCHES "Intel" + ) + # TODO(sergey): Do we want c++11 or gnu-c++11 here? +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + else() + message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++11 build") + endif() +--- a/extern/mantaflow/CMakeLists.txt ++++ b/extern/mantaflow/CMakeLists.txt +@@ -51,7 +51,6 @@ + + if(WITH_OPENVDB) + add_definitions(-DOPENVDB=1) +- add_definitions(-DOPENVDB_STATICLIB) + endif() + + if(WIN32 diff --git a/media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch b/media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch new file mode 100644 index 000000000000..1392510a23a7 --- /dev/null +++ b/media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch @@ -0,0 +1,219 @@ +diff --git a/intern/libmv/libmv/base/vector.h b/intern/libmv/libmv/base/vector.h +index bdc4392155c..300291c5679 100644 +--- a/intern/libmv/libmv/base/vector.h ++++ b/intern/libmv/libmv/base/vector.h +@@ -25,151 +25,18 @@ + #ifndef LIBMV_BASE_VECTOR_H + #define LIBMV_BASE_VECTOR_H + +-#include +-#include ++#include + + #include + + namespace libmv { + +-// A simple container class, which guarantees 16 byte alignment needed for most +-// vectorization. Don't use this container for classes that cannot be copied +-// via memcpy. +-// FIXME: this class has some issues: +-// - doesn't support iterators. +-// - impede compatibility with code using STL. +-// - the STL already provide support for custom allocators +-// it could be replaced with a simple +-// template class vector : std::vector {} declaration +-// provided it doesn't break code relying on libmv::vector specific behavior +-template > +-class vector { +- public: +- ~vector() { clear(); } ++// A simple container class, which guarantees the correct memory alignment ++// needed for most eigen vectorization. Don't use this container for classes ++// that cannot be copied via memcpy. + +- vector() { init(); } +- vector(int size) { init(); resize(size); } +- vector(int size, const T & val) { +- init(); +- resize(size); +- std::fill(data_, data_+size_, val); } +- +- // Copy constructor and assignment. +- vector(const vector &rhs) { +- init(); +- copy(rhs); +- } +- vector &operator=(const vector &rhs) { +- if (&rhs != this) { +- copy(rhs); +- } +- return *this; +- } +- +- /// Swaps the contents of two vectors in constant time. +- void swap(vector &other) { +- std::swap(allocator_, other.allocator_); +- std::swap(size_, other.size_); +- std::swap(capacity_, other.capacity_); +- std::swap(data_, other.data_); +- } +- +- T *data() const { return data_; } +- int size() const { return size_; } +- int capacity() const { return capacity_; } +- const T& back() const { return data_[size_ - 1]; } +- T& back() { return data_[size_ - 1]; } +- const T& front() const { return data_[0]; } +- T& front() { return data_[0]; } +- const T& operator[](int n) const { return data_[n]; } +- T& operator[](int n) { return data_[n]; } +- const T& at(int n) const { return data_[n]; } +- T& at(int n) { return data_[n]; } +- const T * begin() const { return data_; } +- const T * end() const { return data_+size_; } +- T * begin() { return data_; } +- T * end() { return data_+size_; } +- +- void resize(size_t size) { +- reserve(size); +- if (size > size_) { +- construct(size_, size); +- } else if (size < size_) { +- destruct(size, size_); +- } +- size_ = size; +- } +- +- void push_back(const T &value) { +- if (size_ == capacity_) { +- reserve(size_ ? 2 * size_ : 1); +- } +- new (&data_[size_++]) T(value); +- } +- +- void pop_back() { +- resize(size_ - 1); +- } +- +- void clear() { +- destruct(0, size_); +- deallocate(); +- init(); +- } +- +- void reserve(unsigned int size) { +- if (size > size_) { +- T *data = static_cast(allocate(size)); +- memcpy(static_cast(data), data_, sizeof(*data)*size_); +- allocator_.deallocate(data_, capacity_); +- data_ = data; +- capacity_ = size; +- } +- } +- +- bool empty() { +- return size_ == 0; +- } +- +- private: +- void construct(int start, int end) { +- for (int i = start; i < end; ++i) { +- new (&data_[i]) T; +- } +- } +- void destruct(int start, int end) { +- for (int i = start; i < end; ++i) { +- data_[i].~T(); +- } +- } +- void init() { +- size_ = 0; +- data_ = 0; +- capacity_ = 0; +- } +- +- void *allocate(int size) { +- return size ? allocator_.allocate(size) : 0; +- } +- +- void deallocate() { +- allocator_.deallocate(data_, size_); +- data_ = 0; +- } +- +- void copy(const vector &rhs) { +- resize(rhs.size()); +- for (int i = 0; i < rhs.size(); ++i) { +- (*this)[i] = rhs[i]; +- } +- } +- +- Allocator allocator_; +- size_t size_; +- size_t capacity_; +- T *data_; +-}; ++template ++using vector = std::vector>; + + } // namespace libmv + +diff --git a/intern/libmv/libmv/base/vector_test.cc b/intern/libmv/libmv/base/vector_test.cc +index f17718c3926..44b9a152148 100644 +--- a/intern/libmv/libmv/base/vector_test.cc ++++ b/intern/libmv/libmv/base/vector_test.cc +@@ -115,31 +115,24 @@ TEST_F(VectorTest, ResizeConstructsAndDestructsAsExpected) { + // Create one object. + v.resize(1); + EXPECT_EQ(1, v.size()); +- EXPECT_EQ(1, v.capacity()); + EXPECT_EQ(1, foo_construct_calls); +- EXPECT_EQ(0, foo_destruct_calls); + EXPECT_EQ(5, v[0].value); + + // Create two more. + v.resize(3); + EXPECT_EQ(3, v.size()); +- EXPECT_EQ(3, v.capacity()); + EXPECT_EQ(3, foo_construct_calls); +- EXPECT_EQ(0, foo_destruct_calls); + + // Delete the last one. + v.resize(2); + EXPECT_EQ(2, v.size()); + EXPECT_EQ(3, v.capacity()); + EXPECT_EQ(3, foo_construct_calls); +- EXPECT_EQ(1, foo_destruct_calls); + + // Delete the remaining two. + v.resize(0); + EXPECT_EQ(0, v.size()); +- EXPECT_EQ(3, v.capacity()); + EXPECT_EQ(3, foo_construct_calls); +- EXPECT_EQ(3, foo_destruct_calls); + } + + TEST_F(VectorTest, PushPopBack) { +@@ -192,15 +185,15 @@ TEST_F(VectorTest, STLFind) { + a.push_back(5); + a.push_back(3); + +- // Find return an int * ++ // Find returns an int * + EXPECT_EQ(std::find(&a[0], &a[2], 1) == &a[0], true); + EXPECT_EQ(std::find(&a[0], &a[2], 5) == &a[1], true); + EXPECT_EQ(std::find(&a[0], &a[2], 3) == &a[2], true); + +- // Find return a const int * +- EXPECT_EQ(std::find(a.begin(), a.end(), 1) == &a[0], true); +- EXPECT_EQ(std::find(a.begin(), a.end(), 5) == &a[1], true); +- EXPECT_EQ(std::find(a.begin(), a.end(), 3) == &a[2], true); ++ // Find returns an interator ++ EXPECT_EQ(std::find(a.begin(), a.end(), 1) == std::next(a.begin(), 0), true); ++ EXPECT_EQ(std::find(a.begin(), a.end(), 5) == std::next(a.begin(), 1), true); ++ EXPECT_EQ(std::find(a.begin(), a.end(), 3) == std::next(a.begin(), 2), true); + + // Search value that are not in the vector + EXPECT_EQ(std::find(a.begin(), a.end(), 0) == a.end(), true); diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index 6fc1b5f9fa50..16d447e56348 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -14,12 +14,6 @@ rendering, post-production, interactive creation and playback. - - Build for OpenVDB ABI 6. - - - Build for OpenVDB ABI 7. - Add support for Alembic through media-gfx/alembic. @@ -42,18 +36,19 @@ Adds DDS textures support to Blender. - - Adds surface fluid simulation to Blender using El'Beem library. + + Use embree to accelerate certain areas of the Cycles render engine. + + + Adds fluid simulation support via the built-in Mantaflow library. Build without graphical support (renderfarm, server mode only). - - Enable features depending on llvm. - Enable NDOF input devices (SpaceNavigator and friends). + Enable OpenImageDenoiser Support Allow OpenCL Graphics Acceleration. This may require extra graphics card drivers. @@ -68,6 +63,12 @@ Add support for OpenShadingLanguage scripting. + + Add support for converting bitmaps into Grease pencil line using the potrace library. + + + Enable PugiXML support (Used for OpenImageIO, Grease Pencil SVG export) + Build the standalone version of Cycles. diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest index c3d161830065..f58e4b722bbf 100644 --- a/media-gfx/cura/Manifest +++ b/media-gfx/cura/Manifest @@ -1,3 +1,3 @@ -DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153 SHA512 0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711 -EBUILD cura-4.8.0.ebuild 1966 BLAKE2B fb232dbe948e892b71ae184225b8c0a36feb34375dafd510332aa950bc0490512983a1ae15378f94beb863c3c4c012e7c5f6fd06c5f181558ad17c569c4ab73e SHA512 05d22e7c757079fa99eeeacd2f398526ff64373b450f46f058d627e85660a59b9d9ae8eb59222b07f364a381a0d9e8e16cbb16c112c69c7f4a46b2150332bcfe +DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463 SHA512 436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf +EBUILD cura-4.9.1.ebuild 2157 BLAKE2B df6f36f6341244880322b4d5e99b7cae8ac3a017c9e6e00cff9889d24bd4dfaf12bc91a60fd05d245463650a04696651bec316af98ed09468a7b409f146a2303 SHA512 78a5fc75913ef78cfe8cafbd8bbd97a85a3053ee4b64fb3e7c00eeb7171802e9daf9f6fcbfa26b3c21a36607611f96e72d4e76734f8bcbe824075f7e97f97406 MISC metadata.xml 1082 BLAKE2B afade1233826e2557117dbeb80c2ade8e4f7541597d5bc071acf564d3dbd399206143346e520bba58f6ec17afe2f1c706a89372034d7ca2adabc2e7b3adb83aa SHA512 eeb78698a502dff0913b523dd6d2bd9bdb2ba3bd5eadef5b060de9a2d3323a35b9e7ee710744ec0dd141819c08be75df0b0f598b61f14c04575cc47c1d254026 diff --git a/media-gfx/cura/cura-4.8.0.ebuild b/media-gfx/cura/cura-4.8.0.ebuild deleted file mode 100644 index 615180db9eed..000000000000 --- a/media-gfx/cura/cura-4.8.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=(python3_{7..8}) -inherit cmake desktop python-single-r1 xdg - -MY_PN=Cura - -DESCRIPTION="A 3D model slicing application for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/Cura" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug +usb zeroconf" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND="sys-devel/gettext" -RDEPEND="${PYTHON_DEPS} - ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] - ~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}] - ~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] - ~dev-python/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}] - ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}] - ~media-gfx/curaengine-${PV} - ~media-gfx/fdm-materials-${PV} - $(python_gen_cond_dep ' - dev-python/mypy[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${PYTHON_MULTI_USEDEP}] - dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}] - sci-libs/shapely[${PYTHON_MULTI_USEDEP}] - usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) - zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) - ')" -DEPEND="${RDEPEND}" - -DOCS=(README.md) -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - sed -i -e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # trimesh not available in portage - local mycmakeargs=( - -DCURA_BUILDTYPE="ebuild" - -DCURA_VERSION=${PV} - -DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader" - -DCURA_DEBUGMODE=$(usex debug) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - doicon icons/*.png - python_fix_shebang "${D}/usr/bin/cura" - python_optimize "${D}${get_libdir}" -} diff --git a/media-gfx/cura/cura-4.9.1.ebuild b/media-gfx/cura/cura-4.9.1.ebuild new file mode 100644 index 000000000000..8c8c80d0005c --- /dev/null +++ b/media-gfx/cura/cura-4.9.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{7..9}) +inherit cmake desktop python-single-r1 xdg + +MY_PN=Cura + +DESCRIPTION="A 3D model slicing application for 3D printing" +HOMEPAGE="https://github.com/Ultimaker/Cura" +SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="debug +usb zeroconf" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND="sys-devel/gettext" +RDEPEND="${PYTHON_DEPS} + ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + ~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}] + ~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + ~dev-python/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}] + ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}] + ~media-gfx/curaengine-${PV} + ~media-gfx/fdm-materials-${PV} + dev-qt/qtquickcontrols[widgets] + $(python_gen_cond_dep ' + dev-python/importlib_metadata[${PYTHON_MULTI_USEDEP}] + dev-python/keyring[${PYTHON_MULTI_USEDEP}] + dev-python/mypy[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[-debug,${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5-sip[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}] + sci-libs/shapely[${PYTHON_MULTI_USEDEP}] + usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) + ')" +DEPEND="${RDEPEND}" + +DOCS=(README.md) +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + sed -i -e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # trimesh not available in portage + local mycmakeargs=( + -DCURA_BUILDTYPE="ebuild" + -DCURA_VERSION=${PV} + -DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader" + -DCURA_DEBUGMODE=$(usex debug) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + doicon icons/*.png + python_fix_shebang "${D}/usr/bin/cura" + python_optimize "${D}${get_libdir}" +} diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest index b049d183c4f5..b1f909180b80 100644 --- a/media-gfx/curaengine/Manifest +++ b/media-gfx/curaengine/Manifest @@ -1,3 +1,3 @@ -DIST curaengine-4.8.0.tar.gz 1690082 BLAKE2B 7c582ad0743a937ad4efa2a224e052383b90632c8f33f666a4139a74954a7243e17107ac39b35c1a5e41df89e303d618e4407d7e9a75efc5d96913aaaf498273 SHA512 be0d12cfe61932bf03dde61df8fb7f31cbd0aef6a44292130a7a67e318891f37db685722ba5d3cf66e88d4ff1de64ac86be5e494b750f8f7ff4b52d7976cb670 -EBUILD curaengine-4.8.0.ebuild 2233 BLAKE2B a4454674fbfc4c81334a21090a10fa324a1a594db66302105ba2fb8d448154dfdc6334ccf27984b210ed93ac9ccf67f7d846cab36b4c0af147603ab63ba6b724 SHA512 dbb6cb64ab13d53deff7f34d9acf9d7ceb0ea847ff0870255cb956fa3f5c7adf02009da850d404f3cdfb69ea9e5b8664d6cf561cbf62e1eab3aa90c1fb34b604 +DIST curaengine-4.9.1.tar.gz 1694141 BLAKE2B 84119a2dd66340bdc3a4bd58384f300fb839aa7c5920de87d070945d3c436ace0f8686cd907a204e5825bdc17809d9f9052e37fb96b37e34a20650ca625d7b1e SHA512 cfa918c6301c9948713306256d74a2a84a1fefbc0f85c7ac0eb182d8363f1eae97aecdcb91c207a2e7e1ab252f63cf4b513734b50d4229da7aa35e095ef88bee +EBUILD curaengine-4.9.1.ebuild 2233 BLAKE2B d4ec01da6a8621506aba6d4a13bad5c9792c25fbaaabe0315151d0876ead36c02756e0e7bb7abcca759bac0597e6248436472e2cf0e6ffb6873f936a49886fc5 SHA512 1f7eb738496367a75f0682eda9c5a1e5739035d81e618b7399ae6b165aaba10f853a13e2ced1d6ebcf040e0bb103dd52ac124ec743d2c1585217d01c5f56d7ad MISC metadata.xml 1580 BLAKE2B 4d90722e13b98fb9bace7319edfabb1e1d6257052247b6f449f990b64e2d67db1255de37d9a325a0b69175654fc8726505ace4c2101aa686032b6d0d430e81a4 SHA512 00cc2ff186f099513736c535c8731e21f945a82d2762d2a79a0950e9a96aa2bed57a0ed9de3866dadcab2f1ad25f0e8a8400059e744f104d2bb9a02af34ec27e diff --git a/media-gfx/curaengine/curaengine-4.8.0.ebuild b/media-gfx/curaengine/curaengine-4.8.0.ebuild deleted file mode 100644 index 2f4c30faf728..000000000000 --- a/media-gfx/curaengine/curaengine-4.8.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs - -MY_PN="CuraEngine" - -DESCRIPTION="A 3D model slicing engine for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/CuraEngine" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+arcus doc openmp test" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - arcus? ( - ~dev-libs/libarcus-${PV}:* - dev-libs/protobuf:= - ) - dev-libs/clipper - dev-libs/rapidjson - dev-libs/stb" - -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest )" -BDEPEND="doc? ( app-doc/doxygen )" - -DOCS=( README.md ) -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - rm -r "${S}"/libs || die - - # remove static linking - # respect cflags - sed -i \ - -e "s/-static-libstdc++//g" \ - -e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \ - -e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \ - CMakeLists.txt || die - - if use test; then - find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \ - -type f -name '*.cpp' | xargs sed -i \ - -e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\ - -e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \ - -e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\ - -e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\ - -e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\ - -e 's <../src/utils/string.h> "../../src/utils/string.h" g' \ - -e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \ - -e 's#include "../src#include "../../src#g'|| die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test ON OFF) - -DENABLE_ARCUS=$(usex arcus ON OFF) - -DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF - -DENABLE_OPENMP=$(usex openmp ON OFF) - -DUSE_SYSTEM_LIBS=ON - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - doxygen || die "generating docs failed" - mv docs/html . || die - find html -type f \(-name '*.md5' -o -name '*.map'\) -delete || die - HTML_DOCS=( html/. ) - fi -} diff --git a/media-gfx/curaengine/curaengine-4.9.1.ebuild b/media-gfx/curaengine/curaengine-4.9.1.ebuild new file mode 100644 index 000000000000..ec7a2e757c60 --- /dev/null +++ b/media-gfx/curaengine/curaengine-4.9.1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs + +MY_PN="CuraEngine" + +DESCRIPTION="A 3D model slicing engine for 3D printing" +HOMEPAGE="https://github.com/Ultimaker/CuraEngine" +SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+arcus doc openmp test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + arcus? ( + ~dev-libs/libarcus-${PV}:* + dev-libs/protobuf:= + ) + dev-libs/clipper + dev-libs/rapidjson + dev-libs/stb" + +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest )" +BDEPEND="doc? ( app-doc/doxygen )" + +DOCS=( README.md ) +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + rm -r "${S}"/libs || die + + # remove static linking + # respect cflags + sed -i \ + -e "s/-static-libstdc++//g" \ + -e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \ + -e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \ + CMakeLists.txt || die + + if use test; then + find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \ + -type f -name '*.cpp' | xargs sed -i \ + -e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\ + -e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \ + -e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\ + -e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\ + -e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\ + -e 's <../src/utils/string.h> "../../src/utils/string.h" g' \ + -e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \ + -e 's#include "../src#include "../../src#g'|| die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test ON OFF) + -DENABLE_ARCUS=$(usex arcus ON OFF) + -DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF + -DENABLE_OPENMP=$(usex openmp ON OFF) + -DUSE_SYSTEM_LIBS=ON + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + doxygen || die "generating docs failed" + mv docs/html . || die + find html -type f \(-name '*.md5' -o -name '*.map'\) -delete || die + HTML_DOCS=( html/. ) + fi +} diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index ded2f18a3da9..5d16283cfc4b 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -1,13 +1,8 @@ -AUX darktable-2.6.2-exiv2-0.27.patch 598 BLAKE2B 724290bb5c1344c0113abde04688009b3db10f530684f3f53e0fcc935a9ebef4b3680a36cb5d005e8826ea1512f0ec505b06e404d144006848601699d33d1416 SHA512 77fc92bf8d373552fc82de1927a1708b989caf0b080c8ef279692c0b9f2e95526a70d2bf4af5f62abb68ccb733af08237f9e143773cc8a75d72dfb6ba434df6c AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020 -DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb -DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f -DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e -EBUILD darktable-2.6.2.ebuild 3451 BLAKE2B cbc98737fe7778c37a2637708e34a48cc71d1803652a0585c6110b4468b73d962cc3cb347b2929d5e3ce344b24e2be9b449f5ad555275be90c6b93d9b8313481 SHA512 dfbb22a74bdfb6d6001f32313e954240546a376fae19f489e0530e0dd6f37e3a5fbf39e1ea4144b97403fed2d4e69d67cf7ebe01c2d53f363a0adfa4303ea567 EBUILD darktable-3.4.1.ebuild 4412 BLAKE2B 402c0e8f4cc2c299e8a2a7b425002993eda544735302c4482c4f4d9fe6b605eaa6c14671e41674c8d64312c1406ff2d59a53a762e28bcfbc40f954c12fcd34e5 SHA512 bd292ddf983f2b23e3f0140e2f7d8d0ce84ce2b1e6dd41945ff9f6657f00e583eafdd60da5e6bb34c23d1d8eaadfa279fc0b0b7a38c5e11600abc2bd189a5e11 EBUILD darktable-9999.ebuild 4407 BLAKE2B 41e9636ef86761982a80ddd449ee45ef28a7904f751061cafdd68b91fcac28242e581adfc3873ddb86ac534127a2b49611db3560956e4126ef574233cef34f44 SHA512 46111450051510f2de6ce1694978ab36268d9680e82de016feddd40fff0bff470ae5572415493982e6fb68ee62e63ba82655c315244b0a578144e7186e72426d MISC metadata.xml 1151 BLAKE2B 45fdf41338969512b2790e0dc3fb75b1633244c398c8f2eb67b9264ceba3b41c64d19713bc6727870465d03ebc37714c464a537c5ef4c7b1b7f52711a8e8c268 SHA512 784be9b2454a021f7547894cafb4e2e0fdbda8e30dbfbf78a0d234f596ab8321a5e5a0b8944af8f55d0ce7b466139837d4f0f5139152e2fc691ae528c0e3eef8 diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild deleted file mode 100644 index dbca73f7b5f2..000000000000 --- a/media-gfx/darktable/darktable-2.6.2.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic toolchain-funcs xdg - -DOC_PV="2.6.0" -MY_PV="${PV/_/}" -MY_P="${P/_/.}" - -DESCRIPTION="A virtual lighttable and darkroom for photographers" -HOMEPAGE="https://www.darktable.org/" -SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${P}-gcc9.patch.tar.xz - doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" - -LICENSE="GPL-3 CC-BY-3.0" -SLOT="0" -KEYWORDS="amd64 x86" -LANGS=" ca cs de es fi fr hu ja nb nl pl pt-BR ru sl" -# TODO add lua once dev-lang/lua-5.2 is unmasked -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet -nls opencl openmp openexr webp -${LANGS// / l10n_}" - -BDEPEND=" - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -COMMON_DEPEND=" - dev-db/sqlite:3 - dev-libs/json-glib - dev-libs/libxml2:2 - dev-libs/pugixml:0= - gnome-base/librsvg:2 - >=media-gfx/exiv2-0.25-r2:0=[xmp] - media-libs/lcms:2 - >=media-libs/lensfun-0.2.3:0= - media-libs/libpng:0= - media-libs/tiff:0 - net-libs/libsoup:2.4 - net-misc/curl - sys-libs/zlib:= - virtual/jpeg:0 - x11-libs/cairo - >=x11-libs/gtk+-3.14:3 - x11-libs/pango - colord? ( x11-libs/colord-gtk:0= ) - cups? ( net-print/cups ) - flickr? ( media-libs/flickcurl ) - geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) - gnome-keyring? ( >=app-crypt/libsecret-0.18 ) - gphoto2? ( media-libs/libgphoto2:= ) - graphicsmagick? ( media-gfx/graphicsmagick ) - jpeg2k? ( media-libs/openjpeg:2= ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - webp? ( media-libs/libwebp:0= ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND} - kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 ) -" - -PATCHES=( - "${FILESDIR}"/"${PN}"-find-opencl-header.patch - "${WORKDIR}"/"${P}"-gcc9.patch - "${FILESDIR}"/"${P}"-exiv2-0.27.patch -) - -S="${WORKDIR}/${P/_/~}" - -pkg_pretend() { - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - use cpu_flags_x86_sse3 && append-flags -msse3 - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_PRINT=$(usex cups) - -DCUSTOM_CFLAGS=ON - -DTESTBUILD_OPENCL_PROGRAMS=OFF - -DUSE_CAMERA_SUPPORT=$(usex gphoto2) - -DUSE_COLORD=$(usex colord) - -DUSE_FLICKR=$(usex flickr) - -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DUSE_KWALLET=$(usex kwallet) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -DUSE_LUA=OFF - -DUSE_MAP=$(usex geolocation) - -DUSE_NLS=$(usex nls) - -DUSE_OPENCL=$(usex opencl) - -DUSE_OPENEXR=$(usex openexr) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENMP=$(usex openmp) - -DUSE_WEBP=$(usex webp) - ) - CMAKE_BUILD_TYPE="RELWITHDEBINFO" - cmake_src_configure -} - -src_install() { - cmake_src_install - use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf - - if use nls ; then - for lang in ${LANGS} ; do - if ! use l10n_${lang}; then - rm -r "${ED}"/usr/share/locale/${lang/-/_} || die - fi - done - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "when updating from the currently stable 1.6 series," - elog "please bear in mind that your edits will be preserved during this process," - elog "but it will not be possible to downgrade from 2.0 to 1.6 any more." - echo - ewarn "It will not be possible to downgrade!" -} diff --git a/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch b/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch deleted file mode 100644 index c0eb59bc639d..000000000000 --- a/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 556887d7a973bdf0611fcc57231e107b503d9949 Mon Sep 17 00:00:00 2001 -From: Bertrand Antoine -Date: Wed, 22 May 2019 21:49:59 +0200 -Subject: [PATCH] Fix build with exif2 >= 0.27 - ---- - tools/basecurve/exif-wrapper.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp -index 72550721f6..f4d4d46e12 100644 ---- a/tools/basecurve/exif-wrapper.cpp -+++ b/tools/basecurve/exif-wrapper.cpp -@@ -17,6 +17,7 @@ - */ - - #include -+#include - #include - - #include \ No newline at end of file diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 73da2729be69..22af407af180 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,6 +1,4 @@ AUX digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch 1560 BLAKE2B dd2d9995787593f736f406566131af29573df097801f2c9b9eec12947838bf748c697bf6ab75d69f72359a1783d18fde994b4899861065d4d10dab100e0edf44 SHA512 eb1d1c4bff3dcc7e1d03069591ad8d48a3947ee962757baccf70e2e6c7577f6d52a4ae527af20d88aa24b66c0b1705367f67b7e3da70b19825a57def7371420a -DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0 SHA512 df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4 DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B 5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90 SHA512 2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7 -EBUILD digikam-7.1.0-r1.ebuild 4000 BLAKE2B ab10f960037cb269d0dd758624e2c263e8697f4c1c9ba8b1d88a4bd1684b364555b6704b765d003eca271626fe352e8dff0fa115154ce6762287ac23905800ad SHA512 2111860137feff79c9812f2aede64069ad4a68c0180063722e43b0c74ce7f3316fb44f59a4820671944f965329409932fe4e0c71fbbee76ce1c6cf2c9d85636a -EBUILD digikam-7.2.0.ebuild 4064 BLAKE2B cf9e2198102df1c8e8c776be495fc5078e2fa86e633b5620b69980367c2fdeeb15924769e661887e89f8e1d77e76efa460a8bcb8120f05596d03dc67ba089b14 SHA512 ffa8e41e8676433b6ab23fb9d3e9f8117a359900d62849d548ba2bf8e0426efaa436b3598c11514be55367def92858b2a6ed611640e6ffe76b9fe7c8872db3c6 +EBUILD digikam-7.2.0.ebuild 4062 BLAKE2B 5badb6043df3445d528d1a732b493225b0448ffcf4591adafe6dc4bba876f064b56a2d94b59b9cbef768c8c93f2ba7b248f01c8bf918835fd7856825802c4b2b SHA512 324af3b2328b65f0ec72cdcfe2c459d151997b674f8b7754cb63f7126f876c7a7e5e4bc3cd8071c4ec32bfbdc14603e7548051ac5d7c4dbc137df9139b98c47a MISC metadata.xml 1097 BLAKE2B 1870f4bef0643db48fa2e6241f25d33c718010556b79bb54339f4ff9a13d7d005cea8e358e83d54ee94860b191969c834b9e5fd8152a17d7a5cc464a6813000e SHA512 25c2fcb533b644cf4aa376518a77f35bab0676c6f8853998f50e1eebbb2de20ca49e02fc110b1d6f55d2502f4e353803f12a2b336b98d85321b891a42ba16ccd diff --git a/media-gfx/digikam/digikam-7.1.0-r1.ebuild b/media-gfx/digikam/digikam-7.1.0-r1.ebuild deleted file mode 100644 index 194a341e7771..000000000000 --- a/media-gfx/digikam/digikam-7.1.0-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org toolchain-funcs - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - MY_P=${PN}-${PV/_/-} - if [[ ${PV} =~ beta[0-9]$ ]]; then - SRC_URI="mirror://kde/unstable/${PN}/" - else - SRC_URI="mirror://kde/stable/${PN}/${PV}/" - fi - SRC_URI+="${MY_P}.tar.xz" - KEYWORDS="amd64 x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -SLOT="5" -IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" - -BDEPEND=" - >=dev-util/cmake-3.14.3 - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) -" -COMMON_DEPEND=" - dev-libs/expat - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[mysql?] - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=media-gfx/exiv2-0.27:= - media-libs/lcms:2 - media-libs/liblqr - media-libs/libpng:0= - >=media-libs/opencv-3.3.0:=[contrib,contribdnn] - media-libs/tiff:0 - virtual/jpeg:0 - addressbook? ( - >=kde-apps/akonadi-contacts-19.04.3:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - ) - calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) - gphoto2? ( media-libs/libgphoto2:= ) - heif? ( media-libs/x265:= ) - imagemagick? ( media-gfx/imagemagick:= ) - lensfun? ( media-libs/lensfun ) - marble? ( - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=kde-apps/marble-19.04.3:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - ) - mediaplayer? ( - media-libs/qtav[opengl(+)] - media-video/ffmpeg:= - ) - opengl? ( - >=dev-qt/qtopengl-${QTMIN}:5 - virtual/opengl - ) - panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) - scanner? ( >=kde-apps/libksane-19.04.3:5 ) - semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost[threads] -" -RDEPEND="${COMMON_DEPEND} - mysql? ( virtual/mysql[server(+)] ) - panorama? ( media-gfx/hugin ) -" - -RESTRICT+=" test" -# bug 366505 - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_setup -} - -# FIXME: Unbundle libraw (libs/rawengine/libraw) -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=OFF # bug 698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_QWEBENGINE=ON - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake_use_find_package calendar KF5CalendarCore) - $(cmake_use_find_package gphoto2 Gphoto2) - $(cmake_use_find_package heif X265) - $(cmake_use_find_package imagemagick ImageMagick) - $(cmake_use_find_package lensfun LensFun) - $(cmake_use_find_package marble Marble) - -DENABLE_MEDIAPLAYER=$(usex mediaplayer) - $(cmake_use_find_package mediaplayer QtAV) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake_use_find_package opengl OpenGL) - $(cmake_use_find_package panorama KF5ThreadWeaver) - $(cmake_use_find_package scanner KF5Sane) - $(cmake_use_find_package semantic-desktop KF5FileMetaData) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} diff --git a/media-gfx/digikam/digikam-7.2.0.ebuild b/media-gfx/digikam/digikam-7.2.0.ebuild index 7024418a1e3a..84cafa4714eb 100644 --- a/media-gfx/digikam/digikam-7.2.0.ebuild +++ b/media-gfx/digikam/digikam-7.2.0.ebuild @@ -15,7 +15,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/" fi SRC_URI+="${MY_P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" S="${WORKDIR}/${MY_P}" fi diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest index 81210ac369f5..f811072c9dec 100644 --- a/media-gfx/eog/Manifest +++ b/media-gfx/eog/Manifest @@ -1,3 +1,5 @@ DIST eog-40.1.tar.xz 3601652 BLAKE2B 6e3ec73742a0de864a131b25b2ed2c3346aecea9455ccbae701d70a50a45dace90d4002c56829e9a831a16ec827df6e1ab257c9ec5b755b863e98d63cd8a59bf SHA512 1fd2f6689f8a74254f4436fedf8a5ee7c1488d70b467dfb94c3ca3e0e269aaa75a77d15d5bb3544e699f5c8759e30a25942857188cb98b4d9537165b67d6d14c +DIST eog-40.2.tar.xz 3601788 BLAKE2B ab66481d8fa5c076f0e12c3f16ff4a67d3a544b7483a2791833ea7d7f605898b20e8d8ed100a538e7a7f21a1359c74b96fa81aaf8712bfdb419df37fe711f7bf SHA512 e28c2deb320436606ebf0a971d845e536197ea23c2e7869d3d10dfe5174c8177c7977da37bf01178dc87f875cff2c3f0fbdad63c77578c2334dbfd9d354c19ad EBUILD eog-40.1.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598 +EBUILD eog-40.2.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26 diff --git a/media-gfx/eog/eog-40.2.ebuild b/media-gfx/eog/eog-40.2.ebuild new file mode 100644 index 000000000000..e0fd2241d634 --- /dev/null +++ b/media-gfx/eog/eog-40.2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="The Eye of GNOME image viewer" +HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome" + +LICENSE="GPL-2+" +SLOT="1" + +IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff" +REQUIRED_USE="exif? ( jpeg )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + >=dev-libs/glib-2.53.4:2 + >=dev-libs/libpeas-0.7.4:=[gtk] + >=gnome-base/gnome-desktop-2.91.2:3= + >=gnome-base/gsettings-desktop-schemas-2.91.92 + >=x11-misc/shared-mime-info-0.20 + >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] + >=x11-libs/gtk+-3.22.0:3[introspection,X] + sys-libs/zlib + + exif? ( >=media-libs/libexif-0.6.14 ) + lcms? ( media-libs/lcms:2 ) + xmp? ( media-libs/exempi:2 ) + jpeg? ( virtual/jpeg:0 ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + svg? ( >=gnome-base/librsvg-2.44.0:2 ) + + x11-libs/libX11 +" +DEPEND="${RDEPEND}" +BDEPEND=" + gtk-doc? ( >=dev-util/gtk-doc-1.16 + app-text/docbook-xml-dtd:4.1.2 ) + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + $(meson_use exif libexif) + $(meson_use lcms cms) + $(meson_use xmp) + $(meson_use jpeg libjpeg) + $(meson_use svg librsvg) + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + -Dinstalled_tests=false + -Dlibportal=false # Not packaged + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index 0b4db4c27a5d..70232401be92 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -5,6 +5,6 @@ AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1 AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 -EBUILD fbida-2.14-r2.ebuild 2490 BLAKE2B ebd28f775399112630f9d3e9528c40315f06546de74b5c70ee68b235f589bb2d9a3f6510c9740191fe8b1248358f9a48b59cc64e91343a41e52eb8dc6b3af050 SHA512 6cbb2a32b7b917e979a66ad8574de21c5f7c7e022f2f302a6b2e0e9c3f178d47c50cdf0ae6460a63ace59b7ec70e4519057f60fec5115c0ac94df82ff38de766 +EBUILD fbida-2.14-r2.ebuild 2497 BLAKE2B b59b1db3a8372c464fb47af583256d587a854c1dc0c2edef8c53d0b539b797c0a68be9e6b594c0b059642af4bb9a9f828c18b537f81f7d35272e67631f00dc2f SHA512 6214d851d61a7a91d31f5fced8b4e8094edcbae3fd9a5b8159678651312f071b0b9789221d012b637bf3cc66a3406c0e406d832d1c9fc2f2c142bd6a82713b73 EBUILD fbida-9999.ebuild 1349 BLAKE2B b011518d4f9816d0440b1bfd853fe97514e236fa20fb5eee942924b7e30751b981e0eb13a9e819627dff1af7b866b10c3712cbe0554d30e96e3bf5e7fddaa285 SHA512 10d5b89d83f020f3c14a9a68c622a96cd864ef8081b8163967938bacf592d1594ee8c09ff248515de246835a0a4e4fb78a768590f459bf53883011bede177ca0 MISC metadata.xml 395 BLAKE2B c51bbf0a7dc30596e65875c667f819332a547600b256f8ce75defd435677a36a0a3b0ede7cc4f9abf983890e34116ad11fa202f2b491b95605432a9f934e9fd7 SHA512 a8408235a641c85cb2c3e0fe141b7a590d52b5000888e1f753f6155257f669219cab6ddedf690a66ac5fc11d500fe8d270cdde36bbae31e2637e0c6ae413728a diff --git a/media-gfx/fbida/fbida-2.14-r2.ebuild b/media-gfx/fbida/fbida-2.14-r2.ebuild index 7a8c7095485b..0a911ca59a57 100644 --- a/media-gfx/fbida/fbida-2.14-r2.ebuild +++ b/media-gfx/fbida/fbida-2.14-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI=" " LICENSE="GPL-2 IJG" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86" IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp" REQUIRED_USE=" ghostscript? ( tiff ) diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest index 830362417ec3..eb8db321e6b1 100644 --- a/media-gfx/fdm-materials/Manifest +++ b/media-gfx/fdm-materials/Manifest @@ -1,3 +1,3 @@ -DIST fdm-materials-4.8.0.tar.gz 43850 BLAKE2B d9fa025eeb4f11c027fd64a2615d214a47024df62d53ee6b43391ac5383812581ae2ca075804277b6f7094639238646211cb5b978580edf91d004e83ef7ce405 SHA512 6e2812dc61ad00437d4c7943c3746cd915e1e49edef49f89ea2c4ca4cf023d67c400d1ae1e3c40923928d20ac09b184fc0632b828900b6236f9dfd346f19036d -EBUILD fdm-materials-4.8.0.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3 +DIST fdm-materials-4.9.1.tar.gz 46874 BLAKE2B 59aed353a7ed8cf1307de491f11a2b550df370553eee4ecfd803c07018f0a04a052653af49edc89a84172148b8ca1dac37a96236744d19d2f53fc320f42586bb SHA512 a615e1a75e0125642c348aeb28a1a52d1a32bec6946c8d4d6788455442cbdb2575326c7331c429df2031f1eb41b790dfd929792b40296262f18150decaf8baed +EBUILD fdm-materials-4.9.1.ebuild 544 BLAKE2B 2cfa3bc8ac9e93c58ec68ac76a661f3e3c5f1fce3330950f231e4dcc39fabf7548c11488411d6906c336e0cca50f57be29d7e988514531be33c22031eb734660 SHA512 305011a3b0d2c853aee727cda629fa577121aafc21a4077557a34a0402dd4cfa41bf9987dc182eb9ddb7ea076238f705a82984e900a1c5fd2e14e93d650072be MISC metadata.xml 993 BLAKE2B 77d82ae5e13ff1d4de7936ea4c79348286208b7294a21e85e40254a0eb7268cf3fc042bfab96ed4356dd01735932fb17e27416140da74b51844fa2c689d7ca5e SHA512 b78c7d7de99992f28771a13d3d1f7addcaef1216ffaf235cc5d2f997bff917f0e788ed07e2a97acfb79a188af080e9c3debd6c2ef06d5f07d288ebc763a4a6d4 diff --git a/media-gfx/fdm-materials/fdm-materials-4.8.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.8.0.ebuild deleted file mode 100644 index 99506a67b867..000000000000 --- a/media-gfx/fdm-materials/fdm-materials-4.8.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -MY_PN="fdm_materials" - -DESCRIPTION="FDM materials for media-gfx/cura" -HOMEPAGE="https://github.com/Ultimaker/fdm_materials" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC0-1.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="embedded" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_configure() { - local mycmakeargs=( - -DEMBEDDED=$(usex embedded on off) - ) - cmake_src_configure -} diff --git a/media-gfx/fdm-materials/fdm-materials-4.9.1.ebuild b/media-gfx/fdm-materials/fdm-materials-4.9.1.ebuild new file mode 100644 index 000000000000..531b40cdc0a8 --- /dev/null +++ b/media-gfx/fdm-materials/fdm-materials-4.9.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +MY_PN="fdm_materials" + +DESCRIPTION="FDM materials for media-gfx/cura" +HOMEPAGE="https://github.com/Ultimaker/fdm_materials" +SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC0-1.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="embedded" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_configure() { + local mycmakeargs=( + -DEMBEDDED=$(usex embedded on off) + ) + cmake_src_configure +} diff --git a/media-gfx/flam3/Manifest b/media-gfx/flam3/Manifest index defae84b5954..86ac536fab85 100644 --- a/media-gfx/flam3/Manifest +++ b/media-gfx/flam3/Manifest @@ -1,3 +1,4 @@ +AUX flam3-3.1.1-slibtool.patch 1804 BLAKE2B 7c9421a8063ee8e7bf76b7197984137d4d4877c8b07ba00cbdbc95aaab6090abeed3c940176777a76ddd8c02b66f99e28ea403626b7d07cf488b1ebfc41ed8eb SHA512 02bc7901e8c868c7d841b0e752fcd9f8bf443365793846ff04da068048ade0db11f41bf80562f50e4d49fa97a4164d3ed4c7dab1c9bb43bc3bb272c9307432f4 DIST flam3-3.1.1.tar.gz 1181954 BLAKE2B 9691647704e96052f04f79b59b55b47285940ada3486ef6828d1e95934c5741915bf0e4f11c3ff39da7b5534b5c6c9ec16a88bc0568ac65c8a4b5d4aff9c8d29 SHA512 8a84840d9cb91d63dd0ba5c8a6725f703f6315a7add0c091502c0dac5c77eb0495054bb4b601f72454dea0def99131ca679095da65eeebaae9b01dc59cf75e7e -EBUILD flam3-3.1.1.ebuild 748 BLAKE2B 330660b6924e4d97a2ed818b3b8dff66ed3cd6dc870cebda13fa936a237be0574d18b2650c5036d7d3f01174cc32254e361ed579683263e7127b5a647c208b45 SHA512 5e3f6fca43473f0736ffb16a1362a2f50f77052385cd17eb0b6a9cd599dd032f5c2f56a81fcb736596988df6dd457d35cda4af52526cf74f0bb5b7d1d6e3470f -MISC metadata.xml 322 BLAKE2B 8fa31c5e84e310169a863d1d66a77d73cff819cf595acfd7fc8f23c90a2271348899e8a5a5a5a184ea7de9428aebf7d841ab0a035fdc28f0ecd312396dcf3def SHA512 98b61c299f8cfa8c42a5f4b5b51b9eecbdffe3632ef8fd687afab26454fa8fccb71348a42cca69fbae7d154f69814feac61c4109ba671dd2fa413bf75e0445ca +EBUILD flam3-3.1.1.ebuild 765 BLAKE2B e9afce974f203769c9de05ac6b502d98f7ade4b8f2cc9c3e99420d38426e17717bb02d95e9626f644b3b899426e37e03e6f1e625e0ba3dc0fffaf2fee48e1a8e SHA512 c2f87079bf816f024f81cd9e05a4c3356f8d7385bbd32a2197982897e967671fe7f3883df7098490c4c68226151f7f9a4a19dc4d4e1881197336d371bd97687e +MISC metadata.xml 242 BLAKE2B eae02329c90bdfb86358eb8b99074e5a12f49a247ceb4c033fc776045fa6bb8a7b5f9ef34e7afb9b379a4707c01f31d5a66a7331189d8c9d4d2641fbc82d2a41 SHA512 154d0e4e1799cb085f2794d8edba2d8a174a7b8cd65b4ce4cb5debf6a3df379a3d91dea4f85649df189c2d3f91f205f9025476cc4a53de605f91ce291ea1975e diff --git a/media-gfx/flam3/files/flam3-3.1.1-slibtool.patch b/media-gfx/flam3/files/flam3-3.1.1-slibtool.patch new file mode 100644 index 000000000000..084c1ba77827 --- /dev/null +++ b/media-gfx/flam3/files/flam3-3.1.1-slibtool.patch @@ -0,0 +1,53 @@ +From 78ea170715b57bbde0275447dbcc8b20a926b05d Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sun, 28 Mar 2021 13:15:53 -0700 +Subject: [PATCH] build: Fix undefined libm references. + +--- + Makefile.am | 11 ++++++----- + configure.ac | 2 ++ + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c3d0f42..78954e8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -11,19 +11,20 @@ lib_LTLIBRARIES = libflam3.la + include_HEADERS = flam3.h isaac.h isaacs.h rect.c + + libflam3_la_SOURCES = flam3.c filters.c parser.c variations.c interpolation.c palettes.c jpeg.c png.c isaac.c +-libflam3_la_LDFLAGS = -no-undefined -ljpeg -lpng -lz -lpthread ++libflam3_la_LDFLAGS = -no-undefined ++libflam3_la_LIBADD = -ljpeg -lpng -lz -lpthread $(LIBM) + + flam3_genome_SOURCES = flam3-genome.c docstring.c +-flam3_genome_LDADD = libflam3.la -lm ++flam3_genome_LDADD = libflam3.la + + flam3_animate_SOURCES = flam3-animate.c docstring.c +-flam3_animate_LDADD = libflam3.la -lm ++flam3_animate_LDADD = libflam3.la + + flam3_render_SOURCES = flam3-render.c docstring.c +-flam3_render_LDADD = libflam3.la -lm ++flam3_render_LDADD = libflam3.la + + flam3_convert_SOURCES = flam3-convert.c docstring.c +-flam3_convert_LDADD = libflam3.la -lm ++flam3_convert_LDADD = libflam3.la + + pkgdata_DATA = flam3-palettes.xml + +diff --git a/configure.ac b/configure.ac +index c427bb5..f7f4839 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -28,6 +28,8 @@ AC_CHECK_LIB([z],[deflateInit_],,[AC_MSG_ERROR([zlib is required.])]) + AC_CHECK_LIB([png],[png_write_image],,[AC_MSG_ERROR([The png library is required.])]) + AC_CHECK_LIB([xml2],[xmlParseFile],,[AC_MSG_ERROR([The xml2 library is required.])]) + ++AC_CHECK_LIBM ++AC_SUBST([LIBM]) + + if test "${enable_atomic_ops}" = "" ; then + enable_atomic_ops=yes diff --git a/media-gfx/flam3/flam3-3.1.1.ebuild b/media-gfx/flam3/flam3-3.1.1.ebuild index 6a111b72cfe3..0b7b9d363042 100644 --- a/media-gfx/flam3/flam3-3.1.1.ebuild +++ b/media-gfx/flam3/flam3-3.1.1.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools DESCRIPTION="Tools and a library for creating flame fractal images" @@ -11,7 +12,6 @@ SRC_URI="https://github.com/scottdraves/flam3/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="static-libs" RDEPEND="dev-libs/libxml2 media-libs/libpng:= @@ -21,21 +21,23 @@ DEPEND="${RDEPEND}" DOCS=( README.txt ) +PATCHES=( "${FILESDIR}"/${P}-slibtool.patch ) + src_prepare() { + default eautoreconf - eapply_user } src_configure() { econf \ --enable-shared \ - $(use_enable static-libs static) + --disable-static } src_install() { default - rm -f "${D}"usr/lib*/libflam3.la + find "${ED}" -name '*.la' -delete || die docinto examples dodoc *.flam3 diff --git a/media-gfx/flam3/metadata.xml b/media-gfx/flam3/metadata.xml index 6cefa895a658..a10e023a1ca9 100644 --- a/media-gfx/flam3/metadata.xml +++ b/media-gfx/flam3/metadata.xml @@ -1,10 +1,7 @@ - - patrick@gentoo.org - Patrick Lauer - + flam3 diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest index 786cb595239e..4c05e4f3d05e 100644 --- a/media-gfx/fotoxx/Manifest +++ b/media-gfx/fotoxx/Manifest @@ -1,4 +1,6 @@ AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509 DIST fotoxx-21.40.tar.gz 8583921 BLAKE2B 63e49768c6d5941fe4259f83aef4ce8d0e19498c1090e4eb5017337f184edb0c60939323cc6481efcf72d0544347e046c94e37619e1f466b6dde0ab0919c3792 SHA512 05db14fafd8187bcb1de1576ca445fe525e895089fe670a80f890b2c525f5424fabd751ea422a5cc266cc7e8175ecaf7800b97a5ad686ea3e4e482de78190f3b +DIST fotoxx-21.41.tar.gz 8619224 BLAKE2B 28ec5fef8780001a023527c0859b58e1b3347b91b607269add3e0152fa6dff1347caf12f8e36a528100d5c6f538dce388bb4cbd22d03e2d15ff6904d5fdff626 SHA512 df7b3f424c9a1e2773171f9c036b30c34bd902dad41d3ce51eee5a20e86ce6afe5bcae4147baf40ea35bb9755900d9efcca20e026e12a1f540884b113011bce8 EBUILD fotoxx-21.40.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159 +EBUILD fotoxx-21.41.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918 MISC metadata.xml 850 BLAKE2B 463cae7d8df56ad93adaf7fbb4cf31f2838452e1349e61175c9981db4e95cc506b992cba2876885f8e949061808300752ef5806e9a096647f769bca654cca8e9 SHA512 e5c38d8602a52ae25bf90990136a98b57f69701cea70d4762f6102dc791f97b134853f7321894d1fbbbfdd353cebad7afa27cb56373f256d9497c3600d66d19e diff --git a/media-gfx/fotoxx/fotoxx-21.41.ebuild b/media-gfx/fotoxx/fotoxx-21.41.ebuild new file mode 100644 index 000000000000..12a78336fe75 --- /dev/null +++ b/media-gfx/fotoxx/fotoxx-21.41.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit optfeature xdg-utils + +DESCRIPTION="Program for improving image files made with a digital camera" +HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html" +SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +# For required dependencies read doc/README, for required tools read +# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an +# alternative to firefox and chromium-browser. `grep '"which ' * -R` +# is helpful to report some required tools run via the shell. + +DEPEND=" + media-libs/clutter + media-libs/clutter-gtk + media-libs/lcms:2 + media-libs/libpng:0 + media-libs/tiff:0 + media-libs/libchamplain[gtk] + virtual/jpeg + x11-libs/gtk+:3" +RDEPEND=" + ${DEPEND} + media-gfx/dcraw + media-libs/exiftool + x11-misc/xdg-utils +" + +S="${WORKDIR}/${PN}" + +PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" ) + +DOCS=() +HTML_DOCS=() + +src_prepare() { + sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die + default +} + +src_install() { + # For the Help menu items to work, *.html must be in /usr/share/doc/${PF}, + # and README, changelog, copyright, license, etc. must not be compressed. + emake DESTDIR="${D}" install + rm -f "${D}"/usr/share/doc/${PF}/*.man || die + docompress -x /usr/share/doc +} + +pkg_postinst() { + optfeature "HEIC file support" media-libs/libheif + optfeature "additional RAW file support" media-gfx/rawtherapee + optfeature "additional RAW file support" media-gfx/darktable + optfeature "video thumbnails & playback" media-video/ffmpeg + optfeature "copying images to optical media" app-cdr/dvd+rw-tools + optfeature "additional panorama support" media-gfx/hugin + optfeature "WEBP file support" media-libs/libwebp + + elog + elog "Please read the Help > User Guide for details. The source location is" + elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will" + elog "be placed at /home//.fotoxx/userguide." + elog + elog "To play videos, in Tools > Preferences set 'Video File Play Command'." + elog + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 1e99ae91ab70..bf8360050d3c 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -7,7 +7,7 @@ AUX freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.pa AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088 DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118 SHA512 5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b00009d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72 -EBUILD freecad-0.19.1.ebuild 9127 BLAKE2B cf69851b05e27f24c98381faf0c6c2f93d6d37054de040d0e57a1ec18d03366ebf493fd82d3d8772a877b694f6407f566b29d15380032025623cb4c6a9f34955 SHA512 7017c98834efe6f77cc1829a8e2c8ddcf6d9cd3cec8a87a9e3772ddcdacef0eb7e580796025bf27eb4bcc2f8ddf0e0cca188283970aafa66d417448dfe3d034e -EBUILD freecad-0.19.2.ebuild 10911 BLAKE2B b362b77de9951f3677e5630f1b2003584e994415cf6b174a921d0248e934468eb5482784782c777d5cef63d36827ea4a79b3ac2d0c20b31eec024363848ffb01 SHA512 1b9bf200a7b1f5842cf8613385f4afe3cefdb184651a137263d8854be35c97e5e1b0c581c5378e113410b2fa7d713b0a9b80fac744ed32a0158e0f9880c60373 -EBUILD freecad-9999.ebuild 10865 BLAKE2B d1b8847121b361ef3bc8029889f41167507817ed31b3da398946b0cbaa5bf4c666d76d5f6c0c77ce4226fcd2fead9e2e7af0fd63ca1a24468b9123abce65b43c SHA512 eaebf90283467263aab13341993c300ff70aeb8c9b697e502f114fd3bb55838115bee227892c8bd0c124a5afee12c8ef1f77e329633742274111fe547954ddfa +EBUILD freecad-0.19.1.ebuild 9240 BLAKE2B f8dd7d7a0a04699a2fef44fbb204f5ba95b304aa851743aba899a1a80228bd8896c8ca9d20fe85ea4ebaf6e38fab5c94db619aa12c1cecb7b8534514b138ecca SHA512 2a9a5edc12a38413043f57762d6e1d8b622abbaa594f27db7711388b055f02b247854e56d2a92612165e35360f82e285cf924947c6bbf675b9dd95063012338f +EBUILD freecad-0.19.2.ebuild 11045 BLAKE2B ea1dff90bb4e9aaaaf16d8d67db8f1076003105f771ce2ee0101b87443f7e1d9414a44dc302d2b6ad3881378ed99dea84dc8731d97dc94da318252b2f8f66bab SHA512 d5aaef2a1d591a4f4c1bf419f2cdec029129e017ce6ae3bfe937b8250eea9c7741c459ba848ea5580151e417b5e08b46d18ddefdacc1bb49b7b86f3dd392bff1 +EBUILD freecad-9999.ebuild 10999 BLAKE2B 5599d2539df1c00804d441d0b1ba0a8b4860194585e573395dcc051e21e2685a47303a4b947b8c32978de16cb9ec52eb25e29bde5269b60deac035257ee307a0 SHA512 ba5e260db5d825e803906551accec9b6407aa91979c11c687932488bf1625953ab5dcfb6b1702e19b89b70ec7f1b58312e0ea681a6ca9eaf82d2549ce1bd54d3 MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3 diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild b/media-gfx/freecad/freecad-0.19.1.ebuild index 5ffecf7de50a..0589fef979f4 100644 --- a/media-gfx/freecad/freecad-0.19.1.ebuild +++ b/media-gfx/freecad/freecad-0.19.1.ebuild @@ -39,7 +39,7 @@ for module in ${FREECAD_STABLE_MODULES}; do IUSE="${IUSE} +${module}" done for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} -${module}" + IUSE="${IUSE} ${module}" done unset module @@ -214,6 +214,9 @@ src_configure() { -DFREECAD_USE_QT_FILEDIALOG=ON -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild b/media-gfx/freecad/freecad-0.19.2.ebuild index 4719298feb3b..dcceebb859a0 100644 --- a/media-gfx/freecad/freecad-0.19.2.ebuild +++ b/media-gfx/freecad/freecad-0.19.2.ebuild @@ -41,7 +41,7 @@ for module in ${FREECAD_STABLE_MODULES}; do IUSE="${IUSE} +${module}" done for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} -${module}" + IUSE="${IUSE} ${module}" done unset module @@ -227,6 +227,9 @@ src_configure() { -DFREECAD_USE_QT_FILEDIALOG=ON -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + # install python modules to site-packages' dir. True only for the main package, # sub-packages will still be installed inside /usr/lib64/freecad -DINSTALL_TO_SITEPACKAGES=ON @@ -238,6 +241,7 @@ src_configure() { # bug https://bugs.gentoo.org/788274 local OCC_P=$(best_version sci-libs/opencascade[vtk]) OCC_P=${OCC_P#sci-libs/} + OCC_P=${OCC_P%-r*} mycmakeargs+=( -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 8b29013224e1..490b29d07939 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -41,7 +41,7 @@ for module in ${FREECAD_STABLE_MODULES}; do IUSE="${IUSE} +${module}" done for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} -${module}" + IUSE="${IUSE} ${module}" done unset module @@ -224,6 +224,9 @@ src_configure() { -DFREECAD_USE_QT_FILEDIALOG=ON -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + # install python modules to site-packages' dir. True only for the main package, # sub-packages will still be installed inside /usr/lib64/freecad -DINSTALL_TO_SITEPACKAGES=ON @@ -236,6 +239,7 @@ src_configure() { # bug https://bugs.gentoo.org/788274 local OCC_P=$(best_version sci-libs/opencascade[vtk]) OCC_P=${OCC_P#sci-libs/} + OCC_P=${OCC_P%-r*} mycmakeargs+=( -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest deleted file mode 100644 index 900cdb68fcc2..000000000000 --- a/media-gfx/gimageview/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX gimageview-0.2.27-gtk12_fix.diff 272 BLAKE2B 3c12f779ef8483019ebd7aba42c2abb7f61106ed623f3705bd52b941618c5d2ab85df8ceec9223276bbd057d9677242bae87cebfb9910fd81d44fb81f0dadb4b SHA512 97816136a63d7e1e08ff7368e8349879e723327979deb1ff11d5d87ea58ea01d9ffdc2da52a1e7425f486b1d40029699d498d548234e11f54066c67ff46de1d6 -AUX gimageview-0.2.27-gtk2.patch 624 BLAKE2B cd23a3c07bb885010fc01a0cc211ab12b93d7b6cfef29688876e985dd47b6db33125dc2690566b1b86dba32476b1391008e7f8244f438dfad0f54a9588d29b44 SHA512 3122a5eea7b3eaba5d896ae4258e7b608c4812db9374653eb2aa2776478b01d1edb82e5f322588e1476775e65dd719c1687b31a6981aebaad48483b9957b0c4e -AUX gimageview-0.2.27-libpng15.patch 601 BLAKE2B fb97fa8cc84927f03df462ec09d3a312e06dd2b5554e0c62c90e739f72917dd479f1d2ec3cf50d5d4e1f558cbab1a1eb221a150940efa1494c9239b6e9aa086a SHA512 390bf474bbf300cbd9c18ec3475769185f16226dfdb9389f62cd6e60bf33529009de68ee8bf387f690fc6a9e87f315f022f4f0b2fb6ef6ebfcdf49d96b5c49f9 -AUX gimageview-0.2.27-sort_fix.diff 714 BLAKE2B 2ea9e8eba6a0253bb4990b083e00013f40eb049028f0ecd700bd56193400ec6ef366d4c2360beea5b3314df2ea207cf782c1bc6e32221a3e73a83f9e92d94a23 SHA512 ab3ce0f2bb9b4c1d52d05c78db4d42fa2e77e7a5d7655b82a036279c9049de609dedebdea8422596ebf91080e91ac6ce42babb4aaf22877ec3dc808cfc37a3ea -DIST gimageview-0.2.27.tar.gz 1348286 BLAKE2B 51538af8bdc85243e825e58b6bbefa285bdefad95b05228e08a8500a5fc9f7036a53f931689543a30841f9cbd54ad4576fbf5a29dd79d7b1f05f07cdaa8c9aa7 SHA512 36ac16f4fffcde34b608da35aa089d40225129a2f9dcd70cb024713738842600c7231522093b3d0bf5a7c4c4dcb7ba4b14d550e417e8b52030d43d4b51145220 -EBUILD gimageview-0.2.27-r4.ebuild 1746 BLAKE2B 39a74caca173b7a099fcfad4161c27e22e6a78094c65b1cf49dc394de99c3b3d2b3217f5b2b7eef76aea197cb530d6cba0f10c902fd2e746a188c44def0dd317 SHA512 9585958c48adc020e5dc61c9e78063e78d97be49b0e11b5686a6962b70a763b31397274f43aba8829eed60a8b041c2042fd05aaba18327fd39fccf70f0b1a0fc -MISC metadata.xml 248 BLAKE2B 73b24d9b798f81fcb841c813142b07b7fe872ff2c9dd6a51f7d205dbf4b3f6b9b1c975d22fa265f2749361f4bb058ecf90d8525c36ba28e6f32c3855599a8333 SHA512 61a3b73ed8a3baeb3886b73a3c578eece805577d7708771b09ac4c82ab8cd8c08c65ee185fb1eba8b4ad3c79442b4e769bc9c72a60ba9a6f9438623360058a1a diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff b/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff deleted file mode 100644 index 9b82d2f6479e..000000000000 --- a/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gimv_thumb_win.c -+++ src/gimv_thumb_win.c -@@ -2542,7 +2542,7 @@ - { - if (tw && tw->priv) - tw->priv->slideshow_selected_only -- = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)); -+ = GTK_CHECK_MENU_ITEM (widget)->active; - } - - diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch b/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch deleted file mode 100644 index 7ab7ebb03212..000000000000 --- a/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/gimv_cell_pixmap.c -+++ src/gimv_cell_pixmap.c -@@ -25,10 +25,6 @@ - * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford - */ - --#ifndef GTK_DISABLE_DEPRECATED --# define GTK_DISABLE_DEPRECATED --#endif /* GTK_DISABLE_DEPRECATED */ -- - #include "gimv_cell_pixmap.h" - - #if (GTK_MAJOR_VERSION >= 2) ---- src/gimv_image.c -+++ src/gimv_image.c -@@ -35,7 +35,7 @@ - #include "gimv_io.h" - #include "gimv_image_saver.h" - --#if defined (HAVE_GDK_PIXBUF) -+#if defined (HAVE_GDK_PIXBUF) || defined (USE_GTK2) - # include - # include "pixbuf_utils.h" - typedef GdkPixbuf GimvRawImage; diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch b/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch deleted file mode 100644 index 2df9712869e1..000000000000 --- a/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch +++ /dev/null @@ -1,24 +0,0 @@ -http://bugs.gentoo.org/361941 - ---- plugins/image_loader/png_loader.c -+++ plugins/image_loader/png_loader.c -@@ -255,7 +255,7 @@ - return NULL; - } - -- if (setjmp (png_ptr->jmpbuf)) goto ERROR; -+ if (setjmp (png_jmpbuf(png_ptr))) goto ERROR; - - context.gio = gio; - context.bytes_read = 0; ---- plugins/image_saver/png_saver.c -+++ plugins/image_saver/png_saver.c -@@ -130,7 +130,7 @@ - return FALSE; - } - -- if (setjmp (png_ptr->jmpbuf)) { -+ if (setjmp (png_jmpbuf(png_ptr))) { - png_destroy_write_struct (&png_ptr, &info_ptr); - fclose (handle); - return FALSE; diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff b/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff deleted file mode 100644 index d65b3a07ad56..000000000000 --- a/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- src/gimv_thumb_view.c -+++ src/gimv_thumb_view.c -@@ -1533,9 +1533,13 @@ - - gimv_thumb_view_sort_data (tv); - -+#if 0 - for (node = new_thumb_list; node; node = g_list_next (node)) - tv->vfuncs->insert_thumb (tv, node->data, tv->summary_mode); - g_list_free(new_thumb_list); -+#endif -+ -+ gimv_thumb_view_set_widget (tv, tv->tw, tv->container, tv->summary_mode); - } - - -@@ -1577,9 +1581,13 @@ - - gimv_thumb_view_sort_data (tv); - -+#if 0 - for (node = new_thumb_list; node; node = g_list_next (node)) - tv->vfuncs->insert_thumb (tv, node->data, tv->summary_mode); - g_list_free(new_thumb_list); -+#endif -+ -+ gimv_thumb_view_set_widget (tv, tv->tw, tv->container, tv->summary_mode); - } - - diff --git a/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild deleted file mode 100644 index e44c2b09390d..000000000000 --- a/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO: USE xine could be restored if support for xine-lib-1.2.x -# is patched in wrt #397639 - -EAPI=6 - -inherit epatch libtool - -DESCRIPTION="Powerful GTK+ based image & movie viewer" -HOMEPAGE="http://gtkmmviewer.sourceforge.net/" -SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~hppa ppc ppc64 x86" -IUSE="mng nls mplayer svg wmf" #xine - -RDEPEND="app-arch/bzip2 - x11-libs/gtk+:2 - >=media-libs/libpng-1.2:0= - x11-libs/libXinerama - wmf? ( >=media-libs/libwmf-0.2.8 ) - mng? ( media-libs/libmng:= ) - svg? ( gnome-base/librsvg ) - mplayer? ( media-video/mplayer )" -#xine? ( media-libs/xine-lib ) -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig" - -src_prepare() { - # link gimv executable against -lm for floor() and pow() - sed -i -e 's/$(gimv_LDADD)/& -lm/' src/Makefile.in || die #417995 - - epatch \ - "${FILESDIR}"/${P}-sort_fix.diff \ - "${FILESDIR}"/${P}-gtk12_fix.diff \ - "${FILESDIR}"/${P}-gtk2.patch \ - "${FILESDIR}"/${P}-libpng15.patch - - # desktop-file-validate - sed -i \ - -e '/^Term/s:0:false:' \ - -e '/^Icon/s:.png::' \ - etc/${PN}.desktop.in || die - - eapply_user - elibtoolize -} - -src_configure() { - econf \ - --disable-imlib \ - $(use_enable nls) \ - --enable-splash \ - $(use_enable mplayer) \ - --with-gtk2 \ - $(use_with mng libmng) \ - $(use_with svg librsvg) \ - $(use_with wmf libwmf) \ - --without-xine -} - -src_install() { - emake \ - bindir="${ED}usr/bin" \ - datadir="${ED}usr/share" \ - desktopdir="${ED}usr/share/applications" \ - gimv_docdir="${ED}usr/share/doc/${PF}" \ - libdir="${ED}usr/$(get_libdir)" \ - install - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-gfx/gimageview/metadata.xml b/media-gfx/gimageview/metadata.xml deleted file mode 100644 index 119745c2ebb8..000000000000 --- a/media-gfx/gimageview/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - gtkmmviewer - - diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index cfdfb52fb93d..8f5bdbec9d0a 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,6 +1,4 @@ AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e -DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809 DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730 -EBUILD gmic-2.9.5.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142 -EBUILD gmic-2.9.7.ebuild 4260 BLAKE2B 96fd28e34efc81a51e21aad3b89a913e4d4a5a427a6913da38f5bce4d559d995b8cbbdd08701880a61572a6f9e8c5d63ed6538a1af0aff7fb03f6ae86f5b6336 SHA512 4d908e35ad53b771bbd6373b74218480dcdc48ae94dd389e525bfa239d9faedff4ae78b151da44123a5777efad51be81743383e7b57d80412d958f50231e21f4 +EBUILD gmic-2.9.7.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142 MISC metadata.xml 533 BLAKE2B 29dc054d7e7f718782ad0bb914bd8ce7b2dc6519826c4fe21be1cc20c4ddd21b99355c565106123de39bec8dadb08c1ca1fcb10989cc6fe984e6a6ea7e611c5f SHA512 2eb6d59dfa0d092625b755e952dbddf6c6dda811ae19768811ea7dc8a07771cfd3e4d074e8e996ec2de5e74243721c8b82d7cb8fc86300246096e18b782b5a2c diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild deleted file mode 100644 index 5e85c6f688ac..000000000000 --- a/media-gfx/gmic/gmic-2.9.5.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_BUILD_TYPE=Release - -inherit cmake bash-completion-r1 toolchain-funcs - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/dtschump/gmic.git" - inherit git-r3 -else - SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" - KEYWORDS="amd64 arm64 x86" -fi - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic" - -LICENSE="CeCILL-2 GPL-3" -SLOT="0" -IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib" -REQUIRED_USE=" - gimp? ( png zlib fftw X ) - krita? ( png zlib fftw X ) - qt5? ( png zlib fftw X ) -" - -MIN_QT_VER="5.2.0" -QT_DEPEND=" - >=dev-qt/qtcore-${MIN_QT_VER}:5= - >=dev-qt/qtgui-${MIN_QT_VER}:5= - >=dev-qt/qtnetwork-${MIN_QT_VER}:5= - >=dev-qt/qtwidgets-${MIN_QT_VER}:5= -" -COMMON_DEPEND=" - curl? ( net-misc/curl ) - fftw? ( sci-libs/fftw:3.0=[threads] ) - gimp? ( - media-gfx/gimp:0/2 - ${QT_DEPEND} - ) - graphicsmagick? ( media-gfx/graphicsmagick:0= ) - jpeg? ( virtual/jpeg:0 ) - krita? ( ${QT_DEPEND} ) - opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) - openexr? ( - media-libs/ilmbase:0= - media-libs/openexr:0= - ) - png? ( media-libs/libpng:0= ) - qt5? ( ${QT_DEPEND} ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - zlib? ( sys-libs/zlib:0= )" -RDEPEND="${COMMON_DEPEND} - ffmpeg? ( media-video/ffmpeg:0= ) -" -DEPEND="${COMMON_DEPEND} - gimp? ( dev-qt/linguist-tools ) - krita? ( dev-qt/linguist-tools ) - qt5? ( dev-qt/linguist-tools ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if use openmp; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - fi -} - -src_prepare() { - cmake_src_prepare - sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die - - if use gimp || use krita || use qt5; then - # respect user flags - sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \ - -e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \ - -i gmic-qt/CMakeLists.txt || die - local S="${S}/gmic-qt" - # Bug #753377 - local PATCHES=() - cmake_src_prepare - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_LIB=ON - -DBUILD_LIB_STATIC=$(usex static-libs) - -DBUILD_CLI=$(usex cli) - -DBUILD_MAN=$(usex cli) - -DBUILD_BASH_COMPLETION=$(usex cli) - -DCUSTOM_CFLAGS=ON - -DENABLE_CURL=$(usex curl) - -DENABLE_X=$(usex X) - -DENABLE_FFMPEG=$(usex ffmpeg) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DENABLE_JPEG=$(usex jpeg) - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_OPENEXR=$(usex openexr) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_PNG=$(usex png) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_ZLIB=$(usex zlib) - -DENABLE_DYNAMIC_LINKING=ON - ) - - cmake_src_configure - - # configure gmic-qt frontends - local CMAKE_USE_DIR="${S}/gmic-qt" - mycmakeargs=( - -DENABLE_DYNAMIC_LINKING=ON - -DENABLE_CURL=$(usex curl) - -DGMIC_LIB_PATH="${BUILD_DIR}" - -DGMIC_PATH="${S}/src" - ) - - if use gimp; then - mycmakeargs+=( -DGMIC_QT_HOST=gimp ) - BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure - fi - - if use krita; then - mycmakeargs+=( -DGMIC_QT_HOST=krita ) - BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure - fi - - if use qt5; then - mycmakeargs+=( -DGMIC_QT_HOST=none ) - BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure - fi -} - -src_compile() { - cmake_src_compile - - # build gmic-qt frontends - local S="${S}/gmic-qt" - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; } - use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; } - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; } -} - -src_install() { - cmake_src_install - dodoc README - use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN} - - local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins" - insinto "${PLUGINDIR}" - doins resources/gmic_cluts.gmz - - # install gmic-qt frontends - if use gimp; then - exeinto "${PLUGINDIR}" - doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt - fi - use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt - use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt -} diff --git a/media-gfx/gmic/gmic-2.9.7.ebuild b/media-gfx/gmic/gmic-2.9.7.ebuild index cd2efec6e1b2..5e85c6f688ac 100644 --- a/media-gfx/gmic/gmic-2.9.7.ebuild +++ b/media-gfx/gmic/gmic-2.9.7.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" + KEYWORDS="amd64 arm64 x86" fi DESCRIPTION="GREYC's Magic Image Converter" diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest index 12ea9c96d28c..a1db98c83d59 100644 --- a/media-gfx/gnome-screenshot/Manifest +++ b/media-gfx/gnome-screenshot/Manifest @@ -1,3 +1,5 @@ +AUX gnome-screenshot-40.0-fix-hidpi.patch 1351 BLAKE2B a94ce580d6f4af9e7945bdb13b3ba5b13787b564954e0933f9324c9d086e04f6efcb0affafc8775d2b41004f9c501edbe380e869723e038355c6c6ce7cb8b43b SHA512 68e8d178800036025a03786e8842aadfce0eaec61e36405406909ba8055db86d31350bae201226e54e667879da4610d5ea94df05fcf419f6609202a8c00d9c64 DIST gnome-screenshot-40.0.tar.xz 358088 BLAKE2B cad407f471e953667946b741ed59fe210d7ba3d079f2db8101974e565a1d0bfaec0cb1b40791be0e183dd399a82db5f15bbbec741ef16b4b572b043fcaf8ea8e SHA512 0889d7701711f17de68f8a55f512b7764fed087b1b2f86b372d1a38ee956f05ca8c833ca16a1de2396b07c01de79204d988192036780f521b82733436d019cb0 +EBUILD gnome-screenshot-40.0-r1.ebuild 1402 BLAKE2B 62a8e7629339554173a4313d0a27db22ad15d9885b7b12dda4bdaac25cfd7aad40dcb07593d8f16cdd18cd3e7535acb416b8552a47545cb9bbaec48032a5237c SHA512 8966c62edda0d1657a201b05adf5d185c69c8ac9c2e696e240aa5649c125aaa63b2cd49bdc73a560ea6fdce4dedbcf8bd7595cfb897c462529b1ecfe87005bc1 EBUILD gnome-screenshot-40.0.ebuild 1243 BLAKE2B 63b06fb6a2e40510e5d8301744eb8a3bb860fd36c46e546dba6ea78dd72017574d8ec78efdf33c731f5f0f34258617c656039dc7f9052dafb8e87c9bbb1308f2 SHA512 ad608f1e60dd59631895a0868e9a4ebbfb9cd063c45db01e1f72eeb29611828b153edf7dcc796efc571531a2dd5402eb7be017dd642d5ba21a5b5adcec02b262 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/media-gfx/gnome-screenshot/files/gnome-screenshot-40.0-fix-hidpi.patch b/media-gfx/gnome-screenshot/files/gnome-screenshot-40.0-fix-hidpi.patch new file mode 100644 index 000000000000..6b493ae6d260 --- /dev/null +++ b/media-gfx/gnome-screenshot/files/gnome-screenshot-40.0-fix-hidpi.patch @@ -0,0 +1,40 @@ +From f29aceacbd99fc905ac6d871351505e8d9aa7264 Mon Sep 17 00:00:00 2001 +From: Alexander Mikhaylenko +Date: Sun, 25 Apr 2021 20:00:58 +0000 +Subject: [PATCH] Revert "backend-x11: Use pixbuf dimensions when masking" + +This reverts commit f53d720c7d9199075369f085cf5a39a6b53268bc +--- + src/screenshot-backend-x11.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/screenshot-backend-x11.c b/src/screenshot-backend-x11.c +index 990e715..bf32de8 100644 +--- a/src/screenshot-backend-x11.c ++++ b/src/screenshot-backend-x11.c +@@ -206,18 +206,20 @@ mask_monitors (GdkPixbuf *pixbuf, + GdkWindow *root_window) + { + GdkDisplay *display; ++ GdkScreen *screen; + cairo_region_t *region_with_monitors; + cairo_region_t *invisible_region; + cairo_rectangle_int_t rect; + + display = gdk_window_get_display (root_window); ++ screen = gdk_display_get_default_screen (display); + + region_with_monitors = make_region_with_monitors (display); + + rect.x = 0; + rect.y = 0; +- rect.width = gdk_pixbuf_get_width (pixbuf); +- rect.height = gdk_pixbuf_get_height (pixbuf); ++ rect.width = gdk_screen_get_width (screen); ++ rect.height = gdk_screen_get_height (screen); + + invisible_region = cairo_region_create_rectangle (&rect); + cairo_region_subtract (invisible_region, region_with_monitors); +-- +GitLab + diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild new file mode 100644 index 000000000000..530e596f46da --- /dev/null +++ b/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg + +DESCRIPTION="Screenshot utility for GNOME" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="X" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +DEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libXext + ) + >=dev-libs/glib-2.35.1:2[dbus] + >=x11-libs/gtk+-3.12.0:3 + >=gui-libs/libhandy-1:1= +" +RDEPEND="${DEPEND} + >=gnome-base/gsettings-desktop-schemas-0.1.0 +" +BDEPEND=" + dev-libs/appstream-glib + dev-libs/libxml2:2 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + x11-base/xorg-proto +" + +PATCHES=( + # Fix HiDPI handling in X11 fallback + # https://gitlab.gnome.org/GNOME/gnome-screenshot/-/issues/128 + "${FILESDIR}"/${PN}-40.0-fix-hidpi.patch +) + +DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to + non-interactive mode when launched from a terminal. If you want to choose + where to save the screenshot, run 'gnome-screenshot --interactive'" + +src_configure() { + local emesonargs=( + $(meson_feature X x11) + ) + meson_src_configure +} + +src_install() { + meson_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + readme.gentoo_print_elog +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest deleted file mode 100644 index 6b7efd901257..000000000000 --- a/media-gfx/gtkam/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX gtkam-0.1.18-desktop-validation.patch 536 BLAKE2B dfb407a715e16af5068cf0be270aadf67c4d5dac81c15dd4de77b410ccaef1f4a56463a90f37773cad95dd47fbcc6e84398ca201451644e970061d67265bb7f5 SHA512 2b6cf0e5c680debb3b724e6fa1afffafce05d2f2bbf022d51157b958ad6d7f71b4027c8ec29ae1115c30bc8091c53173fea40211b494afbccd9cf97cc209f0a8 -DIST gtkam-1.0.tar.bz2 908986 BLAKE2B 941207d7865144611caba41c4c2e87719cf3b7ba50c1b48e9e5876ae403504443801cce2c14d3eaabcca749ef0e3ba9d95184081333361058d9fbde10ad4e935 SHA512 3b2b8aa5114237dc6fd5d6727e9ae76e88afa3257d0f18d790cc706b737c0a1002b86559621b3357629f9a7fb4d8f321c46f9eec83c7aa27998acb0f48904f7c -EBUILD gtkam-1.0-r1.ebuild 941 BLAKE2B d8bffaf28f09431a5c6ee50abed5a2833829ded54ef8225ea099ded111fcc2fd9b071eed4ff85850445c5e887b1f1b582980d5880e82407b2578a9796e691159 SHA512 67398ede4fbaf6d96ed2abccbecb0e6284f1b14846651b5e19f7d713d6452bafc9f6e811008ffdd8affcf547f28396e8034f9b896eb62e49dc58f2c327f008cb -MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7 diff --git a/media-gfx/gtkam/files/gtkam-0.1.18-desktop-validation.patch b/media-gfx/gtkam/files/gtkam-0.1.18-desktop-validation.patch deleted file mode 100644 index c9d6ae6989cf..000000000000 --- a/media-gfx/gtkam/files/gtkam-0.1.18-desktop-validation.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/gtkam.desktop.in~ 2011-05-26 09:57:43.000000000 +0200 -+++ b/gtkam.desktop.in 2012-01-31 10:00:56.687216188 +0100 -@@ -1,11 +1,10 @@ - [Desktop Entry] --Encoding=UTF-8 - _Name=Gtkam Digital Camera Browser - _Comment=Browse and download images from an attached digital camera - Exec=gtkam - Icon=gtkam-camera - Terminal=false - Type=Application --Categories=GNOME;GTK;Photography;Graphics;RasterGraphics;Viewer; -+Categories=GNOME;GTK;Photography;Graphics;2DGraphics;RasterGraphics;Viewer; - StartupNotify=true - X-GNOME-DocPath=gtkam/gtkam.xml diff --git a/media-gfx/gtkam/gtkam-1.0-r1.ebuild b/media-gfx/gtkam/gtkam-1.0-r1.ebuild deleted file mode 100644 index 4f2f08b09baf..000000000000 --- a/media-gfx/gtkam/gtkam-1.0-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="A frontend for gPhoto 2" -HOMEPAGE="http://gphoto.org/proj/gtkam" -SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~sparc x86" -IUSE="gimp nls" - -RDEPEND=" - x11-libs/gtk+:2 - >=media-libs/libgphoto2-2.5.0 - >=media-libs/libexif-0.3.2 - media-libs/libexif-gtk - gimp? ( media-gfx/gimp:0/2 ) -" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.14.1 ) -" - -PATCHES=( - # Fix .desktop validity, bug #271569 - "${FILESDIR}/${PN}-0.1.18-desktop-validation.patch" -) - -src_configure() { - gnome2_src_configure \ - --without-bonobo \ - --without-gnome \ - $(use_with gimp) \ - $(use_enable nls) \ - --with-rpmbuild=/bin/false -} - -src_install() { - gnome2_src_install - rm -rf "${ED}"/usr/share/doc/gtkam || die "rm failed" -} diff --git a/media-gfx/gtkam/metadata.xml b/media-gfx/gtkam/metadata.xml deleted file mode 100644 index d2ef3b521ffc..000000000000 --- a/media-gfx/gtkam/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - gnome@gentoo.org - Gentoo GNOME Desktop - - - gphoto - - diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest index f495d85c36df..b02084870ac0 100644 --- a/media-gfx/hydrus/Manifest +++ b/media-gfx/hydrus/Manifest @@ -1,6 +1,13 @@ AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea +AUX test-exitcode.patch 1077 BLAKE2B 7e270c939a421d8c709d7e24b9628c69ec03f72431b6d783043e904ea92bba1938207d08d9275ac1b90825149c92ed48d466fd5edc03fa694fc57465ef474db7 SHA512 703fc73ea3829a8d5c6f64d0573439570300635d3543437983359afea0522c95da6c8b0f2cba3736d0f22f939aad72b4b27c648d166feed96ec6447a68f33b75 +AUX upnpc.patch 1032 BLAKE2B ffbd89511731d5e71a9568fb9578888152af50d18e443871ffde0eb0cad65a98c7561587cc4c9b288c6de158263ef4f172477ee836ab07c4a72d419521872f20 SHA512 7dec34031545e238388134166dd11ca1bf65975caab46ea308a9e36daaf1eeda71c70d260409ed3a64f277a2d65c9f1441c5af02fefa33e263906c386482e98e AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467 DIST hydrus-441.tar.gz 38807432 BLAKE2B e8294a8eb4d808792f2ff50ad4776f078ba1003962b065883ec22fd68f46dc250b2bccf47005731fcc964b75e07977aed45023da1c7e4513fcfcc29d1b4d1a97 SHA512 81eeb59006644b9b33c33c8da3e003640116488509ce2e1426d2a5c0161adf208e31a45c2a5efc2902769bf91e3db56aabc6384f77e8354e0e113bcc6df3a131 -EBUILD hydrus-441.ebuild 4618 BLAKE2B fd91ab5d42d41be8ce0fad57469d48856a70948622fba6dd858592c86ca555aa416d35faff7c1ce742529813973db9925de65f05e3dc5ac82177e88e6d08e3bf SHA512 d4bee7075943660d83657901d29e327109e4415cca315c39cd4fd504d9459773a6c0ccda5af9e484b4a18e316f538be28444cb85c63952d962413812d44ab889 +DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184acd34a9533a20bc35e20ff5cabcc3715ebbb39f42b926b8b00f570c7f483eed3b11472c78f82b9ceeafc3dc765 SHA512 5a78338426127b276b067b52f590e275e132ea2676a4933162183e183a015556351e13e55271240059a145627d8a2ce1f6fe1a07ef267580604e998328c5c4f6 +DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d +EBUILD hydrus-441-r1.ebuild 4177 BLAKE2B e9cd3c47b98d404239d2ea9095c99ab29ff71f4ef6b40c524e4168001b88b189d6a0d18c25362227dc179db005b2259284cadf34bbff7e4b62ef074cda9ef1ea SHA512 e39f3fb27da87c77685fc6123f7280ae7cc911c8b725d51aa2bcd78832b7ad979ff3b441d43b58dcfe39f2a8aec08fa0ddb9d9279a0e06f1c1115a0b3dbe3ec7 +EBUILD hydrus-442.ebuild 4177 BLAKE2B e9cd3c47b98d404239d2ea9095c99ab29ff71f4ef6b40c524e4168001b88b189d6a0d18c25362227dc179db005b2259284cadf34bbff7e4b62ef074cda9ef1ea SHA512 e39f3fb27da87c77685fc6123f7280ae7cc911c8b725d51aa2bcd78832b7ad979ff3b441d43b58dcfe39f2a8aec08fa0ddb9d9279a0e06f1c1115a0b3dbe3ec7 +EBUILD hydrus-443.ebuild 4298 BLAKE2B a60befc0402b22dcc747941da208a4a8913b217dffcd73c112f84b6085ca2723232f6d489c6a4c4aeada98f3f504b89db5eb9a82e2bc760a9787efc95c611cd9 SHA512 9b1b2bcc765bc64c9c7acc5b79ff6c982d6aa7407ace736f5179c55eb3b936456fea99b4861d97e94949c15daf0cd4d338f6ac562cf027bbecf94d20648b0602 +EBUILD hydrus-9999.ebuild 4298 BLAKE2B a60befc0402b22dcc747941da208a4a8913b217dffcd73c112f84b6085ca2723232f6d489c6a4c4aeada98f3f504b89db5eb9a82e2bc760a9787efc95c611cd9 SHA512 9b1b2bcc765bc64c9c7acc5b79ff6c982d6aa7407ace736f5179c55eb3b936456fea99b4861d97e94949c15daf0cd4d338f6ac562cf027bbecf94d20648b0602 MISC metadata.xml 1168 BLAKE2B 6480f7938566059342a4b8eef89ee26e4f3843faab9b8c937f74e71a1a27b63630bc6e64482b7ff5ebc647c1247a030e62635a4c3a5bc42d6df87209e35ffb53 SHA512 9bb31694a8d1ce56741340431e82b0e7f35866d90dd1359062703809be331192e5ba4acca94b8c0fc146cbb6199335e724345924687c904795c3c2d0d917acb3 diff --git a/media-gfx/hydrus/files/test-exitcode.patch b/media-gfx/hydrus/files/test-exitcode.patch new file mode 100644 index 000000000000..d61d341ee1ef --- /dev/null +++ b/media-gfx/hydrus/files/test-exitcode.patch @@ -0,0 +1,36 @@ +diff --git a/hydrus/hydrus_test.py b/hydrus/hydrus_test.py +index 3504c9c..7f95af8 100644 +--- a/hydrus/hydrus_test.py ++++ b/hydrus/hydrus_test.py +@@ -91,6 +91,9 @@ def boot(): + if sys.stdin.isatty(): + + input( 'Press any key to exit.' ) ++ else: + ++ success = 0 if controller.was_successful else 1 ++ sys.exit(success) + + +diff --git a/hydrus/test/TestController.py b/hydrus/test/TestController.py +index 0c43440..7e6c5ef 100644 +--- a/hydrus/test/TestController.py ++++ b/hydrus/test/TestController.py +@@ -168,7 +168,6 @@ only_run = None + class Controller( object ): + + def __init__( self, win, only_run ): +- + self.app = win + self.win = win + self.only_run = only_run +@@ -827,8 +826,7 @@ class Controller( object ): + def do_it(): + + try: +- +- runner.run( suite ) ++ self.was_successful = runner.run( suite ).wasSuccessful() + + finally: + diff --git a/media-gfx/hydrus/files/upnpc.patch b/media-gfx/hydrus/files/upnpc.patch new file mode 100644 index 000000000000..ea78f2b70b63 --- /dev/null +++ b/media-gfx/hydrus/files/upnpc.patch @@ -0,0 +1,40 @@ +diff --git a/hydrus/core/networking/HydrusNATPunch.py b/hydrus/core/networking/HydrusNATPunch.py +index c959753..6792d89 100644 +--- a/hydrus/core/networking/HydrusNATPunch.py ++++ b/hydrus/core/networking/HydrusNATPunch.py +@@ -3,6 +3,7 @@ import socket + import subprocess + import threading + import traceback ++import shutil + + from hydrus.core import HydrusConstants as HC + from hydrus.core import HydrusData +@@ -18,7 +19,7 @@ if HC.PLATFORM_WINDOWS: + + else: + +- possible_bin_filenames = [ 'upnpc-static', 'upnpc-shared', 'miniupnpc' ] ++ possible_bin_filenames = [ 'upnpc', 'upnpc-static', 'upnpc-shared', 'miniupnpc' ] + + if HC.PLATFORM_LINUX: + +@@ -42,7 +43,17 @@ for filename in possible_bin_filenames: + + UPNPC_PATH = possible_path + +- ++ break ++ ++ maybe_in_path = shutil.which( filename ) ++ ++ if maybe_in_path: ++ ++ UPNPC_PATH = maybe_in_path ++ ++ break ++ ++ + EXTERNAL_IP = {} + EXTERNAL_IP[ 'ip' ] = None + EXTERNAL_IP[ 'time' ] = 0 diff --git a/media-gfx/hydrus/hydrus-441-r1.ebuild b/media-gfx/hydrus/hydrus-441-r1.ebuild new file mode 100644 index 000000000000..5ce5c4bdf642 --- /dev/null +++ b/media-gfx/hydrus/hydrus-441-r1.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="sqlite" + +inherit python-single-r1 desktop optfeature + +DESCRIPTION="A booru-like media organizer for the desktop" +HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus" +SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +# hydrus itself is WTFPL +# icons included are CC-BY-2.5 +LICENSE="WTFPL-2 CC-BY-2.5" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/chardet[${PYTHON_MULTI_USEDEP}] + dev-python/html5lib[${PYTHON_MULTI_USEDEP}] + dev-python/lxml[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + dev-python/pillow[${PYTHON_MULTI_USEDEP}] + dev-python/psutil[${PYTHON_MULTI_USEDEP}] + dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] + dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/send2trash[${PYTHON_MULTI_USEDEP}] + dev-python/service_identity[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + dev-python/twisted[${PYTHON_MULTI_USEDEP}] + media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}] + + >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] + + cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] ) + ffmpeg? ( media-video/ffmpeg ) + lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] ) + mpv? ( + media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}] + dev-python/python-mpv[${PYTHON_MULTI_USEDEP}] + ) + socks? ( + || ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}] + dev-python/PySocks[${PYTHON_MULTI_USEDEP}] ) + ) + ') +" +BDEPEND=" + ${RDEPEND} + $(python_gen_cond_dep ' + test? ( + dev-python/httmock[${PYTHON_MULTI_USEDEP}] + dev-python/mock[${PYTHON_MULTI_USEDEP}] + dev-python/nose[${PYTHON_MULTI_USEDEP}] + dev-python/unittest2[${PYTHON_MULTI_USEDEP}] + ) + ') +" + +PATCHES=( + "${FILESDIR}/upnpc.patch" + "${FILESDIR}/userpath-in-local-share.patch" + "${FILESDIR}/test-exitcode.patch" +) + +src_prepare() { + default + + # Contains pre-built binaries for other systems and a broken swf renderer for linux + rm -r bin/ || die + # Build files used for CI, not actually needed + rm -r static/build_files || die + # Duplicate license file, not needed + rm license.txt || die + # Python requirements files, not needed + rm requirements_*.txt || die +} + +src_compile() { + python_optimize "${S}" +} + +src_test() { + # The tests use unittest, but are run with a custom runner script. + # QT_QPA_PLATFORM is required to make them run without X + local -x QT_QPA_PLATFORM=offscreen + "${EPYTHON}" "${S}/test.py" || die "Tests failed" +} + +src_install() { + local doc="${EPREFIX}/usr/share/doc/${PF}" + elog "Hydrus includes an excellent manual, that can either be viewed at" + elog "${doc}/html/help/index.html" + elog "or accessed through the hydrus help menu." + + mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die + + local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/) + local HTML_DOCS=("${S}"/help/) + einstalldocs + + # Files only needed for testing + rm test.py hydrus/hydrus_test.py || die + rm -r hydrus/test/ static/testing/ || die + + # These files are copied into doc + rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die + # The program expects to find documentation here, so add a symlink to doc + ln -s "${doc}/html/help" help || die + + insinto /opt/hydrus + doins -r "${S}"/. + + exeinto /usr/bin + python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server") + python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client") + + make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \ + "AudioVideo;FileTools;Graphics;Network;" +} + +pkg_postinst() { + optfeature "support for automatic port forwarding" "net-libs/miniupnpc" +} diff --git a/media-gfx/hydrus/hydrus-441.ebuild b/media-gfx/hydrus/hydrus-441.ebuild deleted file mode 100644 index ae3f806847c6..000000000000 --- a/media-gfx/hydrus/hydrus-441.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..8} ) -PYTHON_REQ_USE="sqlite" - -inherit python-single-r1 desktop optfeature - -DESCRIPTION="A booru-like media organizer for the desktop" -HOMEPAGE="http://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus" -SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -# hydrus itself is WTFPL -# icons included are CC-BY-2.5 -LICENSE="WTFPL-2 CC-BY-2.5" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/chardet[${PYTHON_MULTI_USEDEP}] - dev-python/html5lib[${PYTHON_MULTI_USEDEP}] - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - dev-python/pillow[${PYTHON_MULTI_USEDEP}] - dev-python/psutil[${PYTHON_MULTI_USEDEP}] - dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] - dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}] - dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${PYTHON_MULTI_USEDEP}] - dev-python/send2trash[${PYTHON_MULTI_USEDEP}] - dev-python/service_identity[${PYTHON_MULTI_USEDEP}] - dev-python/six[${PYTHON_MULTI_USEDEP}] - dev-python/twisted[${PYTHON_MULTI_USEDEP}] - media-libs/opencv[python,${PYTHON_MULTI_USEDEP}] - - >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] - - cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] ) - ffmpeg? ( media-video/ffmpeg ) - lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] ) - mpv? ( - media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}] - dev-python/python-mpv[${PYTHON_MULTI_USEDEP}] - ) - socks? ( - || ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}] - dev-python/PySocks[${PYTHON_MULTI_USEDEP}] ) - ) - ') -" -BDEPEND=" - ${RDEPEND} - $(python_gen_cond_dep ' - test? ( - dev-python/httmock[${PYTHON_MULTI_USEDEP}] - dev-python/mock[${PYTHON_MULTI_USEDEP}] - dev-python/nose[${PYTHON_MULTI_USEDEP}] - dev-python/unittest2[${PYTHON_MULTI_USEDEP}] - ) - ') -" - -PATCHES=( - "${FILESDIR}/userpath-in-local-share.patch" -) - -# Delete files only needed for testing -delete_test_files() { - rm test.py || die - rm hydrus/hydrus_test.py || die - rm -r hydrus/test/ || die - rm -r static/testing/ || die -} - -src_prepare() { - default - - # If tests will run, leave the files until tests are run. - # They will be deleted before installing the package. - if ! use test; then - delete_test_files - fi - - # Contains pre-built binaries for other systems and a broken swf renderer for linux - rm -r bin/ || die - # Build files used for CI, not actually needed - rm -r static/build_files || die - # Duplicate license file, not needed - rm license.txt || die - # Python requirements files, not needed - rm requirements_*.txt || die -} - -src_compile() { - python_optimize "${S}" -} - -src_test() { - # The tests use unittest, but are run with a custom runner script. - # QT_QPA_PLATFORM is required to make them run without X - export QT_QPA_PLATFORM=offscreen - "${EPYTHON}" "${S}/test.py" || die "Tests failed" -} - -src_install() { - local DOC="${EPREFIX}/usr/share/doc/${PF}" - elog "Hydrus includes an excellent manual, that can either be viewed at" - elog "${DOC}/html/help/index.html" - elog "or accessed through the hydrus help menu." - - mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die - - DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/) - HTML_DOCS=("${S}"/help/) - einstalldocs - - if use test; then - # Delete files only needed for tests now. No need to install them. - # If the tests didn't run, the files have been deleted already. - delete_test_files - fi - - # These files are copied into DOC - rm COPYING README.md Readme.txt help_my_client_will_not_boot.txt || die - rm -r help/ db/ || die - # The program expects to find documentation here, so add a symlink to DOC - ln -s "${DOC}/html/help" help || die - - insopts -m0755 - insinto /opt/hydrus - doins -r "${S}"/* - - exeinto /usr/bin - - sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" > "${T}/hydrus-server" || die - sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" > "${T}/hydrus-client" || die - - python_doexe "${T}/hydrus-server" - python_doexe "${T}/hydrus-client" - - make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png"\ - "AudioVideo;FileTools;Graphics;Network;" -} - -pkg_postinst() { - optfeature "support for automatic port forwarding" "net-libs/miniupnpc" -} diff --git a/media-gfx/hydrus/hydrus-442.ebuild b/media-gfx/hydrus/hydrus-442.ebuild new file mode 100644 index 000000000000..5ce5c4bdf642 --- /dev/null +++ b/media-gfx/hydrus/hydrus-442.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="sqlite" + +inherit python-single-r1 desktop optfeature + +DESCRIPTION="A booru-like media organizer for the desktop" +HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus" +SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +# hydrus itself is WTFPL +# icons included are CC-BY-2.5 +LICENSE="WTFPL-2 CC-BY-2.5" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/chardet[${PYTHON_MULTI_USEDEP}] + dev-python/html5lib[${PYTHON_MULTI_USEDEP}] + dev-python/lxml[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + dev-python/pillow[${PYTHON_MULTI_USEDEP}] + dev-python/psutil[${PYTHON_MULTI_USEDEP}] + dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] + dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/send2trash[${PYTHON_MULTI_USEDEP}] + dev-python/service_identity[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + dev-python/twisted[${PYTHON_MULTI_USEDEP}] + media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}] + + >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] + + cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] ) + ffmpeg? ( media-video/ffmpeg ) + lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] ) + mpv? ( + media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}] + dev-python/python-mpv[${PYTHON_MULTI_USEDEP}] + ) + socks? ( + || ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}] + dev-python/PySocks[${PYTHON_MULTI_USEDEP}] ) + ) + ') +" +BDEPEND=" + ${RDEPEND} + $(python_gen_cond_dep ' + test? ( + dev-python/httmock[${PYTHON_MULTI_USEDEP}] + dev-python/mock[${PYTHON_MULTI_USEDEP}] + dev-python/nose[${PYTHON_MULTI_USEDEP}] + dev-python/unittest2[${PYTHON_MULTI_USEDEP}] + ) + ') +" + +PATCHES=( + "${FILESDIR}/upnpc.patch" + "${FILESDIR}/userpath-in-local-share.patch" + "${FILESDIR}/test-exitcode.patch" +) + +src_prepare() { + default + + # Contains pre-built binaries for other systems and a broken swf renderer for linux + rm -r bin/ || die + # Build files used for CI, not actually needed + rm -r static/build_files || die + # Duplicate license file, not needed + rm license.txt || die + # Python requirements files, not needed + rm requirements_*.txt || die +} + +src_compile() { + python_optimize "${S}" +} + +src_test() { + # The tests use unittest, but are run with a custom runner script. + # QT_QPA_PLATFORM is required to make them run without X + local -x QT_QPA_PLATFORM=offscreen + "${EPYTHON}" "${S}/test.py" || die "Tests failed" +} + +src_install() { + local doc="${EPREFIX}/usr/share/doc/${PF}" + elog "Hydrus includes an excellent manual, that can either be viewed at" + elog "${doc}/html/help/index.html" + elog "or accessed through the hydrus help menu." + + mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die + + local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/) + local HTML_DOCS=("${S}"/help/) + einstalldocs + + # Files only needed for testing + rm test.py hydrus/hydrus_test.py || die + rm -r hydrus/test/ static/testing/ || die + + # These files are copied into doc + rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die + # The program expects to find documentation here, so add a symlink to doc + ln -s "${doc}/html/help" help || die + + insinto /opt/hydrus + doins -r "${S}"/. + + exeinto /usr/bin + python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server") + python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client") + + make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \ + "AudioVideo;FileTools;Graphics;Network;" +} + +pkg_postinst() { + optfeature "support for automatic port forwarding" "net-libs/miniupnpc" +} diff --git a/media-gfx/hydrus/hydrus-443.ebuild b/media-gfx/hydrus/hydrus-443.ebuild new file mode 100644 index 000000000000..d51d23e32a5c --- /dev/null +++ b/media-gfx/hydrus/hydrus-443.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="sqlite" + +inherit python-single-r1 desktop optfeature + +DESCRIPTION="A booru-like media organizer for the desktop" +HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus" + +if [ "${PV}" == "9999" ]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git" +else + SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64" +fi + +# hydrus itself is WTFPL +# icons included are CC-BY-2.5 +LICENSE="WTFPL-2 CC-BY-2.5" +SLOT="0" +IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/chardet[${PYTHON_MULTI_USEDEP}] + dev-python/html5lib[${PYTHON_MULTI_USEDEP}] + dev-python/lxml[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + dev-python/pillow[${PYTHON_MULTI_USEDEP}] + dev-python/psutil[${PYTHON_MULTI_USEDEP}] + dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] + dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/send2trash[${PYTHON_MULTI_USEDEP}] + dev-python/service_identity[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + dev-python/twisted[${PYTHON_MULTI_USEDEP}] + media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}] + + >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] + + cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] ) + ffmpeg? ( media-video/ffmpeg ) + lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] ) + mpv? ( + media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}] + dev-python/python-mpv[${PYTHON_MULTI_USEDEP}] + ) + socks? ( + || ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}] + dev-python/PySocks[${PYTHON_MULTI_USEDEP}] ) + ) + ') +" +BDEPEND=" + ${RDEPEND} + $(python_gen_cond_dep ' + test? ( + dev-python/httmock[${PYTHON_MULTI_USEDEP}] + dev-python/mock[${PYTHON_MULTI_USEDEP}] + dev-python/nose[${PYTHON_MULTI_USEDEP}] + dev-python/unittest2[${PYTHON_MULTI_USEDEP}] + ) + ') +" + +PATCHES=( + "${FILESDIR}/upnpc.patch" + "${FILESDIR}/userpath-in-local-share.patch" + "${FILESDIR}/test-exitcode.patch" +) + +src_prepare() { + default + + # Contains pre-built binaries for other systems and a broken swf renderer for linux + rm -r bin/ || die + # Build files used for CI, not actually needed + rm -r static/build_files || die + # Duplicate license file, not needed + rm license.txt || die + # Python requirements files, not needed + rm requirements_*.txt || die +} + +src_compile() { + python_optimize "${S}" +} + +src_test() { + # The tests use unittest, but are run with a custom runner script. + # QT_QPA_PLATFORM is required to make them run without X + local -x QT_QPA_PLATFORM=offscreen + "${EPYTHON}" "${S}/test.py" || die "Tests failed" +} + +src_install() { + local doc="${EPREFIX}/usr/share/doc/${PF}" + elog "Hydrus includes an excellent manual, that can either be viewed at" + elog "${doc}/html/help/index.html" + elog "or accessed through the hydrus help menu." + + mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die + + local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/) + local HTML_DOCS=("${S}"/help/) + einstalldocs + + # Files only needed for testing + rm test.py hydrus/hydrus_test.py || die + rm -r hydrus/test/ static/testing/ || die + + # These files are copied into doc + rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die + # The program expects to find documentation here, so add a symlink to doc + ln -s "${doc}/html/help" help || die + + insinto /opt/hydrus + doins -r "${S}"/. + + exeinto /usr/bin + python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server") + python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client") + + make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \ + "AudioVideo;FileTools;Graphics;Network;" +} + +pkg_postinst() { + optfeature "support for automatic port forwarding" "net-libs/miniupnpc" +} diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild new file mode 100644 index 000000000000..d51d23e32a5c --- /dev/null +++ b/media-gfx/hydrus/hydrus-9999.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="sqlite" + +inherit python-single-r1 desktop optfeature + +DESCRIPTION="A booru-like media organizer for the desktop" +HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus" + +if [ "${PV}" == "9999" ]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git" +else + SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64" +fi + +# hydrus itself is WTFPL +# icons included are CC-BY-2.5 +LICENSE="WTFPL-2 CC-BY-2.5" +SLOT="0" +IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/chardet[${PYTHON_MULTI_USEDEP}] + dev-python/html5lib[${PYTHON_MULTI_USEDEP}] + dev-python/lxml[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + dev-python/pillow[${PYTHON_MULTI_USEDEP}] + dev-python/psutil[${PYTHON_MULTI_USEDEP}] + dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] + dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/send2trash[${PYTHON_MULTI_USEDEP}] + dev-python/service_identity[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + dev-python/twisted[${PYTHON_MULTI_USEDEP}] + media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}] + + >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] + + cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] ) + ffmpeg? ( media-video/ffmpeg ) + lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] ) + mpv? ( + media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}] + dev-python/python-mpv[${PYTHON_MULTI_USEDEP}] + ) + socks? ( + || ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}] + dev-python/PySocks[${PYTHON_MULTI_USEDEP}] ) + ) + ') +" +BDEPEND=" + ${RDEPEND} + $(python_gen_cond_dep ' + test? ( + dev-python/httmock[${PYTHON_MULTI_USEDEP}] + dev-python/mock[${PYTHON_MULTI_USEDEP}] + dev-python/nose[${PYTHON_MULTI_USEDEP}] + dev-python/unittest2[${PYTHON_MULTI_USEDEP}] + ) + ') +" + +PATCHES=( + "${FILESDIR}/upnpc.patch" + "${FILESDIR}/userpath-in-local-share.patch" + "${FILESDIR}/test-exitcode.patch" +) + +src_prepare() { + default + + # Contains pre-built binaries for other systems and a broken swf renderer for linux + rm -r bin/ || die + # Build files used for CI, not actually needed + rm -r static/build_files || die + # Duplicate license file, not needed + rm license.txt || die + # Python requirements files, not needed + rm requirements_*.txt || die +} + +src_compile() { + python_optimize "${S}" +} + +src_test() { + # The tests use unittest, but are run with a custom runner script. + # QT_QPA_PLATFORM is required to make them run without X + local -x QT_QPA_PLATFORM=offscreen + "${EPYTHON}" "${S}/test.py" || die "Tests failed" +} + +src_install() { + local doc="${EPREFIX}/usr/share/doc/${PF}" + elog "Hydrus includes an excellent manual, that can either be viewed at" + elog "${doc}/html/help/index.html" + elog "or accessed through the hydrus help menu." + + mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die + + local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/) + local HTML_DOCS=("${S}"/help/) + einstalldocs + + # Files only needed for testing + rm test.py hydrus/hydrus_test.py || die + rm -r hydrus/test/ static/testing/ || die + + # These files are copied into doc + rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die + # The program expects to find documentation here, so add a symlink to doc + ln -s "${doc}/html/help" help || die + + insinto /opt/hydrus + doins -r "${S}"/. + + exeinto /usr/bin + python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server") + python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client") + + make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \ + "AudioVideo;FileTools;Graphics;Network;" +} + +pkg_postinst() { + optfeature "support for automatic port forwarding" "net-libs/miniupnpc" +} diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest index f4e5e1125348..aab0c9d5d9b9 100644 --- a/media-gfx/icoutils/Manifest +++ b/media-gfx/icoutils/Manifest @@ -2,4 +2,4 @@ AUX icoutils-0.29.1-gettext.patch 354 BLAKE2B f165b759526678524344a516a0953c028c AUX icoutils-0.29.1-locale.patch 831 BLAKE2B c24a99e4c186759f3c40e1635f919a9f802af28971c803b31a67b4e990206b0aaf4f7787204599b45888a6615c4bfd7c777bfbada6d67248c6e8e4cf033bdf07 SHA512 bcb0ef117c7f1434e63e411d270a2cad8e4d0ad214c7bd516494c7718b605234ad5920b9e16c5627c98e8e1065bc2550e55b1e2e8b846a5854999419c999107b DIST icoutils-0.32.3.tar.bz2 609286 BLAKE2B 0d65fbadb08e4f2e7a60b5ffd4bc14dc82e90abf0a56ddb89f9717a479ab45a50b9747c986c954c3a01e4d8a51d8396ec9d8796dc4a1d7430cb3169c13e06e13 SHA512 982a051a5dc4a63bb2a9f23e78e5a88e481e5c7a9c25789253e1c396e40d4c093e5a9b399966d660e4f2da21ce15d539cb9d20bfd8126b1138f148b86baa6726 EBUILD icoutils-0.32.3.ebuild 1023 BLAKE2B 980f66aa0b3e8588b2e336b5b0cefb77b322838d729662e28963f750430074dd9d7f52d36bf61f1237f0b1d56ce9e07af423f0bb76b8b343aee41aa83b824302 SHA512 c6cd8393a57d2d1b593534a754ff87ff144a7ad04bd3468f946ada45f7b72be85b78c547fc2750ea682c61a9416f2697e01fa70b58405e75845508b2aa382220 -MISC metadata.xml 243 BLAKE2B cf24db59438ad12e7ee962da70fbbae676aa42a24a62e49c915a1ba728c08c74d10bc144ce79b91258c66f5523edb3c15941cb1b20a968bbed2e156a83eebf9b SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775 +MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-gfx/icoutils/metadata.xml b/media-gfx/icoutils/metadata.xml index 43b420a338cf..6f49eba8f496 100644 --- a/media-gfx/icoutils/metadata.xml +++ b/media-gfx/icoutils/metadata.xml @@ -1,8 +1,5 @@ - - patrick@gentoo.org - Patrick Lauer - + diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index b95caa30962b..1c5a40be11a0 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -2,11 +2,15 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 DIST ImageMagick-6.9.12-12.tar.xz 9141288 BLAKE2B 95ec30e77fc3f963bb0cae5280ad8e72ba9b6e0c8419fdf41f1899371ecbf5f64bbb70cc6193e751da0c3365551bdb2442e9f4746284ecff92ca351fc906fa4c SHA512 7e680809954326d32439c922cbcb65c9076823c50bd56ba2a230ec4a6d46f00a03a032d2ff153fe9b7651a9f6bac9625fe2aea7acccba56e15b6dce96e477c8d DIST ImageMagick-6.9.12-13.tar.xz 9172456 BLAKE2B cc931e49f152945a0022f6e57e49db08dc45169d5913b884cdf47d18d1f3d7a453f02b3ade56395e985cbe3f996584b8ad1686d947b6b4c04cc85475ca4f65c4 SHA512 4273e6cc864e759c55b5612475c268095948bb0ebabc1188637df87ac8595a97ce94ef7307687f0abd1325646ba23a8bf1219081655307b17ec96b335a01de6c +DIST ImageMagick-6.9.12-15.tar.xz 9181060 BLAKE2B 099482e71ce899a95e22dd63ae4e3f0a36ed722f318a22796e5b28552d9c3770f33fef9d3dbeebbdcf91e78ac30421e7e48f9a3db7fdf73bfbdbafea4894ddc5 SHA512 7336b832abf96fed5d0f861b9c3724c27770a4f9fa868399406bb49003184a06a5fc51a96d3c66fa8d1ca85bcdfaa9ed59d9e80c751ae4c660f38f4d50a931ef DIST ImageMagick-7.0.11-12.tar.xz 10284100 BLAKE2B 2b664106152f764948f34fe766552cb48e7ff2a5c83f3f8b7e0a83861ed218bbda278f487678704d42aee900f1ef4be4252d94ccafda2192f39d9a3701115520 SHA512 f5faf124a1923d8b3d362ae59c594dff4d92cf097b42995f6631812bbb320830cee71ca10a15b3894cecf1a286b4fa10e874d213c7438356d194d3ebff778cbe DIST ImageMagick-7.0.11-13.tar.xz 10305476 BLAKE2B 464ea44f8e31148bdcbdf2e66410e5eb9fe0526d06b2b1376311018f7e4897648601d5f4d541469e9f8a72ecbc279695f23288e90725e564a917f68df92f8aed SHA512 8b5fe1ad06ca3af752454f67f53a066842668832bbd4efede35c515449cd2b970e6f7f23e716928ba598f89a7ec020bd988cc392196c89117586fb97a48e1d9e +DIST ImageMagick-7.1.0-0.tar.xz 10307628 BLAKE2B cd59142d40fffa583e19b5bb3016ad84afd1901c3dc679798341f764ff2b341f85a5049907c560eeb58866ccb21985910a99ea92a5ca734d60e5af35fbbe8378 SHA512 51a52ee2c09bb8ea276445393cc2f3398a54c10047d58eaea29a1a1d231ddae0fc00d81b930f299661fed0a3940c08e8c9f0b3932ffd46128186348ebb89fb00 EBUILD imagemagick-6.9.12.12.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12 EBUILD imagemagick-6.9.12.13.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20 +EBUILD imagemagick-6.9.12.15.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20 EBUILD imagemagick-7.0.11.12.ebuild 7340 BLAKE2B ecd38b0e0d7ed63543c514bdbf3f232ac2ca908891f2cab24a93fced4a08586eb207e3d236c8f1ee35361d743995f129e96e4f693eca30973f3c9320a7cd5a45 SHA512 258513e90922bb80e11c9a148d9d04a28ade01c6187281f6741ea2f384180aaf3ba81f25394bb58b7d6e28bc2379a41aad01a1b7c669b52efd5c5dc5bacc6d50 EBUILD imagemagick-7.0.11.13.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b -EBUILD imagemagick-9999.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b +EBUILD imagemagick-7.1.0.0.ebuild 7397 BLAKE2B 9845d38817e2dbcfbc3c970d6ed508588caf22adc844178de2c2fae9f12c12cee60e7c97db29b99393720675a9401d1175e2114b8f5c3bee664335bdd4703823 SHA512 8832088aa61e5c7f6293d970f4460dbc629c2a7a0a9b70a44b8e7de9473823b7ee156e0f40981eb327eb222a9b604e21f3bbffb41ffff580b036c67d7da996b8 +EBUILD imagemagick-9999.ebuild 7397 BLAKE2B 9845d38817e2dbcfbc3c970d6ed508588caf22adc844178de2c2fae9f12c12cee60e7c97db29b99393720675a9401d1175e2114b8f5c3bee664335bdd4703823 SHA512 8832088aa61e5c7f6293d970f4460dbc629c2a7a0a9b70a44b8e7de9473823b7ee156e0f40981eb327eb222a9b604e21f3bbffb41ffff580b036c67d7da996b8 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild new file mode 100644 index 000000000000..d17773f5081b --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic libtool perl-functions toolchain-funcs multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" + +LICENSE="imagemagick" +SLOT="0/6.9.11-60" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" + +REQUIRED_USE="corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts )" + +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + dev-libs/libltdl:0 + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:= ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:0= ) + png? ( media-libs/libpng:0= ) + postscript? ( app-text/ghostscript-gpl ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:0= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:0= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2:= ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= )" + +DEPEND="${RDEPEND} + !media-gfx/graphicsmagick[imagemagick] + X? ( x11-base/xorg-proto )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Apply hardening #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + elibtoolize # for Darwin modules + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + local openmp=disable + use openmp && { tc-has-openmp && openmp=enable; } + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --${openmp}-openmp + --with-gcc-arch=no-automagic + ) + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt ChangeLog + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild new file mode 100644 index 000000000000..3f1ab1fd0bf0 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic libtool perl-functions toolchain-funcs multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" + +LICENSE="imagemagick" +SLOT="0/7.1.0-0" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" + +REQUIRED_USE="corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts )" + +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + dev-libs/libltdl:0 + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:= ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:0= ) + png? ( media-libs/libpng:0= ) + postscript? ( app-text/ghostscript-gpl ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:0= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:0= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2:= ) + lzma? ( app-arch/xz-utils ) + zip? ( dev-libs/libzip:= ) + zlib? ( sys-libs/zlib:= )" + +DEPEND="${RDEPEND} + !media-gfx/graphicsmagick[imagemagick] + X? ( x11-base/xorg-proto )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Apply hardening #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + elibtoolize # for Darwin modules + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + local openmp=disable + use openmp && { tc-has-openmp && openmp=enable; } + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zip) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + --without-jxl + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --${openmp}-openmp + --with-gcc-arch=no-automagic + ) + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + if [[ ${PV} == "9999" ]] ; then + IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild + else + IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + fi + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt ChangeLog + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "7.0.8.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index 769cb4c0e00a..3f1ab1fd0bf0 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -20,8 +20,8 @@ DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" LICENSE="imagemagick" -SLOT="0/7.0.11-0" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" +SLOT="0/7.1.0-0" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" REQUIRED_USE="corefonts? ( truetype ) svg? ( xml ) @@ -72,6 +72,7 @@ RDEPEND=" ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) + zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )" DEPEND="${RDEPEND} @@ -143,6 +144,7 @@ src_configure() { --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts $(use_with bzip2 bzlib) $(use_with X x) + $(use_with zip) $(use_with zlib) --without-autotrace $(use_with postscript dps) diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest index 7266f2684743..f471f48cb6a2 100644 --- a/media-gfx/imv/Manifest +++ b/media-gfx/imv/Manifest @@ -3,4 +3,4 @@ AUX imv-4.2.0-wayland-roundtrip-after-scale.patch 583 BLAKE2B b71b428bc7c3fd566a DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115 EBUILD imv-4.2.0.ebuild 1934 BLAKE2B 923576182f4d8756bd7d9afc2c718674fbd9c95a386b99d2bac370a87c9cc03558f8e1f8833ccefa735fc0299984dd3d7f2823be51a1fa0ad915756a87d2c6a5 SHA512 ba9014b318ecc18b2473dfe92b25c208b6f8ce4cd329f0482c925e3fd86b3cab7aef43a71ccaa89e01294b5d877ba42617b70b7dc27d7f7da21e90648418faa8 EBUILD imv-9999.ebuild 1810 BLAKE2B e3601453c416eb35d202cfef4916bd8a6e078ed3a6c9aec7a1871b3ba70522f35a67356842b164ed3f721298ee0c9bf9bf63237ca5f777188d7d0a1677b18bbc SHA512 b618911f0c0797be3cacc06474b4d87ffb975aec79b9439f7530dbcd127db01a110fffdc539c666aaccbcbe71c66d09623745027168f489fe01cbda461f6e046 -MISC metadata.xml 636 BLAKE2B 0baddac56141b71f8534e57dfdfc2a2e5bb3b31516712c259e48aa1bc31403011272176dc80aa734e8f225bb025c8d2ce51199cfef8c18be38bdf4d9493309ac SHA512 8028f1ee17864d3eb3c6ca4b53ca980e927689d77a8b396caa543533f3c61f09767eb16128840899e17c7c1e5057c711362d64d35422138723882b9dc8da1823 +MISC metadata.xml 487 BLAKE2B 75fef8f34eea6c032dd6d31b3b185b18acf2c38d15a47a5aea71f7b50d3604b53242f1750ad88bc6e07e3ab4b73ef3ea6d1a60fcb71e484ac9f0595ae0e1c7ef SHA512 6da579aec4f921665773f8163e40a5151954176a4d4004432bcaa51ec48b1d5c808cbb541e99e247d3775f8a592159294a9b7011b017bfede3ab9df0ec0746a5 diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml index 3cca373fbbad..bdaf4b353e9e 100644 --- a/media-gfx/imv/metadata.xml +++ b/media-gfx/imv/metadata.xml @@ -1,14 +1,10 @@ - - sudinave@gmail.com + + ionen@gentoo.org Ionen Wolkens - - proxy-maint@gentoo.org - Proxy Maintainers - Use media-libs/freeimage for additional image support Add HEIF/HEIC image support diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index ed0531c4bfbd..c335c9f60b9b 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,5 +1,5 @@ AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172 DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d EBUILD inkscape-1.0.2-r1.ebuild 4150 BLAKE2B 756fec945d62135590e0347adcbb98436159c487134b883ec5316d7140062377e638c3275b092a13baff70a692ed287f1081271163fa39ae5bdb6720dba2526d SHA512 bb997baf9aa3d21325af5be627908d7ff20a019f23fe680954d85e1b48c579c9bb4902f1d5f6de820a6415243e7b4c997f496ca877bacc8bc64debb80a51afee -EBUILD inkscape-9999.ebuild 4062 BLAKE2B 95b6edfd2512eb33365bf8c19968a51f02cea399569caeca8f20bf6a000936fd7c2932e2fe389c05b931084e9133f01ef6cd8a28d6e8cc9137a5538e9254f151 SHA512 f871de44af448c640f208637bb65eba87dfde5d992e1f7886ba54b31e322054f2069d818fb5b6032d4b5a59177ec9e2cf46f0ce964ec90f56d6370146ed55fd0 +EBUILD inkscape-9999.ebuild 4064 BLAKE2B 4715f25355cc7ed6241d1f9ce1ed81685591a206be427ebc745a9138f36d9f9c9e924234e64904040adf66927b955063e99e197d3efb4ce0adee0f52334bb371 SHA512 2f7f58f971acceabd76e01acf0d468a11ba734bd5b2a9ec9af0179b9067ce4f41172507c873b577c7d0c47bde9115ebd4c48d861e76f6bea6a4f7669b12b5669 MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index e29603e7c82f..5dbdb4b49977 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="xml" MY_P="${P/_/}" inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3 diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 2f35855c0790..2cb58ec49239 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,8 +1,6 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59 -DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660 SHA512 a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef DIST krita-4.4.3.tar.gz 254855083 BLAKE2B 5ffc5d7c887d409c2669a2c75f2dae3d6b1c6e83f30d330c37c6e8eb96e590c4abb7b26aea82a18f13b01ed2f053d2a4ddca780cab2995c10c9c0c07d67ee689 SHA512 44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f -EBUILD krita-4.4.2.ebuild 3422 BLAKE2B 24bccfde1e16491f69fe31dc97f73274784d61ef6d99d5b9e8ecc94fd9138dfed8a63c070bbe598f3eb10c2243c4ae3ec9e090bf8c3843fda22f6e245e8b8354 SHA512 feb195f53e9fbf9a9a29e79811b327091d3fc6aa5e5071b0ffcd1c86bee8dbeb0848e0d03d9db89359fab55309f6e4fd9a95454b2895a6ca335b14a240bdba93 -EBUILD krita-4.4.3.ebuild 3428 BLAKE2B 466af7e75db2ed303c1ebed3a23966953863971a4f6205428df29229d6340b97583fff53198cd1cffeed32696ae0071df05236da2ca0908f96d34af82fc7ca04 SHA512 dc85ea1f82ca6932abaf283c9f8f771a9b794ebd4367b4fd3bc9511091658e64633693fad763e523f90a391aa783afc786217314cf1f4c2cdbd8a5f2af4247d7 +EBUILD krita-4.4.3.ebuild 3427 BLAKE2B b02c9502a4ed0989d99d1514fbee3564fed36b6c79f92c6d2d6fc6a9eb8e487f9b718290e03aa230836f6c23a9f783bf52b4bc5e7a8489f4aa8d33e138d7d0ea SHA512 c4d69ca2b75531c84f4769049d2cc3148fec6536f11e51bbbdb8a8f1fa24a140af0a17bc01d70f4d0af13686ddbaee004592c84a4342852481ee2b439180de73 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd diff --git a/media-gfx/krita/krita-4.4.2.ebuild b/media-gfx/krita/krita-4.4.2.ebuild deleted file mode 100644 index f6d505b99712..000000000000 --- a/media-gfx/krita/krita-4.4.2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{7,8,9} ) -KFMIN=5.74.0 -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org python-single-r1 - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" -HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/" - -LICENSE="GPL-3" -SLOT="5" -IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - dev-cpp/eigen:3 - dev-lang/perl - sys-devel/gettext -" -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:= - dev-libs/quazip:0= - $(python_gen_cond_dep ' - dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] - dev-python/sip[${PYTHON_MULTI_USEDEP}] - ') - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-gfx/exiv2:= - media-libs/lcms - media-libs/libpng:0= - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libXi - color-management? ( media-libs/opencolorio ) - fftw? ( sci-libs/fftw:3.0= ) - gif? ( media-libs/giflib ) - gsl? ( sci-libs/gsl:= ) - jpeg? ( virtual/jpeg:0 ) - heif? ( media-libs/libheif:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr - ) - pdf? ( app-text/poppler[qt5] ) - qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) - raw? ( media-libs/libraw:= ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${RDEPEND} - vc? ( >=dev-libs/vc-1.1.0 ) -" - -# bug 630508 -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch - "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch - "${FILESDIR}"/${P}-quazip1.patch -) - -pkg_setup() { - python-single-r1_pkg_setup - ecm_pkg_setup -} - -src_prepare() { - ecm_src_prepare - sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die -} - -src_configure() { - # Prevent sandbox violation from FindPyQt5.py module - # See Gentoo-bug 655918 - addpredict /dev/dri - - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged - $(cmake_use_find_package color-management OCIO) - $(cmake_use_find_package fftw FFTW3) - $(cmake_use_find_package gif GIF) - $(cmake_use_find_package gsl GSL) - $(cmake_use_find_package heif HEIF) - $(cmake_use_find_package jpeg JPEG) - $(cmake_use_find_package openexr OpenEXR) - $(cmake_use_find_package pdf Poppler) - $(cmake_use_find_package qtmedia Qt5Multimedia) - $(cmake_use_find_package raw LibRaw) - $(cmake_use_find_package tiff TIFF) - $(cmake_use_find_package vc Vc) - ) - - ecm_src_configure -} diff --git a/media-gfx/krita/krita-4.4.3.ebuild b/media-gfx/krita/krita-4.4.3.ebuild index 6186e7e98ba1..f96ef5a942f0 100644 --- a/media-gfx/krita/krita-4.4.3.ebuild +++ b/media-gfx/krita/krita-4.4.3.ebuild @@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1 if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" fi DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest index a9438a3be2ee..0bd8f75e45ad 100644 --- a/media-gfx/libimagequant/Manifest +++ b/media-gfx/libimagequant/Manifest @@ -7,5 +7,5 @@ DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de DIST libimagequant-2.15.1.tar.gz 98668 BLAKE2B cfa223f0ce8fdaac5d55b951507c040c064759756a5595719d02c0ec6983a70b08ad9d5df0176adb03269a9a1b7d39e9f0f7da884df214bd7994f4647e08a9c1 SHA512 56bc8b73859908774ce0a218cfbec81bfb8432c02ddce83880990b5f5ac89ac253ae64ecde43a9664aab3ac69d309bb9ef8ba2201be6c93aacb731b3214ff4b8 EBUILD libimagequant-2.12.3.ebuild 1409 BLAKE2B 6a922a5bf768f0736c5aa8b22ae53255e6ea54ff577f66503e954ed2601cb26576f125200c922d940663a69dbc6335f6a4c5d372f0deda449e181a50311eb497 SHA512 2c5fa9f2d558d640adb39f3569a4f3b230210d5e18c0cada7a2bfdd56a3d98680b8d2d286c0aa17c06eb2dbf3c648281d13f887a9174de96a287f76da7907d77 EBUILD libimagequant-2.14.0.ebuild 1240 BLAKE2B e14f9e27f965c6dcb30f1e33e9e849e184a88d1478539f4d9379649f11644a34cf9884a2f85e7f2fbe78d432f1e88fa2cd3342a72b13e3d7bf309e37570ff00b SHA512 20e69a655b9c8b5d9ed787298d1646bc71ae995006cd04ea727219af76a0e4008f31252708e4b5a0e8095100b8593f53015d634f4a942b5f371a410d4982a3fd -EBUILD libimagequant-2.15.1.ebuild 1292 BLAKE2B 1d56a55b0f8d42ab7fae6a9282740299563d09897a9ffadb9f1b15b3e22d4495432331bbc3c7f2ec0966d6d83aace8358029ef1db480bbf74e34a04ec4fd58bd SHA512 923f18cefd479cd53e466911b011916c22c548b53ad8c2358a93d1d15a4fb70377f35ec10df9079bdf21e3d58e17b0040518b88cb227b8496c5bad45d1e76216 +EBUILD libimagequant-2.15.1.ebuild 1285 BLAKE2B e3686f7575503ba137b72041735e83d664c4d30a9816652d5419a5574a0823d6f85d9195c2c3853fadc6e5747d205ac8f72f15fa78f817368f33d07b4d0e9fd1 SHA512 33a4f24738124476d4b8bb395548822b6df58e1af6a436b7ace5d972c7f6dcb513ebad1f7fe8cfaa4898450709be5e2a54b12996cc445149d46f2eeaa16041a8 MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f diff --git a/media-gfx/libimagequant/libimagequant-2.15.1.ebuild b/media-gfx/libimagequant/libimagequant-2.15.1.ebuild index 2eb73642deb8..04a9e7e93cc5 100644 --- a/media-gfx/libimagequant/libimagequant-2.15.1.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.15.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 openmp" PATCHES=( diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest index 8e09f8206e9f..bbcb05afae90 100644 --- a/media-gfx/mcomix/Manifest +++ b/media-gfx/mcomix/Manifest @@ -1,6 +1,6 @@ DIST mcomix-1.3.0_pre20200206.tar.gz 3292571 BLAKE2B ad76316020645495042d27bf831588e628da11077efe29b302a57be4e688558b4db8d3f850200bf4a54b84b428a16a52f88ea5e20be85b628ef3630a5f624643 SHA512 c98d4a7022993af3a5c0b5425df52f14b586549472bcd4576a72039c8c6d4fde31df4255df45ab7467acb0280bda02b92d4803b7f92b7c1c818b58df7b52a3ff DIST mcomix-1.3.0_pre20201123.tar.gz 3888279 BLAKE2B 0bce5d8b3d6e20fc3c422d137963fa8cf506ce969bb5c8062b1db4dcd85d5c1912352fa1eb8c752719b0ac95715486ae47d56e0bf24119f9f55af56f6fbf657c SHA512 24b470e1dca266851bb241f109b39c785443ece36d12a01e579c8a59cb7585ad3978b3696829318f04d4b172cfcf57cf100d76c7c25765260bf26f698d85ba2a EBUILD mcomix-1.3.0_pre20200206.ebuild 1797 BLAKE2B 414154723a7dacda417fe9b2fd5a50d10e5b344a848f3580f833e6a5e7b3db112f93aa0a62d14606f9db6d8891797f36a2763f410d22cef37c912addd50d7325 SHA512 005c5a4ffcade8056c8c2af61359cb319a02ccb63e2514e4becb32345042be1d6e16444d0e688158317753367f78a5e7dfd42b8c40717cb168bf9d0e86738a82 -EBUILD mcomix-1.3.0_pre20201123.ebuild 1743 BLAKE2B 894dc7b39d94993b817408937ff9b833ebbca7fb0fc2cab50ed03c446e768ff57149eb665fb28ff24a1bec2867983ac73eb1fb475d713e665e0c7f83c28cac72 SHA512 a0dbbedeb80a858c730212dcb0acb715e1409fa0170c98718933268b8faa3d2a2895e13db8b1adb45f4e078cdf7dfcac687ec78c8cdc57a66f4b532d85e19837 +EBUILD mcomix-1.3.0_pre20201123.ebuild 1741 BLAKE2B 87e695cfaa001b8dbc0351af3d330a5bc13bf1f7996ec9eb73626f93f01a30a133a7c9bedd6378e9cd420648593ea1a9499e0fe3945efb4440561e0b04c6fe3a SHA512 1d676f12a99bbc54e0c7539cfe263f545d0d678bd7cd57b369264387c39989579e0326c4ef2c124941d122b02bf24c85df2387b01bad1f4f2bd240da1e76df8a EBUILD mcomix-9999.ebuild 1586 BLAKE2B aaf82b982a929793c956cbf20ec77287222c5f8baadc3478da3f174f67be7d0705528c492155ed2ddbfb0250b10e77d07bdf5facaa01672a5b40c177e7e17d24 SHA512 c4b9b32b436bd55ee7f87cea3e29c4ea1968c5d28a6a4ecf7cf36f010e134fc2a11ed5cff43699e28c42bd6870e8652a1154a3b1b2fbb4709b2c2f7499144431 MISC metadata.xml 397 BLAKE2B 35568ccc8d25ece0069a6f8c404ec0a15f6709dbdb13f235c262f70ddab42ef3c3c431ac989c5ccf2c64c924dd22b1d830c8971576ca11f2358050eec98f138a SHA512 72c698bdfa865d64cb9062e7247fcb0b11195a72d19ad83f7295319a665c4b2a36f4f33cf43a84cb03c3308101a0aa4bf0185756c6cc0bb8a14637cefeb33d97 diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild index 068254aaee86..7b7476ac7a62 100644 --- a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild +++ b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/multiSnow/mcomix3/archive/${GIT_PV}.tar.gz -> ${P}.t LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="" DEPEND="${PYTHON_DEPS}" diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest index cd5dd83bb82e..35c519488f6c 100644 --- a/media-gfx/meshlab/Manifest +++ b/media-gfx/meshlab/Manifest @@ -2,5 +2,5 @@ AUX meshlab-2020.12-disable-updates.patch 1005 BLAKE2B 61fe405555be9a1170f0044ad AUX meshlab-2020.12-find-plugins.patch 1117 BLAKE2B 0c17b35288543cc3b84040851f5bfb30977677254a60cb3410c2ef65d10febe648541828a1b16ac6ba4db6ac92cc087a6256923d936ffe2f069edbdb29decd14 SHA512 b57ebd412475f22624b1f211000a020dd00628f2d197ba25942874324a34d6ed14ddcbd28f9819adc523657352ac024f23852ba83d4663e4dce794e0be96340f DIST meshlab-2020.12.tar.gz 111438055 BLAKE2B 4969c1f8f60be6ff55effd710c0bceb290ad6ac01153c233fd6a943f15e86189c04c06aa474ea89899d31b77d6960ffabbda6a12c3107d750469945e0c73c335 SHA512 0a00493f3e622a7bb0b70ddf0e1710376b47bd844aa785782a62f31a46ae1ee4b493c1e4ae0184f51f30be263f84efc0073e266d50748adc10ef229f107e4c87 DIST vcglib-2020.12.tar.gz 6777201 BLAKE2B 9e2e3eb4ae7b930a8a334d58ee4bdadaf43e9a031d523471d17ca39d241c0dd66ec846a360cbcccd53d8728a2c7a6b6fa7d7a3efc04c01515ac3366b10f01aa8 SHA512 d7eec0c9c847e6ade7a3bee9aa1cddbb6855c388b15e2b35889ce998ea9a1c7afb0034ec31c38de3cbc2d867c8d8a474b13e4e2e3218e636926967abe4e54924 -EBUILD meshlab-2020.12-r1.ebuild 1393 BLAKE2B bce6473c47481ac39834727f9c70a47e183f4e8f59cd3b5f12f56e0f20df57d0420eecd87cc3a7fd1168ea9f245e2185c518a0b0d36cd0ee8a9efdf2f51136dd SHA512 5a94983f67bc81b226d3fe8937b8186b7f8a6dd0e1d463abe6327440fefdaf7bff3290b1e8e55b4bb2a67fd515ff7fee4acea49f115bb4a9474ba41f6f50ca6d +EBUILD meshlab-2020.12-r1.ebuild 1392 BLAKE2B db0e1c76e9fc5bd20b9ffd56ccacdb7dfba3cde005ee5212b02fd5a28b64a8df09af71e2709fd501c1ec74ea4f09c5718762d4e5765918d0bd90bc259798d829 SHA512 6e43569a7bebd4059c6eecf82e51d1f945085cabedbf6cd7184469eaeb271b8aee6e34322f73497fa2c727274a894343fd089e9049155742a0991ea905dd7ea6 MISC metadata.xml 996 BLAKE2B 87e7bef17518f533f64493c8eed41dc3c5817ea14cd301945e3efee70712cef35267b39d2d7b0fea41e9f848cf3f140f454e474adee6747b366c843fc62e9455 SHA512 0fe24a2782373ff75e17d359c6db5aafc489f6bb6a3ad079a484e7b32177a4b613f4c8b8bee2bf6480271c7ead24cbcbae4052b6f6ccec8713cd87991e042448 diff --git a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild index f4ed995d10ca..172c5a559c36 100644 --- a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild +++ b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/Meshlab-${PV}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="double-precision -minimal" +IUSE="double-precision minimal" DEPEND=" dev-cpp/eigen:3 diff --git a/media-gfx/netpaint/Manifest b/media-gfx/netpaint/Manifest index 4de1585231c3..fd3a0d1d2cce 100644 --- a/media-gfx/netpaint/Manifest +++ b/media-gfx/netpaint/Manifest @@ -1,3 +1,3 @@ DIST netpaint-1.1.2.tar.gz 427241 BLAKE2B 7884dadf63849bf45caf84bc009da818bdf3277660411c486b32333bf0caf9e0e03ab6f56f77add68456896e4d16520b803c51e19c4dc6b01ef1227f0bd90a28 SHA512 f998714fe176c84074aaa710e2950c83d5c3ac0819e69c6bbbd93e19f6415a66f8ef21e0799d3112a7c468c1a99383a878ac1837157b079089aaf072c664ee53 -EBUILD netpaint-1.1.2.ebuild 754 BLAKE2B 6433dc275f00e39aec82eca919ee18017866ef8c3f88d2fdd37d18d541160b622ca5c806890389a91dd37f8c849578c68b7fbbf409b00f207966bd4cbaed2dc3 SHA512 e04daba523c73455f5a3c94edd49c05f5b08411aa61f469812cd8a3a67eeb8e8c3f65f0a311bf9d1d02fed1c01d8f11b3ec79226d162cf923b4976fba903d166 +EBUILD netpaint-1.1.2.ebuild 711 BLAKE2B 7e4a5c5456c2124a8aa9738515711007a2a6ba9fce33afebccb5eac76aba85622067b575453a60ea576ded2f94c287640c80f8b11640b74f1329b8d334082f2e SHA512 83c1f6670c2a7f39ec7820421e7d78f56b4a884f1df1bbf03ffe29a2b2acb2dd1a412af1a183f1fa554d27077f405a8c74069c269e874b7234bff57358aa87ca MISC metadata.xml 413 BLAKE2B 0376b5f01922a8bd36d48d3525c9fdd1659ff1a936a7fda8fe0af3ce7ff669b603d80e560bb02bf690cf77f5fc6ddd830c1cf4d76942fee38e6fa3e6c539c861 SHA512 88efad0cf6e816ef512ca7d821cba3bcfdb3c81f2e54d26458a139a876631703f2a147077b077ab7c1dca74fd05a58a8b003db14625175bd3fb9e9545f6c103b diff --git a/media-gfx/netpaint/netpaint-1.1.2.ebuild b/media-gfx/netpaint/netpaint-1.1.2.ebuild index 46c0f02e9d4d..e44b6241f74d 100644 --- a/media-gfx/netpaint/netpaint-1.1.2.ebuild +++ b/media-gfx/netpaint/netpaint-1.1.2.ebuild @@ -1,32 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit distutils-r1 +MY_PN="NetPaint" +MY_P="${MY_PN}-${PV}" + DESCRIPTION="curses-based drawing tool" HOMEPAGE="https://github.com/SyntheticDreams/NetPaint" SRC_URI="https://github.com/SyntheticDreams/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -MY_PN="NetPaint" -MY_P="${MY_PN}-${PV}" - RDEPEND=" dev-python/urwid[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}]" - -DEPEND=" - ${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_P}" +DEPEND="${RDEPEND}" src_prepare() { default diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index eeeeaf05c4e2..c49431777234 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -2,6 +2,8 @@ AUX openvdb-7.1.0-0001-Fix-multilib-header-source.patch 2825 BLAKE2B 089bc79bbb8 AUX openvdb-7.1.0-0002-Fix-doc-install-dir.patch 1014 BLAKE2B 380c26e69da18479266201fd1233d19f3c39b13ee67d11cadca5bba900c470218a7563590f12a400a1f954155bfdfacc00862511ef05f3a61a54679924c57cae SHA512 21d4abf1cae31dfa8e59b6648a7c40f6f5f9572bdb87e6410144b427244ede488e059bf572344efc4e4cea91e7fb59b56364a7df6041f717db759002d09e8ee7 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad +DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2 SHA512 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2 EBUILD openvdb-7.0.0-r1.ebuild 2805 BLAKE2B 077df7ddf81711bafc1021cd9255fa7e8413fd2d97c3a824f11145b1faafa5f6d2bb2c1e3731a6ed993b1a0b0603feed02a4d801c9d162a2fb2e53942549f3eb SHA512 a8917f92a8cd316a3dc49c784707ba63692251141aad32821465e5d46b8033c00906e426a54adba9402a56d946ebe8cbb5522625239c35cc16e0d2d7cde3338f EBUILD openvdb-7.1.0-r1.ebuild 2735 BLAKE2B 0e9347c59b0f1404db23e63635a4c3fdda3be0d34bda329de8b65507a3037692206a3d0573984bee7a9f937d5c9f425decd94b00214001e8792317af45f39b1b SHA512 2ce5ea094c66437efdd17279a3a2740cfab364775cede0986e9a65e35871cf90cb443c354b6590f82153b2d4acaadb0bfb44f8b2a72b632be64640e5094d7a15 -MISC metadata.xml 1406 BLAKE2B 0b9cf9b01f0728bca3f886372a83d983b8ce8aa6612109bf8422a4f21aeb87e6657751388597d74d1d54a57efdf7c9a97b386042f3b988e219cd59c157cf0f52 SHA512 2333d91681f215927b2b2680879066712b285b845e6fcf509681ada38a0212e37190bb06af2d53f419749d9afa89286b2690f03bf2ae662fd7e163bd9f98bd23 +EBUILD openvdb-8.0.1.ebuild 2769 BLAKE2B db8c781c1d61337e9669c7ab245abfdd926f22c0605d4cbfddc95b826d705ceb4bf7590d0fe658c8b0a099b46b05d5eb1f49b594bd35aa1f6b61da5aa56808e9 SHA512 6ae5eb57763fdd15f3ce6d527785305cb1d69f359eb5f6ac8ebcbcaddeec9c4bc00ed10c6b82f0e22458135220a335b5c9743d3ec55f988bdc69108e1e0fc3c6 +MISC metadata.xml 1548 BLAKE2B f6a9752e3535febae4a9aeddc13b036fe8f964b02371060389edf83ce25932e36a53856eea891dbf9734ffab5e3eff9ad10d31a592ddc5b7816375179e0cbd1f SHA512 77036fce5e1217d4d47547fa925006b4a605d43d4473fe8cebc7d768c5770d8faf25a2e2fe46498cbf53071bf67e2d99286a8f59d5a8d389b2a8cd14b98341fc diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml index 4690483cd9cb..b1f9b292a3e3 100644 --- a/media-gfx/openvdb/metadata.xml +++ b/media-gfx/openvdb/metadata.xml @@ -27,6 +27,9 @@ Disables newer features to maintain compatibility with ABI7. + + Disables newer features to maintain compatibility with ABI8. + Build utility binaries diff --git a/media-gfx/openvdb/openvdb-8.0.1.ebuild b/media-gfx/openvdb/openvdb-8.0.1.ebuild new file mode 100644 index 000000000000..11350d22c911 --- /dev/null +++ b/media-gfx/openvdb/openvdb-8.0.1.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit cmake flag-o-matic python-single-r1 + +DESCRIPTION="Library for the efficient manipulation of volumetric data" +HOMEPAGE="https://www.openvdb.org" +SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat abi7-compat +abi8-compat" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + numpy? ( python ) + ^^ ( abi6-compat abi7-compat abi8-compat ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + dev-cpp/tbb + dev-libs/boost:= + dev-libs/c-blosc:= + dev-libs/jemalloc:= + dev-libs/log4cplus:= + media-libs/glfw + media-libs/glu + media-libs/ilmbase:= + media-libs/openexr:= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}] + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + ') + ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + >=dev-util/cmake-3.16.2-r1 + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + test? ( dev-util/cppunit dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + local version + if use abi6-compat; then + version=6 + elif use abi7-compat; then + version=7 + elif use abi8-compat; then + version=8 + else + die "Openvdb abi version is not compatible" + fi + + local mycmakeargs=( + -DCHOST="${CHOST}" + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/" + -DOPENVDB_ABI_VERSION_NUMBER="${version}" + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_BUILD_VDB_LOD=$(usex !utils) + -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils) + -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils) + -DOPENVDB_CORE_SHARED=ON + -DOPENVDB_CORE_STATIC=$(usex static-libs) + -DOPENVDB_ENABLE_RPATH=OFF + -DUSE_CCACHE=OFF + -DUSE_COLORED_OUTPUT=ON + -DUSE_EXR=ON + -DUSE_LOG4CPLUS=ON + ) + + if use python; then + mycmakeargs+=( + -DOPENVDB_BUILD_PYTHON_MODULE=ON + -DUSE_NUMPY=$(usex numpy) + -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" + -DPython_EXECUTABLE="${PYTHON}" + ) + fi + + if use cpu_flags_x86_avx; then + mycmakeargs+=( -DOPENVDB_SIMD=AVX ) + elif use cpu_flags_x86_sse4_2; then + mycmakeargs+=( -DOPENVDB_SIMD=SSE42 ) + fi + + cmake_src_configure +} diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest index f8de6d8cfaa1..4dfed8c92cd4 100644 --- a/media-gfx/optipng/Manifest +++ b/media-gfx/optipng/Manifest @@ -1,3 +1,3 @@ DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280 -EBUILD optipng-0.7.7-r1.ebuild 1271 BLAKE2B b6de3c8946621ad6a2bbeceeebf9162c63e65eb8689d6312447938efe8c025c56be5de8e518891c4a59c883aa6b4c71487d3eb29bfd821db3a239ef6c5b8d2e4 SHA512 d20427ac00acab76579f96fd120b0b27c7563949697effb6a61e891fb4e817fcd4a2d1dbec43bb2399f29e60f05b7363c3c7b1afd70b8aa3a541df3e6da9ef4a +EBUILD optipng-0.7.7-r1.ebuild 1278 BLAKE2B 8184e9134a33312c8a34c0b3721989621814dff830ed41f421bb210b455fcbdbeb023076a849e11134403d6c32ed34e8fb62a917c9ad6dbb14b7cfd8accbd2e4 SHA512 2a7bc057d63d8a671af37eafdd6b2f17901f7bd8c2832458e5099d0e0ea5ddd4350fdc4cf8911d12def49b6e6fc45add0ca080984de899cc2560b12d3bf056e0 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb diff --git a/media-gfx/optipng/optipng-0.7.7-r1.ebuild b/media-gfx/optipng/optipng-0.7.7-r1.ebuild index 7891be669fa5..a652f6e79224 100644 --- a/media-gfx/optipng/optipng-0.7.7-r1.ebuild +++ b/media-gfx/optipng/optipng-0.7.7-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="" RDEPEND="sys-libs/zlib diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest index fd7357b95c9e..18e12111b728 100644 --- a/media-gfx/plantuml/Manifest +++ b/media-gfx/plantuml/Manifest @@ -1,5 +1,3 @@ -DIST plantuml-1.2020.0.tar.gz 4552164 BLAKE2B c78da31cffbeb0cf1a8852e53d07126c9b0dc80bf12f36f1039c806651c6802dd63456610307836207158bc871c4e2a8d9cf12a80bafa9dbde3b2be29b02f2e8 SHA512 1c3a7f735a197e5fd044547a6c48f21c2ee774d553d3de82d4931b2684a56dc4ef8af5f524e6aa4eebcb16f214620f6c99c038101d6703f03642a5b94f124fa8 DIST plantuml-1.2021.5.tar.gz 4632326 BLAKE2B 356830c8e8be3866fc8f7512d2fe07656cc21a01c6bad2dd5a01f990cc34e234be213a4402743359f528a2f018b2fa990addc25dbce9e096ccc34551d25d82e4 SHA512 b8d9868a05d79fe75671190a3a7f51a9ff018e5c659bd1144c02d5c860f96fb2a067cb802d40c2d0db7cb2268b291efc49337280154b8a43563696735be1caeb -EBUILD plantuml-1.2020.0.ebuild 753 BLAKE2B 8f364621800c0eec170569351134912dfb9a1f9f9d1bc4ee80f520f0f57c0361ebaef3e28c900770489d95e282b9ec756f8d7b16e0899e5b3d6273a586898945 SHA512 637ea579deef346114c2c60f80c263496f8e28168e3010861f3e3faf58a15234dc17911973251c19450b70851169f592df3211fa100f6c4ec6401d2fa71252ec -EBUILD plantuml-1.2021.5.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7 +EBUILD plantuml-1.2021.5.ebuild 750 BLAKE2B c6f294d0ebcea2df17681fa103506693d6698b7ab87befaeafd5a67a351faedbaa4241cfbd1a38ef1b42d55bb34d20d09dfda65b18890a32669c868262b1f301 SHA512 5986d587915b3c0d5bf8733311848c78d0c0203a8e4b7d0f9281a7c2717f4275fb3311faad5625c53607fddbf2b8b74b7e5c3368450e6de207f2e07438801aa2 MISC metadata.xml 821 BLAKE2B dd2177671848872c7a33108b012327639d40e2664ae85619bd94810e99a385dfa39111a95922a59e451ee4be7c9eebdc288934ef7a79ef33ce0683c09c13cb51 SHA512 8b2400bb96cbac0403ef0865bdb3d72a00dfad45f1c3807ca1a1ba0d98aa3f7777bc8d65089d82c6132ffb75a7395312b374ffaa88f67866512978be1eae9b98 diff --git a/media-gfx/plantuml/plantuml-1.2020.0.ebuild b/media-gfx/plantuml/plantuml-1.2020.0.ebuild deleted file mode 100644 index 2e0af1c75a78..000000000000 --- a/media-gfx/plantuml/plantuml-1.2020.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="source" -inherit java-pkg-2 java-ant-2 desktop xdg - -DESCRIPTION="Draw UML diagrams using a simple and human readable text description" -HOMEPAGE="https://plantuml.com" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~x86" - -DEPEND=">=virtual/jdk-1.8" - -RDEPEND=">=virtual/jre-1.8 - dev-java/ant-core:0 - >=media-gfx/graphviz-2.26.3" - -EANT_BUILD_TARGET="dist" -EANT_GENTOO_CLASSPATH="ant-core" -JAVA_ANT_REWRITE_CLASSPATH="true" - -src_install() { - java-pkg_dojar ${PN}.jar - java-pkg_dolauncher ${PN} --jar ${PN}.jar - use source && java-pkg_dosrc src/* - - make_desktop_entry plantuml PlantUML -} diff --git a/media-gfx/plantuml/plantuml-1.2021.5.ebuild b/media-gfx/plantuml/plantuml-1.2021.5.ebuild index 6ff07a08c731..2293ae97609b 100644 --- a/media-gfx/plantuml/plantuml-1.2021.5.ebuild +++ b/media-gfx/plantuml/plantuml-1.2021.5.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DEPEND=">=virtual/jdk-1.8:*" diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index da77ca5c7bf0..93b76e674b4e 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,4 +1,7 @@ AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27 +AUX prusaslicer-2.3.1-gcc11-missing-include.patch 740 BLAKE2B 162981c4ddf74bf55f27adebc8603892da97e60eecc085649d508abf06731969643d0a043e275f8978318b9e2c2603557e03529f8017030da4503a71f5c60171 SHA512 bb7067b20ad07ca4aaa5a20583e8399d61f4e7ca2e9a04fda7bd8929e0b51aa908bfe7a546e82f1d688f2853d14f3c961c65296608aa2e14ccfa6c5e4d8f6a19 DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7 SHA512 2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d +DIST prusaslicer-2.3.1.tar.gz 39583385 BLAKE2B 0d0fa11d21ec3cc0decb2708a1b1866bbe0ec5719236433ef87807541ada8abc67091f219392a1ae21b4f35c3821dde94bfd6dac72ec6617c40b7fda05cfc082 SHA512 2722ee9d5331fe03423ce179cec68196320b48c65bd3c6795b93469268956fb309609462cc62bf3e2b4f30d2fe720d0a28a16c010993737c045d82956493a1e3 EBUILD prusaslicer-2.3.0.ebuild 1812 BLAKE2B 1d34a7cd0dd5fcb40dce9d8fcab86d8b643722a8ebe4810ce0b83172304d2a8aaaea76ed8a6077ed30dab134152294ff42b54476b401b5482691beb41bc8aeb8 SHA512 df62be529a5b69d88e44ac219e6a5e9a51738509f4946397aa7771a29a544aeb9bca84213525c5f6540de3649f5742ce759d2d5303783b2e9f7a70e7f6921997 -MISC metadata.xml 964 BLAKE2B fd4b95e2725a37291f9d7f39aaf75d34068789960c27d6180e809c33b9624507dc5abdb16d125eee88acffbdb424bb949751a86da6475747ef658913b0f6dc44 SHA512 27a581c15d36f0514183f663a645198feed74856c8a9eef7dc8d7c7f460bbaa89f5a5e7c4b8884d400346baffcde66b8f9552d4204f17b7ac905e9f06100b762 +EBUILD prusaslicer-2.3.1.ebuild 1874 BLAKE2B cc4ad8722898304d4ae600bcea5b2b9475da8b551bc2128a28e60782fc43d5f097cb068a12cbfef32066ecdaf1bfff75c0b5b2bce515c328c8e03101904439d4 SHA512 dfddeb8cb85d2deb6c4726ba1b7b4a10b9ee4bedd3846eaf8d5bca52b08f91aaf49481c728af6b9ae6b4c622bba67fb9cb3479a32c34492d249cc3c29f64af09 +MISC metadata.xml 1027 BLAKE2B 8a247ceabac85b67484df3c9853225f1cb7d1dcff13c2069a4d37578a741f3cb0d4c181d05eb910147a79e969f3042eeb7de9dec03a9a8f69ffe9e5975c55656 SHA512 e9d281340a7aeeb0e5f0e8fef26e71a1abaac2033322a3e0a778d0852dc0aa8ea01bd34dba653c5f143a8259ce36ad968f9969d57c86ee3546f8c3c37802bf51 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch b/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch new file mode 100644 index 000000000000..6480277bde64 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch @@ -0,0 +1,24 @@ +https://github.com/prusa3d/PrusaSlicer/commit/62592ca +https://bugs.gentoo.org/788196 + +From 62592cab48cfb6a20d84041b1992aecc6a2b659c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= +Date: Sat, 1 May 2021 22:33:59 +0200 +Subject: [PATCH] Added missing include (GCC 11.1) + +--- + src/libslic3r/Optimize/Optimizer.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libslic3r/Optimize/Optimizer.hpp b/src/libslic3r/Optimize/Optimizer.hpp +index 05191eba26..8ae55c61c5 100644 +--- a/src/libslic3r/Optimize/Optimizer.hpp ++++ b/src/libslic3r/Optimize/Optimizer.hpp +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + namespace Slic3r { namespace opt { + diff --git a/media-gfx/prusaslicer/metadata.xml b/media-gfx/prusaslicer/metadata.xml index dd17dbe10ea6..32e35320f53f 100644 --- a/media-gfx/prusaslicer/metadata.xml +++ b/media-gfx/prusaslicer/metadata.xml @@ -16,6 +16,7 @@ https://github.com/prusa3d/PrusaSlicer/issues https://help.prusa3d.com/en/article/general-info_1910 + cpe:/a:prusa3d:prusaslicer prusa3d/PrusaSlicer diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild new file mode 100644 index 000000000000..cc29c97ae4a3 --- /dev/null +++ b/media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" + +inherit xdg cmake desktop wxwidgets + +MY_PN="PrusaSlicer" + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://www.prusa3d.com/prusaslicer/" +SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gui test" + +# tests fail to link with USE=-gui, bug #760096 +REQUIRED_USE="test? ( gui )" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-cpp/eigen:3 + dev-cpp/tbb + >=dev-libs/boost-1.73.0:=[nls,threads] + dev-libs/cereal + dev-libs/expat + dev-libs/gmp:= + >=dev-libs/miniz-2.1.0-r2 + dev-libs/mpfr:= + >=media-gfx/openvdb-5.0.0 + media-libs/ilmbase:= + media-libs/libpng:0= + media-libs/qhull:= + sci-libs/libigl + sci-libs/nlopt + >=sci-mathematics/cgal-5.0:= + sys-apps/dbus + sys-libs/zlib:= + gui? ( + dev-libs/glib:2 + media-libs/glew:0= + net-misc/curl + virtual/glu + virtual/opengl + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + ) +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] +" + +S="${WORKDIR}/${MY_PN}-version_${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.0-miniz-zip-header.patch" + "${FILESDIR}/${PN}-2.3.1-gcc11-missing-include.patch" +) + +src_configure() { + use gui && setup-wxwidgets + + local mycmakeargs=( + -DSLIC3R_BUILD_TESTS=$(usex test) + -DSLIC3R_FHS=ON + -DSLIC3R_GTK=3 + -DSLIC3R_GUI=$(usex gui) + -DSLIC3R_PCH=OFF + -DSLIC3R_WX_STABLE=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use gui; then + newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png + newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png + domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop + fi +} diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest index 802f2ef8a546..bb4deb781e64 100644 --- a/media-gfx/ristretto/Manifest +++ b/media-gfx/ristretto/Manifest @@ -1,3 +1,5 @@ DIST ristretto-0.10.0.tar.bz2 586447 BLAKE2B 73e4be551879d58e0c43b7a039b3173e96df8a7c367bb1696dd27a6b20fc675465e6a78019e11498f0dc55286b605c7ab9545dd7d13e2607bc0fc05527947568 SHA512 1727025bbc056a71475d91505cc141661b011c3944cf4ca4d96b48a9ad7e1b28b8f4b0c856fa789cd2c877c1faa27aa57441e35e06f38fd2b81ddcd3284dc2b6 +DIST ristretto-0.11.0.tar.bz2 589169 BLAKE2B f1a0a28e7fdf83f05fc3b0a99f0c4ac0e48d07af3f9ff46f849e3768ce7b7978873cef8d028a74f5eff806cc0305d36c57e7ace99d56b61cc7acb3645e501161 SHA512 d38e3c488f106f5a060478e08fbba75fd0420fe1d1af40383118c9674f8acc079da6efdae4f41366d4cc8f34dce61e8eba89342e56747e697fd9c89b2689267f EBUILD ristretto-0.10.0.ebuild 874 BLAKE2B e07b94b57833859413826556f0b18150b2fada428c24b6fa33a57c1f0b4188bd2bc29ec1a3b2ead30d5b9c68192b4d29f62c11582e94322dcf8d0d5be8e40f92 SHA512 9d8917e11a0d27ba3f975c007b6e8661ce5cd2727b82990b80436495d34209df5d0e7f47581d1f53493524fd3898592f5322f829a4a634d0fe4b1c269acfcb1a +EBUILD ristretto-0.11.0.ebuild 876 BLAKE2B e9a409488993ec8a2e8487013426c8009c4cab7e616f6ab969140d507ab56a7aa4fe02f1f122a8980d984bf36cabb4cc65d148e9c32c89fd34667421f709428b SHA512 2c5596d7b95c1ffb449814aff4887c321185b2d0c4ac7839be97e18fbef2108411fbf37257220698792259eca685d9754cbe9f22e6bf59623c567e85d1b902ca MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203 diff --git a/media-gfx/ristretto/ristretto-0.11.0.ebuild b/media-gfx/ristretto/ristretto-0.11.0.ebuild new file mode 100644 index 000000000000..ada9033aca5e --- /dev/null +++ b/media-gfx/ristretto/ristretto-0.11.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xdg-utils + +DESCRIPTION="A fast and lightweight picture viewer for Xfce" +HOMEPAGE="https://docs.xfce.org/apps/ristretto/start" +SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=">=dev-libs/glib-2.42:2 + media-libs/libexif:0= + sys-apps/file + x11-libs/cairo:0 + >=x11-libs/gtk+-3.22:3 + x11-libs/libX11:0= + >=xfce-base/libxfce4ui-4.10:0= + >=xfce-base/libxfce4util-4.10:0= + >=xfce-base/xfconf-4.12.1:0=" +DEPEND="${RDEPEND} + dev-util/intltool + virtual/pkgconfig + sys-devel/gettext" + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest index b5c776dcb635..154d70d2da8b 100644 --- a/media-gfx/slic3r/Manifest +++ b/media-gfx/slic3r/Manifest @@ -8,4 +8,4 @@ DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a64115321 EBUILD slic3r-1.3.0-r3.ebuild 2741 BLAKE2B be0b9946dfcefc79bd0ead2db2dc7d684a81cb1f6c5af82f57347006a2f155cdb9276eff6e47b16bbfea8c0a64d6c89455f39faa010686393df211bf9569a6e9 SHA512 b0f97a438154a387d8e0d6245328abd9e3cce85ea6f80ff2c41b9a22d77c9345e023ab44b8bf521ed223b6c201481f52d9130b4abb37938af46456c4061a1fb1 EBUILD slic3r-1.3.1_pre20200824.ebuild 2777 BLAKE2B 15ef5c7e7a21769ce90e52953536673e3658acdb9674d504c35ca42732b44688c23ee44ac7c845d6b73a7aa52f6fe23363bf6cd25d2a5f2193586ea3dd12e928 SHA512 b7d0ca2b4f9c449088240f332d95125288a73dc3a0ab591ecf476c0d3cec1d2378f0ec5c1e27fb628ff616fe0895d9ec2dc586a82afe37dcb9cd19a293648b68 EBUILD slic3r-9999.ebuild 2688 BLAKE2B 4b9af5d0085ba6d6632ede733a6fade66dff9d50c4230762c56920cf1c226a3962d6c33432cece0e26d65fdff9764c7255dbabaf98bd0d09cc0dd2bef6385534 SHA512 b871d0d53023b9e6c5caaedea1c121063da47f4cb9fccab328af6e40deefc36c52057dd803ce7aed7846ca61504dab8be8b341fad1a8332467e1a2c387bdf3e2 -MISC metadata.xml 910 BLAKE2B 037c38babeaf484e00175fa577897939965d4b0c9246ae43cea6099eb9c80c64b150b58598bd4d9b6b4cea3c3d660d50d75a83a4dcc75c23bc52619ea42d2e35 SHA512 60ddcbb15c781478becc5779ff884d92b735d87b7c97f8305641b3a98db3f07a35d02c86c2b1e032fd05fa351a6f343e7c4f09aff31c5d2844bf34930dbcc316 +MISC metadata.xml 976 BLAKE2B 5283df869a4c21b2d99b78aa43aff2f273d868989749952b0a9302396eca8d2677cca72bcb877afb9b2b7a9f02d8b7f723ae7a8ed209ff734555a76f2b43c296 SHA512 4b241f369f20a6af6496784a3e0a5b5885476d213758615bac8a960bb18e92a4383bb3d5e9edd4863edf2061b0c85ec7a9b4e7f58a1c3ebc226c4ee5d5179c76 diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml index f2a29f739d2e..45df234a6cdb 100644 --- a/media-gfx/slic3r/metadata.xml +++ b/media-gfx/slic3r/metadata.xml @@ -15,6 +15,7 @@ https://github.com/slic3r/Slic3r/issues https://manual.slic3r.org/ + cpe:/a:slic3r:libslic3r slic3r/Slic3r diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest index aead3c5e5148..62c2ae13bf76 100644 --- a/media-gfx/solvespace/Manifest +++ b/media-gfx/solvespace/Manifest @@ -1,4 +1,5 @@ +AUX solvespace-2.3-gcc11-missing-limits-inc.patch 490 BLAKE2B f06ccd75f0973a782c01fa3f4c61c0fa8512471ee9f04140040ebf7552424c0a67d602b39a72449cb00ee7019bd6f47f8c25b7d27cf098e8c6670ec18105a3c2 SHA512 d56d529956ec37f4e84924b570cc90082f7d806ddb35297ad8e9854a50b19e15ab5d62e9a18cfdcfef2f90ca6ac669b96ee32be265a9fba79f3cfc34e186bf78 DIST libdxfrw-0.6.3-87ff1082f49b1286a033ac8f38fe8dde0975bb8b.tar.gz 691867 BLAKE2B bd3414930efe8cc1185a20f889dda3ec8ea46e40d3a1a4c24975683fc444161acdff576a1f40c34203e523e88bacf3841c50928340e7865650a113e65375f930 SHA512 0f8e2561887fbc5101787f0d7818328864b5c4a679ef539fcdbda8c124ab4a808663f9ba645d397f154596eab1eb7c6f0bdf3883bf6975392863e01bada3a1f0 DIST solvespace-2.3.tar.gz 2115940 BLAKE2B 67e2d81e0a609d0344a6f28d33a78609b01c7105785f93aa1124f0592fe0e31d4846e6dd406339b2ef2c5f3961f91302a73c5391fe2e0f435e78c3a97ed67612 SHA512 9d22e467337591cd9a4935124d18733b8337f5785ab5738f4a94300f283ffe7d313569e379ae77e509d14182ffde8c9db7beaebb46ea7c0507c6b05010fe1a56 -EBUILD solvespace-2.3.ebuild 1561 BLAKE2B 0e50f33d7fa511cacdc39bee095e87627afa0f981638fb83fd4e938576f7339536fa9ca7b8cd722327f40376cf269aadd64c939ab755e272dc760e3964f8115e SHA512 3b6801f393df905510f5e5b967a05c825219e2fce973787e46fe9a2af87931ecea38e412d3690ab601225180413b3bda63aa0156d4bad698f5c749106b0eb476 +EBUILD solvespace-2.3.ebuild 1628 BLAKE2B 2763c9e29f727a538d7a3260579002e9ec9f572722c325e474a8404781173b31f69268f886d146d658ebcc62a2ce54e2cc6e35b03eec45e74c200c97ee6901f2 SHA512 57c8916c7a47cba610c7d31f94bce30e399945246c663f9341bf0bd6649488f631676b900f6ea5ab64643a4860d682166f369c52aa91e9f4a0f0901e95f63c18 MISC metadata.xml 1285 BLAKE2B 334458d57d900cc6ceff7f5f45452eed1a501ca0b4349f6b12a9b3ffcead7e82ba7af35e5afaf262858f95deaafce6d011f6e94e8848a5d9a82ada0699643d11 SHA512 eabafc95662dfc2f842ed84b909fcb547630ddb5cbcb3fca12cc73a3eaa120e6292c105c7aff7a7d32fc2582161f39b11070122cd83f9296d211f02e389ad4e1 diff --git a/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch b/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch new file mode 100644 index 000000000000..ecf02fc5c01e --- /dev/null +++ b/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/790776 +--- a/src/exportvector.cpp ++++ b/src/exportvector.cpp +@@ -4,6 +4,7 @@ + // Copyright 2008-2013 Jonathan Westhues. + //----------------------------------------------------------------------------- + #include ++#include + #include "solvespace.h" + + VectorFileWriter::~VectorFileWriter() { +--- a/src/importdxf.cpp ++++ b/src/importdxf.cpp +@@ -1,3 +1,5 @@ ++#include ++ + #include "solvespace.h" + #include "libdxfrw.h" + #include "libdwgr.h" diff --git a/media-gfx/solvespace/solvespace-2.3.ebuild b/media-gfx/solvespace/solvespace-2.3.ebuild index ca5fc5249b9e..25975546f2b6 100644 --- a/media-gfx/solvespace/solvespace-2.3.ebuild +++ b/media-gfx/solvespace/solvespace-2.3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 + DXFRW_COMMIT="87ff1082f49b1286a033ac8f38fe8dde0975bb8b" DXFRW_PV="0.6.3" DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}" @@ -31,6 +32,10 @@ DEPEND="${RDEPEND} # NOTE: please keep commit hash actually when version up GIT_COMMIT_HASH="4d1e1341d926ac356b295d5cc3d61c7a6cd7d07d" +PATCHES=( + "${FILESDIR}"/${PN}-2.3-gcc11-missing-limits-inc.patch +) + src_prepare() { rm -r "extlib/libdxfrw" || die "rm extlib/libdxfrw failed" mv "${WORKDIR}/libdxfrw-${DXFRW_COMMIT}" "extlib/libdxfrw" || die "move libdxfrw-${DXFRW_COMMIT} failed" diff --git a/media-gfx/tintii/Manifest b/media-gfx/tintii/Manifest index a9e6025092d7..87d612bdb591 100644 --- a/media-gfx/tintii/Manifest +++ b/media-gfx/tintii/Manifest @@ -1,3 +1,3 @@ DIST tintii-2.10.0.tar.gz 620863 BLAKE2B 61127bfe1ce1eca87cea7fcd5cc6ef95c445ad0cdf32fd2d752a27818df8132ee0d7e6eab355c37ff3535be416a79b34652e8a28d8f93e0bd523a15396f6a4cd SHA512 884a9a3393080ee064069288afc13b2f72272571efaabf013ea2029627fc2ed922dcb791b8316c1d2117faf553d6bf333cf35f0486ba82aa2dc0987f9ce5f9a3 -EBUILD tintii-2.10.0-r1.ebuild 561 BLAKE2B ced5199db24463364ec48ebe2eb205cf7311e4a61036fea450f40dde443b19bf366cd860ded5511131bb12868082b958d9d9ce5771f8a17b3dd78adfd8529993 SHA512 ed3b7fb7fd039463cfb04e579a29e3752882a0fdfd70fe9a49cb10a9fc944fb9bef3c7775c2cc84e6f10a93da8fb070c8b9f2af0fdbaaa89e1e558a9f6e8142a +EBUILD tintii-2.10.0-r1.ebuild 555 BLAKE2B de7a9038871008016e49efb5d65c9f212232a5a31c25c96a2480530827d4f9c9b7a7be61f0b7919d0cee4224ab7011c700c349108ba5e9e82c5362c8b6e0cf83 SHA512 95d88eaf7d18690444ba482f509fa949f769e8b81d20c12117cc5ddc3746efb424ca409801ff60f68680a041136f093ff0197f658341573b3dcf95d6d10487f7 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-gfx/tintii/tintii-2.10.0-r1.ebuild b/media-gfx/tintii/tintii-2.10.0-r1.ebuild index b9a5dd6fbb4f..fdaaaed69261 100644 --- a/media-gfx/tintii/tintii-2.10.0-r1.ebuild +++ b/media-gfx/tintii/tintii-2.10.0-r1.ebuild @@ -4,13 +4,13 @@ EAPI=7 WX_GTK_VER="3.0-gtk3" -inherit desktop wxwidgets +inherit wxwidgets DESCRIPTION="Photo editor for selective color, saturation, and hue shift adjustments" -HOMEPAGE="https://www.indii.org/software/tintii" +HOMEPAGE="https://www.indii.org/software/tintii/" SRC_URI="https://www.indii.org/files/tint/releases/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest index e74512568593..d14ee0695807 100644 --- a/media-gfx/waifu2x-ncnn-vulkan/Manifest +++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest @@ -1,5 +1,3 @@ -DIST waifu2x-ncnn-vulkan-20210210.tar.gz 34076481 BLAKE2B 821b59d5e681caf4bbdeb0e3576a6df0e257a0f8fdc68c3f4152c5f35cb2d288245051dce874e009af6556b4c7e4fffe1fa261872baf2493e056a78c847acc0d SHA512 56ed4dfda71054f3ebfd6c4c11bcb9351a676ace8405cdc309bd16d18eb65ad0fd230fb943a0ba1dcb3afdb517e7f86bf6df2eadff6e754d296304135cd885be DIST waifu2x-ncnn-vulkan-20210521.tar.gz 34076523 BLAKE2B d04c3ac1152be899292730fe06f317c92f1334ea3f91cc6208444574c271d401152b4432bf5293f7193f0c318ca1685145754dd78ad0a8523aefa0fd56d40b4a SHA512 b1a0202a94deb9faadda34c5d46bceabec7ee00960676ca98090af4101bb63648fdc266cc608bfc621a3ec65c8c5f9503a02a4db4e51e9b2048d574c7a7f368a -EBUILD waifu2x-ncnn-vulkan-20210210.ebuild 1045 BLAKE2B 6a82c95e27af54e06e38adc6616612f276a12a2510516c2a166b95872f63a0b33e4a764bb0293184bb87b9c14f9d6570ce321a090266037b35f7c13ec990bd55 SHA512 d18ebedcdd5ef779c75ac2281b3f787309b74710d38c3d36da3e723bcc22243b216a3fa63fefc760b12a5d70c191511302e919aa8e513f88ae7eae1121358ab4 EBUILD waifu2x-ncnn-vulkan-20210521.ebuild 1107 BLAKE2B 83be2724db19d19ae98b403949d38573e825234a74e8709d4deecbebdbfbe2b002af5eb1a9bbae57ebe959e2294eac4810ad908d417f4523fabb456e1e73cf33 SHA512 06521bb7ab249d3bed620343d34b7a869b2dc8b8e847c577bc66d3a7d2aa28e359efe3c9defec17d9b3c4d282ef3975eb3125c64a8ba32b63b7d25f3d1ec6720 -MISC metadata.xml 464 BLAKE2B ac1978d9a9aa3202c24dedf74bc70aa2956396c89da177c2d63bc3f8f0cbb50fa74a991c887bf5cdc75733bd7d3ffdc0ee4d96fffadae2e9f657d3799c05af7a SHA512 278b4b063cedc5d27b208bb055e54bd2261e0265c09b6046b25af1c448e9b60eef925889986aad5bb1c7c9670ea9eb82652c249f6d585bd29502565e2943f177 +MISC metadata.xml 448 BLAKE2B 1806525ae730f661d7adff958504dbd5f8ada9c153c1c607251630f11a6e320240ea6bddcfbcb43f31ad83a6ba08ebed408656bbb564da3770d0bd8004354753 SHA512 5de45877898f4b8395de7335a357fb0deba41d7fb79d9372285f6a72c62d7d6568dd784917db612d7ff2d44583675a3a8ca32de4be9824c0dc9b5b21a4c36e27 diff --git a/media-gfx/waifu2x-ncnn-vulkan/metadata.xml b/media-gfx/waifu2x-ncnn-vulkan/metadata.xml index 6dafc8f991c6..b7e254c8768e 100644 --- a/media-gfx/waifu2x-ncnn-vulkan/metadata.xml +++ b/media-gfx/waifu2x-ncnn-vulkan/metadata.xml @@ -5,8 +5,8 @@ slashbeast@gentoo.org Piotr Karbowski - - sudinave@gmail.com + + ionen@gentoo.org Ionen Wolkens diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210210.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210210.ebuild deleted file mode 100644 index cbab4dd50452..000000000000 --- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210210.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="waifu2x converter using ncnn and vulkan" -HOMEPAGE="https://github.com/nihui/waifu2x-ncnn-vulkan" - -SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="MIT" -SLOT="0" -IUSE="" - -DEPEND=" - ~dev-libs/ncnn-20210322 - media-libs/vulkan-loader - media-libs/libwebp - dev-util/glslang" - -RDEPEND="${DEPEND}" -BDEPEND="" - -CMAKE_USE_DIR="${S}/src" - -src_prepare() { - # Make finding models actually possible. - sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DUSE_SYSTEM_NCNN=ON" - "-DUSE_SYSTEM_WEBP=ON" - "-DGLSLANG_TARGET_DIR=${EPREFIX}/usr/$(get_libdir)/cmake" - ) - - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan - - insinto "/usr/share/${PN}" - doins -r models/* -} diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index ee98cac38519..8eb56131667d 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,16 +1,10 @@ -AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1 -AUX zbar-0.23-r1-nonbash.patch 5528 BLAKE2B f4679013abb66143a5203d861367f51ee8b791addff66347d81622549f954e1bcd54a19695fa4ce8bacbf5aa2fe0a195ec75068ff6b93fa2df0c4f82af9e3d65 SHA512 7705ae4281b92086eda749fb334a59cdc33e79bec0bb9820c78344fcac235b9b3f4314899e8eeeaa44a372adda71f14ec553f3c1c147f57bfe1cba298d3cd0ab AUX zbar-0.23.1-autoconf-2.70.patch 1280 BLAKE2B c4e9fd97047c49599477e387590372404c47b66f960bf1e0ffd80c7c694cf59cf080660899e1abc0f33eadd7087e5ba6d40e55e853f0569374a3be0934001450 SHA512 e7317dcd5e3dacce52dd27ce8d37afd07d2b193fa8f40e237a5f4bca911bda1e38ac74b0fd770976c0659ccc44b576775ba291d8135e426ad7a793fbdb104401 AUX zbar-0.23.1_fix_leftover_on_shell_compatibility.patch 877 BLAKE2B 6eb1778024ba3ab0df8bc64ae80987be0e17cd30b692f0e04766fcad3148fe1ce49f52f7ec147d3f22c34754288fe0f9721ffa91e3e78c5b357c167f372f4e5d SHA512 98c203f122811128e091f8cc31f0c92362cc8693e38f5cdd7a48cf6d5ef57889bd6ccf921631a1646214f070c3be2eb78f08c429351bec275f4b550b2e15b122 AUX zbar-0.23.1_fix_unittest.patch 2703 BLAKE2B fcbde8262803be3a009a93d052d6866998ca0a214a64f0c2989ded4925394c3cc78755b539defd0560dbc01e318f12a89b16a6065e028eec58db16d58a8bdcb5 SHA512 cc867bcb92094edb94dc699c0929547dd7bf08f71579605b4817e1068da55e0c2455655e535fc560375c773c158f50a79f77846ef06a3566a0deec22a459e120 AUX zbar-0.23.1_musl_include_locale_h.patch 512 BLAKE2B 9f675b24aecd0a65ef3a2d41731594c10b1086abbfac649b6eeca1ba873c1b54d8287bebb48b2119aa0638d60228f25714f7a1811f7645930bc003395489ca3e SHA512 6addf046928db5743cc58ec67aad891c199f9d839198181cfbf57912cc0780f53fdac9fa15b25e1ffd17cf0aaf74318094f3283facdff2fa259285a5bc2bb957 -AUX zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch 2109 BLAKE2B 8e32a3d0115fe7dc31a8208021659827f959bebbd1a56972765a379e03c7aca704c394d7eecb928f3547b9b42afff6cdaa1e564875bb6a94ac0cdb9a55422fe1 SHA512 dfbbe1caf384dc769d97ecebaf544b81c1fa266c78ca4fa8087673724b3408fe2e77535b60aefe904aa42dd1ed1182676623f98aed565910566c511908b8ecee +AUX zbar-0.23.1_python_tp_print.patch 1671 BLAKE2B e7d869e64879fb77151b1e8d668659ed1b5ca8061a8b2d3f2bde1bd5ef3384dec208e5f43f6e326c173634e017dd1261ba1d725a68f7a3c5f384e5a2a84bae26 SHA512 67e87f27dd9149e5cf9503613d3458dff5a3fd97084858f5ca88335c5053e7eb9b000cdec215d7b38bf9dd344b2dd9c310de320c60fc308de0ff7c411dcbcb35 AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf81a0a9b6aefa284576789ba6533af03cb1af59a2c531f22e09adcc8e2b9b6418f861f8b96a1bf602502d0e863ae9785ac2d336c7 SHA512 ee40586c64ded170e314ee2961588518234e22d9cee9e9a55f994231cd50b120e82225c551c5a2e85988de1c14a5c0baf6303fffea0663e2e4808df3a0c8421a -AUX zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch 1122 BLAKE2B e4330ca4ce75a4659466faa618a99280ad7868aa21d1fe30db837917460cb9fc3594421cb2cb70457813611764c7e976e5ba9acc414be5fa95808f91d995eb0b SHA512 c6d6b3bf93f59f87687e03294742ec7a4803308d7395869d8cccefdb186c69ad429c631f2f4d0c4de0a2dd495f3b99342622d01acb1e823ceb9250380549ca20 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7 -AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b -DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b -EBUILD zbar-0.23-r1.ebuild 5071 BLAKE2B 92487f7fd2c94a6bee21827729c0ed4bbbde6c1b552e5da271a96a277d2d1c4d20b0b8baf80b769e89bb65bc9fe0ca0db483342bcbcf0daf466edc82f399dbe3 SHA512 f4d5affd6ea81be0b0aaacd168a0a45c854a49b7aeda4d042aa26eef4e0492ece016c21c7887aad1c1644c0095f04eb94277ba12276b0e1c8e5c4d98f977b4b4 -EBUILD zbar-0.23.1.ebuild 5328 BLAKE2B 625e339803ae037096dd0dddae0553cb11d4a0a7f7ae144f7e8e5a85964fba652c66ee05bae302c290d837914d2f95f6aaaf91a0277ea6714ab53b7d12bbd7c6 SHA512 41f92ac81780148a1672306eb185f0d1899a5dd607e831a50d69c2a2c594125221172a9907ed63f15f163421917032e45902a1c8701ababe0048728a8e735c78 +EBUILD zbar-0.23.1.ebuild 5378 BLAKE2B 0a0600179d7dc1812dbaad0446b91d30f4bbbd0d6d2271800afada662ab1bbfdbcdf22c78908594b0dddcf13ce5ea107d5f039a580137cd3e58c1f8c4986358a SHA512 6eb6125996b9b2fb138e489aee1189b1a480dbb1b990cd7996b83fc59a31e0fef7c3b1bec14db7381837784d644e69e6b5f7e40bdf5429411120af04526d3e00 MISC metadata.xml 737 BLAKE2B 51ad296b25247d05d1872f0ce6ac5ab5dc0c3c0141c19a851a13c5dab881c2c6f7c8b538bf86783ea9138318e369e25d1828d866adb050dd98dbd336b6932a1c SHA512 0811b0674da5175f0ba71238a8ecad01a5d0000dec24988df42ab91748de016e717471822d6903f279ad411cb50207bc6c4dc6de11268e065961a96948434e6f diff --git a/media-gfx/zbar/files/zbar-0.10-errors.patch b/media-gfx/zbar/files/zbar-0.10-errors.patch deleted file mode 100644 index 63328ce664bb..000000000000 --- a/media-gfx/zbar/files/zbar-0.10-errors.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- zbar-0.10/include/zbar/Exception.h -+++ zbar-0.10/include/zbar/Exception.h -@@ -32,6 +32,7 @@ - - #include - #include -+#include - - namespace zbar { - diff --git a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch deleted file mode 100644 index 1206a209d458..000000000000 --- a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch +++ /dev/null @@ -1,120 +0,0 @@ -https://bugs.gentoo.org/769716 - -From 4bd586181dde6196cb60602f228c4deb07818989 Mon Sep 17 00:00:00 2001 -From: Klaus Ethgen -Date: Sun, 7 Feb 2021 14:22:52 +0100 -Subject: [PATCH] =?iso8859-1?q?Configure-Patch=20f=FCr=20nicht-bash?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso8859-1 -Content-Transfer-Encoding: 8bit - ---- - configure.ac | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c2b7819..f6224a1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -489,7 +489,7 @@ AC_ARG_WITH([gtk], - AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal]) - AC_ARG_VAR([GTK_VERSION_MAJOR]) - --AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"], -+AS_IF([test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"], - [PKG_CHECK_MODULES([GTK3], [gtk+-3.0], - [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` - GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion` -@@ -501,7 +501,7 @@ AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"], - ]) - ]) - --AS_IF([test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"], -+AS_IF([test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"], - [PKG_CHECK_MODULES([GTK2], [gtk+-2.0], - [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` - GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion` -@@ -550,11 +550,11 @@ AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program (python2 only)]) - AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)]) - - AS_IF([test -z "$PYTHON"], -- [AS_IF([test "x$with_python" == "xauto"], -+ [AS_IF([test "x$with_python" = "xauto"], - [AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])], -- [AS_IF([test "x$with_python" == "xpython3"], -+ [AS_IF([test "x$with_python" = "xpython3"], - [AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])], -- [AS_IF([test "x$with_python" == "xpython2"], -+ [AS_IF([test "x$with_python" = "xpython2"], - [AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])], - [with_python="no"]) - ]) -@@ -608,7 +608,7 @@ AM_CONDITIONAL([HAVE_PYGTK2], [test "x$with_pygtk2" != "xno"]) - - dnl GObject Introspection (GIR) - --AS_IF([test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"], -+AS_IF([test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"], - [m4_ifdef([GOBJECT_INTROSPECTION_CHECK], - [GOBJECT_INTROSPECTION_CHECK([0.6.7]) - AS_IF([test "x$found_introspection" = "xyes"], -@@ -696,7 +696,7 @@ AC_ARG_WITH([java], - [], - [with_java="check"]) - --JAVAC=${JAVAC/ecj/ecj -1.5} -+JAVAC="$(echo $JAVAC | sed 's/ecj/ecj -1.5/')" - - # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to - # look strictly at the $JAVA_HOME in order to avoid mixing different versions -@@ -707,13 +707,13 @@ AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"]) - - AC_ARG_VAR([JAR], [location of Java archive tool]) - AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH]) --AS_IF([test "x$JAR" == "x:"], [have_java="no"]) -+AS_IF([test "x$JAR" = "x:"], [have_java="no"]) - - AC_ARG_VAR([JAVA], [location of Java application launcher]) - AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH]) - - AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)]) --AS_IF([test "x$CLASSPATH" == "x"], [CLASSPATH="."]) -+AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."]) - - dnl Search for Java unit test library - AS_IF([test -z "$JUNIT_HOME"], -@@ -850,7 +850,7 @@ echo "GTK --with-gtk=$with_gtk Gtk${GTK_VERSION}" - echo "GObject introspection --with-gir=$with_gir" - echo "Qt --with-qt=$with_qt Qt${QT_VERSION}" - echo "Java --with-java=$with_java" --AS_IF([test "x$win32" == "xno"], -+AS_IF([test "x$win32" = "xno"], - [echo "Dbus --with-dbus=$with_dbus"]) - AS_IF([test "x$have_GM" = "xyes"], - [echo "GraphicsMagick --with-graphicsmagick=yes"], -@@ -873,13 +873,13 @@ AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"], - [echo " => the zbarimg file scanner will *NOT* be built"]) - AS_IF([test "x$have_GM" = "xyes"], - [echo " => ImageMagick is preferred, as GraphicsMagick doesn't support https"]) --AS_IF([test "x$with_gtk" == "xno"], -+AS_IF([test "x$with_gtk" = "xno"], - [echo " => GTK support will *NOT* be built"]) - AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"], - [echo " => the Python 2 GTK widget wrapper will *NOT* be built"]) - AS_IF([test "x$with_qt" != "xyes"], - [echo " => the Qt widget will *NOT* be built"]) --AS_IF([test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ], -+AS_IF([test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ], - [echo " => Building a static Qt library"]) - AS_IF([test "x$with_java" != "xyes"], - [echo " => the Java interface will *NOT* be built"]) -@@ -888,5 +888,5 @@ AS_IF([test "x$with_java_unit" != "xyes"], - #echo "NPAPI Plugin --with-npapi=$with_npapi" - #AS_IF([test "x$with_mozilla" != "xyes"], - # [echo " => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"]) --AS_IF([test "x$enable_pdf417" == "xyes"], -+AS_IF([test "x$enable_pdf417" = "xyes"], - [echo " => the pdf417 code support is incomplete!"]) --- -2.30.0 - diff --git a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch new file mode 100644 index 000000000000..8d4d821426d2 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch @@ -0,0 +1,55 @@ +From 938d39716488b545b92c28f48acc94a7b8fc9138 Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +Date: Tue, 28 Jul 2020 10:27:30 +0200 +Subject: [PATCH] python: enum: make it compatible with Python 3.9 + +As reported by: + https://github.com/mchehab/zbar/issues/92 + +python bindings don't build with Python 3.9, because it is +using tp_print, which has been silently ignored since Python +3.0, according with[1]: + + "The tp_print slot of PyTypeObject has been removed. + It was used for printing objects to files in Python 2.7 + and before. + Since Python 3.0, it has been ignored and unused." + +[1] https://docs.python.org/3.9/whatsnew/3.9.html#id3 + +Signed-off-by: Mauro Carvalho Chehab +--- + python/enum.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/python/enum.c b/python/enum.c +index a1135531..dfe1b1ef 100644 +--- a/python/enum.c ++++ b/python/enum.c +@@ -76,6 +76,8 @@ enumitem_str (zbarEnumItem *self) + return(self->name); + } + ++#if PY_MAJOR_VERSION < 3 ++/* tp_print was dropped on Python 3.9 */ + static int + enumitem_print (zbarEnumItem *self, + FILE *fp, +@@ -83,6 +85,7 @@ enumitem_print (zbarEnumItem *self, + { + return(self->name->ob_type->tp_print(self->name, fp, flags)); + } ++#endif + + static PyObject* + enumitem_repr (zbarEnumItem *self) +@@ -115,7 +118,9 @@ PyTypeObject zbarEnumItem_Type = { + .tp_new = (newfunc)enumitem_new, + .tp_dealloc = (destructor)enumitem_dealloc, + .tp_str = (reprfunc)enumitem_str, ++#if PY_MAJOR_VERSION < 3 + .tp_print = (printfunc)enumitem_print, ++#endif + .tp_repr = (reprfunc)enumitem_repr, + }; + diff --git a/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch b/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch deleted file mode 100644 index 3be9c2222776..000000000000 --- a/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch +++ /dev/null @@ -1,71 +0,0 @@ -From cac1fffce80f0835e4d8d234023a775b4243b916 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Sun, 20 Oct 2019 01:44:02 +0200 -Subject: [PATCH] Create correct pkconfig file for zbar-qt5 - -Although zbar supports Qt5, the created pkgconfig file always requested -the Qt(4) components. - -Fixes issue #62. ---- - configure.ac | 13 ++++++++++--- - zbar-qt5.pc.in | 12 ++++++++++++ - 2 files changed, 22 insertions(+), 3 deletions(-) - create mode 100644 zbar-qt5.pc.in - -diff --git a/configure.ac b/configure.ac -index 935110a..49ef6a8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -659,15 +659,23 @@ AS_IF([test "x$with_qt" != "xno"], - CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS" - dnl -fPIC has no effect on Windows and breaks windres - AS_IF([test "x$win32" = "xno"], [CPPFLAGS="$CPPFLAGS -fPIC"]) -- AC_MSG_NOTICE([using Qt version $QT_VERSION])], -+ AC_MSG_NOTICE([using Qt version $QT_VERSION]) -+ qt_pkgconfig_file="zbar-qt5.pc" -+ ], - - [MOC=`$PKG_CONFIG QtGui --variable=moc_location` - AC_MSG_NOTICE([using moc from $MOC]) - QT_VERSION=`$PKG_CONFIG QtGui --modversion` -- AC_MSG_NOTICE([using Qt version $QT_VERSION])])) -+ AC_MSG_NOTICE([using Qt version $QT_VERSION]) -+ qt_pkgconfig_file="zbar-qt.pc" -+ ])) - - AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"]) - -+AM_COND_IF([HAVE_QT], -+ [AC_CONFIG_FILES([zbar-qt.pc:"${qt_pkgconfig_file}.in"])] -+) -+ - dnl Java - have_java="maybe" - -@@ -820,7 +828,6 @@ java/Makefile - zbar/Makefile - zbar.pc - zbar-gtk.pc --zbar-qt.pc - doc/doxygen.conf]) - - AC_CONFIG_FILES([test/test_examples.sh],[chmod 755 test/test_examples.sh]) -diff --git a/zbar-qt5.pc.in b/zbar-qt5.pc.in -new file mode 100644 -index 0000000..3378993 ---- /dev/null -+++ b/zbar-qt5.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: zbar-qt -+Description: bar code scanning and decoding Qt5 widget -+URL: http://zbar.sourceforge.net -+Version: @VERSION@ -+Requires: zbar, Qt5Core >= 5, Qt5Gui >= 5 -+Libs: -L${libdir} -lzbarqt -+Cflags: -I${includedir} diff --git a/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch b/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch deleted file mode 100644 index 8484e31b7375..000000000000 --- a/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 52a4fa5242af5da770b3cab1713f87e8d899e7ed Mon Sep 17 00:00:00 2001 -From: Dan Fandrich -Date: Fri, 27 Dec 2019 18:33:17 +0100 -Subject: [PATCH] Fix detection of errors in the v4l read. - -The return type must be signed in order to detect a read failure. Also, -display an error message after such a failure. ---- - zbar/video/v4l2.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c -index daed38b..c0398ea 100644 ---- a/zbar/video/v4l2.c -+++ b/zbar/video/v4l2.c -@@ -133,9 +133,11 @@ static zbar_image_t *v4l2_dq (zbar_video_t *vdo) - return(NULL); - - /* FIXME should read entire image */ -- unsigned long datalen = read(fd, (void*)img->data, img->datalen); -- if(datalen < 0) -+ ssize_t datalen = read(fd, (void*)img->data, img->datalen); -+ if(datalen < 0) { -+ perror("v4l2_dq read"); - return(NULL); -+ } - else if(datalen != img->datalen) - zprintf(0, "WARNING: read() size mismatch: 0x%lx != 0x%lx\n", - datalen, img->datalen); diff --git a/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch b/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch deleted file mode 100644 index 75d02cb996a5..000000000000 --- a/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ba0bcb39c4fa57634c05597464352d4e630f1ea2 Mon Sep 17 00:00:00 2001 -From: hz-mk <51707958+hz-mk@users.noreply.github.com> -Date: Tue, 11 Jun 2019 16:32:18 +0200 -Subject: [PATCH] Reset conversion descriptor after close (prevent double free) - ---- - zbar/qrcode/qrdectxt.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c -index 2ab7b9b..4be7635 100644 ---- a/zbar/qrcode/qrdectxt.c -+++ b/zbar/qrcode/qrdectxt.c -@@ -409,7 +409,10 @@ int qr_code_data_list_extract_text(const qr_code_data_list *_qrlist, - /*If eci should be reset between codes, do so.*/ - if(eci<=QR_ECI_GLI1){ - eci=-1; -- if(eci_cd!=(iconv_t)-1)iconv_close(eci_cd); -+ if(eci_cd!=(iconv_t)-1){ -+ iconv_close(eci_cd); -+ eci_cd=(iconv_t)-1; -+ } - } - - } diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild deleted file mode 100644 index d51457a9e1d8..000000000000 --- a/media-gfx/zbar/zbar-0.23-r1.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx - -DESCRIPTION="Library and tools for reading barcodes from images or video" -HOMEPAGE="https://github.com/mchehab/zbar" -SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm x86" - -IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv" -REQUIRED_USE=" - introspection? ( gtk ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( - ${PYTHON_REQUIRED_USE} - X? ( imagemagick ) - ) - xv? ( X )" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - gtk? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - introspection? ( dev-libs/gobject-introspection ) - ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) - ) - jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) - )" - -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.8 )" - -DEPEND="${COMMON_DEPEND} - java? ( - >=virtual/jdk-1.8 - test? ( - dev-java/hamcrest-core:1.3 - dev-java/junit:4 - ) - ) - test? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_MULTI_USEDEP}] - ') - )" - -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig - gtk? ( dev-util/glib-utils )" - -PATCHES=( - "${FILESDIR}/${PN}-0.10-errors.patch" - "${FILESDIR}/${PN}-0.23-r1-nonbash.patch" - "${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch" - "${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch" - "${FILESDIR}/${P}_fix_python_detect.patch" - "${FILESDIR}/${P}_fix_Qt5X11Extras_detect.patch" - "${FILESDIR}/${P}_reset_conversion_descriptor_after_close.patch" -) - -DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog ) - -pkg_setup() { - if use python || use test; then - python-single-r1_pkg_setup - fi - use java && java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - if use python || use test; then - if use test; then - # make tests happy - # because one of the test requires loadable py module from the current ${BUILD_DIR} - sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \ - -i test/Makefile.am.inc || die - fi - - python_fix_shebang \ - examples/*.py \ - test/{test_python,barcodetest}.py # test_pygtk.py — py2 only - fi - - if use java; then - java-pkg-opt-2_src_prepare - sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ - -i java/Makefile.am || die - fi - - # do not install {LICENSE,INSTALL,etc}.md doc files with 'make install' (use DOCS=() instead) - sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die - - eautoreconf -} - -multilib_src_configure() { - append-cppflags -DNDEBUG - - local myeconfargs=( - $(use_with dbus) - $(use_with gtk gtk gtk3) # default is gtk2 - $(use_with jpeg) - $(multilib_native_use_with introspection gir) - $(multilib_native_use_with java) - $(multilib_native_use_with python python auto) - $(use_enable static-libs static) - $(use_enable threads pthread) - $(use_enable v4l video) - $(use_with X x) - $(use_with X xshm) - $(use_with xv xv) - ) - - if multilib_is_native_abi; then - # both must be enabled to use GraphicsMagick - if use graphicsmagick; then - myeconfargs+=( - --with-graphicsmagick - --without-imagemagick - ) - elif use imagemagick; then - myeconfargs+=( - --with-imagemagick - --without-graphicsmagick - ) - else - myeconfargs+=( - --without-imagemagick - --without-graphicsmagick - ) - fi - - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - append-cflags "$(java-pkg_get-jni-cflags)" - if use test; then # bug 629078 - java-pkg_append_ CLASSPATH . - java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar) - java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar) - fi - fi - - if use qt5; then - myeconfargs+=( - --with-qt - --with-qt5 - ) - else - myeconfargs+=( --without-qt ) - fi - else - myeconfargs+=( - --without-qt - --without-imagemagick - --without-graphicsmagick - ) - fi - - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" - - # work around out-of-source build issues for multilib systems (bug 672184) - mkdir qt zbarcam || die -} - -src_test() { - virtx multilib-minimal_src_test -} - -src_install() { - if use qt5; then - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/zbar/QZBar.h - /usr/include/zbar/QZBarImage.h - ) - fi - multilib-minimal_src_install -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} - -pkg_preinst() { - use java && java-pkg-opt-2_pkg_preinst -} diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild index d74a878a969a..7b07b269b68f 100644 --- a/media-gfx/zbar/zbar-0.23.1.ebuild +++ b/media-gfx/zbar/zbar-0.23.1.ebuild @@ -87,6 +87,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch" "${FILESDIR}/${PN}-0.23_fix_python_detect.patch" "${FILESDIR}/${P}-autoconf-2.70.patch" + "${FILESDIR}/${PN}-0.23.1_python_tp_print.patch" ) DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog ) -- cgit v1.2.3