summaryrefslogtreecommitdiff
path: root/packages/media-libs/imlib2
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2015-05-01 10:35:44 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2015-05-01 11:35:44 +0200
commitf36440bea677cd61af65e4935e5b81c23e00acd5 (patch)
treead38888d872b5fded1006efac0d8e25787f2cd29 /packages/media-libs/imlib2
parent93bfc41083ce6085a164e8ece14f148498d2031b (diff)
downloadmedia-f36440bea677cd61af65e4935e5b81c23e00acd5.tar.gz
media-f36440bea677cd61af65e4935e5b81c23e00acd5.tar.xz
imlib2: Version bump to 1.4.7
Change-Id: I42d620acd42a376c1afb138fc79d50625a016789
Diffstat (limited to 'packages/media-libs/imlib2')
-rw-r--r--packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Fix-for-libgif-version-5.1.patch35
-rw-r--r--packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Fix-for-libgif-version-5.patch45
-rw-r--r--packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Simplify-error-handling.patch178
-rw-r--r--packages/media-libs/imlib2/files/imlib2-1.4.6-do-not-link-with-X-libs-when-X-is-disabled.patch31
-rw-r--r--packages/media-libs/imlib2/files/imlib2-1.4.6-imlib2-config-delete-old-reference-to-my_libs.patch30
-rw-r--r--packages/media-libs/imlib2/imlib2-1.4.7.exheres-0 (renamed from packages/media-libs/imlib2/imlib2-1.4.6-r2.exheres-0)14
6 files changed, 2 insertions, 331 deletions
diff --git a/packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Fix-for-libgif-version-5.1.patch b/packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Fix-for-libgif-version-5.1.patch
deleted file mode 100644
index dc694780..00000000
--- a/packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Fix-for-libgif-version-5.1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream: yes
-
-From b3d7033f2e9836437a9541a43c33d76bcb8f4efd Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Thu, 9 Oct 2014 23:12:06 +0200
-Subject: [PATCH] GIF loader: Fix for libgif version 5.1
-
-From giflib-5.1.0's NEWS:
-"A small change to the API: DGifClose() and EGifClose() now take a
-pointer-to-int second argument (like the corresponding openers)
-where a diagnostic code will be deposited when they return
-GIF_ERROR."
----
- src/modules/loaders/loader_gif.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c
-index be10478..e8d2cb1 100644
---- a/src/modules/loaders/loader_gif.c
-+++ b/src/modules/loaders/loader_gif.c
-@@ -198,7 +198,11 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- free(rows);
-
- quit2:
-+#if GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)
-+ DGifCloseFile(gif, NULL);
-+#else
- DGifCloseFile(gif);
-+#endif
-
- return rc;
- }
---
-2.1.2
-
diff --git a/packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Fix-for-libgif-version-5.patch b/packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Fix-for-libgif-version-5.patch
deleted file mode 100644
index 1502e86e..00000000
--- a/packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Fix-for-libgif-version-5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream: yes
-
-From 1df8defbaa5712fe23d34f13d6aae7a568c720a1 Mon Sep 17 00:00:00 2001
-From: Kim Woelders <kim@woelders.dk>
-Date: Sun, 4 Aug 2013 08:05:27 +0200
-Subject: [PATCH] GIF loader: Fix for libgif version 5.
-
----
- src/modules/loaders/loader_gif.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c
-index 23b8fd0..d1c2ae2 100644
---- a/src/modules/loaders/loader_gif.c
-+++ b/src/modules/loaders/loader_gif.c
-@@ -29,6 +29,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- /* already data in this image - dont load it again */
- if (im->data)
- return 0;
-+
- #ifndef __EMX__
- fd = open(im->real_file, O_RDONLY);
- #else
-@@ -36,12 +37,18 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- #endif
- if (fd < 0)
- return 0;
-+
-+#if GIFLIB_MAJOR >= 5
-+ gif = DGifOpenFileHandle(fd, NULL);
-+#else
- gif = DGifOpenFileHandle(fd);
-+#endif
- if (!gif)
- {
- close(fd);
- return 0;
- }
-+
- do
- {
- if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
---
-1.9.2
-
diff --git a/packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Simplify-error-handling.patch b/packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Simplify-error-handling.patch
deleted file mode 100644
index 16e0f221..00000000
--- a/packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Simplify-error-handling.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Upstream: yes
-Reason: Needed for imlib2-1.4.6-GIF-loader-Fix-for-libgif-version-5.1.patch
-
-From b7ad34abbc50aec5050bff56242e342e41935f1a Mon Sep 17 00:00:00 2001
-From: Kim Woelders <kim@woelders.dk>
-Date: Tue, 31 Dec 2013 18:13:45 +0100
-Subject: [PATCH] GIF loader: Simplify error handling.
-
-Also:
-- Fix memory leak when image data allocation fails.
-- Some aux data arrays may as well be const.
----
- src/modules/loaders/loader_gif.c | 80 ++++++++++++++++------------------------
- 1 file changed, 32 insertions(+), 48 deletions(-)
-
-diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c
-index 9bd07e0..69de9dc 100644
---- a/src/modules/loaders/loader_gif.c
-+++ b/src/modules/loaders/loader_gif.c
-@@ -8,6 +8,9 @@ char
- load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- char immediate_load)
- {
-+ static const int intoffset[] = { 0, 4, 2, 1 };
-+ static const int intjump[] = { 8, 8, 4, 2 };
-+ int rc;
- DATA32 *ptr;
- GifFileType *gif;
- GifRowType *rows;
-@@ -16,8 +19,6 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- int i, j, done, bg, r, g, b, w = 0, h = 0;
- float per = 0.0, per_inc;
- int last_per = 0, last_y = 0;
-- int intoffset[] = { 0, 4, 2, 1 };
-- int intjump[] = { 8, 8, 4, 2 };
- int transp;
- int fd;
-
-@@ -45,6 +46,8 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- return 0;
- }
-
-+ rc = 0; /* Failure */
-+
- do
- {
- if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
-@@ -62,37 +65,19 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- w = gif->Image.Width;
- h = gif->Image.Height;
- if (!IMAGE_DIMENSIONS_OK(w, h))
-- {
-- DGifCloseFile(gif);
-- return 0;
-- }
-- rows = malloc(h * sizeof(GifRowType *));
-+ goto quit2;
-+
-+ rows = calloc(h, sizeof(GifRowType *));
- if (!rows)
-- {
-- DGifCloseFile(gif);
-- return 0;
-- }
-- for (i = 0; i < h; i++)
-- {
-- rows[i] = NULL;
-- }
-+ goto quit2;
-+
- for (i = 0; i < h; i++)
- {
- rows[i] = malloc(w * sizeof(GifPixelType));
- if (!rows[i])
-- {
-- DGifCloseFile(gif);
-- for (i = 0; i < h; i++)
-- {
-- if (rows[i])
-- {
-- free(rows[i]);
-- }
-- }
-- free(rows);
-- return 0;
-- }
-+ goto quit;
- }
-+
- if (gif->Image.Interlace)
- {
- for (i = 0; i < 4; i++)
-@@ -131,6 +116,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- }
- }
- while (rec != TERMINATE_RECORD_TYPE);
-+
- if (transp >= 0)
- {
- SET_FLAG(im->flags, F_HAS_ALPHA);
-@@ -139,6 +125,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- {
- UNSET_FLAG(im->flags, F_HAS_ALPHA);
- }
-+
- /* set the format string member to the lower-case full extension */
- /* name for the format - so example names would be: */
- /* "png", "jpeg", "tiff", "ppm", "pgm", "pbm", "gif", "xpm" ... */
-@@ -146,17 +133,15 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- im->h = h;
- if (!im->format)
- im->format = strdup("gif");
-+
- if (im->loader || immediate_load || progress)
- {
- bg = gif->SBackGroundColor;
- cmap = (gif->Image.ColorMap ? gif->Image.ColorMap : gif->SColorMap);
- im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
- if (!im->data)
-- {
-- DGifCloseFile(gif);
-- free(rows);
-- return 0;
-- }
-+ goto quit;
-+
- ptr = im->data;
- per_inc = 100.0 / (((float)w) * h);
- for (i = 0; i < h; i++)
-@@ -184,30 +169,29 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- last_per = (int)per;
- if (!(progress(im, (int)per, 0, last_y, w, i)))
- {
-- DGifCloseFile(gif);
-- for (i = 0; i < h; i++)
-- {
-- free(rows[i]);
-- }
-- free(rows);
-- return 2;
-+ rc = 2;
-+ goto quit;
- }
- last_y = i;
- }
- }
- }
-+
-+ if (progress)
-+ progress(im, 100, 0, last_y, w, h);
- }
-- if (progress)
-- {
-- progress(im, 100, 0, last_y, w, h);
-- }
-- DGifCloseFile(gif);
-+
-+ rc = 1; /* Success */
-+
-+ quit:
- for (i = 0; i < h; i++)
-- {
-- free(rows[i]);
-- }
-+ free(rows[i]);
- free(rows);
-- return 1;
-+
-+ quit2:
-+ DGifCloseFile(gif);
-+
-+ return rc;
- }
-
- void
---
-2.1.2
-
diff --git a/packages/media-libs/imlib2/files/imlib2-1.4.6-do-not-link-with-X-libs-when-X-is-disabled.patch b/packages/media-libs/imlib2/files/imlib2-1.4.6-do-not-link-with-X-libs-when-X-is-disabled.patch
deleted file mode 100644
index 93cbed4c..00000000
--- a/packages/media-libs/imlib2/files/imlib2-1.4.6-do-not-link-with-X-libs-when-X-is-disabled.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream: yes
-
-From 4f36e69934ebf520a3b677c344f4b0db6e2d1400 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 28 Jul 2014 23:01:23 -0400
-Subject: [PATCH] do not link with X libs when X is disabled
-
-URL: https://bugs.gentoo.org/517670
----
- src/lib/Makefile.am | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index b03f753..93c708f 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -84,7 +84,10 @@ AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
-
- EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S
-
--MY_LIBS = -lXext -lX11 $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
-+MY_LIBS = $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
-+if BUILD_X11
-+MY_LIBS += -lXext -lX11
-+endif
-
- if BUILD_MMX
- libImlib2_la_LIBADD = $(MMX_OBJS) $(MY_LIBS)
---
-2.1.2
-
diff --git a/packages/media-libs/imlib2/files/imlib2-1.4.6-imlib2-config-delete-old-reference-to-my_libs.patch b/packages/media-libs/imlib2/files/imlib2-1.4.6-imlib2-config-delete-old-reference-to-my_libs.patch
deleted file mode 100644
index 24d4d203..00000000
--- a/packages/media-libs/imlib2/files/imlib2-1.4.6-imlib2-config-delete-old-reference-to-my_libs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream: yes
-
-From 5dde234b2d3caf067ea827858c53adc5d4c56c13 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 18 Jan 2014 13:56:54 -0500
-Subject: [PATCH] imlib2-config: delete old reference to @my_libs@
-
-This was cleaned up a while ago, but this file was missed.
-
-URL: https://bugs.gentoo.org/497894
----
- imlib2-config.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/imlib2-config.in b/imlib2-config.in
-index cf814c6..965f7c3 100644
---- a/imlib2-config.in
-+++ b/imlib2-config.in
-@@ -46,7 +46,7 @@ while test $# -gt 0; do
- ;;
- --libs)
- libdirs=-L@libdir@
-- echo $libdirs -lImlib2 @my_libs@
-+ echo $libdirs -lImlib2
- ;;
- *)
- echo "${usage}" 1>&2
---
-2.1.2
-
diff --git a/packages/media-libs/imlib2/imlib2-1.4.6-r2.exheres-0 b/packages/media-libs/imlib2/imlib2-1.4.7.exheres-0
index 9c0ef293..b29f4905 100644
--- a/packages/media-libs/imlib2/imlib2-1.4.6-r2.exheres-0
+++ b/packages/media-libs/imlib2/imlib2-1.4.7.exheres-0
@@ -3,8 +3,6 @@
# Based in part upon 'imlib2-1.4.0.ebuild' from Gentoo, which is:
# Copyright 1999-2008 Gentoo Foundation
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.13 ] ]
-
SUMMARY="Image Processing Library"
HOMEPAGE="http://docs.enlightenment.org/api/imlib2/html/pages.html"
DOWNLOADS="mirror://sourceforge/enlightenment/${PNV}.tar.bz2"
@@ -37,14 +35,6 @@ DEPENDENCIES="
)
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PNV}-GIF-loader-Fix-for-libgif-version-5.patch
- "${FILES}"/${PNV}-imlib2-config-delete-old-reference-to-my_libs.patch
- "${FILES}"/${PNV}-GIF-loader-Simplify-error-handling.patch
- "${FILES}"/${PNV}-GIF-loader-Fix-for-libgif-version-5.1.patch
- "${FILES}"/${PNV}-do-not-link-with-X-libs-when-X-is-disabled.patch
-)
-
src_configure() {
local myconf=()
@@ -61,9 +51,9 @@ src_configure() {
$(option_enable platform:amd64)
)
- if option platform:amd64; then
+ if [[ $(exhost --target) == x86_64-pc-linux-gnu ]] ; then
myconf+=( --enable-mmx )
- elif option platform:x86; then
+ elif [[ $(exhost --target) == i686-pc-linux-gnu ]] ; then
myconf+=( option_with x86_cpu_features:mmx )
fi