summaryrefslogtreecommitdiff
path: root/packages/media-libs/imlib2
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2014-04-15 18:50:09 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2014-04-20 14:51:32 +0200
commit37c7dea60c05115c91c05c2ed560ca3cd12baa63 (patch)
treeaecabbd5a15d8a602ef98483f285820cd08b928a /packages/media-libs/imlib2
parent3a45203691756c45d84d27de6c2ac25f7d310189 (diff)
downloadmedia-37c7dea60c05115c91c05c2ed560ca3cd12baa63.tar.gz
media-37c7dea60c05115c91c05c2ed560ca3cd12baa63.tar.xz
imlib2: version bump to 1.4.6
Change-Id: I68934f721eed072ce8d310a59d6ac9785beef40a
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.patch45
-rw-r--r--packages/media-libs/imlib2/files/imlib2-giflib5.patch18
-rw-r--r--packages/media-libs/imlib2/imlib2-1.4.5-r1.exheres-042
-rw-r--r--packages/media-libs/imlib2/imlib2-1.4.6.exheres-064
4 files changed, 109 insertions, 60 deletions
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
new file mode 100644
index 00000000..1502e86e
--- /dev/null
+++ b/packages/media-libs/imlib2/files/imlib2-1.4.6-GIF-loader-Fix-for-libgif-version-5.patch
@@ -0,0 +1,45 @@
+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-giflib5.patch b/packages/media-libs/imlib2/files/imlib2-giflib5.patch
deleted file mode 100644
index 00e9b4b9..00000000
--- a/packages/media-libs/imlib2/files/imlib2-giflib5.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: https://projects.archlinux.org/svntogit/packages.git/tree/trunk/imlib2-giflib5.patch?h=packages/imlib2
-Upstream: no
-Reason: compile with giflib-5
-
---- imlib2-1.4.5/src/modules/loaders/loader_gif.c
-+++ imlib2-1.4.5/src/modules/loaders/loader_gif.c
-@@ -40,7 +40,11 @@ load(ImlibImage * im, ImlibProgressFunct
- #endif
- if (fd < 0)
- return 0;
-+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5)
-+ gif = DGifOpenFileHandle(fd, NULL);
-+#else
- gif = DGifOpenFileHandle(fd);
-+#endif
- if (!gif)
- {
- close(fd);
diff --git a/packages/media-libs/imlib2/imlib2-1.4.5-r1.exheres-0 b/packages/media-libs/imlib2/imlib2-1.4.5-r1.exheres-0
deleted file mode 100644
index a2dc150e..00000000
--- a/packages/media-libs/imlib2/imlib2-1.4.5-r1.exheres-0
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2008 Richard Brown
-# Distributed under the terms of the GNU General Public License v2
-# Based in part upon 'imlib2-1.4.0.ebuild' from Gentoo, which is:
-# Copyright 1999-2008 Gentoo Foundation
-
-SUMMARY="Image Processing Library"
-HOMEPAGE="http://docs.enlightenment.org/api/imlib2/html/pages.html"
-DOWNLOADS="mirror://sourceforge/enlightenment/${PNV}.tar.bz2"
-
-LICENCES="${PN}"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="gif tiff X x86_cpu_features: mmx"
-
-DEPENDENCIES="
- build:
- X? ( x11-proto/xextproto )
- build+run:
- media-libs/freetype:=
- media-libs/jpeg
- media-libs/libpng:=
- gif? ( media-libs/giflib )
- tiff? ( media-libs/tiff )
- run:
- X? ( x11-libs/libXext )
-"
-
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/imlib2-giflib5.patch" )
-
-# --enable-amd64 segfaults
-DEFAULT_SRC_CONFIGURE_PARAMS=(
- --enable-visibility-hiding
- --disable-amd64
- --with-bzip2
- --with-jpeg
- --with-png
- --with-zlib
- --without-id3
-)
-DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( gif tiff "X x" )
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( x86_cpu_features:mmx )
-
diff --git a/packages/media-libs/imlib2/imlib2-1.4.6.exheres-0 b/packages/media-libs/imlib2/imlib2-1.4.6.exheres-0
new file mode 100644
index 00000000..b5002602
--- /dev/null
+++ b/packages/media-libs/imlib2/imlib2-1.4.6.exheres-0
@@ -0,0 +1,64 @@
+# Copyright 2008 Richard Brown
+# Distributed under the terms of the GNU General Public License v2
+# Based in part upon 'imlib2-1.4.0.ebuild' from Gentoo, which is:
+# Copyright 1999-2008 Gentoo Foundation
+
+SUMMARY="Image Processing Library"
+HOMEPAGE="http://docs.enlightenment.org/api/imlib2/html/pages.html"
+DOWNLOADS="mirror://sourceforge/enlightenment/${PNV}.tar.bz2"
+
+LICENCES="${PN}"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS="tiff X
+ ( platform: amd64 x86 )
+ ( x86_cpu_features: mmx )"
+
+DEPENDENCIES="
+ build:
+ virtual/pkg-config
+ X? (
+ x11-proto/xproto
+ x11-proto/xextproto
+ )
+ build+run:
+ app-arch/bzip2
+ media-libs/freetype:=
+ media-libs/giflib
+ media-libs/jpeg
+ media-libs/libpng:=
+ sys-libs/zlib
+ tiff? ( media-libs/tiff )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )
+"
+
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-GIF-loader-Fix-for-libgif-version-5.patch )
+
+src_configure() {
+ local myconf=()
+
+ myconf+=(
+ --enable-visibility-hiding
+ --with-bzip2
+ --with-gif
+ --with-jpeg
+ --with-png
+ --with-zlib
+ --without-id3
+ $(option_with tiff)
+ $(option_with X x)
+ $(option_enable platform:amd64)
+ )
+
+ if option platform:amd64; then
+ myconf+=( --enable-mmx )
+ elif option platform:x86; then
+ myconf+=( option_with x86_cpu_features:mmx )
+ fi
+
+ econf "${myconf[@]}"
+}
+