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 CEB4E138334 for ; Sun, 5 May 2019 20:42:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C42F0E089C; Sun, 5 May 2019 20:42:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 96D71E089C for ; Sun, 5 May 2019 20:42:15 +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 B4B343436E5 for ; Sun, 5 May 2019 20:42:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28B4E5EF for ; Sun, 5 May 2019 20:42:12 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1557088914.4f14b921f51055be968c01d1b6c994918d0bc279.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/, media-libs/freeimage/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch media-libs/freeimage/freeimage-3.18.0-r1.ebuild media-libs/freeimage/freeimage-3.18.0.ebuild X-VCS-Directories: media-libs/freeimage/files/ media-libs/freeimage/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 4f14b921f51055be968c01d1b6c994918d0bc279 X-VCS-Branch: master Date: Sun, 5 May 2019 20:42:12 +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: 9843f2f2-51b4-4c95-a863-79209da4c5ab X-Archives-Hash: 6c34eb1df7329bfe3c67c561f04262e6 commit: 4f14b921f51055be968c01d1b6c994918d0bc279 Author: James Le Cuirot gentoo org> AuthorDate: Sun May 5 20:41:04 2019 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun May 5 20:41:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f14b921 media-libs/freeimage: Fix missing link against libwebpmux Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: James Le Cuirot gentoo.org> media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch | 6 +++--- .../{freeimage-3.18.0.ebuild => freeimage-3.18.0-r1.ebuild} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch b/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch index ad2e4961e44..ab2e0341b32 100644 --- a/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch +++ b/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch @@ -31,7 +31,7 @@ index b59c419..c6b82bb 100644 +LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng) +LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase) +LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw) -+LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp) ++LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux) MODULES = $(SRCS:.c=.o) MODULES := $(MODULES:.cpp=.o) @@ -88,7 +88,7 @@ index 92f6358..345f0db 100644 +LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng) +LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase) +LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw) -+LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp) ++LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux) MODULES = $(SRCS:.c=.o) MODULES := $(MODULES:.cpp=.o) @@ -265,7 +265,7 @@ index de25754..cb41903 100644 +INCLUDE-$(USE_PNG) += -DUSE_PNG $(shell $(PKG_CONFIG) --cflags-only-I libpng) +INCLUDE-$(USE_TIFF) += -DUSE_TIFF $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase) +INCLUDE-$(USE_RAW) += -DUSE_RAW $(shell $(PKG_CONFIG) --cflags-only-I libraw) -+INCLUDE-$(USE_WEBP) += -DUSE_WEBP $(shell $(PKG_CONFIG) --cflags-only-I libwebp) ++INCLUDE-$(USE_WEBP) += -DUSE_WEBP $(shell $(PKG_CONFIG) --cflags-only-I libwebp libwebpmux) +INCLUDE = $(INCLUDE-yes) diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp index 1776c3b..538f1c5 100644 diff --git a/media-libs/freeimage/freeimage-3.18.0.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild similarity index 100% rename from media-libs/freeimage/freeimage-3.18.0.ebuild rename to media-libs/freeimage/freeimage-3.18.0-r1.ebuild