summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/imlib2/Makefile6
-rw-r--r--graphics/imlib2/distinfo18
-rw-r--r--graphics/imlib2/patches/patch-imlib2-config.in13
-rw-r--r--graphics/imlib2/patches/patch-src_lib_Makefile.in16
-rw-r--r--graphics/imlib2/patches/patch-src_lib_amd64__blend.S4
-rw-r--r--graphics/imlib2/patches/patch-src_lib_amd64__blend__cmod.S4
-rw-r--r--graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c67
7 files changed, 24 insertions, 104 deletions
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index af92ce0839f..4d7d02d9962 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2014/05/31 15:56:27 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2016/01/22 21:06:59 leot Exp $
-DISTNAME= imlib2-1.4.6
-PKGREVISION= 1
+DISTNAME= imlib2-1.4.7
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
EXTRACT_SUFX= .tar.bz2
@@ -9,6 +8,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://docs.enlightenment.org/api/imlib2/html/
COMMENT= Image manipulation library
+LICENSE= mit # with some modifications
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 4868630b957..9effd8af394 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.35 2015/11/03 21:34:04 agc Exp $
+$NetBSD: distinfo,v 1.36 2016/01/22 21:06:59 leot Exp $
-SHA1 (imlib2-1.4.6.tar.bz2) = 20e111d822074593e8d657ecf8aafe504e9e2967
-RMD160 (imlib2-1.4.6.tar.bz2) = e0dc6f59f54ce7ef17b25dae5b3d013040939441
-SHA512 (imlib2-1.4.6.tar.bz2) = 50d9f16eb09029c127c2ea904d59c46dceefabec7cf2aeb05a6cec7bfd9886f01fee863958c209cbdb7fe7991e0b6a883e5d910c9c2bf2991038719aa8687787
-Size (imlib2-1.4.6.tar.bz2) = 872717 bytes
+SHA1 (imlib2-1.4.7.tar.bz2) = 0ed225afbbee8e990c655cf13ed802bda8a5cd8a
+RMD160 (imlib2-1.4.7.tar.bz2) = 9d857475b4f514bc34479efa42a0c5a4b65d4b80
+SHA512 (imlib2-1.4.7.tar.bz2) = 3954d6426efbe2fcfb755c74a0ea7c1c61e65c5dc3cbdcea88c9e5de6294de69439ac05c724d83f4703f121d70f6af2f860e2aa423296c30ef99f4bdd2e60db8
+Size (imlib2-1.4.7.tar.bz2) = 889510 bytes
SHA1 (patch-ab) = 9ec9287a8003760e3c330b6a751c0d28bef19afc
SHA1 (patch-ac) = b570d72992643d88edbd00126cf77b5ffcd79d49
SHA1 (patch-ad) = 3dc74b7804fde49f6fa0f0b8fe8c1bd87b37535a
SHA1 (patch-ae) = 9a2838ebfebe2db8bcd1f5fbe13a680122f0f8c0
-SHA1 (patch-imlib2-config.in) = 2a651e5979875950aae6f23922a268f2e2a5b0c3
-SHA1 (patch-src_lib_Makefile.in) = ffc1d054121196f5f663c4f6b06f4d15b89ea15a
-SHA1 (patch-src_lib_amd64__blend.S) = 226de814e6c890ec1fea105641e036416e670a9f
-SHA1 (patch-src_lib_amd64__blend__cmod.S) = a02c7b101cc16889002101cfc689e8e39cb04016
-SHA1 (patch-src_modules_loaders_loader__gif.c) = fc4b01b32d277a8aa8b471fa800b3797371ccc90
+SHA1 (patch-imlib2-config.in) = 22bd429a029e1071f1920ed2261cb94fd66b1146
+SHA1 (patch-src_lib_amd64__blend.S) = 09e89c6b1d6fb622b3ee88f6c3a5e9b6f3ab3fad
+SHA1 (patch-src_lib_amd64__blend__cmod.S) = d533eeacd4b196086f1854c657d3e0773596790b
diff --git a/graphics/imlib2/patches/patch-imlib2-config.in b/graphics/imlib2/patches/patch-imlib2-config.in
index 03b5acf5f98..0651099511a 100644
--- a/graphics/imlib2/patches/patch-imlib2-config.in
+++ b/graphics/imlib2/patches/patch-imlib2-config.in
@@ -1,14 +1,15 @@
-$NetBSD: patch-imlib2-config.in,v 1.2 2014/05/20 16:18:38 adam Exp $
+$NetBSD: patch-imlib2-config.in,v 1.3 2016/01/22 21:07:00 leot Exp $
---- imlib2-config.in.orig 2013-03-01 19:12:59.000000000 +0000
+Add the COMPILER_RPATH_FLAG to imlib2-config.
+
+--- imlib2-config.in.orig 2014-12-20 16:19:20.000000000 +0000
+++ imlib2-config.in
-@@ -45,8 +45,7 @@ while test $# -gt 0; do
+@@ -45,7 +45,7 @@ while test $# -gt 0; do
echo $includes
;;
--libs)
- libdirs=-L@libdir@
-- echo $libdirs -lImlib2 @my_libs@
-+ echo -L@libdir@ @COMPILER_RPATH_FLAG@@libdir@ -lImlib2
++ libdirs="-L@libdir@ @COMPILER_RPATH_FLAG@@libdir@"
+ echo $libdirs -lImlib2
;;
*)
- echo "${usage}" 1>&2
diff --git a/graphics/imlib2/patches/patch-src_lib_Makefile.in b/graphics/imlib2/patches/patch-src_lib_Makefile.in
deleted file mode 100644
index 8abae0f8039..00000000000
--- a/graphics/imlib2/patches/patch-src_lib_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_lib_Makefile.in,v 1.1 2014/05/17 09:25:01 adam Exp $
-
-Don't link against X11 libs, when X11 support has been disabled.
-
---- src/lib/Makefile.in.orig 2014-05-17 07:59:57.000000000 +0000
-+++ src/lib/Makefile.in
-@@ -443,7 +443,8 @@ amd64_blend_cmod.S
- MMX_OBJS = $(MMX_SRCS:.S=.lo)
- AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
- EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S
--MY_LIBS = -lXext -lX11 $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
-+@BUILD_X11_FALSE@MY_LIBS = $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
-+@BUILD_X11_TRUE@MY_LIBS = -lXext -lX11 $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
- @BUILD_AMD64_FALSE@@BUILD_MMX_FALSE@libImlib2_la_LIBADD = $(MY_LIBS)
- @BUILD_AMD64_TRUE@@BUILD_MMX_FALSE@libImlib2_la_LIBADD = $(AMD64_OBJS) $(MY_LIBS)
- @BUILD_MMX_TRUE@libImlib2_la_LIBADD = $(MMX_OBJS) $(MY_LIBS)
diff --git a/graphics/imlib2/patches/patch-src_lib_amd64__blend.S b/graphics/imlib2/patches/patch-src_lib_amd64__blend.S
index 342a32c53ce..7fc827f0173 100644
--- a/graphics/imlib2/patches/patch-src_lib_amd64__blend.S
+++ b/graphics/imlib2/patches/patch-src_lib_amd64__blend.S
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_lib_amd64__blend.S,v 1.1 2012/06/15 18:52:26 joerg Exp $
+$NetBSD: patch-src_lib_amd64__blend.S,v 1.2 2016/01/22 21:07:00 leot Exp $
+
+Drop .extern, it is ignored by GNU as and not supported by LLVM.
--- src/lib/amd64_blend.S.orig 2012-06-15 15:25:04.000000000 +0000
+++ src/lib/amd64_blend.S
diff --git a/graphics/imlib2/patches/patch-src_lib_amd64__blend__cmod.S b/graphics/imlib2/patches/patch-src_lib_amd64__blend__cmod.S
index 5915b089eba..f67244ebb26 100644
--- a/graphics/imlib2/patches/patch-src_lib_amd64__blend__cmod.S
+++ b/graphics/imlib2/patches/patch-src_lib_amd64__blend__cmod.S
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_lib_amd64__blend__cmod.S,v 1.1 2012/06/15 18:52:26 joerg Exp $
+$NetBSD: patch-src_lib_amd64__blend__cmod.S,v 1.2 2016/01/22 21:07:00 leot Exp $
+
+Drop .extern, it is ignored by GNU as and not supported by LLVM.
--- src/lib/amd64_blend_cmod.S.orig 2012-06-15 15:25:46.000000000 +0000
+++ src/lib/amd64_blend_cmod.S
diff --git a/graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c b/graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c
deleted file mode 100644
index bff55a98dc0..00000000000
--- a/graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-src_modules_loaders_loader__gif.c,v 1.2 2014/05/16 10:19:11 obache Exp $
-
-* Fix build with giflib>=5.1.
-
---- src/modules/loaders/loader_gif.c.orig 2011-04-15 22:05:28.000000000 +0000
-+++ src/modules/loaders/loader_gif.c
-@@ -36,7 +36,7 @@ load(ImlibImage * im, ImlibProgressFunct
- #endif
- if (fd < 0)
- return 0;
-- gif = DGifOpenFileHandle(fd);
-+ gif = DGifOpenFileHandle(fd, NULL);
- if (!gif)
- {
- close(fd);
-@@ -60,13 +60,13 @@ load(ImlibImage * im, ImlibProgressFunct
- h = gif->Image.Height;
- if (!IMAGE_DIMENSIONS_OK(w, h))
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- return 0;
- }
- rows = malloc(h * sizeof(GifRowType *));
- if (!rows)
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- return 0;
- }
- for (i = 0; i < h; i++)
-@@ -78,7 +78,7 @@ load(ImlibImage * im, ImlibProgressFunct
- rows[i] = malloc(w * sizeof(GifPixelType));
- if (!rows[i])
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- for (i = 0; i < h; i++)
- {
- if (rows[i])
-@@ -150,7 +150,7 @@ load(ImlibImage * im, ImlibProgressFunct
- im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
- if (!im->data)
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- free(rows);
- return 0;
- }
-@@ -181,7 +181,7 @@ load(ImlibImage * im, ImlibProgressFunct
- last_per = (int)per;
- if (!(progress(im, (int)per, 0, last_y, w, i)))
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- for (i = 0; i < h; i++)
- {
- free(rows[i]);
-@@ -198,7 +198,7 @@ load(ImlibImage * im, ImlibProgressFunct
- {
- progress(im, 100, 0, last_y, w, h);
- }
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- for (i = 0; i < h; i++)
- {
- free(rows[i]);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 18:15:39 +0000