diff options
author | James Le Cuirot <chewi@gentoo.org> | 2019-05-05 21:41:04 +0100 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2019-05-05 21:41:54 +0100 |
commit | 4f14b921f51055be968c01d1b6c994918d0bc279 (patch) | |
tree | c5e1f504eb47bb951b1392ed04e2b034cf6fb64a /media-libs | |
parent | net-dns/libidn2: Revision and subslot bump straight to stable (diff) | |
download | gentoo-4f14b921f51055be968c01d1b6c994918d0bc279.tar.gz gentoo-4f14b921f51055be968c01d1b6c994918d0bc279.tar.bz2 gentoo-4f14b921f51055be968c01d1b6c994918d0bc279.zip |
media-libs/freeimage: Fix missing link against libwebpmux
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch | 6 | ||||
-rw-r--r-- | media-libs/freeimage/freeimage-3.18.0-r1.ebuild (renamed from media-libs/freeimage/freeimage-3.18.0.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 ad2e4961e440..ab2e0341b324 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 index fa58c6fc2f75..fa58c6fc2f75 100644 --- a/media-libs/freeimage/freeimage-3.18.0.ebuild +++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild |