[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/files/, media-libs/simage/
commit: c734710761ac100e3814f4a540981e02280a967c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 25 11:39:18 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 25 12:38:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7347107 media-libs/simage: drop 1.8.1-r3 Closes: https://bugs.gentoo.org/926343 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/simage/Manifest | 1 - .../simage-1.8.1-fail-on-missing-quicktime.patch | 12 --- media-libs/simage/simage-1.8.1-r3.ebuild | 89 -- 3 files changed, 102 deletions(-) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index e8f2c117a07c..98994b4cc952 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1,2 +1 @@ -DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe DIST simage-1.8.3.tar.gz 829994 BLAKE2B 794ee3a1c71727af7e92839542470a4732584715b01cbfd5be7b34d8ea8295ca65f5634e10027e0e7e4eb36a024d31704ad31d9aa0a6ad6b66c08612879a1603 SHA512 193137bd00a322fe6c170d3ff318ac81e4cc685bdfa40a0415c5bb95802b6290174fea630eb79956f362b4e79fa0b60916976c63ef26d6a65a6a51d5d9f7de03 diff --git a/media-libs/simage/files/simage-1.8.1-fail-on-missing-quicktime.patch b/media-libs/simage/files/simage-1.8.1-fail-on-missing-quicktime.patch deleted file mode 100644 index c6fc96af05dc.. --- a/media-libs/simage/files/simage-1.8.1-fail-on-missing-quicktime.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN simage/CMakeLists.txt simage-my/CMakeLists.txt simage/CMakeLists.txt 2021-01-11 23:16:40.0 +0100 -+++ simage-my/CMakeLists.txt 2021-01-24 04:12:55.309111983 +0100 -@@ -126,7 +126,7 @@ - # On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA. - # see https://en.wikipedia.org/wiki/QuickTime - if(SIMAGE_USE_QUICKTIME) -- find_package(QuickTime) -+ find_package(QuickTime REQUIRED) - endif() - - if(SIMAGE_USE_CGIMAGE) diff --git a/media-libs/simage/simage-1.8.1-r3.ebuild b/media-libs/simage/simage-1.8.1-r3.ebuild deleted file mode 100644 index 0c2755db7da4.. --- a/media-libs/simage/simage-1.8.1-r3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Image and video texturing library" -HOMEPAGE="https://github.com/coin3d/simage/; - -if [[ ${PV} = * ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/coin3d/simage.git; -else - SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" - S="${WORKDIR}/${PN}" -fi - -LICENSE="BSD-1" -SLOT="0" -IUSE="gif jpeg png qt5 sndfile test tiff vorbis zlib" -RESTRICT="!test? ( test )" - -RDEPEND=" - gif? ( media-libs/giflib:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( media-libs/libpng:= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - ) - sndfile? ( - media-libs/libsndfile - media-libs/flac:= - ) - tiff? ( - media-libs/tiff:=[lzma,zstd] - app-arch/xz-utils - app-arch/zstd:= - ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - media-libs/opus - ) - zlib? ( sys-libs/zlib:= ) -" -DEPEND="${RDEPEND}" -BDEPEND="test? ( media-libs/libsndfile )" - -PATCHES=( - "${FILESDIR}"/${P}-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch - "${FILESDIR}"/${PN}-1.8.1-fail-on-missing-quicktime.patch -) - -DOCS=(AUTHORS ChangeLog NEWS README) - -src_configure() { - local mycmakeargs=( - -DSIMAGE_BUILD_SHARED_LIBS=ON - -DSIMAGE_BUILD_EXAMPLES=OFF - -DSIMAGE_BUILD_TESTS=$(usex test) - -DSIMAGE_BUILD_DOCUMENTATION=OFF - -DSIMAGE_USE_AVIENC=OFF # Windows only - -DSIMAGE_USE_GDIPLUS=OFF # Windows - -DSIMAGE_USE_CGIMAGE=OFF # OS X only - -DSIMAGE_USE_QUICKTIME=OFF # OS X only - -DSIMAGE_USE_QIMAGE=$(usex qt5) - -DSIMAGE_USE_QT5=$(usex qt5) - -DSIMAGE_USE_CPACK=OFF - -DSIMAGE_USE_STATIC_LIBS=OFF - -DSIMAGE_LIBJASPER_SUPPORT=OFF - -DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile) - -DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis) - -DSIMAGE_EPS_SUPPORT=ON - -DSIMAGE_MPEG2ENC_SUPPORT=ON - -DSIMAGE_PIC_SUPPORT=ON
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: d5d0f79f14b15badaa71f33fbd70e336ee4d Author: Sam James gentoo org> AuthorDate: Mon Mar 25 11:22:10 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 25 11:22:10 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5d0f79f media-libs/simage: Stabilize 1.8.3 x86, #926343 Signed-off-by: Sam James gentoo.org> media-libs/simage/simage-1.8.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.3.ebuild b/media-libs/simage/simage-1.8.3.ebuild index f0b1668311ad..157cbf9495c5 100644 --- a/media-libs/simage/simage-1.8.3.ebuild +++ b/media-libs/simage/simage-1.8.3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git; else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" S="${WORKDIR}/${PN}" fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 809232bf8b6160530e9b5936302c4ab491411379 Author: Sam James gentoo org> AuthorDate: Mon Mar 25 11:22:01 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 25 11:22:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809232bf media-libs/simage: Stabilize 1.8.3 ppc64, #926343 Signed-off-by: Sam James gentoo.org> media-libs/simage/simage-1.8.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/simage/simage-1.8.3.ebuild b/media-libs/simage/simage-1.8.3.ebuild index fcec6add0f0c..1d0066c62808 100644 --- a/media-libs/simage/simage-1.8.3.ebuild +++ b/media-libs/simage/simage-1.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git; else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86" S="${WORKDIR}/${PN}" fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 6c31070e823f69e900a8eb44ad93ef99bbeb3c34 Author: Sam James gentoo org> AuthorDate: Mon Mar 25 11:22:05 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 25 11:22:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c31070e media-libs/simage: Stabilize 1.8.3 amd64, #926343 Signed-off-by: Sam James gentoo.org> media-libs/simage/simage-1.8.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.3.ebuild b/media-libs/simage/simage-1.8.3.ebuild index a8574c5059c1..f0b1668311ad 100644 --- a/media-libs/simage/simage-1.8.3.ebuild +++ b/media-libs/simage/simage-1.8.3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git; else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86" S="${WORKDIR}/${PN}" fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 6b3020c3a2fce347fd0cb977ef850278fd430aa2 Author: Sam James gentoo org> AuthorDate: Mon Mar 25 11:22:03 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 25 11:22:03 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3020c3 media-libs/simage: Stabilize 1.8.3 ppc, #926343 Signed-off-by: Sam James gentoo.org> media-libs/simage/simage-1.8.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.3.ebuild b/media-libs/simage/simage-1.8.3.ebuild index 1d0066c62808..a8574c5059c1 100644 --- a/media-libs/simage/simage-1.8.3.ebuild +++ b/media-libs/simage/simage-1.8.3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git; else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86" S="${WORKDIR}/${PN}" fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 1610fe59e84df9b728930d2fe1083de1f4ee512e Author: Maciej Mrozowski gentoo org> AuthorDate: Sat Dec 9 02:57:53 2023 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sat Dec 9 02:58:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1610fe59 media-libs/simage: add 1.8.3 with optional qt6 support Signed-off-by: Maciej Mrozowski gentoo.org> media-libs/simage/Manifest | 1 + media-libs/simage/simage-1.8.1-r3.ebuild | 4 ++-- .../{simage-.ebuild => simage-1.8.3.ebuild}| 23 -- media-libs/simage/simage-.ebuild | 23 -- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index f01f4b90a2a4..e8f2c117a07c 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1 +1,2 @@ DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe +DIST simage-1.8.3.tar.gz 829994 BLAKE2B 794ee3a1c71727af7e92839542470a4732584715b01cbfd5be7b34d8ea8295ca65f5634e10027e0e7e4eb36a024d31704ad31d9aa0a6ad6b66c08612879a1603 SHA512 193137bd00a322fe6c170d3ff318ac81e4cc685bdfa40a0415c5bb95802b6290174fea630eb79956f362b4e79fa0b60916976c63ef26d6a65a6a51d5d9f7de03 diff --git a/media-libs/simage/simage-1.8.1-r3.ebuild b/media-libs/simage/simage-1.8.1-r3.ebuild index bc61f6c45c3a..0c2755db7da4 100644 --- a/media-libs/simage/simage-1.8.1-r3.ebuild +++ b/media-libs/simage/simage-1.8.1-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Image and video texturing library" HOMEPAGE="https://github.com/coin3d/simage/; diff --git a/media-libs/simage/simage-.ebuild b/media-libs/simage/simage-1.8.3.ebuild similarity index 83% copy from media-libs/simage/simage-.ebuild copy to media-libs/simage/simage-1.8.3.ebuild index ae5ce0a704a3..fcec6add0f0c 100644 --- a/media-libs/simage/simage-.ebuild +++ b/media-libs/simage/simage-1.8.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Image and video texturing library" HOMEPAGE="https://github.com/coin3d/simage/; @@ -13,13 +13,14 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git; else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" S="${WORKDIR}/${PN}" fi LICENSE="BSD-1" SLOT="0" -IUSE="gif jpeg png qt5 sndfile test tiff vorbis zlib" +IUSE="gif jpeg png qt5 qt6 sndfile test tiff vorbis zlib" +REQUIRED_USE="qt5? ( !qt6 )" RESTRICT="!test? ( test )" RDEPEND=" @@ -30,6 +31,9 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 ) + qt6? ( + dev-qt/qtbase:6[gui] + ) sndfile? ( media-libs/libsndfile media-libs/flac:= @@ -56,6 +60,12 @@ PATCHES=( DOCS=(AUTHORS ChangeLog NEWS README) src_configure() { + local use_qt + if use qt5 || use qt6 ; then + use_qt=ON + else + use_qt=OFF + fi local mycmakeargs=( -DSIMAGE_BUILD_SHARED_LIBS=ON -DSIMAGE_BUILD_EXAMPLES=OFF @@ -65,8 +75,9 @@ src_configure() { -DSIMAGE_USE_GDIPLUS=OFF # Windows -DSIMAGE_USE_CGIMAGE=OFF # OS X only -DSIMAGE_USE_QUICKTIME=OFF # OS X only - -DSIMAGE_USE_QIMAGE=$(usex qt5) + -DSIMAGE_USE_QIMAGE=${use_qt} -DSIMAGE_USE_QT5=$(usex qt5) + -DSIMAGE_USE_QT6=$(usex qt6) -DSIMAGE_USE_CPACK=OFF -DSIMAGE_USE_STATIC_LIBS=OFF -DSIMAGE_LIBJASPER_SUPPORT=OFF diff --git a/media-libs/simage/simage-.ebuild b/media-libs/simage/simage-.ebuild index ae5ce0a704a3..fcec6add0f0c 100644 --- a/media-libs/simage/simage-.ebuild +++ b/media-libs/simage/simage-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Image and video texturing library" HOMEPAGE="https://github.com/coin3d/simage/; @@
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/, media-libs/simage/files/
commit: b1f3c4f08cc26126f9bd4c7a90b6907e1cafb092 Author: Sam James gentoo org> AuthorDate: Sun Dec 18 08:09:30 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 08:30:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f3c4f0 media-libs/simage: drop 1.8.0-r3 Signed-off-by: Sam James gentoo.org> media-libs/simage/Manifest | 1 - .../files/simage-1.7.1-cmake-automagic-deps.patch | 85 -- .../files/simage-1.7.1-disable-examples.patch | 44 --- .../simage-1.7.1-disable-gif-quantize-buffer.patch | 31 .../files/simage-1.7.1-tests-conditional.patch | 52 - ...-CMakeLists.txt-comment-cpack.d-inclusion.patch | 25 --- media-libs/simage/simage-1.8.0-r3.ebuild | 82 - 7 files changed, 320 deletions(-) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index 6af22527239c..f01f4b90a2a4 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1,2 +1 @@ -DIST simage-1.8.0-src.tar.gz 797069 BLAKE2B 6f9e3512c9815974b1b2799306c6567f6b5aec6771fe31e0a5fa47a827819df02e80e976063ddbae3e3aa3a4d33da68a23c9067e7b91f82c28592f83d0e782cc SHA512 fb4943c38f418461b087d5d013c2054f25d553a872fc80f9445a5e907901eb40265d838c5cc1031032dd84885f066f1c640a1949bc450591fb0ea88c05d1e38f DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe diff --git a/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch b/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch deleted file mode 100644 index 5f3fd2db7146.. --- a/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5536922..8225dc4 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -218,14 +218,14 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD - find_package(TIFF) - - set(HAVE_ZLIB ${ZLIB_FOUND}) -- set(HAVE_GIFLIB ${GIF_FOUND}) -- set(HAVE_JPEGLIB ${JPEG_FOUND}) -- set(HAVE_PNGLIB ${PNG_FOUND}) -- set(HAVE_TIFFLIB ${TIFF_FOUND}) -+ set(HAVE_GIFLIB ${SIMAGE_GIF_SUPPORT}) -+ set(HAVE_JPEGLIB ${SIMAGE_JPEG_SUPPORT}) -+ set(HAVE_PNGLIB ${SIMAGE_PNG_SUPPORT}) -+ set(HAVE_TIFFLIB ${SIMAGE_TIFF_SUPPORT}) - endif() - --set(HAVE_JASPER ${JASPER_FOUND}) --set(HAVE_VFW ${VFW_FOUND}) -+set(HAVE_JASPER ${SIMAGE_JASPER_SUPPORT}) -+set(HAVE_VFW ${SIMAGE_AVIENC_SUPPORT}) - - check_include_files(guile/gh.h HAVE_GUILE_GH_H) - check_include_files(inttypes.h HAVE_INTTYPES_H) -@@ -430,27 +430,27 @@ if(SIMAGE_GDIPLUS_SUPPORT) - target_link_libraries(simage PRIVATE ${GDIPLUS_LIBRARIES}) - endif() - --if(GIF_FOUND) -+if(SIMAGE_GIF_SUPPORT) - target_include_directories(simage PRIVATE ${GIF_INCLUDE_DIR}) - target_link_libraries(simage PRIVATE ${GIF_LIBRARIES}) - endif() - --if(JASPER_FOUND) -+if(SIMAGE_JASPER_SUPPORT) - target_include_directories(simage PRIVATE ${JASPER_INCLUDE_DIR}) - target_link_libraries(simage PRIVATE ${JASPER_LIBRARIES}) - endif() - --if(JPEG_FOUND) -+if(SIMAGE_JPEG_SUPPORT) - target_include_directories(simage PRIVATE ${JPEG_INCLUDE_DIR}) - target_link_libraries(simage PRIVATE ${JPEG_LIBRARIES}) - endif() - --if(OGGVORBIS_FOUND) -+if(SIMAGE_OGGVORBIS_SUPPORT) - target_include_directories(simage PRIVATE ${OGGVORBIS_INCLUDE_DIRS}) - target_link_libraries(simage PRIVATE ${OGGVORBIS_LIBRARIES}) - endif() - --if(PNG_FOUND) -+if(SIMAGE_PNG_SUPPORT) - target_include_directories(simage PRIVATE ${PNG_INCLUDE_DIR}) - target_link_libraries(simage PRIVATE ${PNG_LIBRARIES}) - endif() -@@ -459,22 +459,22 @@ if(SIMAGE_QIMAGE_SUPPORT) - target_link_libraries(simage PRIVATE ${QT_LIBRARIES}) - endif() - --if(QUICKTIME_FOUND) -+if(SIMAGE_QUICKTIME_SUPPORT) - target_include_directories(simage PRIVATE ${QUICKTIME_INCLUDE_DIR}) - target_link_libraries(simage PRIVATE ${QUICKTIME_LIBRARIES}) - endif() - --if(SNDFILE_FOUND) -+if(SIMAGE_SNDFILE_SUPPORT) - target_include_directories(simage PRIVATE ${SNDFILE_INCLUDE_DIRS}) - target_link_libraries(simage PRIVATE ${SNDFILE_LIBRARIES}) - endif() - --if(TIFF_FOUND) -+if(SIMAGE_TIFF_SUPPORT) - target_include_directories(simage PRIVATE ${TIFF_INCLUDE_DIR}) - target_link_libraries(simage PRIVATE ${TIFF_LIBRARY}) - endif() - --if(VFW_FOUND) -+if(SIMAGE_VFW_SUPPORT) - target_link_libraries(simage PRIVATE ${VFW_LIBRARIES}) - endif() - diff --git a/media-libs/simage/files/simage-1.7.1-disable-examples.patch b/media-libs/simage/files/simage-1.7.1-disable-examples.patch deleted file mode 100644 index 9e43e073ccd1.. --- a/media-libs/simage/files/simage-1.7.1-disable-examples.patch
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 66760a8e4ffaadc60403130ef45b57dfb6784cda Author: Sam James gentoo org> AuthorDate: Fri Dec 16 04:25:08 2022 + Commit: Sam James gentoo org> CommitDate: Fri Dec 16 04:29:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66760a8e media-libs/simage: unrevbump Unintentional, was defect in script for libtiff revbumps (fixed already for next time.) Signed-off-by: Sam James gentoo.org> media-libs/simage/{simage--r1.ebuild => simage-.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media-libs/simage/simage--r1.ebuild b/media-libs/simage/simage-.ebuild similarity index 100% rename from media-libs/simage/simage--r1.ebuild rename to media-libs/simage/simage-.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 99aeded44051f17ece1521903c5929ff799a66a3 Author: Sam James gentoo org> AuthorDate: Wed Dec 8 03:32:46 2021 + Commit: Sam James gentoo org> CommitDate: Wed Dec 8 03:32:46 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99aeded4 media-libs/simage: Keyword 1.8.1 arm64, #806776 Signed-off-by: Sam James gentoo.org> media-libs/simage/simage-1.8.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1.ebuild index d2d198033f3d..16a7636b4951 100644 --- a/media-libs/simage/simage-1.8.1.ebuild +++ b/media-libs/simage/simage-1.8.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git; else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" S="${WORKDIR}/${PN}" fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 9ad784d4440e6b3d6b6fc2ec3dc5ff03d03644d1 Author: Sam James gentoo org> AuthorDate: Wed Feb 24 22:07:15 2021 + Commit: Sam James gentoo org> CommitDate: Wed Feb 24 22:07:15 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad784d4 media-libs/simage: Stabilize 1.8.1 ppc, #771804 Signed-off-by: Sam James gentoo.org> media-libs/simage/simage-1.8.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1.ebuild index 5922c9eacfb..d2d198033f3 100644 --- a/media-libs/simage/simage-1.8.1.ebuild +++ b/media-libs/simage/simage-1.8.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git; else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86" + KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86" S="${WORKDIR}/${PN}" fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: d9453003ed21f6de7510bb44531168d628661ffd Author: Sam James gentoo org> AuthorDate: Wed Feb 24 20:45:41 2021 + Commit: Sam James gentoo org> CommitDate: Wed Feb 24 20:45:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9453003 media-libs/simage: Stabilize 1.8.1 ppc64, #771804 Signed-off-by: Sam James gentoo.org> media-libs/simage/simage-1.8.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1.ebuild index ded465c1bc8..5922c9eacfb 100644 --- a/media-libs/simage/simage-1.8.1.ebuild +++ b/media-libs/simage/simage-1.8.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git; else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" + KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86" S="${WORKDIR}/${PN}" fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: fa39bf7a389675eaa81dc0c797bdf34af15ba41b Author: Sam James gentoo org> AuthorDate: Sun Feb 21 04:04:49 2021 + Commit: Sam James gentoo org> CommitDate: Sun Feb 21 04:04:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa39bf7a media-libs/simage: Stabilize 1.8.1 x86, #771804 Signed-off-by: Sam James gentoo.org> media-libs/simage/simage-1.8.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1.ebuild index 4417c43feac..ded465c1bc8 100644 --- a/media-libs/simage/simage-1.8.1.ebuild +++ b/media-libs/simage/simage-1.8.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git; else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" S="${WORKDIR}/${PN}" fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 118c7f1c14f09e79a7ec93e8f5f628b1da6604b2 Author: Sam James gentoo org> AuthorDate: Sun Feb 21 04:03:51 2021 + Commit: Sam James gentoo org> CommitDate: Sun Feb 21 04:03:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118c7f1c media-libs/simage: Stabilize 1.8.1 amd64, #771804 Signed-off-by: Sam James gentoo.org> media-libs/simage/simage-1.8.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1.ebuild index 20e75177d9c..4417c43feac 100644 --- a/media-libs/simage/simage-1.8.1.ebuild +++ b/media-libs/simage/simage-1.8.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = * ]]; then EGIT_REPO_URI="https://github.com/coin3d/simage.git; else SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" S="${WORKDIR}/${PN}" fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/files/, media-libs/simage/
commit: 3a144cb3379f83e093d1e224d15bdfec51a6ad4f Author: Maciej Mrozowski gentoo org> AuthorDate: Sun Jan 24 03:35:19 2021 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sun Jan 24 03:38:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a144cb3 media-libs/simage: reorder cmake options to match order in CMakeLists. Prevent silent fail to find QuickTime Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Maciej Mrozowski gentoo.org> .../simage-1.8.1-fail-on-missing-quicktime.patch | 12 media-libs/simage/simage-1.8.1.ebuild | 33 -- media-libs/simage/simage-.ebuild | 32 +++-- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/media-libs/simage/files/simage-1.8.1-fail-on-missing-quicktime.patch b/media-libs/simage/files/simage-1.8.1-fail-on-missing-quicktime.patch new file mode 100644 index 000..c6fc96af05d --- /dev/null +++ b/media-libs/simage/files/simage-1.8.1-fail-on-missing-quicktime.patch @@ -0,0 +1,12 @@ +diff -ruN simage/CMakeLists.txt simage-my/CMakeLists.txt +--- simage/CMakeLists.txt 2021-01-11 23:16:40.0 +0100 simage-my/CMakeLists.txt 2021-01-24 04:12:55.309111983 +0100 +@@ -126,7 +126,7 @@ + # On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA. + # see https://en.wikipedia.org/wiki/QuickTime + if(SIMAGE_USE_QUICKTIME) +- find_package(QuickTime) ++ find_package(QuickTime REQUIRED) + endif() + + if(SIMAGE_USE_CGIMAGE) diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1.ebuild index abb7ac24fcb..20e75177d9c 100644 --- a/media-libs/simage/simage-1.8.1.ebuild +++ b/media-libs/simage/simage-1.8.1.ebuild @@ -51,36 +51,39 @@ BDEPEND="test? ( media-libs/libsndfile )" PATCHES=( "${FILESDIR}"/${P}-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch + "${FILESDIR}"/${PN}-1.8.1-fail-on-missing-quicktime.patch ) DOCS=(AUTHORS ChangeLog NEWS README) src_configure() { local mycmakeargs=( - -DSIMAGE_BUILD_DOCUMENTATION=OFF - -DSIMAGE_BUILD_EXAMPLES=OFF -DSIMAGE_BUILD_SHARED_LIBS=ON + -DSIMAGE_BUILD_EXAMPLES=OFF -DSIMAGE_BUILD_TESTS=$(usex test) - -DSIMAGE_EPS_SUPPORT=ON - -DSIMAGE_GIF_SUPPORT=$(usex gif) - -DSIMAGE_JPEG_SUPPORT=$(usex jpeg) + -DSIMAGE_BUILD_DOCUMENTATION=OFF + -DSIMAGE_USE_AVIENC=OFF # Windows only + -DSIMAGE_USE_GDIPLUS=OFF # Windows + -DSIMAGE_USE_CGIMAGE=OFF # OS X only + -DSIMAGE_USE_QUICKTIME=OFF # OS X only + -DSIMAGE_USE_QIMAGE=$(usex qt5) + -DSIMAGE_USE_QT5=$(usex qt5) + -DSIMAGE_USE_CPACK=OFF + -DSIMAGE_USE_STATIC_LIBS=OFF + -DSIMAGE_LIBJASPER_SUPPORT=OFF -DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile) - -DSIMAGE_MPEG2ENC_SUPPORT=ON -DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis) + -DSIMAGE_EPS_SUPPORT=ON + -DSIMAGE_MPEG2ENC_SUPPORT=ON -DSIMAGE_PIC_SUPPORT=ON - -DSIMAGE_PNG_SUPPORT=$(usex png) -DSIMAGE_RGB_SUPPORT=ON -DSIMAGE_TGA_SUPPORT=ON - -DSIMAGE_TIFF_SUPPORT=$(usex tiff) - -DSIMAGE_USE_AVIENC=OFF # Windows only - -DSIMAGE_USE_CGIMAGE=OFF # OS X only - -DSIMAGE_USE_GDIPLUS=OFF # Windows only - -DSIMAGE_USE_QIMAGE=$(usex qt5) - -DSIMAGE_USE_QT5=$(usex qt5) - -DSIMAGE_USE_QUICKTIME=OFF # OS X only -DSIMAGE_XWD_SUPPORT=ON -DSIMAGE_ZLIB_SUPPORT=$(usex zlib) + -DSIMAGE_GIF_SUPPORT=$(usex gif) + -DSIMAGE_JPEG_SUPPORT=$(usex jpeg) + -DSIMAGE_PNG_SUPPORT=$(usex png) + -DSIMAGE_TIFF_SUPPORT=$(usex tiff) ) - cmake_src_configure } diff --git a/media-libs/simage/simage-.ebuild b/media-libs/simage/simage-.ebuild index 4dc309e659c..f18a1bb093a 100644 --- a/media-libs/simage/simage-.ebuild +++ b/media-libs/simage/simage-.ebuild @@ -57,30 +57,32 @@ DOCS=(AUTHORS ChangeLog NEWS README) src_configure() { local mycmakeargs=( - -DSIMAGE_BUILD_DOCUMENTATION=OFF - -DSIMAGE_BUILD_EXAMPLES=OFF -DSIMAGE_BUILD_SHARED_LIBS=ON + -DSIMAGE_BUILD_EXAMPLES=OFF -DSIMAGE_BUILD_TESTS=$(usex test) - -DSIMAGE_EPS_SUPPORT=ON - -DSIMAGE_GIF_SUPPORT=$(usex gif) - -DSIMAGE_JPEG_SUPPORT=$(usex jpeg) + -DSIMAGE_BUILD_DOCUMENTATION=OFF + -DSIMAGE_USE_AVIENC=OFF # Windows only + -DSIMAGE_USE_GDIPLUS=OFF # Windows + -DSIMAGE_USE_CGIMAGE=OFF # OS X only +
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 5d5ca731d00b0a4d34c8ebde538bf6f044b9ba22 Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 14 18:58:40 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jan 15 06:50:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d5ca731 media-libs/simage: updated remote-id Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/simage/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/metadata.xml b/media-libs/simage/metadata.xml index 5d644615b93..3a028eb34df 100644 --- a/media-libs/simage/metadata.xml +++ b/media-libs/simage/metadata.xml @@ -5,6 +5,6 @@ reave...@gentoo.org - Coin3D/coin + coin3d/simage
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/files/, media-libs/simage/
commit: 169c02849e8bd630f18b48834df15623b7220eb3 Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 14 11:03:24 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jan 14 11:03:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169c0284 media-libs/simage: bump to 1.8.1 + added live copied from waebbl's overlay with minor adjustments Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/simage/Manifest | 1 + ...cific-remove-RELEASE-flag-from-pkg-config.patch | 28 +++ media-libs/simage/simage-1.8.1.ebuild | 86 ++ media-libs/simage/simage-.ebuild | 86 ++ 4 files changed, 201 insertions(+) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index 9b5912ad3db..6af22527239 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1 +1,2 @@ DIST simage-1.8.0-src.tar.gz 797069 BLAKE2B 6f9e3512c9815974b1b2799306c6567f6b5aec6771fe31e0a5fa47a827819df02e80e976063ddbae3e3aa3a4d33da68a23c9067e7b91f82c28592f83d0e782cc SHA512 fb4943c38f418461b087d5d013c2054f25d553a872fc80f9445a5e907901eb40265d838c5cc1031032dd84885f066f1c640a1949bc450591fb0ea88c05d1e38f +DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe diff --git a/media-libs/simage/files/simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch b/media-libs/simage/files/simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch new file mode 100644 index 000..341cee6db31 --- /dev/null +++ b/media-libs/simage/files/simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch @@ -0,0 +1,28 @@ +From 8c4fda363a940a365571ae0985e742f7df1f9620 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Wed, 13 Jan 2021 22:03:46 +0100 +Subject: [PATCH] [Gentoo-specific] remove RELEASE flag from pkg-config + +Signed-off-by: Bernd Waibel +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d869715..a980571 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -794,8 +794,8 @@ if(UNIX OR MINGW) + set(PKG_CONFIG_REQUIRES "$<$:$>") + set(PKG_CONFIG_REQUIRES_PRIVATE "$<$:$>") + +- set(PKG_CONFIG_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE} ${PKG_CONFIG_CFLAGS}") +- set(PKG_CONFIG_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} ${PKG_CONFIG_CXXFLAGS}") ++ set(PKG_CONFIG_CFLAGS "${CMAKE_C_FLAGS} ${PKG_CONFIG_CFLAGS}") ++ set(PKG_CONFIG_CXXFLAGS "${CMAKE_CXX_FLAGS} ${PKG_CONFIG_CXXFLAGS}") + + # PKG-CONFIG settings + # according to https://www.gnu.org/prep/standards/html_node/Directory-Variables.html +-- +2.30.0 + diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1.ebuild new file mode 100644 index 000..abb7ac24fcb --- /dev/null +++ b/media-libs/simage/simage-1.8.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2021 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/; + +if [[ ${PV} = * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/coin3d/simage.git; +else + SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + S="${WORKDIR}/${PN}" +fi + +LICENSE="BSD-1" +SLOT="0" +IUSE="gif jpeg png qt5 sndfile test tiff vorbis zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + 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 + media-libs/flac + ) + tiff? ( + media-libs/tiff[lzma,zstd] + app-arch/xz-utils + app-arch/zstd:= + ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + media-libs/opus + ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( media-libs/libsndfile )" + +PATCHES=( + "${FILESDIR}"/${P}-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch +) + +DOCS=(AUTHORS ChangeLog NEWS README) + +src_configure() { + local mycmakeargs=( + -DSIMAGE_BUILD_DOCUMENTATION=OFF + -DSIMAGE_BUILD_EXAMPLES=OFF + -DSIMAGE_BUILD_SHARED_LIBS=ON +
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: d9fb066c026acd199939600b4f6f089e01095e32 Author: Miroslav Šulc gentoo org> AuthorDate: Fri Dec 25 09:38:08 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Dec 25 09:38:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9fb066c media-libs/simage: fixed linking against libsndfile 1) changed to updated upstream tarball - based on findings by Bernd Waibel gmail.com> described at https://github.com/waebbl/waebbl-gentoo/issues/274#issuecomment-748602840 2) fixed discrepancy in config variable name Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/simage/Manifest| 2 +- media-libs/simage/{simage-1.8.0.ebuild => simage-1.8.0-r1.ebuild} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index 19eabf5208f..9b5912ad3db 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1 +1 @@ -DIST simage-1.8.0.tar.gz 791151 BLAKE2B 0a5720c06501c8212b5a148ad790ff60d6d9fc507868a66d40dbe3b6b089e47dca21828fee96ef708a03651d02843c9e6b6db7856088ddf7e487b4b5eeafbccd SHA512 7070c845fc72094a97b1253d23a5f60f90e71dc6ed968c9c7da67e05660b05245a807fbdf0f592a1d459c7c3b725783c55f59f867182b11cb9ec40741d7ad58c +DIST simage-1.8.0-src.tar.gz 797069 BLAKE2B 6f9e3512c9815974b1b2799306c6567f6b5aec6771fe31e0a5fa47a827819df02e80e976063ddbae3e3aa3a4d33da68a23c9067e7b91f82c28592f83d0e782cc SHA512 fb4943c38f418461b087d5d013c2054f25d553a872fc80f9445a5e907901eb40265d838c5cc1031032dd84885f066f1c640a1949bc450591fb0ea88c05d1e38f diff --git a/media-libs/simage/simage-1.8.0.ebuild b/media-libs/simage/simage-1.8.0-r1.ebuild similarity index 93% rename from media-libs/simage/simage-1.8.0.ebuild rename to media-libs/simage/simage-1.8.0-r1.ebuild index 53eb51da047..1b1b448073e 100644 --- a/media-libs/simage/simage-1.8.0.ebuild +++ b/media-libs/simage/simage-1.8.0-r1.ebuild @@ -7,7 +7,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; +SRC_URI="https://github.com/coin3d/simage/releases/download/${P}/${P}-src.tar.gz; LICENSE="BSD-1" KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86" @@ -36,7 +36,7 @@ DEPEND=" test? ( media-libs/libsndfile ) " -S="${WORKDIR}/${PN}-${P}" +S="${WORKDIR}/${PN}" PATCHES=( "${FILESDIR}/${PN}-1.7.1-cmake-automagic-deps.patch" @@ -63,13 +63,13 @@ src_configure() { -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_SNDFILE_SUPPORT=$(usex sndfile) -DSIMAGE_TIFF_SUPPORT=$(usex tiff) -DSIMAGE_USE_QT5=ON -DSIMAGE_RGB_SUPPORT=ON
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 4e4192476d5d683e89e02aadec492089b7685947 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Mar 4 16:34:22 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Mar 4 16:34:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e419247 media-libs/simage: removed old 1.7.1-r1 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/simage/Manifest | 1 - media-libs/simage/simage-1.7.1-r1.ebuild | 83 2 files changed, 84 deletions(-) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index ffa68c89f9b..19eabf5208f 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1,2 +1 @@ -DIST simage-1.7.1-src.zip 4145907 BLAKE2B 99f5f5f46530c2600d47ab0bb080d69281447ee96a2bb9b63ebe5a5c56e235f34ca8bd97b0d6adedf061fe221a61d144d4ccce00123941a9c74d72b1f190030d SHA512 b3c81fa363cd570b3512cd2984f154b83876353ec389dc35afcac4e4ddf8d301eef5b0f8df93c38b9caa6afd81fbe53d3943ad05e041b77734f03c26d2e12867 DIST simage-1.8.0.tar.gz 791151 BLAKE2B 0a5720c06501c8212b5a148ad790ff60d6d9fc507868a66d40dbe3b6b089e47dca21828fee96ef708a03651d02843c9e6b6db7856088ddf7e487b4b5eeafbccd SHA512 7070c845fc72094a97b1253d23a5f60f90e71dc6ed968c9c7da67e05660b05245a807fbdf0f592a1d459c7c3b725783c55f59f867182b11cb9ec40741d7ad58c diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild deleted file mode 100644 index d71968b640f..000 --- a/media-libs/simage/simage-1.7.1-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils flag-o-matic - -DESCRIPTION="Image and video texturing library" -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" -SLOT="0" -IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/unzip -" -RDEPEND=" - 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}" - -PATCHES=( - "${FILESDIR}/${P}-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}/${P}-disable-examples.patch" - "${FILESDIR}/${P}-tests-conditional.patch" - "${FILESDIR}/${P}-disable-gif-quantize-buffer.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-utils_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 88bdaf19e9c336f27c7150d4fe409786582e7841 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Mar 4 16:17:07 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Mar 4 16:17:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88bdaf19 media-libs/simage: ppc64 stable wrt bug #711422 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/simage/simage-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.0.ebuild b/media-libs/simage/simage-1.8.0.ebuild index b9f20968907..53eb51da047 100644 --- a/media-libs/simage/simage-1.8.0.ebuild +++ b/media-libs/simage/simage-1.8.0.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86" SLOT="0" IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: c2396e76e2c9f693a654a1e60324a95612998efb Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Mar 4 13:03:09 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Mar 4 13:03:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2396e76 media-libs/simage: x86 stable wrt bug #711422 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/simage/simage-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.0.ebuild b/media-libs/simage/simage-1.8.0.ebuild index 313e0728467..b9f20968907 100644 --- a/media-libs/simage/simage-1.8.0.ebuild +++ b/media-libs/simage/simage-1.8.0.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86" SLOT="0" IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 0c65d2ac38e513e678e430e90e61d1db0022526f Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Mar 4 08:08:39 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Mar 4 08:08:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c65d2ac media-libs/simage: ppc stable wrt bug #711422 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/simage/simage-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.0.ebuild b/media-libs/simage/simage-1.8.0.ebuild index 4c4a51240cb..313e0728467 100644 --- a/media-libs/simage/simage-1.8.0.ebuild +++ b/media-libs/simage/simage-1.8.0.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86" SLOT="0" IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: f667f172922a06366ecac7e09a32efb273faf1e3 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Mar 3 16:21:27 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Mar 3 16:21:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f667f172 media-libs/simage: amd64 stable wrt bug #711422 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/simage/simage-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.8.0.ebuild b/media-libs/simage/simage-1.8.0.ebuild index 8d8e6434e9b..4c4a51240cb 100644 --- a/media-libs/simage/simage-1.8.0.ebuild +++ b/media-libs/simage/simage-1.8.0.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" SLOT="0" IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/files/
commit: 7956028c2a326c7179ca2889317fe789a05c734d Author: Miroslav Šulc gentoo org> AuthorDate: Fri Jan 31 01:15:03 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jan 31 01:15:21 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7956028c media-libs/simage: removed unused patches Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/simage/files/simage-1.7.0-libpng15.patch | 12 .../simage/files/simage-1.7.0-pkgconfig-partial.patch | 13 - 2 files changed, 25 deletions(-) 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 f99d474cf04..000 --- 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.0 +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(_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 c8c893855e8..000 --- 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.0 +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@"
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/, media-libs/simage/files/
commit: afb66845a9e3c30f419685657be626c4cccd323d Author: Miroslav Šulc gentoo org> AuthorDate: Fri Jan 31 01:13:08 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jan 31 01:15:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb66845 media-libs/simage: bump to 1.8.0 1) switched from cmake-utils to cmake 2) updated homepage, src_uri and license 3) updated deps some updates used from the ebuild in waebbl overlay Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/simage/Manifest | 1 + ...-CMakeLists.txt-comment-cpack.d-inclusion.patch | 25 +++ media-libs/simage/simage-1.8.0.ebuild | 82 ++ 3 files changed, 108 insertions(+) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index dff8036465f..ffa68c89f9b 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1 +1,2 @@ DIST simage-1.7.1-src.zip 4145907 BLAKE2B 99f5f5f46530c2600d47ab0bb080d69281447ee96a2bb9b63ebe5a5c56e235f34ca8bd97b0d6adedf061fe221a61d144d4ccce00123941a9c74d72b1f190030d SHA512 b3c81fa363cd570b3512cd2984f154b83876353ec389dc35afcac4e4ddf8d301eef5b0f8df93c38b9caa6afd81fbe53d3943ad05e041b77734f03c26d2e12867 +DIST simage-1.8.0.tar.gz 791151 BLAKE2B 0a5720c06501c8212b5a148ad790ff60d6d9fc507868a66d40dbe3b6b089e47dca21828fee96ef708a03651d02843c9e6b6db7856088ddf7e487b4b5eeafbccd SHA512 7070c845fc72094a97b1253d23a5f60f90e71dc6ed968c9c7da67e05660b05245a807fbdf0f592a1d459c7c3b725783c55f59f867182b11cb9ec40741d7ad58c 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 000..4dcc5994f36 --- /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 +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 +--- + 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.8.0.ebuild b/media-libs/simage/simage-1.8.0.ebuild new file mode 100644 index 000..8d8e6434e9b --- /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 +
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: ba7aef47a070873ae75c04b038040f27bd6320d1 Author: Miroslav Šulc gentoo org> AuthorDate: Fri Jan 31 00:38:42 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jan 31 00:39:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7aef47 media-libs/simage: removed old 1.7.0-r1 Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/simage/Manifest | 1 - media-libs/simage/simage-1.7.0-r1.ebuild | 75 2 files changed, 76 deletions(-) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index 58cf77d47d7..dff8036465f 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1,2 +1 @@ -DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f DIST simage-1.7.1-src.zip 4145907 BLAKE2B 99f5f5f46530c2600d47ab0bb080d69281447ee96a2bb9b63ebe5a5c56e235f34ca8bd97b0d6adedf061fe221a61d144d4ccce00123941a9c74d72b1f190030d SHA512 b3c81fa363cd570b3512cd2984f154b83876353ec389dc35afcac4e4ddf8d301eef5b0f8df93c38b9caa6afd81fbe53d3943ad05e041b77734f03c26d2e12867 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 f491e59cb38..000 --- 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 -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 57f9826bd51fac0eccc773c7f3443b21badee824 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Jan 30 12:55:26 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Jan 30 12:55:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f9826b media-libs/simage: x86 stable wrt bug #707328 Package-Manager: Portage-2.3.84, Repoman-2.3.20 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/simage/simage-1.7.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild index 06068735eac..d71968b640f 100644 --- a/media-libs/simage/simage-1.7.1-r1.ebuild +++ b/media-libs/simage/simage-1.7.1-r1.ebuild @@ -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 )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 57222dfcc34d804cc0c05af07f44b480a0adefa1 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Jan 30 11:04:10 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Jan 30 11:04:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57222dfc media-libs/simage: ppc stable wrt bug #707328 Package-Manager: Portage-2.3.84, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/simage/simage-1.7.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild index a7067267250..06068735eac 100644 --- a/media-libs/simage/simage-1.7.1-r1.ebuild +++ b/media-libs/simage/simage-1.7.1-r1.ebuild @@ -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 )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: ae803b459b306bfd399287c6250ca3a080ce7a60 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Jan 30 11:00:35 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Jan 30 11:00:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae803b45 media-libs/simage: ppc64 stable wrt bug #707328 Package-Manager: Portage-2.3.84, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/simage/simage-1.7.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild index 23f6d13813d..a7067267250 100644 --- a/media-libs/simage/simage-1.7.1-r1.ebuild +++ b/media-libs/simage/simage-1.7.1-r1.ebuild @@ -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 )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: eb391aa645d867fb1f4602317e2a4414e9e5776d Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Jan 30 10:09:45 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Jan 30 10:09:45 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb391aa6 media-libs/simage: amd64 stable wrt bug #707328 Package-Manager: Portage-2.3.84, Repoman-2.3.20 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/simage/simage-1.7.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild index 34859fa678e..23f6d13813d 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 )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/, media-libs/simage/files/
commit: 01bc8ce0c058cd799bcc5d2fb0730eb87eb8c59b Author: Miroslav Šulc gentoo org> AuthorDate: Fri Dec 27 10:52:29 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Dec 27 10:52:49 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bc8ce0 media-libs/simage: fixed tests in 1.7.1-r1 1) fixed building tests 2) organized deps Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> .../files/simage-1.7.1-tests-conditional.patch | 52 ++ media-libs/simage/simage-1.7.1-r1.ebuild | 10 - 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/media-libs/simage/files/simage-1.7.1-tests-conditional.patch b/media-libs/simage/files/simage-1.7.1-tests-conditional.patch new file mode 100644 index 000..ced49159ba6 --- /dev/null +++ b/media-libs/simage/files/simage-1.7.1-tests-conditional.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5536922..b6de403 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -504,25 +504,28 @@ endforeach() + # Build tests + # + +-enable_testing() +- +-add_executable(loaders tests/loaders.c) +-target_link_libraries(loaders simage) +-target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) +-if(UNIX) +- target_link_libraries(loaders m) +-endif() +- +-add_test( +- loaders +- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders +- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif +- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg +- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png +- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb +- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga +- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif +-) ++if(TESTS) ++ enable_testing() ++ ++ add_executable(loaders tests/loaders.c) ++ target_link_libraries(loaders simage) ++ target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) ++ if(UNIX) ++target_link_libraries(loaders m) ++target_link_libraries(loaders sndfile) ++ endif() ++ ++ add_test( ++loaders ++${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders ++${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif ++${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg ++${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png ++${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb ++${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga ++${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif ++ ) ++endif() + + # Add a target to generate API documentation with Doxygen + if(SIMAGE_BUILD_DOCUMENTATION) diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild index 5117be12735..34859fa678e 100644 --- a/media-libs/simage/simage-1.7.1-r1.ebuild +++ b/media-libs/simage/simage-1.7.1-r1.ebuild @@ -12,8 +12,12 @@ SRC_URI="https://bitbucket.org/Coin3D/simage/downloads/${P}-src.zip; LICENSE="public-domain mpeg2enc" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" SLOT="0" -IUSE="debug gif jpeg png qt5 sndfile tiff vorbis" +IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis" +RESTRICT="!test? ( test )" +BDEPEND=" + app-arch/unzip +" RDEPEND=" gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) @@ -31,7 +35,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - app-arch/unzip + test? ( media-libs/libsndfile ) " S="${WORKDIR}/${PN}" @@ -42,6 +46,7 @@ PATCHES=( # 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}/${P}-disable-examples.patch" + "${FILESDIR}/${P}-tests-conditional.patch" "${FILESDIR}/${P}-disable-gif-quantize-buffer.patch" ) @@ -71,6 +76,7 @@ src_configure() { -DSIMAGE_RGB_SUPPORT=ON -DSIMAGE_TGA_SUPPORT=ON -DSIMAGE_XWD_SUPPORT=ON + -DTESTS=$(usex test) ) cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/, media-libs/simage/files/
commit: 1e5e9468b40041e840c3018a2a930c0562018490 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Dec 16 09:33:50 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 16 09:34:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5e9468 media-libs/simage-1.7.1-r1: fixed examples linking 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. Closes: https://bugs.gentoo.org/701030 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> .../files/simage-1.7.1-disable-examples.patch | 44 ++ .../files/simage-1.7.1-fix-examples-linking.patch | 22 --- media-libs/simage/simage-1.7.1-r1.ebuild | 5 ++- 3 files changed, 48 insertions(+), 23 deletions(-) diff --git a/media-libs/simage/files/simage-1.7.1-disable-examples.patch b/media-libs/simage/files/simage-1.7.1-disable-examples.patch new file mode 100644 index 000..9e43e073ccd --- /dev/null +++ b/media-libs/simage/files/simage-1.7.1-disable-examples.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5536922..07df95a 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -482,23 +482,23 @@ endif() + # Build examples + # + +-set(SIMAGE_EXAMPLE_SOURCE +- ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c +- ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c ++#set(SIMAGE_EXAMPLE_SOURCE ++# ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c ++# ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c + # ${CMAKE_CURRENT_SOURCE_DIR}/examples/mpeg2enc.cpp # requires Coin to build +- ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c +- ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c +-) +- +-foreach(_source ${SIMAGE_EXAMPLE_SOURCE}) +- get_filename_component(_example ${_source} NAME_WE) +- add_executable(${_example} ${_source}) +- target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) +- target_link_libraries(${_example} simage) +- if(UNIX) +-target_link_libraries(${_example} m) +- endif() +-endforeach() ++# ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c ++# ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c ++#) ++ ++#foreach(_source ${SIMAGE_EXAMPLE_SOURCE}) ++# get_filename_component(_example ${_source} NAME_WE) ++# add_executable(${_example} ${_source}) ++# target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) ++# target_link_libraries(${_example} simage) ++# if(UNIX) ++#target_link_libraries(${_example} m) ++# endif() ++#endforeach() + + # + # Build tests diff --git a/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch b/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch deleted file mode 100644 index 756ddea5c73..000 --- a/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8225dc4..de89fd0 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -494,7 +494,7 @@ foreach(_source ${SIMAGE_EXAMPLE_SOURCE}) - get_filename_component(_example ${_source} NAME_WE) - add_executable(${_example} ${_source}) - target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) -- target_link_libraries(${_example} simage) -+ target_link_libraries(${_example} simage sndfile) - if(UNIX) - target_link_libraries(${_example} m) - endif() -@@ -507,7 +507,7 @@ endforeach() - enable_testing() - - add_executable(loaders tests/loaders.c) --target_link_libraries(loaders simage) -+target_link_libraries(loaders simage sndfile) - target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) - if(UNIX) - target_link_libraries(loaders m) diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild index e6405b2179a..5117be12735 100644 --- a/media-libs/simage/simage-1.7.1-r1.ebuild +++ b/media-libs/simage/simage-1.7.1-r1.ebuild @@ -38,7 +38,10 @@ S="${WORKDIR}/${PN}" PATCHES=( "${FILESDIR}/${P}-cmake-automagic-deps.patch" - "${FILESDIR}/${P}-fix-examples-linking.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. +
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 812945cb11655e47af34b9fb9aa6262f6d03ebd3 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Nov 16 17:28:22 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Nov 16 17:28:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812945cb media-libs/simage-1.7.1-r1: fixed #700272 Closes: https://bugs.gentoo.org/700272 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/simage/{simage-1.7.1.ebuild => simage-1.7.1-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild similarity index 98% rename from media-libs/simage/simage-1.7.1.ebuild rename to media-libs/simage/simage-1.7.1-r1.ebuild index e27f0252065..e6405b2179a 100644 --- a/media-libs/simage/simage-1.7.1.ebuild +++ b/media-libs/simage/simage-1.7.1-r1.ebuild @@ -64,7 +64,7 @@ src_configure() { -DSIMAGE_QIMAGE_SUPPORT=$(usex qt5) -DSIMAGE_QUICKTIME_SUPPORT=OFF # OS X only -DSIMAGE_TIFF_SUPPORT=$(usex tiff) - -DUSE_QT5=ON + -DSIMAGE_USE_QT5=ON -DSIMAGE_RGB_SUPPORT=ON -DSIMAGE_TGA_SUPPORT=ON -DSIMAGE_XWD_SUPPORT=ON
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/, media-libs/simage/files/
commit: cbf3b048f150e28d08d1ba12cbaf22f6135cd552 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Nov 16 13:54:01 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Nov 16 13:54:51 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf3b048 media-libs/simage-1.7.1: bump 1) removed not needed stuff from simage-1.7.1-cmake-automagic-deps.patch 2) disabling check that uses GifQuantizeBuffer (see #687088, #682198) 3) added simage-1.7.1-fix-examples-linking.patch for fixing linking issues 4) reintroduced ~sparc 5) removed buggy simage-1.7.1a_beta_pre20180312.ebuild (see 2)) Bug: https://bugs.gentoo.org/682198 Closes: https://bugs.gentoo.org/687088 Closes: https://bugs.gentoo.org/698882 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/simage/Manifest | 2 +- .../files/simage-1.7.1-cmake-automagic-deps.patch | 498 ++--- .../simage-1.7.1-disable-gif-quantize-buffer.patch | 31 ++ .../files/simage-1.7.1-fix-examples-linking.patch | 22 + ...beta_pre20180312.ebuild => simage-1.7.1.ebuild} | 19 +- 5 files changed, 108 insertions(+), 464 deletions(-) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index 59b5c71b67f..58cf77d47d7 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1,2 +1,2 @@ -DIST Coin3D-simage-3bd369da8f08.tar.bz2 630229 BLAKE2B 6231dde891c07d8a4a37eebd5f89d9e445c048bf48d1718a5f1e2b12f488ad6c806edd04fd4eb30b5e041f978fbb65ea0b1d3b1263d7006bbda4568f4bef87c6 SHA512 61793a728c66dc4f427b1f853e0dcf38a71dced68814c8438e6653a4a1486d8066ce50a7c088d476cf796b4872c724687b3ca9d51ec0ed74f54d5d7e47c89b34 DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f +DIST simage-1.7.1-src.zip 4145907 BLAKE2B 99f5f5f46530c2600d47ab0bb080d69281447ee96a2bb9b63ebe5a5c56e235f34ca8bd97b0d6adedf061fe221a61d144d4ccce00123941a9c74d72b1f190030d SHA512 b3c81fa363cd570b3512cd2984f154b83876353ec389dc35afcac4e4ddf8d301eef5b0f8df93c38b9caa6afd81fbe53d3943ad05e041b77734f03c26d2e12867 diff --git a/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch b/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch index c119c938eeb..5f3fd2db714 100644 --- a/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch +++ b/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch @@ -1,497 +1,85 @@ -diff -ruN Coin3D-simage-3bd369da8f08/CMakeLists.txt my/CMakeLists.txt Coin3D-simage-3bd369da8f08/CMakeLists.txt 2018-03-12 19:57:28.0 +0100 -+++ my/CMakeLists.txt 2018-05-06 08:53:45.202467390 +0200 -@@ -74,6 +74,36 @@ - set(SIMAGE_GDIPLUS_SUPPORT OFF) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5536922..8225dc4 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -218,14 +218,14 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD + find_package(TIFF) + + set(HAVE_ZLIB ${ZLIB_FOUND}) +- set(HAVE_GIFLIB ${GIF_FOUND}) +- set(HAVE_JPEGLIB ${JPEG_FOUND}) +- set(HAVE_PNGLIB ${PNG_FOUND}) +- set(HAVE_TIFFLIB ${TIFF_FOUND}) ++ set(HAVE_GIFLIB ${SIMAGE_GIF_SUPPORT}) ++ set(HAVE_JPEGLIB ${SIMAGE_JPEG_SUPPORT}) ++ set(HAVE_PNGLIB ${SIMAGE_PNG_SUPPORT}) ++ set(HAVE_TIFFLIB ${SIMAGE_TIFF_SUPPORT}) endif() -+if(GIF_FOUND) -+ option(SIMAGE_GIF_SUPPORT "Enable support for GIF images" ON) -+else() -+ set(SIMAGE_GIF_SUPPORT OFF) -+endif() -+ -+if(JASPER_FOUND) -+ option(SIMAGE_JASPER_SUPPORT "Enable support for JPEG2K images" ON) -+else() -+ set(SIMAGE_JASPER_SUPPORT OFF) -+endif() -+ -+if(JPEG_FOUND) -+ option(SIMAGE_JPEG_SUPPORT "Enable support for JPEG images" ON) -+else() -+ set(SIMAGE_JPEG_SUPPORT OFF) -+endif() -+ -+if(PNG_FOUND) -+ option(SIMAGE_PNG_SUPPORT "Enable support for PNG images" ON) -+else() -+ set(SIMAGE_PNG_SUPPORT OFF) -+endif() -+ -+if(TIFF_FOUND) -+ option(SIMAGE_TIFF_SUPPORT "Enable support for TIFF images" ON) -+else() -+ set(SIMAGE_TIFF_SUPPORT OFF) -+endif() -+ - if(SNDFILE_FOUND) - option(SIMAGE_LIBSNDFILE_SUPPORT "" ON) - else() -@@ -141,23 +171,23 @@ - return 0; - } - " HAVE_GDIPLUS_LOCKBITS_RECTARG_POINTER) --set(HAVE_GIFLIB ${GIF_FOUND}) -+set(HAVE_GIFLIB ${SIMAGE_GIF_SUPPORT}) - check_include_files(guile/gh.h HAVE_GUILE_GH_H) - check_include_files(inttypes.h HAVE_INTTYPES_H) -set(HAVE_JASPER ${JASPER_FOUND}) --set(HAVE_JPEGLIB ${JPG_FOUND}) -+set(HAVE_JASPER ${SIMAGE_JASPER_SUPPORT}) -+set(HAVE_JPEGLIB ${SIMAGE_JPEG_SUPPORT}) - check_include_files(libguile.h HAVE_LIBGUILE_H) - check_include_files(memory.h HAVE_MEMORY_H) --set(HAVE_PNGLIB ${PNG_FOUND}) -+set(HAVE_PNGLIB ${SIMAGE_PNG_SUPPORT}) -
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: fa93185a7f7bfb8801165a13c3f884765f2e9473 Author: David Seifert gentoo org> AuthorDate: Wed Aug 28 08:19:20 2019 + Commit: David Seifert gentoo org> CommitDate: Wed Aug 28 08:19:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa93185a media-libs/simage: [QA] Remove media-libs/jasper dep Bug: https://bugs.gentoo.org/689784 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: David Seifert gentoo.org> media-libs/simage/simage-1.7.0-r1.ebuild| 7 +++ media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild | 7 +++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild index 88bffba3a7b..f491e59cb38 100644 --- a/media-libs/simage/simage-1.7.0-r1.ebuild +++ b/media-libs/simage/simage-1.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,13 +10,12 @@ 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 jpeg2k png sndfile static-libs tiff vorbis zlib" +IUSE="debug gif jpeg png sndfile static-libs tiff vorbis zlib" RESTRICT="mirror bindist" #465086 RDEPEND=" gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) - jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0= ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) @@ -54,7 +53,7 @@ src_configure() { $(use_enable debug) \ $(use_enable debug symbols) \ $(use_with jpeg) \ - $(use_with jpeg2k jasper) \ + --without-jasper \ $(use_with png) \ $(use_with sndfile libsndfile) \ $(use_enable static-libs static) \ diff --git a/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild b/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild index 01635618aef..4ced5ba2961 100644 --- a/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild +++ b/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,12 +14,11 @@ SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.tar.bz2; LICENSE="public-domain mpeg2enc" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" SLOT="0" -IUSE="debug gif jpeg jpeg2k png qt5 sndfile tiff vorbis" +IUSE="debug gif jpeg png qt5 sndfile tiff vorbis" RDEPEND=" gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) - jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 @@ -52,7 +51,7 @@ src_configure() { -DSIMAGE_EPS_SUPPORT=ON -DSIMAGE_GDIPLUS_SUPPORT=OFF # Windows only -DSIMAGE_GIF_SUPPORT=$(usex gif) - -DSIMAGE_JASPER_SUPPORT=$(usex jpeg2k) + -DSIMAGE_JASPER_SUPPORT=OFF -DSIMAGE_JPEG_SUPPORT=$(usex jpeg) -DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile) -DSIMAGE_MPEG2ENC_SUPPORT=ON
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 6fb8621e1225100c77435c4405d4c7e15348d065 Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Aug 29 05:18:21 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Aug 29 06:15:10 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb8621e media-libs/simage: keyworded 1.7.0-r1 for sparc, bug #550040 Package-Manager: Portage-2.3.40, Repoman-2.3.9 RepoMan-Options: --include-arches="sparc" media-libs/simage/simage-1.7.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild index 21d6246ddb1..88bffba3a7b 100644 --- a/media-libs/simage/simage-1.7.0-r1.ebuild +++ b/media-libs/simage/simage-1.7.0-r1.ebuild @@ -8,7 +8,7 @@ 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 x86" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86" SLOT="0" IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib" RESTRICT="mirror bindist" #465086
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/files/, media-libs/simage/
commit: 46f5ebe3c2895e00f4547bbc31456c21d0a7 Author: Maciej Mrozowski gentoo org> AuthorDate: Sun May 6 07:55:54 2018 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sun May 6 08:00:18 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f5ebe3 media-libs/simage: Version bump (SCM snapshot) media-libs/simage/Manifest | 1 + .../files/simage-1.7.1-cmake-automagic-deps.patch | 497 + .../simage/simage-1.7.1a_beta_pre20180312.ebuild | 72 +++ 3 files changed, 570 insertions(+) diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index 0189c1dc17c..59b5c71b67f 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1 +1,2 @@ +DIST Coin3D-simage-3bd369da8f08.tar.bz2 630229 BLAKE2B 6231dde891c07d8a4a37eebd5f89d9e445c048bf48d1718a5f1e2b12f488ad6c806edd04fd4eb30b5e041f978fbb65ea0b1d3b1263d7006bbda4568f4bef87c6 SHA512 61793a728c66dc4f427b1f853e0dcf38a71dced68814c8438e6653a4a1486d8066ce50a7c088d476cf796b4872c724687b3ca9d51ec0ed74f54d5d7e47c89b34 DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f diff --git a/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch b/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch new file mode 100644 index 000..c119c938eeb --- /dev/null +++ b/media-libs/simage/files/simage-1.7.1-cmake-automagic-deps.patch @@ -0,0 +1,497 @@ +diff -ruN Coin3D-simage-3bd369da8f08/CMakeLists.txt my/CMakeLists.txt +--- Coin3D-simage-3bd369da8f08/CMakeLists.txt 2018-03-12 19:57:28.0 +0100 my/CMakeLists.txt 2018-05-06 08:53:45.202467390 +0200 +@@ -74,6 +74,36 @@ + set(SIMAGE_GDIPLUS_SUPPORT OFF) + endif() + ++if(GIF_FOUND) ++ option(SIMAGE_GIF_SUPPORT "Enable support for GIF images" ON) ++else() ++ set(SIMAGE_GIF_SUPPORT OFF) ++endif() ++ ++if(JASPER_FOUND) ++ option(SIMAGE_JASPER_SUPPORT "Enable support for JPEG2K images" ON) ++else() ++ set(SIMAGE_JASPER_SUPPORT OFF) ++endif() ++ ++if(JPEG_FOUND) ++ option(SIMAGE_JPEG_SUPPORT "Enable support for JPEG images" ON) ++else() ++ set(SIMAGE_JPEG_SUPPORT OFF) ++endif() ++ ++if(PNG_FOUND) ++ option(SIMAGE_PNG_SUPPORT "Enable support for PNG images" ON) ++else() ++ set(SIMAGE_PNG_SUPPORT OFF) ++endif() ++ ++if(TIFF_FOUND) ++ option(SIMAGE_TIFF_SUPPORT "Enable support for TIFF images" ON) ++else() ++ set(SIMAGE_TIFF_SUPPORT OFF) ++endif() ++ + if(SNDFILE_FOUND) + option(SIMAGE_LIBSNDFILE_SUPPORT "" ON) + else() +@@ -141,23 +171,23 @@ + return 0; + } + " HAVE_GDIPLUS_LOCKBITS_RECTARG_POINTER) +-set(HAVE_GIFLIB ${GIF_FOUND}) ++set(HAVE_GIFLIB ${SIMAGE_GIF_SUPPORT}) + check_include_files(guile/gh.h HAVE_GUILE_GH_H) + check_include_files(inttypes.h HAVE_INTTYPES_H) +-set(HAVE_JASPER ${JASPER_FOUND}) +-set(HAVE_JPEGLIB ${JPG_FOUND}) ++set(HAVE_JASPER ${SIMAGE_JASPER_SUPPORT}) ++set(HAVE_JPEGLIB ${SIMAGE_JPEG_SUPPORT}) + check_include_files(libguile.h HAVE_LIBGUILE_H) + check_include_files(memory.h HAVE_MEMORY_H) +-set(HAVE_PNGLIB ${PNG_FOUND}) ++set(HAVE_PNGLIB ${SIMAGE_PNG_SUPPORT}) + check_include_files(stdint.h HAVE_STDINT_H) + check_include_files(stdlib.h HAVE_STDLIB_H) + check_include_files(strings.h HAVE_STRINGS_H) + check_include_files(string.h HAVE_STRING_H) + check_include_files(sys/stat.h HAVE_SYS_STAT_H) + check_include_files(sys/types.h HAVE_SYS_TYPES_H) +-set(HAVE_TIFFLIB ${TIFF_FOUND}) ++set(HAVE_TIFFLIB ${SIMAGE_TIFF_SUPPORT}) + check_include_files(unistd.h HAVE_UNISTD_H) +-set(HAVE_VFW ${VFW_FOUND}) ++set(HAVE_VFW ${SIMAGE_AVIENC_SUPPORT}) + check_include_files(windows.h HAVE_WINDOWS_H) + set(PACKAGE "simage") + set(PACKAGE_BUGREPORT "coin-supp...@coin3d.org") +@@ -321,27 +351,27 @@ + target_link_libraries(simage ${GDIPLUS_LIBRARIES}) + endif() + +-if(GIF_FOUND) ++if(SIMAGE_GIF_SUPPORT) + target_include_directories(simage PUBLIC ${GIF_INCLUDE_DIR}) + target_link_libraries(simage ${GIF_LIBRARIES}) + endif() + +-if(JASPER_FOUND) ++if(SIMAGE_JASPER_SUPPORT) + target_include_directories(simage PUBLIC ${JASPER_INCLUDE_DIR}) + target_link_libraries(simage ${JASPER_LIBRARIES}) + endif() + +-if(JPEG_FOUND) ++if(SIMAGE_JPEG_SUPPORT) + target_include_directories(simage PUBLIC ${JPEG_INCLUDE_DIR}) + target_link_libraries(simage ${JPEG_LIBRARIES}) + endif() + +-if(OGGVORBIS_FOUND) ++if(SIMAGE_OGGVORBIS_SUPPORT) + target_include_directories(simage PUBLIC ${OGGVORBIS_INCLUDE_DIRS}) + target_link_libraries(simage ${OGGVORBIS_LIBRARIES}) + endif() + +-if(PNG_FOUND) ++if(SIMAGE_PNG_SUPPORT) + target_include_directories(simage PUBLIC ${PNG_INCLUDE_DIR}) +
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: dba871f086ef9931c25dfb3d92047e4577ba1a3c Author: Matt Turner gentoo org> AuthorDate: Mon Mar 12 04:27:15 2018 + Commit: Matt Turner gentoo org> CommitDate: Mon Mar 12 04:27:15 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba871f0 media-libs/simage-1.7.0-r1: ppc64 stable, bug 649688 media-libs/simage/simage-1.7.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild index 3b6e40d1caf..21d6246ddb1 100644 --- a/media-libs/simage/simage-1.7.0-r1.ebuild +++ b/media-libs/simage/simage-1.7.0-r1.ebuild @@ -8,7 +8,7 @@ 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 x86" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 x86" SLOT="0" IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib" RESTRICT="mirror bindist" #465086
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: ca7a3ad21e59987f1673fb098b0a8ef654ff7a78 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 5 19:42:20 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 5 22:13:39 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7a3ad2 media-libs/simage: Drop old EAPI2-- Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-libs/simage/simage-1.7.0.ebuild | 76 --- 1 file changed, 76 deletions(-) diff --git a/media-libs/simage/simage-1.7.0.ebuild b/media-libs/simage/simage-1.7.0.ebuild deleted file mode 100644 index 52c69c5549a..000 --- a/media-libs/simage/simage-1.7.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 - -inherit base - -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 ppc x86" -SLOT="0" -IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib" -RESTRICT="mirror bindist" #465086 - -RDEPEND=" - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - 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) \ - $(use_with jpeg2k 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 - - base_src_install - - # Remove libtool files when not needed. - use static-libs || rm -f "${D}"/usr/lib*/*.la -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 0a41fcecf546ee6549e4440d5f531dafb315f56b Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Mar 4 22:25:39 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Mar 4 22:29:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a41fcec media-libs/simage: stable 1.7.0-r1 for ppc, bug #631800 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="ppc" media-libs/simage/simage-1.7.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild index b49018795d7..3b6e40d1caf 100644 --- a/media-libs/simage/simage-1.7.0-r1.ebuild +++ b/media-libs/simage/simage-1.7.0-r1.ebuild @@ -8,7 +8,7 @@ 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 x86" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86" SLOT="0" IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib" RESTRICT="mirror bindist" #465086
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 7d3357a9c5fe4e1c3d8c92ddf0670c8fca5b9b0f Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Jan 17 04:58:38 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Jan 17 04:58:38 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d3357a9 media-libs/simage: x86 stable (bug #631800) Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-libs/simage/simage-1.7.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild index 7d2ebd4d958..b49018795d7 100644 --- a/media-libs/simage/simage-1.7.0-r1.ebuild +++ b/media-libs/simage/simage-1.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ 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 ~x86" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86" SLOT="0" IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib" RESTRICT="mirror bindist" #465086
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 786b907606f8ecd207c5de5cad75516b8c4e7675 Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Jul 20 19:51:30 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Jul 20 20:57:04 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=786b9076 media-libs/simage: ia64 keyworded, bug #10 Package-Manager: Portage-2.3.6, Repoman-2.3.3 RepoMan-Options: --include-arches="ia64" media-libs/simage/simage-1.7.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild index cd76d427756..5cf1e9156c3 100644 --- a/media-libs/simage/simage-1.7.0-r1.ebuild +++ b/media-libs/simage/simage-1.7.0-r1.ebuild @@ -8,7 +8,7 @@ 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 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" SLOT="0" IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib" RESTRICT="mirror bindist" #465086
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: bda891f1961c045c093bb48bce3c4c21a35fb3e7 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Apr 20 08:18:46 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Apr 20 08:26:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda891f1 media-libs/simage: Mark ~hppa (bug #550040). Package-Manager: Portage-2.3.5, Repoman-2.3.2 RepoMan-Options: --ignore-arches media-libs/simage/simage-1.7.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild index 14e709493e8..cd76d427756 100644 --- a/media-libs/simage/simage-1.7.0-r1.ebuild +++ b/media-libs/simage/simage-1.7.0-r1.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://bitbucket.org/Coin3D/simage; SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz; LICENSE="public-domain mpeg2enc" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" SLOT="0" IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib" RESTRICT="mirror bindist" #465086
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: c73189c97a24df7c16d3ed8cbd02dc5d3e7b37b7 Author: Michael Weber gentoo org> AuthorDate: Wed Apr 5 20:21:49 2017 + Commit: Michael Weber gentoo org> CommitDate: Wed Apr 5 20:25:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73189c9 media-libs/simage: add ~ppc64 keyword (bug 550040) Package-Manager: Portage-2.3.5, Repoman-2.3.2 RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64" media-libs/simage/simage-1.7.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild index d1cf4fbe818..14e709493e8 100644 --- a/media-libs/simage/simage-1.7.0-r1.ebuild +++ b/media-libs/simage/simage-1.7.0-r1.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://bitbucket.org/Coin3D/simage; SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz; LICENSE="public-domain mpeg2enc" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" SLOT="0" IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib" RESTRICT="mirror bindist" #465086
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: 0b6ec95cd4c8bc9f3915fedc7397847290957bc2 Author: Justin Lecher gentoo org> AuthorDate: Sun Jan 15 09:39:38 2017 + Commit: Justin Lecher gentoo org> CommitDate: Sun Jan 15 09:39:59 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6ec95c media-libs/simage: Bump to EAPI=6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Signed-off-by: Justin Lecher gentoo.org> media-libs/simage/simage-1.7.0-r1.ebuild | 77 1 file changed, 77 insertions(+) diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild new file mode 100644 index ..8ffb8ed --- /dev/null +++ b/media-libs/simage/simage-1.7.0-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 ~ppc ~x86" +SLOT="0" +IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib" +RESTRICT="mirror bindist" #465086 + +RDEPEND=" + gif? ( media-libs/giflib ) + jpeg? ( virtual/jpeg:0= ) + jpeg2k? ( media-libs/jasper ) + 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) \ + $(use_with jpeg2k 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 +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/, media-libs/coin/, media-libs/SoQt/
commit: 16eaa1f0be8416864d75951c529b6e8e53a78bba Author: Maciej Mrozowski gentoo org> AuthorDate: Fri Nov 4 02:27:06 2016 + Commit: Maciej Mrozowski gentoo org> CommitDate: Fri Nov 4 02:39:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16eaa1f0 media-libs/{coin,SoQt,simage}: update homepage and URLs, bug 578276 media-libs/SoQt/SoQt-1.5.0-r1.ebuild | 4 ++-- media-libs/coin/coin-3.1.3-r2.ebuild | 6 +++--- media-libs/simage/simage-1.7.0.ebuild | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-libs/SoQt/SoQt-1.5.0-r1.ebuild b/media-libs/SoQt/SoQt-1.5.0-r1.ebuild index 1a43d73..7b660f7 100644 --- a/media-libs/SoQt/SoQt-1.5.0-r1.ebuild +++ b/media-libs/SoQt/SoQt-1.5.0-r1.ebuild @@ -7,8 +7,8 @@ EAPI=5 inherit autotools-utils DESCRIPTION="The glue between Coin3D and Qt" -SRC_URI="http://ftp.coin3d.org/coin/src/all/${P}.tar.gz; -HOMEPAGE="http://www.coin3d.org/; +HOMEPAGE="https://bitbucket.org/Coin3D/soqt; +SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz; LICENSE="|| ( GPL-2 PEL )" KEYWORDS="~amd64 ~arm ~x86" diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild index 521b9f1..bc3761a 100644 --- a/media-libs/coin/coin-3.1.3-r2.ebuild +++ b/media-libs/coin/coin-3.1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,8 +9,8 @@ inherit autotools-utils flag-o-matic MY_P=${P/c/C} DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1" -HOMEPAGE="http://www.coin3d.org/; -SRC_URI="ftp://ftp.coin3d.org/pub/coin/src/all/${MY_P}.tar.gz; +HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home; +SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${MY_P}.tar.gz; LICENSE="|| ( GPL-2 PEL )" KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux" diff --git a/media-libs/simage/simage-1.7.0.ebuild b/media-libs/simage/simage-1.7.0.ebuild index 075558a..da6705a 100644 --- a/media-libs/simage/simage-1.7.0.ebuild +++ b/media-libs/simage/simage-1.7.0.ebuild @@ -7,7 +7,7 @@ EAPI=2 inherit base DESCRIPTION="Image and video texturing library" -HOMEPAGE="http://www.coin3d.org/lib/simage/; +HOMEPAGE="https://bitbucket.org/Coin3D/simage; SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz; LICENSE="public-domain mpeg2enc"
[gentoo-commits] repo/gentoo:master commit in: media-libs/simage/
commit: f2d9e6edce89c951602b24df51fd4bdf23c24bae Author: Alexis Ballier aballier AT gentoo DOT org AuthorDate: Mon Aug 24 14:22:27 2015 + Commit: Alexis Ballier aballier AT gentoo DOT org CommitDate: Mon Aug 24 14:22:56 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d9e6ed media-libs/simage: keyword ~arm Package-Manager: portage-2.2.20.1 media-libs/simage/simage-1.7.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/simage/simage-1.7.0.ebuild b/media-libs/simage/simage-1.7.0.ebuild index d0a6ecf..075558a 100644 --- a/media-libs/simage/simage-1.7.0.ebuild +++ b/media-libs/simage/simage-1.7.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE=http://www.coin3d.org/lib/simage/; SRC_URI=https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz; LICENSE=public-domain mpeg2enc -KEYWORDS=amd64 ppc x86 +KEYWORDS=amd64 ~arm ppc x86 SLOT=0 IUSE=debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib RESTRICT=mirror bindist #465086