diff options
Diffstat (limited to 'media-libs/gegl')
| -rw-r--r-- | media-libs/gegl/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/gegl/files/gegl-0.4.18-arch.patch | 11 | ||||
| -rw-r--r-- | media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch | 51 | ||||
| -rw-r--r-- | media-libs/gegl/gegl-0.4.18.ebuild | 4 |
4 files changed, 55 insertions, 15 deletions
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index 015d3df5d65a..3386cd669020 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -11,8 +11,8 @@ AUX gegl-0.2.0-underlinking.patch 1638 BLAKE2B c8118a47b9d83d9737a2ec1deb25d23b9 AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84 AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c9091043374b54c9c4a684e6decc376e8b57e2a60b7ff5c5b21e07f24d7835f92f62a7aebf976122391d206450cc1d5a52bcb30 SHA512 1edf86549a0a91b7e66ad1b59373b141c20e7f63fff981aaa5a0ba535b38e89b593c60a4a4573cf6fa723181cb38a10c6ac4a0838fc947bb54713a3bde299e4f AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a -AUX gegl-0.4.18-arch.patch 282 BLAKE2B 110c1bfec14a27c1d5fab8021673ee981769f4ad301bf5fe5bfa23bd95fee5610765e4e0e491d05a84586457612e7014202642e86ad6cfb71ca5091060679c5f SHA512 85244dc8747c52ed7135bceef3f12cb9c27dc9f801aa564d80feb0705972b782ce153e762648ebe777abfe42e8e0be079a88f34c1ae38f8fc195350d8e9cdafd AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773d4835f13d8ff0d271fe83ca5da93ad83da7f5e808b8be3858b6812b4e102d0086fcb55270157b6fd3a568882537d4ddf33d298 SHA512 efeb64b100e2e5d548fdcfe49be3ee5fe208e90b8655b16f0dcfe08821d1ea792501ad372d7ae0029552ffe762bb5408543e573f9d7977d238afb8f261f521f5 +AUX gegl-0.4.18-meson_cpu_detection.patch 1506 BLAKE2B ad1038c71b3d2b735fe20010710a94c9460990d9bfb965731c732945d00f992d27f9168fd3fdda3b88ac913c984ad4ad7f231f1d5cd7bae8a8312e91d37cfdf2 SHA512 d9e96e57db0821c5510bb3d8faee3850ab4083e2f1697b5acda75e719ca778cd48ae86cffbc66b621de65dbf5096d125e612af329c7a7ef11f586d24be52a3dc AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417 DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8 DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6cdf39dae4374d2749823f3a1af62995382a1247427dde1921e0b11304adb800a2157ca6e7e773fdd97fee47f5 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6 @@ -26,6 +26,6 @@ EBUILD gegl-0.3.0.ebuild 5228 BLAKE2B 04a228c189e9fdf2619cfc1467eae37ecd01ef35ad EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B f468df5f492a5cb4079ab021d10833a6d75ab97c28bb03a8091df0bb80f284171fe04476e522632264a795ae4f198d7a69d412eb378d25225b7f345a5bfd013b SHA512 376186430d951aced6ef210eee6f7ff7dc8f7f1fb7087083bb86ee6b12d46170df6293db136acfb3f696348b33e84c2657d0679f968b1dbca79291a232d6e1b0 EBUILD gegl-0.4.14.ebuild 4963 BLAKE2B 155fd64e71878d62960a1beaf50b8e2b4fec41a8884b916319b498adc6393449d41f6a2fbff128e68eebcf688046bcca540c9e10382f805e8df536d28fa04244 SHA512 ed2796b93ef55352f51a8eace6ccb97e5352a203d6fa33d178307c0f215279d337efabd9aa2c0d41faa6757c5a0f34dda1f1907eced0712979413d03980b9de0 EBUILD gegl-0.4.16.ebuild 4849 BLAKE2B 0ddc711066dc3430b2dfdd3f97edf9accca4feda969ed3534a9f5ce62e8470780f6cb488582b3d7c18edb9d3888df234ef0aeac218a5be08ed5d1182ca4aa1ba SHA512 2bec113e795760a92f09b481f5220fa3b2db96fb3239fb7d3b7db83e5f06319f9ffd9220d0ef509c5cf4fa77315e9600521a7beb63d069e27b0c6726f3aca967 -EBUILD gegl-0.4.18.ebuild 4416 BLAKE2B 117874fa6d9abc38104b93e73e7a225b21b647a52fc78c0599adfb77a4645adf3cfa6fb254880c42a523e3a121a71bdeb3c3ca13cc5dac7b2650e32383686d71 SHA512 c1fcfba56c0cdb9aa500886017d45bececbea9d2ac2f808bd52ec75399de11b8918283525c48516fdc0e37977e9368d03d1f52aea215efa25b624acc123f9fe6 +EBUILD gegl-0.4.18.ebuild 4428 BLAKE2B 6acdd9873395e682bc94b30743e7353400607aee79376781cb446f09860fecb81e54106ddd44677ac7ee815c33c913cb6d5d37fa80ed61b688ff1084585b358e SHA512 a103fe6457f6876b3e1e33c25596b5d199e598c97a0804e0d939b9852c22715d64a3468b8921d2263036ba5addcded48ca6e9be1fe3c0747d5680812bb972ca1 EBUILD gegl-9999.ebuild 4377 BLAKE2B 340ec7416904d1273b193b5449ea97b1104121ae0f6c2b11d39f92bc77adfe231b06101307af8948925c952bbb6db67958b54f68dbf25d775019b09ce66e2608 SHA512 0bfed5bf968d6d7bd5b111a8fd7f51ee27a9c500a5fd49ec40242558fe0c98c42387c28f8259ea7b5bede089b08553e5f16e26bbb4ecb69feedaf46c2dc43173 MISC metadata.xml 347 BLAKE2B 3cf9993960788f9caef109afbc99045affa49f771e4b5c1afc8d7f1ad438eaa3ffaf062e6c3056f8228ea4d745a807517875bc82ae13a8f2dc776f7bee01f465 SHA512 c893f262197b33a5ce7c4df6da4f0b761bae4a12082b1f263ed3878eadb388a4c785a1117033d52854a7bbcc102f505946f6e7bfb7449126634d8730ef7d61b2 diff --git a/media-libs/gegl/files/gegl-0.4.18-arch.patch b/media-libs/gegl/files/gegl-0.4.18-arch.patch deleted file mode 100644 index 57bfaf4a6c73..000000000000 --- a/media-libs/gegl/files/gegl-0.4.18-arch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -88,8 +88,6 @@ - have_ppc = true - config.set10('ARCH_PPC', true) - config.set10('ARCH_PPC64', true) --else -- error('Unknown host architecture') - endif - - ################################################################################ diff --git a/media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch b/media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch new file mode 100644 index 000000000000..7f6b3624f361 --- /dev/null +++ b/media-libs/gegl/files/gegl-0.4.18-meson_cpu_detection.patch @@ -0,0 +1,51 @@ +From 6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter <reiter.christoph@gmail.com> +Date: Sun, 27 Oct 2019 14:10:08 +0100 +Subject: [PATCH] meson: fix cpu detection + +Use host_machine.cpu_family() instead of cpu(). Only the former +provides a stable/defined set of values. + +Also don't error out on some arches for no good reason. + +This fixes the build on 32bit Windows. +--- + meson.build | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index af133a0f1..540498921 100644 +--- a/meson.build ++++ b/meson.build +@@ -73,23 +73,21 @@ if os_osx and cc.get_id() != 'clang' + endif + + +-host_cpu = host_machine.cpu() +-if host_cpu.startswith('i') and host_cpu.endswith('86') ++host_cpu_family = host_machine.cpu_family() ++if host_cpu_family == 'x86' + have_x86 = true + config.set10('ARCH_X86', true) +-elif host_cpu == 'x86_64' ++elif host_cpu_family == 'x86_64' + have_x86 = true + config.set10('ARCH_X86', true) + config.set10('ARCH_X86_64', true) +-elif host_cpu == 'ppc' or host_cpu == 'powerpc' ++elif host_cpu_family == 'ppc' + have_ppc = true + config.set10('ARCH_PPC', true) +-elif host_cpu == 'ppc64' or host_cpu == 'powerpc64' ++elif host_cpu_family == 'ppc64' + have_ppc = true + config.set10('ARCH_PPC', true) + config.set10('ARCH_PPC64', true) +-else +- error('Unknown host architecture') + endif + + ################################################################################ +-- +2.22.0 + diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild index 7de01528fc40..96f2051b491a 100644 --- a/media-libs/gegl/gegl-0.4.18.ebuild +++ b/media-libs/gegl/gegl-0.4.18.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" @@ -80,7 +80,7 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) PATCHES=( "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch - "${FILESDIR}"/${PN}-0.4.18-arch.patch + "${FILESDIR}"/${P}-meson_cpu_detection.patch ) pkg_setup() { |