From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 154FF1382C5 for ; Sun, 24 Jan 2021 03:39:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18F5DE09AE; Sun, 24 Jan 2021 03:39:35 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 71757E09AE for ; Sun, 24 Jan 2021 03:39:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63458340FB2 for ; Sun, 24 Jan 2021 03:39:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBE504A2 for ; Sun, 24 Jan 2021 03:39:30 +0000 (UTC) From: "Maciej Mrozowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Mrozowski" Message-ID: <1611459486.3a144cb3379f83e093d1e224d15bdfec51a6ad4f.reavertm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/simage/files/, media-libs/simage/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/simage/files/simage-1.8.1-fail-on-missing-quicktime.patch media-libs/simage/simage-1.8.1.ebuild media-libs/simage/simage-9999.ebuild X-VCS-Directories: media-libs/simage/ media-libs/simage/files/ X-VCS-Committer: reavertm X-VCS-Committer-Name: Maciej Mrozowski X-VCS-Revision: 3a144cb3379f83e093d1e224d15bdfec51a6ad4f X-VCS-Branch: master Date: Sun, 24 Jan 2021 03:39:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 91dd6487-34f7-41f3-9cca-8231f4815ad1 X-Archives-Hash: fa6d19a362f0c6c354d1fa6b73b3fa50 commit: 3a144cb3379f83e093d1e224d15bdfec51a6ad4f Author: Maciej Mrozowski gentoo org> AuthorDate: Sun Jan 24 03:35:19 2021 +0000 Commit: Maciej Mrozowski gentoo org> CommitDate: Sun Jan 24 03:38:06 2021 +0000 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-9999.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 00000000000..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.000000000 +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-9999.ebuild b/media-libs/simage/simage-9999.ebuild index 4dc309e659c..f18a1bb093a 100644 --- a/media-libs/simage/simage-9999.ebuild +++ b/media-libs/simage/simage-9999.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 + -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 }