diff options
Diffstat (limited to 'media-libs/simage')
| -rw-r--r-- | media-libs/simage/Manifest | 9 | ||||
| -rw-r--r-- | media-libs/simage/files/simage-1.7.0-libpng15.patch | 12 | ||||
| -rw-r--r-- | media-libs/simage/files/simage-1.7.0-pkgconfig-partial.patch | 13 | ||||
| -rw-r--r-- | media-libs/simage/files/simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch | 25 | ||||
| -rw-r--r-- | media-libs/simage/simage-1.7.0-r1.ebuild | 75 | ||||
| -rw-r--r-- | media-libs/simage/simage-1.7.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/simage/simage-1.8.0.ebuild | 82 |
7 files changed, 113 insertions, 107 deletions
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index 256934103cb4..c843a90d723c 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1,11 +1,10 @@ -AUX simage-1.7.0-libpng15.patch 572 BLAKE2B 7f4eacdd5aac3e6634fd26824d0dfb7ec779fcf6be86e642f2870c62b1f0bd86b1ef767e19034e05fd62cba9904ef45e13a85be7657e00133febb67b0469c337 SHA512 0a867187b0dbc644182784e56dfd26b51f48c9355b01228fe3386fab05cee084e0066d4b18eb3f63110a25c0d2abf8f8b214d9b94e2e7dc7438e90308653e4e8 -AUX simage-1.7.0-pkgconfig-partial.patch 467 BLAKE2B a2957c1d5fc6939df7ecb1bb15743253294142a87f98d4043368f189dc4f5ee302de16e84572a69e3ea5755124326fb075b2e45d3574a1759c899d9e96eaf828 SHA512 791db9c02fc0dc7526ed43b340ab6f92baea91a5bf9005099f6adf1550a7ab73ef36790d2e761f0b50b88098e9124f3035ff21149cca00d819c2262d8e180618 AUX simage-1.7.1-cmake-automagic-deps.patch 2730 BLAKE2B f4948226c05c123a92d7221d6e670e1d9bcbea326c34fcb7615e69493fab14707be47965ec68a0fa2d1ec71bfc08d74c772730acf78dd8da1062d833205eceb0 SHA512 81ad61d683915b803909729a69bf5496254920ab0d40ce1186fae838eadda831ef9d8cc1138624145f2e1e88dbfd75852f3c97da0316bc6a85cd23d55d5f1a5d AUX simage-1.7.1-disable-examples.patch 1803 BLAKE2B 93c4ef68fa3e2e1db406c7fd3fe67096e9a70692e1a8c35c0391e38be5335072aa87ae5fb41cc1a3b3b0fac06df9c525566d1b7efab3db1f4cde2ca7b3530d74 SHA512 5046fec14950e1cec25ac0576197208dad05cc862c8c59b405db38586c91fd5dbd1b2793551901f34312eabb4cd6dfb7a84f8620372a7d6aefafd6490f6a7847 AUX simage-1.7.1-disable-gif-quantize-buffer.patch 1054 BLAKE2B 15c0cf6c1ca78798e3c93034e7e4d17e1bf5ba5f9921f307e52b87f9d3e02babfac83e40eed401f98db8a225f404fa248957f41b03e360541e46bc62c893d099 SHA512 4a25f0f54a609c613e4f7baaf87a694e246b0c283cf85195e6d272826deb95dda9106125925188e785a2c64c2ed9633465ceb76b2b816e463cfa063ec16dffdc AUX simage-1.7.1-tests-conditional.patch 1757 BLAKE2B 59bb06980457f85c68670d02efdb3ddf149576d9f8728a33e7a0e97e736454b3858ba3eb123e6239f89006c836cb640b49238ffa733fe97ea65a5ca871712005 SHA512 3063e47ac6a7e90ce27f93d8046d897d203756b52008ed867061260378858b2b0c6b0cf6cb87a846f2f98cf2e595f2e4b4a468a32e34e9676d16848c387cd46e -DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f +AUX simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch 790 BLAKE2B 117b907b783404e4e8d03d09ca66496e0fede9bac5ea056ca4489140e9b0532ba585ebb4e75aec47a85e16b88a027fc7ec95297df4fed44a880ad4f0855b17a8 SHA512 692d3741b059148ce1190425319862fdc4299d7efc3a392aee91b60b5575f4702c5f72a066a70984afb14d68fd561f03c76f3ff76894aae36036579272f0f9e8 DIST simage-1.7.1-src.zip 4145907 BLAKE2B 99f5f5f46530c2600d47ab0bb080d69281447ee96a2bb9b63ebe5a5c56e235f34ca8bd97b0d6adedf061fe221a61d144d4ccce00123941a9c74d72b1f190030d SHA512 b3c81fa363cd570b3512cd2984f154b83876353ec389dc35afcac4e4ddf8d301eef5b0f8df93c38b9caa6afd81fbe53d3943ad05e041b77734f03c26d2e12867 -EBUILD simage-1.7.0-r1.ebuild 1774 BLAKE2B 672761903a9a91db1c92d6cd0248902b1c9c5612cc95bb8f7b543991672b9dfc761c29ea89f432f02c119170c8c7539830d00fa811dc06675ba19dd2d9cdb0d4 SHA512 609cdd06c38fab358d4f6aaa469dec35e14789a7ec2ab459f80f3065ca9341a9801d7c6e48490fd436d667f71dfda51396474f25fe4481dbadfca27928c3f394 -EBUILD simage-1.7.1-r1.ebuild 2175 BLAKE2B 78d7d95b1121df159983b79dfdd93182424c40c5a85010b408f789ca522abf9920a135245a4089ab360df3f7df33f8ae8a3a2c0283de2c69598bcb3fe5bea458 SHA512 b5ac712222fff11ce87dd3b2fdbe340ef8bfa49001f348a8c26b87f64c3e3d216af92107032aebaceff8de9980150ba7a64b331f544b8edf11ab64b2e64d77d9 +DIST simage-1.8.0.tar.gz 791151 BLAKE2B 0a5720c06501c8212b5a148ad790ff60d6d9fc507868a66d40dbe3b6b089e47dca21828fee96ef708a03651d02843c9e6b6db7856088ddf7e487b4b5eeafbccd SHA512 7070c845fc72094a97b1253d23a5f60f90e71dc6ed968c9c7da67e05660b05245a807fbdf0f592a1d459c7c3b725783c55f59f867182b11cb9ec40741d7ad58c +EBUILD simage-1.7.1-r1.ebuild 2171 BLAKE2B b9601d5a9e1435935b0f275440443de886b81bc3ffa4fbfc6569827a8f78ada80d7bb051a064fcc370c58d07c3a96a2847c5ca3f0c552043e13a64cba762288e SHA512 c6929402f3fb600842bce7fbca0541a518c3708b500c18999736437611e5c49e16bf17dc4a06ba1eb2d051b84ba5639cabcbd28b0e5dbf4132c5c9ad825a1542 +EBUILD simage-1.8.0.ebuild 2232 BLAKE2B 85cb03874a1dcfb784aedf6726873ae5a99842c1c19f3b194ab0418878b4a5271e3e0656ea34791306a5699beeea18fe62a517b4613fb880a6e871cecd06e1b6 SHA512 800797bec59dabdb1f84a7f9b88f90026d4048d51b8edd7db54c15a315e48afd8dd9c6a893397cefebc8cf3ee980a3c873195144f3270ba8b0b74d641c6b38fb MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a diff --git a/media-libs/simage/files/simage-1.7.0-libpng15.patch b/media-libs/simage/files/simage-1.7.0-libpng15.patch deleted file mode 100644 index f99d474cf04a..000000000000 --- a/media-libs/simage/files/simage-1.7.0-libpng15.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN simage-1.7.0/src/simage_png.c new/src/simage_png.c ---- simage-1.7.0/src/simage_png.c 2010-02-26 16:47:31.000000000 +0100 -+++ new/src/simage_png.c 2013-06-06 22:34:23.537331509 +0200 -@@ -323,7 +323,7 @@ - /* Set error handling. REQUIRED if you aren't supplying your own - * error hadnling functions in the png_create_write_struct() call. - */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* If we get here, we had a problem reading the file */ - fclose(fp); - png_destroy_write_struct(&png_ptr, (png_infopp)info_ptr); diff --git a/media-libs/simage/files/simage-1.7.0-pkgconfig-partial.patch b/media-libs/simage/files/simage-1.7.0-pkgconfig-partial.patch deleted file mode 100644 index c8c893855e8a..000000000000 --- a/media-libs/simage/files/simage-1.7.0-pkgconfig-partial.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN simage-1.7.0/simage.pc.in new/simage.pc.in ---- simage-1.7.0/simage.pc.in 2010-02-26 16:47:31.000000000 +0100 -+++ new/simage.pc.in 2013-06-06 22:35:42.303326845 +0200 -@@ -8,7 +8,8 @@ - Version: @VERSION@ - Requires: - Conflicts: --Libs: -L${libdir} @SIMAGE_EXTRA_LDFLAGS@ @SIMAGE_EXTRA_LIBS@ -+Libs: -L${libdir} -lsimage -+Libs.private: -L${libdir} @SIMAGE_EXTRA_LIBS@ - Cflags: -I${includedir} @SIMAGE_EXTRA_CFLAGS@ @SIMAGE_EXTRA_CPPFLAGS@ - - simage_host="@host@" diff --git a/media-libs/simage/files/simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch b/media-libs/simage/files/simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch new file mode 100644 index 000000000000..4dcc5994f360 --- /dev/null +++ b/media-libs/simage/files/simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch @@ -0,0 +1,25 @@ +From 1c0e3fb6deb9c3d3c1dd1d4940ffe8d71c2158c9 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl@gmail.com> +Date: Mon, 20 Jan 2020 18:45:10 +0100 +Subject: [PATCH] CMakeLists.txt: comment cpack.d inclusion + +Directory is not included in tarball and not needed on Gentoo. + +Signed-off-by: Bernd Waibel <waebbl@gmail.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 775037a..e3deb01 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -627,4 +627,4 @@ install(EXPORT ${PROJECT_NAME} +
+ # ############################################################################
+ # New CPACK section, please see the README file inside cpack.d directory.
+-add_subdirectory(cpack.d)
++#add_subdirectory(cpack.d)
+-- +2.25.0 + diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild deleted file mode 100644 index f491e59cb38b..000000000000 --- a/media-libs/simage/simage-1.7.0-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Image and video texturing library" -HOMEPAGE="https://bitbucket.org/Coin3D/simage" -SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz" - -LICENSE="public-domain mpeg2enc" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86" -SLOT="0" -IUSE="debug gif jpeg png sndfile static-libs tiff vorbis zlib" -RESTRICT="mirror bindist" #465086 - -RDEPEND=" - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg:0= ) - png? ( media-libs/libpng:0= ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0= ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -DOCS=(AUTHORS ChangeLog NEWS README) - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-pkgconfig-partial.patch - "${FILESDIR}"/${PN}-1.7.0-libpng15.patch -) - -# --with-pic, two defined (PIC and one for image format, sillyt), no not pass -# --enable-qimage, broken Qt checks, unable to locate FHS-compliant Qt install -# --with-x, not used anywhere -src_configure() { - econf \ - --disable-qimage \ - --disable-quicktime \ - --with-eps \ - --with-mpeg2enc \ - --with-rgb \ - --with-targa \ - --with-xwd \ - --without-x \ - $(use_with gif) \ - $(use_enable debug) \ - $(use_enable debug symbols) \ - $(use_with jpeg) \ - --without-jasper \ - $(use_with png) \ - $(use_with sndfile libsndfile) \ - $(use_enable static-libs static) \ - $(use_with tiff) \ - $(use_with vorbis oggvorbis) \ - $(use_with zlib) -} - -src_install() { - # Remove simage from Libs.private - sed -e '/Libs.private/s/ -lsimage//' -i simage.pc || die - - default - - # Remove libtool files when not needed. - if use static-libs; then - rm -f "${ED}"/usr/lib*/*.la || die - fi -} diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild index 34859fa678e4..d71968b640f5 100644 --- a/media-libs/simage/simage-1.7.1-r1.ebuild +++ b/media-libs/simage/simage-1.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://bitbucket.org/Coin3D/simage" SRC_URI="https://bitbucket.org/Coin3D/simage/downloads/${P}-src.zip" LICENSE="public-domain mpeg2enc" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86" SLOT="0" IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis" RESTRICT="!test? ( test )" diff --git a/media-libs/simage/simage-1.8.0.ebuild b/media-libs/simage/simage-1.8.0.ebuild new file mode 100644 index 000000000000..8d8e6434e9ba --- /dev/null +++ b/media-libs/simage/simage-1.8.0.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic + +DESCRIPTION="Image and video texturing library" +HOMEPAGE="https://github.com/coin3d/simage/" +SRC_URI="https://github.com/coin3d/simage/archive/${P}.tar.gz" + +LICENSE="BSD-1" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +SLOT="0" +IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-libs/zlib:= + gif? ( media-libs/giflib:= ) + jpeg? ( virtual/jpeg:0 ) + png? ( media-libs/libpng:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + ) + sndfile? ( media-libs/libsndfile ) + tiff? ( media-libs/tiff:0 ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) +" +DEPEND=" + ${RDEPEND} + test? ( media-libs/libsndfile ) +" + +S="${WORKDIR}/${PN}-${P}" + +PATCHES=( + "${FILESDIR}/${PN}-1.7.1-cmake-automagic-deps.patch" + # examples need to link against libsndfile unconditionally so either we could + # make the dep unconditional or not build the examples. i chose the latter way. + # btw, examples are not installed anyway, they are just compiled. + "${FILESDIR}/${PN}-1.7.1-disable-examples.patch" + "${FILESDIR}/${PN}-1.7.1-tests-conditional.patch" + "${FILESDIR}/${PN}-1.7.1-disable-gif-quantize-buffer.patch" + "${FILESDIR}/${P}-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch" +) + +DOCS=(AUTHORS ChangeLog NEWS README) + +src_configure() { + use debug && append-cppflags -DSIMAGE_DEBUG=1 + + local mycmakeargs=( + -DSIMAGE_AVIENC_SUPPORT=OFF # Windows only + -DSIMAGE_BUILD_SHARED_LIBS=ON + -DSIMAGE_CGIMAGE_SUPPORT=OFF # OS X only + -DSIMAGE_EPS_SUPPORT=ON + -DSIMAGE_GDIPLUS_SUPPORT=OFF # Windows only + -DSIMAGE_GIF_SUPPORT=$(usex gif) + -DSIMAGE_JASPER_SUPPORT=OFF + -DSIMAGE_JPEG_SUPPORT=$(usex jpeg) + -DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile) + -DSIMAGE_MPEG2ENC_SUPPORT=ON + -DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis) + -DSIMAGE_PIC_SUPPORT=ON + -DSIMAGE_PNG_SUPPORT=$(usex png) + -DSIMAGE_QIMAGE_SUPPORT=$(usex qt5) + -DSIMAGE_QUICKTIME_SUPPORT=OFF # OS X only + -DSIMAGE_TIFF_SUPPORT=$(usex tiff) + -DSIMAGE_USE_QT5=ON + -DSIMAGE_RGB_SUPPORT=ON + -DSIMAGE_TGA_SUPPORT=ON + -DSIMAGE_XWD_SUPPORT=ON + -DTESTS=$(usex test) + ) + + cmake_src_configure +} |