summaryrefslogtreecommitdiffstats
path: root/e/imlib2
diff options
context:
space:
mode:
authorRemko van der Vossen2013-06-24 18:47:20 +0200
committerRemko van der Vossen2013-06-24 18:47:20 +0200
commit3573cc86e1de5e742174f1676e7ef12e978fbb95 (patch)
tree20827159a253debe8230468ba8a19953cd8e8be5 /e/imlib2
parentc200284be74489747b5292b77e981504789bf0da (diff)
imlib2: cleanup and X11 sub depends added
Diffstat (limited to 'e/imlib2')
-rwxr-xr-xe/imlib2/BUILD4
-rwxr-xr-xe/imlib2/CONFIGURE1
-rwxr-xr-xe/imlib2/DEPENDS8
-rwxr-xr-xe/imlib2/DETAILS2
-rw-r--r--e/imlib2/HISTORY9
-rw-r--r--e/imlib2/Imlib2.h.patch129
-rwxr-xr-xe/imlib2/PRE_BUILD6
-rwxr-xr-xe/imlib2/PRE_SUB_DEPENDS7
-rwxr-xr-xe/imlib2/REPAIR^all^PRE_SUB_DEPENDS7
-rwxr-xr-xe/imlib2/SUB_DEPENDS7
-rwxr-xr-xe/imlib2/TRIGGERS4
11 files changed, 41 insertions, 143 deletions
diff --git a/e/imlib2/BUILD b/e/imlib2/BUILD
index b3b9881b01..7b82be6ea5 100755
--- a/e/imlib2/BUILD
+++ b/e/imlib2/BUILD
@@ -1,7 +1,5 @@
if [[ $HOST == x86_64-* ]]; then
- OPTS="--disable-mmx $IMLIB2_X11 $OPTS"
-else
- OPTS="$IMLIB2_X11 $OPTS"
+ OPTS="--disable-mmx $OPTS"
fi &&
default_build
diff --git a/e/imlib2/CONFIGURE b/e/imlib2/CONFIGURE
deleted file mode 100755
index a770cab7ca..0000000000
--- a/e/imlib2/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_option IMLIB2_X11 "Enable X11 support?" y "" "--without-x"
diff --git a/e/imlib2/DEPENDS b/e/imlib2/DEPENDS
index 14b575f0d9..6bb0bb4df0 100755
--- a/e/imlib2/DEPENDS
+++ b/e/imlib2/DEPENDS
@@ -1,8 +1,12 @@
depends libtool &&
depends freetype2 &&
-if [[ -z $IMLIB2_X11 ]]; then
- depends libx11
+optional_depends libx11 \
+ '--with-x' \
+ '--without-x' \
+ 'X11 support' &&
+
+if is_depends_enabled $SPELL libx11; then
depends libxext
fi &&
diff --git a/e/imlib2/DETAILS b/e/imlib2/DETAILS
index 0fcb406310..5ce64a3af0 100755
--- a/e/imlib2/DETAILS
+++ b/e/imlib2/DETAILS
@@ -2,7 +2,7 @@
VERSION=1.4.5
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
+ SOURCE_URL[0]=http://sourceforge.net/projects/enlightenment/files/imlib2-src/$VERSION/$SOURCE/download
SOURCE_HASH=sha512:6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
WEB_SITE=http://sourceforge.net/projects/enlightenment/files/
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index 27adac941d..d0a26e0728 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,3 +1,12 @@
+2013-06-23 Remko van der Vossen <wich@sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS: make X a proper optiona depends
+ * PRE_BUILD, Imlib2.h.patch: patch not needed anymore, --without-x is
+ handled properly now
+ * PRE_SUB_DEPENDS, SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS: expose X11
+ sub depends
+ * DETAILS: use new sourceforge url
+ * TRIGGERS: only set on_cast if zlib depend is enabled
+
2012-12-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: updated WEB_SITE
diff --git a/e/imlib2/Imlib2.h.patch b/e/imlib2/Imlib2.h.patch
deleted file mode 100644
index 9dcbd8df6e..0000000000
--- a/e/imlib2/Imlib2.h.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- ./src/lib/Imlib2.h 2008-08-17 05:39:12.000000000 -0400
-+++ ./src/lib/Imlib2.h 2009-05-22 01:01:51.000000000 -0400
-@@ -22,10 +22,6 @@
- # endif
- # endif
-
--# ifndef X_DISPLAY_MISSING
--# include <X11/Xlib.h>
--# endif
--
- /* Data types to use */
- # ifndef DATA64
- # define DATA64 unsigned long long
-@@ -129,14 +125,6 @@
- EAPI Imlib_Context imlib_context_get(void);
-
- /* context setting */
--# ifndef X_DISPLAY_MISSING
-- EAPI void imlib_context_set_display(Display * display);
-- EAPI void imlib_context_disconnect_display(void);
-- EAPI void imlib_context_set_visual(Visual * visual);
-- EAPI void imlib_context_set_colormap(Colormap colormap);
-- EAPI void imlib_context_set_drawable(Drawable drawable);
-- EAPI void imlib_context_set_mask(Pixmap mask);
--# endif
- EAPI void imlib_context_set_dither_mask(char dither_mask);
- EAPI void imlib_context_set_mask_alpha_threshold(int mask_alpha_threshold);
- EAPI void imlib_context_set_anti_alias(char anti_alias);
-@@ -160,13 +148,6 @@
- EAPI void imlib_context_set_TTF_encoding(Imlib_TTF_Encoding encoding);
-
- /* context getting */
--# ifndef X_DISPLAY_MISSING
-- EAPI Display *imlib_context_get_display(void);
-- EAPI Visual *imlib_context_get_visual(void);
-- EAPI Colormap imlib_context_get_colormap(void);
-- EAPI Drawable imlib_context_get_drawable(void);
-- EAPI Pixmap imlib_context_get_mask(void);
--# endif
- EAPI char imlib_context_get_dither_mask(void);
- EAPI char imlib_context_get_anti_alias(void);
- EAPI int imlib_context_get_mask_alpha_threshold(void);
-@@ -194,11 +175,6 @@
- EAPI int imlib_get_color_usage(void);
- EAPI void imlib_set_color_usage(int max);
- EAPI void imlib_flush_loaders(void);
--# ifndef X_DISPLAY_MISSING
-- EAPI int imlib_get_visual_depth(Display * display, Visual * visual);
-- EAPI Visual *imlib_get_best_visual(Display * display, int screen,
-- int *depth_return);
--# endif
-
- EAPI Imlib_Image imlib_load_image(const char *file);
- EAPI Imlib_Image imlib_load_image_immediately(const char *file);
-@@ -233,24 +209,6 @@
- EAPI void imlib_image_query_pixel_cmya(int x, int y, int *cyan, int *magenta, int *yellow, int *alpha);
-
- /* rendering functions */
--# ifndef X_DISPLAY_MISSING
-- EAPI void imlib_render_pixmaps_for_whole_image(Pixmap * pixmap_return,
-- Pixmap * mask_return);
-- EAPI void imlib_render_pixmaps_for_whole_image_at_size(Pixmap * pixmap_return,
-- Pixmap * mask_return,
-- int width, int height);
-- EAPI void imlib_free_pixmap_and_mask(Pixmap pixmap);
-- EAPI void imlib_render_image_on_drawable(int x, int y);
-- EAPI void imlib_render_image_on_drawable_at_size(int x, int y, int width,
-- int height);
-- EAPI void imlib_render_image_part_on_drawable_at_size(int source_x,
-- int source_y,
-- int source_width,
-- int source_height, int x,
-- int y, int width,
-- int height);
-- EAPI DATA32 imlib_render_get_pixel_color(void);
--# endif
- EAPI void imlib_blend_image_onto_image(Imlib_Image source_image,
- char merge_alpha, int source_x,
- int source_y, int source_width,
-@@ -264,27 +222,6 @@
- DATA32 * data);
- EAPI Imlib_Image imlib_create_image_using_copied_data(int width, int height,
- DATA32 * data);
--# ifndef X_DISPLAY_MISSING
-- EAPI Imlib_Image imlib_create_image_from_drawable(Pixmap mask, int x, int y,
-- int width, int height,
-- char need_to_grab_x);
-- EAPI Imlib_Image imlib_create_image_from_ximage(XImage *image, XImage *mask, int x, int y,
-- int width, int height,
-- char need_to_grab_x);
-- EAPI Imlib_Image imlib_create_scaled_image_from_drawable(Pixmap mask,
-- int source_x,
-- int source_y,
-- int source_width,
-- int source_height,
-- int destination_width,
-- int destination_height,
-- char need_to_grab_x,
-- char
-- get_mask_from_shape);
-- EAPI char imlib_copy_drawable_to_image(Pixmap mask, int x, int y, int width,
-- int height, int destination_x,
-- int destination_y, char need_to_grab_x);
--# endif
- EAPI Imlib_Image imlib_clone_image(void);
- EAPI Imlib_Image imlib_create_cropped_image(int x, int y, int width,
- int height);
-@@ -472,21 +409,6 @@
- int destination_y, int h_angle_x,
- int h_angle_y, int v_angle_x,
- int v_angle_y);
--# ifndef X_DISPLAY_MISSING
-- EAPI void imlib_render_image_on_drawable_skewed(int source_x, int source_y,
-- int source_width,
-- int source_height,
-- int destination_x,
-- int destination_y,
-- int h_angle_x, int h_angle_y,
-- int v_angle_x, int v_angle_y);
-- EAPI void imlib_render_image_on_drawable_at_angle(int source_x, int source_y,
-- int source_width,
-- int source_height,
-- int destination_x,
-- int destination_y,
-- int angle_x, int angle_y);
--# endif
-
- /* image filters */
- EAPI void imlib_image_filter(void);
diff --git a/e/imlib2/PRE_BUILD b/e/imlib2/PRE_BUILD
deleted file mode 100755
index 0e20c0d14c..0000000000
--- a/e/imlib2/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ $IMLIB2_X11 == "--without-x" ]]; then
- patch -p0 < "$SCRIPT_DIRECTORY"/Imlib2.h.patch
-fi
diff --git a/e/imlib2/PRE_SUB_DEPENDS b/e/imlib2/PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..73f3d38309
--- /dev/null
+++ b/e/imlib2/PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ X11)
+ is_depends_enabled $SPELL libx11 &&
+ is_depends_enabled $SPELL libxext &&
+ return 0;;
+esac
+return 1
diff --git a/e/imlib2/REPAIR^all^PRE_SUB_DEPENDS b/e/imlib2/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..73f3d38309
--- /dev/null
+++ b/e/imlib2/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ X11)
+ is_depends_enabled $SPELL libx11 &&
+ is_depends_enabled $SPELL libxext &&
+ return 0;;
+esac
+return 1
diff --git a/e/imlib2/SUB_DEPENDS b/e/imlib2/SUB_DEPENDS
new file mode 100755
index 0000000000..d90e31b897
--- /dev/null
+++ b/e/imlib2/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ X11) echo "X11 support requested: forcing libx11 & libxext dependency."
+ depends libx11 &&
+ depends libxext;;
+ *) echo "Bogus sub_depends: $THIS_SUB_DEPENDS"
+ return 1;;
+esac
diff --git a/e/imlib2/TRIGGERS b/e/imlib2/TRIGGERS
index c83574f80c..2bc04d157a 100755
--- a/e/imlib2/TRIGGERS
+++ b/e/imlib2/TRIGGERS
@@ -1 +1,3 @@
-on_cast zlib cast_self
+if is_depends_enabled $SPELL zlib; then
+ on_cast zlib cast_self
+fi