File imlib2-bswap.patch of Package imlib2
--- src/lib/grab.c.orig
+++ src/lib/grab.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#ifdef BUILD_X11
#include <X11/Xlib.h>
@@ -8,6 +12,7 @@
#include <sys/shm.h>
#include "grab.h"
#include "ximage.h"
+#include <byteswap.h>
static char _x_err = 0;
static DATA8 rtab[256], gtab[256], btab[256];
@@ -54,14 +59,8 @@ __imlib_GrabXImageToRGBA(DATA32 * data,
if ((depth == 24) && (xim->bits_per_pixel == 32))
depth = 25; /* fake depth meaning 24 bit in 32 bpp ximage */
/* data needs swapping */
-#define SWAP32(x) (x) = \
- ((((int)(x) & 0x000000ff ) << 24) |\
- (((int)(x) & 0x0000ff00 ) << 8) |\
- (((int)(x) & 0x00ff0000 ) >> 8) |\
- (((int)(x) & 0xff000000 ) >> 24))
-#define SWAP16(x) (x) = \
- ((((short)(x) & 0x00ff ) << 8) |\
- (((short)(x) & 0xff00 ) >> 8))
+#define SWAP32(x) (x) = (bswap_32(x))
+#define SWAP16(x) (x) = (bswap_16(x))
#ifdef WORDS_BIGENDIAN
if (xim->bitmap_bit_order == LSBFirst)
--- src/modules/loaders/loader_argb.c.orig
+++ src/modules/loaders/loader_argb.c
@@ -1,10 +1,10 @@
-#include "loader_common.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
-#define SWAP32(x) (x) = \
-((((x) & 0x000000ff ) << 24) |\
- (((x) & 0x0000ff00 ) << 8) |\
- (((x) & 0x00ff0000 ) >> 8) |\
- (((x) & 0xff000000 ) >> 24))
+#include "loader_common.h"
+#include <byteswap.h>
+#define SWAP32(x) (x) = (bswap_32(x))
char
load(ImlibImage * im, ImlibProgressFunction progress,
--- configure.ac.orig
+++ configure.ac
@@ -14,7 +14,9 @@ AM_CONFIG_HEADER(config.h)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_C_BIGENDIAN
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
AM_PROG_AS
dnl Set default visibility to hidden?
--- src/lib/blend.c.orig
+++ src/lib/blend.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "colormod.h"
#include "image.h"
--- src/lib/color.c.orig
+++ src/lib/color.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#ifdef BUILD_X11
#include <X11/Xlib.h>
--- src/lib/color_helpers.c.orig
+++ src/lib/color_helpers.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "color_helpers.h"
/*
* Color space conversion helper routines
--- src/lib/colormod.c.orig
+++ src/lib/colormod.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "colormod.h"
#include "file.h"
--- src/lib/context.c.orig
+++ src/lib/context.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#ifdef BUILD_X11
#include <X11/Xlib.h>
--- src/lib/draw.c.orig
+++ src/lib/draw.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#ifdef BUILD_X11
#include <X11/Xlib.h>
--- src/lib/dynamic_filters.c.orig
+++ src/lib/dynamic_filters.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include <stdio.h>
#include <stdlib.h>
--- src/lib/ellipse.c.orig
+++ src/lib/ellipse.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "colormod.h"
#include "image.h"
--- src/lib/file.c.orig
+++ src/lib/file.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include <stdio.h>
#include <ctype.h>
--- src/lib/filter.c.orig
+++ src/lib/filter.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "colormod.h"
#include "image.h"
--- src/lib/format.c.orig
+++ src/lib/format.c
@@ -1 +1,5 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "format.h"
--- src/lib/grad.c.orig
+++ src/lib/grad.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "colormod.h"
#include "file.h"
--- src/lib/image.c.orig
+++ src/lib/image.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include <time.h>
#include <string.h>
--- src/lib/line.c.orig
+++ src/lib/line.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "colormod.h"
#include "image.h"
--- src/lib/polygon.c.orig
+++ src/lib/polygon.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "colormod.h"
#include "image.h"
--- src/lib/rectangle.c.orig
+++ src/lib/rectangle.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "colormod.h"
#include "image.h"
--- src/lib/rend.c.orig
+++ src/lib/rend.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#ifdef BUILD_X11
#include <X11/Xlib.h>
--- src/lib/rgba.c.orig
+++ src/lib/rgba.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#ifdef BUILD_X11
#include <X11/Xlib.h>
--- src/lib/rgbadraw.c.orig
+++ src/lib/rgbadraw.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include <math.h>
#include "colormod.h"
--- src/lib/rotate.c.orig
+++ src/lib/rotate.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "rotate.h"
#include "blend.h"
--- src/lib/scale.c.orig
+++ src/lib/scale.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "colormod.h"
#include "image.h"
--- src/lib/script.c.orig
+++ src/lib/script.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include <stdio.h>
#include <stdlib.h>
--- src/lib/span.c.orig
+++ src/lib/span.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "colormod.h"
#include "image.h"
--- src/lib/updates.c.orig
+++ src/lib/updates.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#include "updates.h"
--- src/lib/ximage.c.orig
+++ src/lib/ximage.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "common.h"
#ifdef BUILD_X11
#include <X11/Xlib.h>
--- src/modules/filters/filter_bumpmap.c.orig
+++ src/modules/filters/filter_bumpmap.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "filter_common.h"
#include <string.h>
#include <math.h>
--- src/modules/filters/filter_colormod.c.orig
+++ src/modules/filters/filter_colormod.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "filter_common.h"
#include <string.h>
#include <math.h>
--- src/modules/filters/filter_test.c.orig
+++ src/modules/filters/filter_test.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "filter_common.h"
#include <string.h>
--- src/modules/loaders/loader_bmp.c.orig
+++ src/modules/loaders/loader_bmp.c
@@ -8,6 +8,10 @@
* - Simplify and make secure RLE encoding
* - Fix 16 and 32 bit depth (old code was incorrect and it's commented)
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <sys/stat.h>
--- src/modules/loaders/loader_bz2.c.orig
+++ src/modules/loaders/loader_bz2.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <bzlib.h>
#include <sys/types.h>
--- src/modules/loaders/loader_gif.c.orig
+++ src/modules/loaders/loader_gif.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <sys/types.h>
#include <sys/stat.h>
--- src/modules/loaders/loader_id3.c.orig
+++ src/modules/loaders/loader_id3.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <sys/types.h>
#include <sys/stat.h>
--- src/modules/loaders/loader_jpeg.c.orig
+++ src/modules/loaders/loader_jpeg.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <jpeglib.h>
#include <setjmp.h>
--- src/modules/loaders/loader_lbm.c.orig
+++ src/modules/loaders/loader_lbm.c
@@ -11,6 +11,10 @@
* Version: 2004-08-28
*------------------------------------------------------------------------------*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#define L2RLONG(a) ((((long)((a)[0]) & 0xff) << 24) + (((long)((a)[1]) & 0xff) << 16) + (((long)((a)[2]) & 0xff) << 8) + ((long)((a)[3]) & 0xff))
--- src/modules/loaders/loader_png.c.orig
+++ src/modules/loaders/loader_png.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <png.h>
--- src/modules/loaders/loader_pnm.c.orig
+++ src/modules/loaders/loader_pnm.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <ctype.h>
--- src/modules/loaders/loader_tga.c.orig
+++ src/modules/loaders/loader_tga.c
@@ -9,6 +9,10 @@
*
* header/footer structures courtesy of the GIMP Targa plugin
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <sys/stat.h>
#include <sys/mman.h>
--- src/modules/loaders/loader_tiff.c.orig
+++ src/modules/loaders/loader_tiff.c
@@ -1,6 +1,10 @@
/* To do: */
/* o Need code to handle tiff with different orientations */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <setjmp.h>
#include <stdarg.h>
--- src/modules/loaders/loader_xpm.c.orig
+++ src/modules/loaders/loader_xpm.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <sys/types.h>
#include <sys/stat.h>
--- src/modules/loaders/loader_zlib.c.orig
+++ src/modules/loaders/loader_zlib.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "loader_common.h"
#include <zlib.h>
#include <sys/types.h>