1: Upgrade imlib2 to 1.2.0

2: chase shared library version to 3.

PR:		ports/78347
Submitted by:	Russell Jackson <raj at cserv62.csub.edu>
Somepart by:	me

2 files changed, 121 insertions, 90 deletions

diff --git a/graphics/imlib2/files/patch-configure.in b/graphics/imlib2/files/patch-configure.in
new file mode 100644
index 000000000000..b2219d63d4d1
--- /dev/null
+++ b/graphics/imlib2/files/patch-configure.in
@@ -0,0 +1,121 @@
+--- configure.in.orig	Wed Jan  5 01:39:08 2005
++++ configure.in	Sun Feb 27 21:16:57 2005
+@@ -6,7 +6,7 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ AC_ISC_POSIX
+-AM_INIT_AUTOMAKE(imlib2, 1.2.0)
++AM_INIT_AUTOMAKE(imlib2, 1.2.0.001)
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_C_BIGENDIAN
+@@ -86,6 +86,9 @@
+ packagesrcdir=`cd $srcdir && pwd`
+ AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
+ 
++# FIXME: fill in requirements for pc.in - but only ft2 has a pc file!
++requirements="freetype2"
++
+ mmx=no
+ AC_ARG_ENABLE(mmx,[  --disable-mmx           attempt compiling using mmx assembly [default=yes]],
+ [
+@@ -98,15 +101,16 @@
+   fi
+ ],
+ [
+-if test x$target_os = xlinux-gnu; then
++if test x$target_os = xlinux-gnu -o x$target_os = xlinux; then
+   if test x$target_cpu = x$host_cpu; then
+     mmx=`cat /proc/cpuinfo | grep mmx`
+     if test -n "$mmx"; then
+       mmx=yes
++      echo "You appear to be compiling on a "$target_cpu/$target_os" system; using MMX."
+     fi
+   else
+     echo ""
+-    echo "You are cross-compiling on a "$host_cpu" machine for a "$target_os" machine."
++    echo "You are cross-compiling on a "$host_cpu" machine for a "$target_cpu/$target_os" machine."
+     echo "If this target supports mmx, please enable mmx with --enable-mmx as a"
+     echo "configure option."
+     echo ""
+@@ -114,6 +118,7 @@
+ else
+   echo ""
+   echo "You are not running Linux - This script cannot auto-detect mmx assembly."
++  echo "(You appear to be running $target_os.)"
+   echo "You will have to enable the mmx assembly (which gives anywhere from 10%"
+   echo "to 300% speedups) by adding --enable-mmx on the configure command-line."
+   echo ""
+@@ -139,35 +144,28 @@
+ freetype_cflags=`$FREETYPE_CONFIG --cflags`
+ freetype_libs=`$FREETYPE_CONFIG --libs`
+ 
+-x11=no
+-AC_ARG_ENABLE(x11,[  --disable-x11           attempt to build with X11 support [default=yes]],
+-[
+-  if test x$enableval = xyes; then
+-    have_x=yes
+-  else
+-    have_x=no
+-  fi
+-],
+-[
+-  AC_CHECK_HEADER(X11/X.h,
+-    [ have_x="yes" ],
+-    [ have_x="no" ]
+-  )
+-]
+-)
+-AC_MSG_CHECKING(whether X11 support is to be enabled)
++AC_PATH_X([X], [X11/Xlib.h], [XOpenDisplay(NULL)])
++
++if test "x$have_x" = "xno"; then
++   # If --without-x was passed, this will be "disabled" instead of "no" --
++   # so always treat "no" as an error
++   AC_MSG_ERROR(
++[no X support found.  Use --x-includes and --x-libraries to specify the X
++path on your system, or --without-x to disable X support.])
++fi
++
+ if test "x$have_x" = "xyes"; then
+-  x_dir="/usr/X11R6";
+-  x_cflags="-I"$x_dir"/include"
+-  x_libs="-L"$x_dir"/lib -lX11 -lXext"
+-  AC_MSG_RESULT(enabling X11 support)
++  if test "x$x_includes" != "x"; then
++    x_cflags="-I$x_includes"
++  fi
++  if test "x$x_libraries" != "x"; then
++    x_libs="-L$x_libraries -lX11 -lXext"
++  fi
+   AM_CONDITIONAL(BUILD_X11, true)
+   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
+-  x_dir=""
+   x_cflags=""
+   x_libs=""
+-  AC_MSG_RESULT(disabling X11 support)
+   AM_CONDITIONAL(BUILD_X11, false)
+ fi
+ 
+@@ -354,7 +352,9 @@
+ fi
+ AM_CONDITIONAL(BUILD_BZ2_LOADER, test "$bz2_ok" = yes)
+ AC_SUBST(BZ2LIBS)
+-  
++
++AC_SUBST(requirements)
++
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+@@ -395,6 +395,9 @@
+ echo "  GIF.....................: $gif_ok"
+ echo "  ZLIB....................: $zlib_ok"
+ echo "  BZIP2...................: $bz2_ok"
++echo
++echo
++echo "Use MMX for extra speed...: $mmx"
+ echo
+ echo
+ echo "Installation Path.........: $prefix"
diff --git a/graphics/imlib2/files/patch-security-1 b/graphics/imlib2/files/patch-security-1
deleted file mode 100644
index 520160f14fed..000000000000
--- a/graphics/imlib2/files/patch-security-1
+++ /dev/null
@@ -1,90 +0,0 @@
-===================================================================
-RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/modules/loaders/loader_xpm.c,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- enlightenment/e17/libs/imlib2/src/modules/loaders/loader_xpm.c	2004/12/14 03:50:46	1.2
-+++ loaders/loader_xpm.c	2005/01/04 03:34:03	1.3
-@@ -192,37 +192,37 @@
-                     {
-                        /* Header */
-                        sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
--                       if (ncolors > 32766)
-+                       if ((ncolors > 32766) || (ncolors < 1))
-                          {
-                             fprintf(stderr,
--                                    "IMLIB ERROR: XPM files with colors > 32766 not supported\n");
-+                                    "IMLIB ERROR: XPM files with colors > 32766 or < 1 not supported\n");
-                             free(line);
-                             fclose(f);
-                             xpm_parse_done();
-                             return 0;
-                          }
--                       if (cpp > 5)
-+                       if ((cpp > 5) || (cpp < 1))
-                          {
-                             fprintf(stderr,
--                                    "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n");
-+                                    "IMLIB ERROR: XPM files with characters per pixel > 5 or < 1not supported\n");
-                             free(line);
-                             fclose(f);
-                             xpm_parse_done();
-                             return 0;
-                          }
--                       if (w > 32767)
-+                       if ((w > 32767) || (w < 1))
-                          {
-                             fprintf(stderr,
--                                    "IMLIB ERROR: Image width > 32767 pixels for file\n");
-+                                    "IMLIB ERROR: Image width > 32767 or < 1 pixels for file\n");
-                             free(line);
-                             fclose(f);
-                             xpm_parse_done();
-                             return 0;
-                          }
--                       if (h > 32767)
-+                       if ((h > 32767) || (h < 1))
-                          {
-                             fprintf(stderr,
--                                    "IMLIB ERROR: Image height > 32767 pixels for file\n");
-+                                    "IMLIB ERROR: Image height > 32767 or < 1 pixels for file\n");
-                             free(line);
-                             fclose(f);
-                             xpm_parse_done();
-@@ -284,9 +284,14 @@
-                                            if (k >= len)
-                                              {
-                                                 if (col[0])
--                                                   strcat(col, " ");
-+						  {
-+						     if (strlen(col) < ( sizeof(col) - 2))
-+						       strcat(col, " ");
-+						     else
-+						       done = 1;
-+						  }
-                                                 if (strlen(col) + strlen(s) <
--                                                    sizeof(col))
-+                                                    (sizeof(col) - 1))
-                                                    strcat(col, s);
-                                              }
-                                            if (col[0])
-@@ -322,9 +327,16 @@
-                                         }
-                                       else
-                                         {
--                                           if (col[0])
--                                              strcat(col, " ");
--                                           strcat(col, s);
-+					   if (col[0])
-+					     {
-+						if (strlen(col) < ( sizeof(col) - 2))
-+						  strcat(col, " ");
-+						else
-+						  done = 1;
-+					     }
-+					   if (strlen(col) + strlen(s) <
-+					       (sizeof(col) - 1))
-+					     strcat(col, s);
-                                         }
-                                    }
-                               }