diff options
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/exiv2/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/exiv2/exiv2-0.26_p20171013.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch | 47 | ||||
| -rw-r--r-- | media-gfx/icc_examin/Manifest | 8 | ||||
| -rw-r--r-- | media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch | 27 | ||||
| -rw-r--r-- | media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch | 25 | ||||
| -rw-r--r-- | media-gfx/icc_examin/icc_examin-0.55-r1.ebuild | 45 | ||||
| -rw-r--r-- | media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild | 55 | ||||
| -rw-r--r-- | media-gfx/icc_examin/icc_examin-9999.ebuild | 49 | ||||
| -rw-r--r-- | media-gfx/pixie/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/pixie/pixie-2.2.6-r1.ebuild | 6 |
11 files changed, 172 insertions, 98 deletions
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 28462d214207..59fd90229efb 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -4,10 +4,11 @@ AUX exiv2-0.25-fix-without-zlib.patch 662 SHA256 66618de00ba07ec660675e2dff99138 AUX exiv2-0.25-fvisibility-hidden.patch 700 SHA256 2d0eb374e3df7dd58a513b616786e9421f63e575c2812d0b3980e0af29d03d96 SHA512 7dd251fa6e09ecc0493899fdc24431f636e56bf86d33fd4cf4b46fc27b14ce7a68cb4021a3799260398f48b256f403e00b86d143a012d3871e0de5bf57db9205 WHIRLPOOL af10468fad08e51f16141e70409e5ec718d5d669db8203df6a09de2fd824eb46376f87195cf1e744c60c567943c24d54afe388d54eeb5c240f876ebbcbd59514 AUX exiv2-0.25-hide-symbols.patch 4098 SHA256 b6fe63951717360caad547275c3810c42803ef2d8dea25c75e02b45b9d7add9e SHA512 aed6746329b12769d8084ca79a99eccd6b52449b80c0b3d1c1d6b22294c2b62398366f0715efa207e2ace0ed52740a8eb81af58d17322d42a4674336fd24e725 WHIRLPOOL ac8e900303ac0b19f24b5eff13791dd42459395763d4c8795ff978c1f2c05431b3f3586dedd2b7df375452d3826d7356fc190c4ba3bc8fc4713792bc9d31d033 AUX exiv2-0.25-tools-optional.patch 1332 SHA256 6c9a3ed5c2b9acff10c3b2f2dd2ca639936beaf6263526b9d85ede579a1d67e1 SHA512 14a8703b86dc4a7a1f210e26bd6532c529f850dd1b25ef116c703a576c389a120e3f8b1087e289cd8b44073071ac88a97503dc2c0cf72f21d32094b2cabbc58c WHIRLPOOL dc7efa7ddcaf1be665cd79aff0b36a0f2b135a87a3a93f9cb6091105b965b4b009e569c447d54d602482410ec59d674d99a71bee2699e8007575b8e2cc727998 +AUX exiv2-0.26_p20171013-cmake.patch 1633 SHA256 1e1d09e876b78e77b4fccccda19cbf3ed4ca782b06805cb4f43a0c6c83af0961 SHA512 7b168242c6524107bafb13b7675d74cb87e20205568e80259d99c46d7328d8c48295977a2f08cc5195bbbaf865ff1e751a22dc7ba0dadbe32d1dbba7b908f9b7 WHIRLPOOL db047f78aaf48cb6d1963175441f0641f5ee29df15312df3726b3b8f306b3f16c3fb3ee75b4c752243e98f1936182337cea786444b2c13d2878cfd53ab5499b3 DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac DIST exiv2-0.26_p20171013.tar.gz 25801252 SHA256 137178f0dfc2734b174ba71b8b18d5852fcd5c6f7835eeb1b58f42b93eed7317 SHA512 4e8b10b8593a80615f5deb9fed3420f118338f1161b99c0b86456686fe8d511bb5df956ee25ed5edf990b34bab9efda64be5c80f6efbd78e6e497cb85e2a3ad5 WHIRLPOOL e32b9d98fa5be77bbf50bf275a95db8e9d15b0d40d762bdf512cb8d02f009fc452921df194121cd32d9780de1c83afd0da5cd75ef653a9ba1459f18884f71ffe EBUILD exiv2-0.25-r2.ebuild 3067 SHA256 74c21aab30f50186256977871d495681c93e41c8044adc052c518a49b42e1fdd SHA512 30a8a1afbb91ec8b226ea16621cacbd9726f31cd9ebddfda4c7771786a4902123b5674ac9221c990b99464eb0d471f694bf57eebc7e3a22d65ad5e61f4805dfc WHIRLPOOL fc5b37699ba112488230aa7fdd8913318e7527c772cb214b87ecd612775f3fffd6686b8db1baee3dc949fbf8ce856607205776aaea50cf67634b6bb7c74f2b0f -EBUILD exiv2-0.26_p20171013.ebuild 2876 SHA256 0fe91c6c9b7c4a03cbcc2c881a6f1b0f6f8a03ba674a96a2eb8162ce3aa2c3c4 SHA512 aba123a1b099598d17471dc83270b4ce6ce8a0aaad88828e1219fcaa4fcb2a2de68b4f06c54f410fdf049fa8b271373913477177e9b75074894a7e16d092d225 WHIRLPOOL 4fd455619f90432886daed16441bfd06d4842048bbeafb0a556386c67a708cd6e377876695b2251394437be4e5a11f15929936bcb10dbb6673d9935dabb3b807 +EBUILD exiv2-0.26_p20171013.ebuild 2920 SHA256 266ed17819513603bf24cf76a361fa1e829ecf846d7418ede626e9bde2b20267 SHA512 695478c1a0c2ef7b352ecae022118852c5ab34d4b4761ecd6fdd72c118febc59cfbe8916c344f926794ad3cf2524b639feccd3c746be57796628c1e3a210fe56 WHIRLPOOL 1558a607e90e3396cbf272b730c57ac1726e42e7a19546b4da0a75579b1046ddb745ccf1e76d3a148bab9a5c6d671c043bab8df1f60e6fa372bdbab692869f05 MISC ChangeLog 6407 SHA256 169192c62c5737f3e30c0f97815a85216ef6c50714d94759089db57cc60468c4 SHA512 dbadbe62c5c985e88553f788bf6b22c98f9c4001d53882d8cff3a0e7fd23aa49dbc9e9dc72854578e711f5041f2f0182226d236946042f349a9ebc015b2a89fb WHIRLPOOL eb2926f593eb897554b5e4c77d4287f7718134e5d88b56ba4c48161d04834a8cd706989b456ba1c707303d6603270ae4cfb6d358c8c2f91bc8f3209caa9e2947 MISC ChangeLog-2015 18145 SHA256 5a973e551b2244f4f36a767d98cf41bc8bb61789fc40a7809cc5a98ebe80097d SHA512 3d54f43d175e49db9e5d727eadd616fbae08e2fd1017ea6382b818bf6ec300b782d62eb037b4859b190996e63fb963da4eb7862c00c5f24fee7da05a875d69f2 WHIRLPOOL 2ed9a6717cf228be16bd1aaf6cf4820b02afbd77952685c4d8fe7cb49707c61f504c05053bcb5223626ce9b0ea22ea9e7d308b35a7a80a0c15676b9f8ca5af8c MISC metadata.xml 612 SHA256 2700f3a6eb0fea03635790e9e55611f58a19dace74c70d0e0106bd70ef825c60 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 WHIRLPOOL 0996d01f595fe4ab40a65fcc19d2eced4dc31a1c8efddddca353828447ff3ca974499dcc81482d47a3470d9530a1886abde9acfaa2ac75df0e845f1a70402056 diff --git a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild index 92035195fe46..9aa6302ffd0d 100644 --- a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild +++ b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild @@ -41,6 +41,8 @@ DEPEND="${RDEPEND} DOCS=( README.md doc/ChangeLog doc/cmd.txt ) +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) + pkg_setup() { use doc && python-any-r1_pkg_setup } diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch b/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch new file mode 100644 index 000000000000..c10f125415b2 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch @@ -0,0 +1,47 @@ +From 57883ee664260f5a1b382575e7477ad34c86ce7d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Fri, 13 Oct 2017 18:54:11 +0200 +Subject: [PATCH] Fix build with EXIV2_BUILD_EXIV2_COMMAND=OFF + +--- + src/CMakeLists.txt | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index fe49a0a6..f75cbf1b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -291,21 +291,28 @@ if(EXIV2_BUILD_EXIV2_COMMAND) + if ( BUILD_SHARED_LIBS ) + target_compile_definitions(exiv2 PRIVATE EXV_HAVE_DLL ) + endif() ++ # modify source lists to suit environment ++ ++ # TODO This should not be needed here! we need to fix the previous TODO ++ target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/) ++ ++ if(NOT EXV_HAVE_TIMEGM ) ++ target_sources(exiv2 PRIVATE localtime.c) ++ endif() ++ ++ if (MSVC) ++ target_sources(exiv2 PRIVATE getopt_win32.c) ++ endif() + install(TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + +-# TODO This should not be needed here! we need to fix the previous TODO +-target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/) +- + # modify source lists to suit environment + if(NOT EXV_HAVE_TIMEGM ) + target_sources(exiv2lib PRIVATE localtime.c) +- target_sources(exiv2 PRIVATE localtime.c) + endif() + + if (MSVC) + target_sources(exiv2lib PRIVATE getopt_win32.c) +- target_sources(exiv2 PRIVATE getopt_win32.c) + endif() + + # ****************************************************************************** diff --git a/media-gfx/icc_examin/Manifest b/media-gfx/icc_examin/Manifest index 8b35e56de25b..346a8579dcc7 100644 --- a/media-gfx/icc_examin/Manifest +++ b/media-gfx/icc_examin/Manifest @@ -1,7 +1,7 @@ -AUX icc_examin-0.55-fix-xrandr-test.patch 896 SHA256 1b8e840dd1e4f9183e8a2110af6413c3a4aeebc926bfdf4f586c315ef67bab05 SHA512 a7226ece057eb4ef215852a99437efc57f8173021dffc82e1e7f480832a4cd8fb5f8a76a0eedf450dca42b1346c9871e63b83d24e02c43ae8721c403e85b2379 WHIRLPOOL 8d11b3e9ba57a85b67f699ca2d901a39dd637e7be7c67c42ef3768c39c022f39705e89c652c25e0192225fb2ab8c2c3414bc2806dfa8dc165421a741a6d778c5 -DIST icc_examin-0.55.tar.gz 692711 SHA256 6a6036e4724845368c2ade86c3d29e9cf0e09801f704d02f45ed2b2481924bab SHA512 503d932890c747b9111167df360e9deedd985a4cd434610a6c0de42d4d36ff22907c1441485731349661ddab85d39268fcfc69c035601c1066ec9b63566f491a WHIRLPOOL b6014338eb79e3ac2bdbbb7e4f817a49cca0d34e6dc3b10fe74f6bc4cc1c85d57d7b76d53574aebdcb7dff599a1f0ade1f809006ada01977361d59a64ca8d413 -EBUILD icc_examin-0.55-r1.ebuild 976 SHA256 995cff1cb94c465e28f04c6bf14429f84ab76858aa77cf16bd3c00fb7003d302 SHA512 ce29066e0b6d7d91486de60dc3f09495924e4b090d7d60020b0e7cc75f2cce4e5e037a16ec198df18f9e5dad6d4e0cfa21bf66d47410f02b1aed6dd0f003b6d6 WHIRLPOOL 9df97471442c8b0e2f03cf2cc19f9b663d5a648115545c94a58c97b2c70b7782b12e718619312ea3a5f394a4f52fe5ce9e7dfcf92a75c328168a1be19124cf69 -EBUILD icc_examin-9999.ebuild 921 SHA256 f76cb47ac872189f02bebff881686d4003ecec34e0ec194d707bd0f4d75729cb SHA512 2f04f522df9bf49bbd8d676fadf9d5414ef94f9396591efa8eb425f270c1d51110b80036a759afbc7bd20a35a7d36a102e866a232078109e92c23bd6643898cd WHIRLPOOL d7f87cb4242753acf067f5a0ff1612a12f75f735305401aaaa04745c420572084df810b3aeb5a33ecb87ec357b3b9da5c8628f22e32f45f368c523bef99414e8 +AUX icc-examin-0.56-fltk.patch 754 SHA256 a8d92211bbb2dd67607c291ffabac47de84972926ee04ebf46540a7e5b7e6601 SHA512 ae8bb21951107f9424abafe81015fba13556b2eaaf49f16a6694ce68e7f86ea4cff1d977364dd7c3c3fd5c7163739860a0f0ec74b28200c7d0f0ad2c43711f0c WHIRLPOOL ab01a5b6e9240cf1106408e674ba4d6c4548b86c75ece6e46017b814259de9004a6a1dcdb1c9e7f147f0dd9fe09850011be37fa33a6c8d30f1d383fd9e0af55b +DIST icc-examin-0.56_p20171007.tar.gz 724698 SHA256 1a7acd84a9891284d84f025baa37b97823fa6708e4b5b26be5f58d52381d12aa SHA512 79d4e42c0ae389128ee6514892d0019b0cec17466e8d8e47efbc0a5114c0d365732e26a9abb442a3bca3c2e83ede4dca407cad3bf250492a36832f8bdebeb2b6 WHIRLPOOL ef06562d25b172ee9aaef143422e0403a89dd0731a9d33a56fd6a60ac560e6f3e66b1bba14c9980feb6a288b4cff1dc2daf9458ca1034ab1c63140bf24b5ea80 +EBUILD icc_examin-0.56_p20171007.ebuild 1117 SHA256 ae5e3a2c5941ab3575d586d91638f0279a7fa7d4ccbe21eaa4d614b6752f9de8 SHA512 678456e641ed9ef1a91401dac6c3a80ba66c145885521b1d3ec3d68c4e3ac83fa938351876e6b0fb698686261185605bac7d0bcdffd0f7692873cb4170896da9 WHIRLPOOL 5b01aa58dca3e9c27a673f5740b683eefb4af352dcb4c2a45fbe2065a24ee4045d41a499e66b18d95804418560c20563b6afcef0283645ea7f8c2f72577c210b +EBUILD icc_examin-9999.ebuild 1000 SHA256 6c3a1ef649e395dc076c3d45eee288fecc8719d62f4ee978fbb41ca6b6c35908 SHA512 1a068527b8785ace85775815d5d3296ea4d9e19bcd1caac8ae5a066e547db75aaaa82b1e280b6be939bad351052d0a79dc87f78d5608b4f439fec26c698088ce WHIRLPOOL 8adc0bfc82c8c20e87e03caef56428c4e2e3054983cd45c50acca46eadb0d7d1216b29812e8d90aaf7a9a460fdec3858fbcb1bb5350ad53c3a5b315da62c7a01 MISC ChangeLog 3200 SHA256 f6c0aead1cf65cb3e260a517e7bfaf2e7776945ce54aed6a0ab9fd2f50f113e4 SHA512 1b911e869e7c1c59eace132e2a67491c911da8f79b5ef1b0c45e41f513038ca7429ad69749f996666c40083b19fc85166d32b715e9fa8c8bb3eb719add7d8c93 WHIRLPOOL 35f21a77e9893bbe286718c17f4cc67fcc492397d92c30e8fd57ea852922e8fd37681bd64f9f43f8e81fed1bb5c31610222f04d9f913092a29d32c847260d183 MISC ChangeLog-2015 1796 SHA256 0bc367d031970d60d3c0b0cdb5be9ef821880e395ed48d66ae0a744f82db5755 SHA512 8ab752449e672fa12661b15e2faa661dc86f75462fdfb9cbde53f007657acd1c0ad0c4c5d141ece2a206f8a6fedd13c0824ae4ca3338e10575bd233eaaa189fe WHIRLPOOL f4c5e6604b60f4aac5df7c6a3709ddfbf10d0ac809cf2d7a499ad069d13aea333e0ccbdbe787d15abae3f16b4c81c70ac263641780ccf3c060e72cc06a1f7961 MISC metadata.xml 382 SHA256 32192873b2fe6313f1382602937b93d69869936bf5de03c3ea88278d281a6333 SHA512 7a5dc10551b676b47699b1a41a1016528efd794de47216fbf68eea9645cb4db32179eacf87fb4b986308b9a64c0cfd36406ed8326859e5247c8f9eb6083be8be WHIRLPOOL 47ac441ea4d3cfe460c4a71981980ba2c9cc670ece3ea47efedfe5a0852af154c739123839a2dbb523cca52dfb338bc93f12edda93bb54cdc16da45728bc3649 diff --git a/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch b/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch new file mode 100644 index 000000000000..5e4645a8b0ef --- /dev/null +++ b/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch @@ -0,0 +1,27 @@ +From 172889b358d0801da8d2c15196129cd911e3afc1 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sat, 14 Oct 2017 18:59:20 +0200 +Subject: [PATCH] Fix FLTK include and libs + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60ee08a..41f7c61 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,8 +103,8 @@ IF(FLTK_FOUND) + SET( FLTK_ADD_LIBS "fltk_jpeg" ) + ENDIF( NOT JPEG_FOUND ) + ENDIF(FLTK_FOUND) +-INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} ) +-LINK_DIRECTORIES( ${FLTK_LIBRARY_DIRS} ) ++INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIR} ) ++LINK_DIRECTORIES( ${FLTK_LIBRARIES} ) + + FIND_PACKAGE( OpenGL ) + IF(OPENGL_FOUND) +-- +2.14.2 + diff --git a/media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch b/media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch deleted file mode 100644 index b9acf4c2d049..000000000000 --- a/media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream as https://sourceforge.net/p/oyranos/patches/6/ - -Michael Weber - ---- icc_examin-0.55/configure_tests.sh -+++ icc_examin-0.55/configure_tests.sh -@@ -689,7 +689,8 @@ - if [ -z "$found" ]; then - pkg-config --atleast-version=1.2 $pc_package - if [ $? = 0 ]; then -- found=`pkg-config --cflags $pc_package` -+ found="yes" -+ cflags=`pkg-config --cflags $pc_package` - version=`pkg-config --modversion $pc_package` - fi - fi -@@ -703,7 +704,7 @@ - if [ -n "$MAKEFILE_DIR" ]; then - for i in $MAKEFILE_DIR; do - test -f "$ROOT_DIR/$i/makefile".in && echo "XRANDR = 1" >> "$i/makefile" -- test -f "$ROOT_DIR/$i/makefile".in && echo "XRANDR_INC = $found" >> "$i/makefile" -+ test -f "$ROOT_DIR/$i/makefile".in && echo "XRANDR_INC = $cflags" >> "$i/makefile" - done - fi - elif [ $OSUNAME = "Linux" ]; then diff --git a/media-gfx/icc_examin/icc_examin-0.55-r1.ebuild b/media-gfx/icc_examin/icc_examin-0.55-r1.ebuild deleted file mode 100644 index bceddcfdbc66..000000000000 --- a/media-gfx/icc_examin/icc_examin-0.55-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="Viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and GPU gamma tables" -HOMEPAGE="http://www.oyranos.org/wiki/index.php?title=ICC_Examin" -SRC_URI="https://github.com/oyranos-cms/${PN/_/-}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="app-admin/elektra - media-libs/ftgl - media-libs/libXcm - =media-libs/oyranos-0.9.5* - media-libs/tiff:0 - x11-libs/fltk - x11-libs/libX11 - x11-libs/libXinerama - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXxf86vm" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${P/_/-} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.55-fix-xrandr-test.patch - - sed -e '/xdg-icon-resource\|xdg-desktop-menu/d' \ - -i makefile.in -} - -src_configure() { - tc-export CC CXX - econf --enable-verbose \ - --disable-static -} diff --git a/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild b/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild new file mode 100644 index 000000000000..fd9e3b7ee0e5 --- /dev/null +++ b/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +COMMIT=ee9e8cd013766b0df2c5e3b4416f985322b22966 +inherit cmake-utils flag-o-matic vcs-snapshot xdg-utils + +DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables" +HOMEPAGE="http://www.oyranos.org/icc-examin/" +SRC_URI="https://github.com/oyranos-cms/${PN/_/-}/tarball/${COMMIT} -> ${P/_/-}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + app-admin/elektra + media-libs/freetype + media-libs/ftgl + media-libs/libXcm[X] + media-libs/oyranos + media-libs/tiff:0 + virtual/jpeg:0 + virtual/opengl + x11-libs/fltk[opengl] + x11-libs/libX11 + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXrandr + x11-libs/libXxf86vm +" +DEPEND="${RDEPEND} + sys-devel/gettext + virtual/libintl + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${PN/_/-}-0.56-fltk.patch" ) + +S="${WORKDIR}/${P/_/-}" + +src_configure() { + append-cxxflags -fpermissive + cmake-utils_src_configure +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/icc_examin/icc_examin-9999.ebuild b/media-gfx/icc_examin/icc_examin-9999.ebuild index 045fa7a82065..ceb2821c90c8 100644 --- a/media-gfx/icc_examin/icc_examin-9999.ebuild +++ b/media-gfx/icc_examin/icc_examin-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils toolchain-funcs git-r3 +inherit cmake-utils flag-o-matic git-r3 xdg-utils -DESCRIPTION="Viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and GPU gamma tables" -HOMEPAGE="http://www.oyranos.org/wiki/index.php?title=ICC_Examin" +DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables" +HOMEPAGE="http://www.oyranos.org/icc-examin/" EGIT_REPO_URI="https://github.com/oyranos-cms/${PN/_/-}.git" LICENSE="GPL-2" @@ -14,30 +14,39 @@ SLOT="0" KEYWORDS="" IUSE="" -RDEPEND="app-admin/elektra +RDEPEND=" + app-admin/elektra + media-libs/freetype media-libs/ftgl - media-libs/libXcm - =media-libs/oyranos-9999 + media-libs/libXcm[X] + media-libs/oyranos media-libs/tiff:0 - x11-libs/fltk + virtual/jpeg:0 + virtual/opengl + x11-libs/fltk[opengl] x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr - x11-libs/libXxf86vm" - + x11-libs/libXxf86vm +" DEPEND="${RDEPEND} - virtual/pkgconfig" + sys-devel/gettext + virtual/libintl + virtual/pkgconfig +" -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.55-fix-xrandr-test.patch +PATCHES=( "${FILESDIR}/${PN/_/-}-0.56-fltk.patch" ) - sed -e '/xdg-icon-resource\|xdg-desktop-menu/d' \ - -i makefile.in +src_configure() { + append-cxxflags -fpermissive + cmake-utils_src_configure } -src_configure() { - tc-export CC CXX - econf --enable-verbose \ - --disable-static +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update } diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest index 400ca5ba927e..508fe3b215b1 100644 --- a/media-gfx/pixie/Manifest +++ b/media-gfx/pixie/Manifest @@ -2,7 +2,8 @@ AUX Makefile.shaders 192 SHA256 c69be93547d8afda3526fbca5fc3e654b7a66f4d0be6f21c AUX pixie-2.2.6-autotools.patch 680 SHA256 c9010ced0371bc3355af70369418d4d86570267169902eb2b3fde40f89ae2263 SHA512 7212c644118af829c3bdc87998eb009b9235fc608054a1ebd1bc0f00c2e6a00f3959c2176db3ad451276351678008d312ecefbf4736eaf63989965c55eb1ac92 WHIRLPOOL cc6542055bb221cb250f44127f7e1fb4ee1109f478ea133ff98187b6c07506bc0b11c4bf71d65108190f313c32e0c5aa9f138552d83f0466d660045875363a23 AUX pixie-2.2.6-zlib-1.2.5.2.patch 2064 SHA256 493d0af97b30e4e07714ffa14da2434018fd35a7afd67a9ae760fd3756152ff3 SHA512 f0cc7956117dc09cae574d5042a897c0f5ef9b26040c75d4c7b2ceef317c89431cceb7d32f61b5b5151efdc043e8968ac9129e1d1d6a7ac9720f9056e6db05d3 WHIRLPOOL 03bdf376dd0d6ce58e1e812dcbfe137f465b74ab8d5f971aa5e3ca185204fd1f189253848b9da6df099153783246d46f36253c9e576991dbe0cbe1028e14cdf9 DIST Pixie-src-2.2.6.tgz 9993504 SHA256 ffbbc404265aff3d4c0303ec91549708ffba8edefc0368ac119ae2e588f35037 SHA512 9b5256f5028d6091da293557e5385e53d8bdb2b3bfc7a89228b436b75424d7bd400d04e95cc04b71526aff026085f2bc2bd49e1ac0c54d3055f827fd5d05cc95 WHIRLPOOL 68599850df3ab0207d75e0c9944cce605002d550070062f83b440d0baf86386651d812f583e8831abeea2cbaf60e5f8160f7fc141eb7bf9e1712355914a27b37 -EBUILD pixie-2.2.6-r1.ebuild 2751 SHA256 563981ccc3455d5c6542a3ab6228224924a5b9b2da41c8ef22c79bd8a082a1ba SHA512 529cf7cec81dd0f773bb7acbab64d70c64ea0c9a31117aee310958593a9d5335bb4cd7520960eaf4fcb92f427ef8dad93d2ccea220516bd413e9581562cbe4f8 WHIRLPOOL 9a313c0dfd69dec8aa4bad95c6a0b0890a9141fea992f1f9914d97ff7f9793c6f2fb3b83eabd9f1ca34b03214fbe15ee3e33e6436a5327352888a8bc7316208a +DIST pixie-2.2.6-gcc6.patch.gz 16661 SHA256 4ee7442697b07c37255a1491fadcd2005efc5510d98d015114b7ebaa7632b0d0 SHA512 2cada11c95df1dde44119b97b44ab8550608427a2351540117655055d98a5ca142bc1fc78e8fc5ab25b8bb33385a7914114796a88cf83a232480e5b84bec57fb WHIRLPOOL d09cee22410ada1d3c2ade6140bcc3047af96ccaa7f35420e02ebb01a7c14dd1edff036257c9fc1b7fbe343b740f518e7ed32982673ebfbaa7c53ca532e5ee74 +EBUILD pixie-2.2.6-r1.ebuild 2872 SHA256 05ce3818336b591310b65cfa320d1d8703244b1fe5f0705b59f0c7ffe49ccc4e SHA512 a7498b2c86f34763d8905bfc79866b1aac48d16314cc3ea94dea72edbedc0c277c65305da8cfe960dadede701a477e1eadb9487d335c44707413b3d39c6fb48d WHIRLPOOL 6b82f95aaf92d6291227b2fe47edcb49685241f4765bbf006bf60235ee832ce4a5f0358e322436e9b0d503a106cf5b415fb44662ed2f43646bd3231b9d41cf7d MISC ChangeLog 2981 SHA256 c316eca3eb3a5dd124aea6ffba6aaf6626c1bec59943543fd829fd97159da0e9 SHA512 f8e7ab6fa2b7a21d4a6bd06c74ad12d0b0bafd8a4270304efe1a6335e047de00a8ac4fc219da653e6a4e4592f2002ac5465dfef64f985c68c5db446ab124934f WHIRLPOOL 382a748ca5d4c96fe5d33ffa44f67a80c3b929f112f3fa7340ee4de0c8dbae737facb1cb54fe7e55b4de53e4a716946eb4f1823e0afc44221d3182d8826445ae MISC ChangeLog-2015 10382 SHA256 4c006af23b8ec95a6b3961c97461c478e1be50c0f187df58e6af90f2de24d1d8 SHA512 bd4125433c961dc9c09a67094aaf038db43c45566e11ae145d8b5975c3b7fdc5f1c80c5e490ec28294c0e806951eace65806110851472a0149e8fa57db580caf WHIRLPOOL 1fc7c8962f13e8752cb292549cc0f2110316bb9250aa9e3e1c0ac88b54ba2c23cb87a43b57eed4993108e1bde6fb35048d2937982804bac249f37b873861f0dd MISC metadata.xml 544 SHA256 9b565484c85fba59fbb5f75a547390f2efa0957244ae7aab5e89a3e405027c3d SHA512 961588ff38565e8a709b30f704d099676d73f0d1cbe5b266cc26542d511648a740ca430ef845b290c4ad0bc2ffdbe15706534b1f6421d975e66eedf6b6853c89 WHIRLPOOL 93259831d532a3180cfff14f72db922abd46b73d13aaf6b5592496b7c41666f2fd8962366d90ec1f0db61d8359afc328d7a8a1d00367433fbaeafba2a92c9f27 diff --git a/media-gfx/pixie/pixie-2.2.6-r1.ebuild b/media-gfx/pixie/pixie-2.2.6-r1.ebuild index faa1c54ca862..5a71b52b4754 100644 --- a/media-gfx/pixie/pixie-2.2.6-r1.ebuild +++ b/media-gfx/pixie/pixie-2.2.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="2" @@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_PN}" DESCRIPTION="RenderMan like photorealistic renderer" HOMEPAGE="http://pixie.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz" +SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz https://dev.gentoo.org/~dilfridge/distfiles/pixie-2.2.6-gcc6.patch.gz" LICENSE="GPL-2" IUSE="X static-libs" @@ -47,6 +47,8 @@ src_prepare() { # FIX: missing @includedir@ # https://sf.net/tracker/?func=detail&aid=2923415&group_id=59462&atid=491094 epatch "${FILESDIR}"/${P}-autotools.patch + # bug 594354 + epatch "${WORKDIR}"/${P}-gcc6.patch eautoreconf # FIX: removing pre-compiled shaders |