summaryrefslogtreecommitdiff
path: root/packages/media-libs/imlib2
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2014-10-10 19:43:26 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2014-10-10 19:48:40 +0200
commita34ea21f44ca952ac0f6f1384ba66f30209fb1f1 (patch)
treea4f956920f4b788ccfa764d351e7c6d873207022 /packages/media-libs/imlib2
parent37e95f9c4dff34ec68522d268cddbc5187d7f83d (diff)
downloadmedia-a34ea21f44ca952ac0f6f1384ba66f30209fb1f1.tar.gz
media-a34ea21f44ca952ac0f6f1384ba66f30209fb1f1.tar.xz
imlib2: fix build with [-X]
Change-Id: Ie3e12b101bf101bd53ce23ba49b4fc3eb65a46ef
Diffstat (limited to 'packages/media-libs/imlib2')
-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/imlib2-1.4.6-r1.exheres-03
2 files changed, 34 insertions, 0 deletions
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
new file mode 100644
index 00000000..93cbed4c
--- /dev/null
+++ b/packages/media-libs/imlib2/files/imlib2-1.4.6-do-not-link-with-X-libs-when-X-is-disabled.patch
@@ -0,0 +1,31 @@
+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/imlib2-1.4.6-r1.exheres-0 b/packages/media-libs/imlib2/imlib2-1.4.6-r1.exheres-0
index 3308a916..2ab8c99e 100644
--- a/packages/media-libs/imlib2/imlib2-1.4.6-r1.exheres-0
+++ b/packages/media-libs/imlib2/imlib2-1.4.6-r1.exheres-0
@@ -3,6 +3,8 @@
# 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"
@@ -40,6 +42,7 @@ DEFAULT_SRC_PREPARE_PATCHES=(
"${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() {