6 files changed, 37 insertions, 9 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index caacf71c0e86..5b8a22aeb688 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	imlib2
-PORTVERSION=	1.6.1
+PORTVERSION=	1.7.0
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	SF/enlightenment/imlib2-src/${PORTVERSION}
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 5de939d2ec22..b90f1f7652d1 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583593121
-SHA256 (imlib2-1.6.1.tar.bz2) = 4d393a77e13da883c8ee2da3b029da3570210fe37d000c9ac33d9fce751b166d
-SIZE (imlib2-1.6.1.tar.bz2) = 893119
+TIMESTAMP = 1596568156
+SHA256 (imlib2-1.7.0.tar.bz2) = 1976ca3db48cbae79cd0fc737dabe39cc81494fc2560e1d22821e7dc9c22b37d
+SIZE (imlib2-1.7.0.tar.bz2) = 893015
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 58083dac2a1b..1c811d3373fe 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -30,7 +30,7 @@ lib/imlib2/loaders/xpm.so
 lib/imlib2/loaders/zlib.so
 lib/libImlib2.so
 lib/libImlib2.so.1
-lib/libImlib2.so.1.6.1
+lib/libImlib2.so.1.7.0
 libdata/pkgconfig/imlib2.pc
 %%DATADIR%%/data/fonts/cinema.ttf
 %%DATADIR%%/data/fonts/grunge.ttf
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index a86cfc844370..aa517045b591 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	imlib2_loaders
-PORTVERSION=	1.6.1
+PORTVERSION=	1.7.0
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	SF/enlightenment/imlib2-src/${PORTVERSION}
diff --git a/graphics/imlib2_loaders/distinfo b/graphics/imlib2_loaders/distinfo
index 1e4d45f180ef..913db936448e 100644
--- a/graphics/imlib2_loaders/distinfo
+++ b/graphics/imlib2_loaders/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583593334
-SHA256 (imlib2_loaders-1.6.1.tar.bz2) = 477335d53fe400fe70d11dbf3ad9975363cbba085ae5b26d198b4dcf106b1562
-SIZE (imlib2_loaders-1.6.1.tar.bz2) = 301965
+TIMESTAMP = 1596568222
+SHA256 (imlib2_loaders-1.7.0.tar.bz2) = 7af5490e9998de039f8234977c3f505c96dcf2d2c9887db811cbbdba492e95af
+SIZE (imlib2_loaders-1.7.0.tar.bz2) = 301990
diff --git a/graphics/imlib2_loaders/files/patch-src_modules_loaders_loader__eet.c b/graphics/imlib2_loaders/files/patch-src_modules_loaders_loader__eet.c
new file mode 100644
index 000000000000..e6af723024ed
--- /dev/null
+++ b/graphics/imlib2_loaders/files/patch-src_modules_loaders_loader__eet.c
@@ -0,0 +1,28 @@
+--- src/modules/loaders/loader_eet.c.orig	2020-08-05 10:54:15 UTC
++++ src/modules/loaders/loader_eet.c
+@@ -6,11 +6,6 @@
+ 
+ #include "loader_common.h"
+ 
+-#define SWAP32(x) (x) = \
+-((((x) & 0x000000ff ) << 24) |\
+- (((x) & 0x0000ff00 ) << 8) |\
+- (((x) & 0x00ff0000 ) >> 8) |\
+- (((x) & 0xff000000 ) >> 24))
+ #include <Eet.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -379,11 +374,6 @@ void
+ formats(ImlibLoader * l)
+ {
+    static const char  *const list_formats[] = { "eet" };
+-   int                 i;
+-
+-   l->num_formats = sizeof(list_formats) / sizeof(char *);
+-   l->formats = malloc(sizeof(char *) * l->num_formats);
+-
+-   for (i = 0; i < l->num_formats; i++)
+-      l->formats[i] = strdup(list_formats[i]);
++   __imlib_LoaderSetFormats(l, list_formats,
++                            sizeof(list_formats) / sizeof(char *));
+ }