| 1 |
commit: 4f14b921f51055be968c01d1b6c994918d0bc279 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 5 20:41:04 2019 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 5 20:41:54 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f14b921 |
| 7 |
|
| 8 |
media-libs/freeimage: Fix missing link against libwebpmux |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch | 6 +++--- |
| 14 |
.../{freeimage-3.18.0.ebuild => freeimage-3.18.0-r1.ebuild} | 0 |
| 15 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch b/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch |
| 18 |
index ad2e4961e44..ab2e0341b32 100644 |
| 19 |
--- a/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch |
| 20 |
+++ b/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch |
| 21 |
@@ -31,7 +31,7 @@ index b59c419..c6b82bb 100644 |
| 22 |
+LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng) |
| 23 |
+LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase) |
| 24 |
+LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw) |
| 25 |
-+LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp) |
| 26 |
++LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux) |
| 27 |
|
| 28 |
MODULES = $(SRCS:.c=.o) |
| 29 |
MODULES := $(MODULES:.cpp=.o) |
| 30 |
@@ -88,7 +88,7 @@ index 92f6358..345f0db 100644 |
| 31 |
+LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng) |
| 32 |
+LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase) |
| 33 |
+LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw) |
| 34 |
-+LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp) |
| 35 |
++LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux) |
| 36 |
|
| 37 |
MODULES = $(SRCS:.c=.o) |
| 38 |
MODULES := $(MODULES:.cpp=.o) |
| 39 |
@@ -265,7 +265,7 @@ index de25754..cb41903 100644 |
| 40 |
+INCLUDE-$(USE_PNG) += -DUSE_PNG $(shell $(PKG_CONFIG) --cflags-only-I libpng) |
| 41 |
+INCLUDE-$(USE_TIFF) += -DUSE_TIFF $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase) |
| 42 |
+INCLUDE-$(USE_RAW) += -DUSE_RAW $(shell $(PKG_CONFIG) --cflags-only-I libraw) |
| 43 |
-+INCLUDE-$(USE_WEBP) += -DUSE_WEBP $(shell $(PKG_CONFIG) --cflags-only-I libwebp) |
| 44 |
++INCLUDE-$(USE_WEBP) += -DUSE_WEBP $(shell $(PKG_CONFIG) --cflags-only-I libwebp libwebpmux) |
| 45 |
+INCLUDE = $(INCLUDE-yes) |
| 46 |
diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp |
| 47 |
index 1776c3b..538f1c5 100644 |
| 48 |
|
| 49 |
diff --git a/media-libs/freeimage/freeimage-3.18.0.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild |
| 50 |
similarity index 100% |
| 51 |
rename from media-libs/freeimage/freeimage-3.18.0.ebuild |
| 52 |
rename to media-libs/freeimage/freeimage-3.18.0-r1.ebuild |
Archives