projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9402f52)
media-libs/freeimage: Fix missing link against libwebpmux
authorJames Le Cuirot <chewi@gentoo.org>
Sun, 5 May 2019 20:41:04 +0000 (21:41 +0100)
committerJames Le Cuirot <chewi@gentoo.org>
Sun, 5 May 2019 20:41:54 +0000 (21:41 +0100)
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch patch | blob | history
media-libs/freeimage/freeimage-3.18.0-r1.ebuild [moved from media-libs/freeimage/freeimage-3.18.0.ebuild with 100% similarity] patch | blob | history

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 ad2e4961e4404020afd0a5bfabd231a04c8faf60..ab2e0341b32498d6aa49c15c38c1e7bc02aa9e6f 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.