Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (c82856e68bcf9a8999159658971efac8a4f0fdba)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (c82856e68bcf9a8999159658971efac8a4f0fdba)
  • Date: Thu, 21 May 2009 21:23:11 -0500

GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

e/imlib2/Imlib2.h.patch | 120
++++++++++++++++++++++++++++++++++++++++++++-
http/w3m/HISTORY | 7 ++
http/w3m/PRE_BUILD | 1
http/w3m/fb_imlib2.c.patch | 10 +++
4 files changed, 136 insertions(+), 2 deletions(-)

New commits:
commit c82856e68bcf9a8999159658971efac8a4f0fdba
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

http/w3m: support imlib2 without X

Since Imlib2.h itself will include X11/Xlib.h if imlib2 is built with
support for X, there's no need for w3m to include it itself in the
imlib2 module. Removing the include from the w3m imlib2 module enables
w3m to be built with support for imlib2 but without support for X.

commit d72b6a05ca59763ae048835444afbba08819bfd3
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

e/imlib2: better support for building without X

Now with the correct patch! :)

commit 2bc5399d558eb32af19f974d4dba3a4852e85575
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

Revert "e/imlib2: better support for building without X"

This reverts commit 87c14cfce7bdc1aa12ba8665a06f8e04621d54be.

Accidentally committed the wrong patch file (I was testing it different
times). This patch only removed reference to Xlib.h, but failed to
remove the imlib2 defines based on Xlib.h.

diff --git a/e/imlib2/Imlib2.h.patch b/e/imlib2/Imlib2.h.patch
index 5b3c122..9dcbd8d 100644
--- a/e/imlib2/Imlib2.h.patch
+++ b/e/imlib2/Imlib2.h.patch
@@ -1,5 +1,5 @@
---- src/lib/Imlib2.h 2008-08-17 05:39:12.000000000 -0400
-+++ src/lib/Imlib2.h 2009-05-22 00:00:30.000000000 -0400
+--- ./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
@@ -11,3 +11,119 @@
/* 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/http/w3m/HISTORY b/http/w3m/HISTORY
index 27aa668..5786b25 100644
--- a/http/w3m/HISTORY
+++ b/http/w3m/HISTORY
@@ -1,3 +1,10 @@
+2008-05-21 Justin Boffemmyer <flux AT sourcemage.org>
+ * PRE_BUILD: patch fb_imlib2.c
+ * fb_imlib2.c.patch: new file, removes #include <X11/Xlib.h> from
+ fb_imlib2.c to support building without X (not harmful to building
+ with X, since Imlib2.h itself will include X11/Xlib.h if imlib2 is
+ built with X support)
+
2008-04-14 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: libgc isn't optional

diff --git a/http/w3m/PRE_BUILD b/http/w3m/PRE_BUILD
index 6e893f2..851e595 100755
--- a/http/w3m/PRE_BUILD
+++ b/http/w3m/PRE_BUILD
@@ -6,3 +6,4 @@ sedit "s:CFLAGS=\$(OPTS):CFLAGS =:g" w3mimg/Makefile.in &&
sedit "s:CFLAGS = \$(OPTS):CFLAGS =:g" libwc/Makefile.in &&
sedit "s:CFLAGS=\$(OPTS):CFLAGS =:g" w3mimg/x11/Makefile.in

+patch -p0 < "$SCRIPT_DIRECTORY"/fb_imlib2.c.patch
diff --git a/http/w3m/fb_imlib2.c.patch b/http/w3m/fb_imlib2.c.patch
new file mode 100644
index 0000000..6ee2464
--- /dev/null
+++ b/http/w3m/fb_imlib2.c.patch
@@ -0,0 +1,10 @@
+--- ./w3mimg/fb/fb_imlib2.c 2004-08-04 13:32:28.000000000 -0400
++++ ./w3mimg/fb/fb_imlib2.c 2009-05-21 19:34:17.000000000 -0400
+@@ -3,7 +3,6 @@
+ fb_imlib2.c 0.3 Copyright (C) 2002, hito
+ **************************************************************************/
+
+-#include <X11/Xlib.h>
+ #include <Imlib2.h>
+ #include "fb.h"
+ #include "fb_img.h"



  • [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (c82856e68bcf9a8999159658971efac8a4f0fdba), Justin Boffemmyer, 05/21/2009

Archive powered by MHonArc 2.6.24.

Top of Page