Ticket #429: webp-leptonica-0.0.1.patch

leptonlib-1.066/configure

@@ -8651 +8651 @@
        save_LIBS="$LIBS"
        CFLAGS="$CFLAGS $LIBTIFF_CFLAGS"
        CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS"
-       LIBS="$LIBS $LIBTIFF_LIBS -lm"
+       LIBS="$LIBS $LIBTIFF_LIBS"
        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8732 +8732 @@
      if test "x$CXX" = "xcl.exe" ; then
        LIBS="$LIBTIFF_LIBS $LIBS"
      else
-       LIBS="$LIBTIFF_LIBS $LIBS -lm"
+       LIBS="$LIBTIFF_LIBS $LIBS"
      fi
      :
   fi

leptonlib-1.066/src/bmpio.c

@@ -503 +503 @@
 #endif  /* HAVE_CONFIG_H */
 
 #if HAVE_FMEMOPEN
-
+#if !defined(__HAIKU__)
 extern FILE *open_memstream(char **data, size_t *size);
+#endif
 extern FILE *fmemopen(void *data, size_t size, const char *mode);
 
 /*!

leptonlib-1.066/src/jpegio.c

@@ -948 +948 @@
  *                         Read/write to memory                        *
  *---------------------------------------------------------------------*/
 #if HAVE_FMEMOPEN
-
+#if !defined(__HAIKU__)
 extern FILE *open_memstream(char **data, size_t *size);
+#endif
 extern FILE *fmemopen(void *data, size_t size, const char *mode);
 
 /*!

leptonlib-1.066/src/pngio.c

@@ -985 +985 @@
  *                         Read/write to memory                        *
  *---------------------------------------------------------------------*/
 #if HAVE_FMEMOPEN
-
+#if !defined(__HAIKU__)
 extern FILE *open_memstream(char **data, size_t *size);
+#endif
 extern FILE *fmemopen(void *data, size_t size, const char *mode);
 
 /*!

leptonlib-1.066/src/pnmio.c

@@ -531 +531 @@
 #endif  /* HAVE_CONFIG_H */
 
 #if HAVE_FMEMOPEN
-
+#if !defined(__HAIKU__)
 extern FILE *open_memstream(char **data, size_t *size);
+#endif
 extern FILE *fmemopen(void *data, size_t size, const char *mode);
 
 /*!

leptonlib-1.066/src/sarray.c

@@ -1795 +1795 @@
         /* It's nice to ignore directories.  For this it is necessary to
          * define _BSD_SOURCE in the CC command, because the DT_DIR
          * flag is non-standard.  */ 
-#if !defined(__SOLARIS__)
+#if !defined(__SOLARIS__) && !defined(__HAIKU__)
         if (pdirentry->d_type == DT_DIR)
             continue;
 #endif

libwebp/makefile

@@ -67 +67 @@
 #    (2) Install giflib-4.1.4, and be sure your LD_LIBRARY_PATH includes
 #        the directory in which libgif.so.4 is installed.
 #    (3) Use the second line below for ALL_LIBS
-ALL_LIBS =      $(LEPTLIB) -ljpeg -lpng -lz -lm
+ALL_LIBS =      $(LEPTLIB) -ljpeg -lpng -lz
 #ALL_LIBS =     $(LEPTLIB) -ltiff -ljpeg -lpng -lgif -lz -lm
 
-VPX_LIB = -lvpx -lpthread
+VPX_LIB = -lvpx
 
 #########################################################################