mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
130 lines
4.1 KiB
Diff
130 lines
4.1 KiB
Diff
|
--- configure.in
|
||
|
|
+++ configure.in
|
||
|
|
@@ -21,6 +21,7 @@
|
||
|
|
AC_PROG_CC
|
||
|
|
AC_ISC_POSIX
|
||
|
|
AM_PROG_CC_STDC
|
||
|
|
+AM_PROG_AS
|
||
|
|
AC_PROG_INSTALL
|
||
|
|
AC_PROG_LN_S
|
||
|
|
AC_PROG_MAKE_SET
|
||
|
|
@@ -147,18 +148,18 @@
|
||
|
|
dnl Test for libtiff
|
||
|
|
if test -z "$LIBTIFF"; then
|
||
|
|
AC_CHECK_LIB(tiff, TIFFReadScanline,
|
||
|
|
- AC_CHECK_HEADER(tiffio.h,
|
||
|
|
+ [AC_CHECK_HEADER(tiffio.h,
|
||
|
|
TIFF='tiff'; LIBTIFF='-ltiff',
|
||
|
|
- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
|
||
|
|
- AC_CHECK_LIB(tiff, TIFFWriteScanline,
|
||
|
|
- AC_CHECK_HEADER(tiffio.h,
|
||
|
|
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
|
||
|
|
+ [AC_CHECK_LIB(tiff, TIFFWriteScanline,
|
||
|
|
+ [AC_CHECK_HEADER(tiffio.h,
|
||
|
|
TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
|
||
|
|
- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
|
||
|
|
- AC_CHECK_LIB(tiff34, TIFFFlushData,
|
||
|
|
- AC_CHECK_HEADER(tiffio.h,
|
||
|
|
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
|
||
|
|
+ [AC_CHECK_LIB(tiff34, TIFFFlushData,
|
||
|
|
+ [AC_CHECK_HEADER(tiffio.h,
|
||
|
|
TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
|
||
|
|
- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
|
||
|
|
- AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)
|
||
|
|
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
|
||
|
|
+ AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
|
||
|
|
fi
|
||
|
|
|
||
|
|
dnl Test for libjpeg
|
||
|
|
@@ -191,9 +192,9 @@
|
||
|
|
dnl Test for libpng
|
||
|
|
if test -z "$LIBPNG"; then
|
||
|
|
AC_CHECK_LIB(png, png_read_info,
|
||
|
|
- AC_CHECK_HEADER(png.h,
|
||
|
|
+ [AC_CHECK_HEADER(png.h,
|
||
|
|
png_ok=yes,
|
||
|
|
- png_ok=no),
|
||
|
|
+ png_ok=no)],
|
||
|
|
AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
|
||
|
|
if test "$png_ok" = yes; then
|
||
|
|
AC_MSG_CHECKING([for png_structp in png.h])
|
||
|
|
--- doc/Makefile.am
|
||
|
|
+++ doc/Makefile.am
|
||
|
|
@@ -156,7 +156,7 @@
|
||
|
|
done; \
|
||
|
|
fi)
|
||
|
|
# echo '-- Installing $(srcdir)/html/index.sgml' ; \
|
||
|
|
-# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
|
||
|
|
+# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR);
|
||
|
|
|
||
|
|
#
|
||
|
|
# Require gtk-doc when making dist
|
||
|
|
--- gdk-pixbuf.m4
|
||
|
|
+++ gdk-pixbuf.m4
|
||
|
|
@@ -9,7 +9,7 @@
|
||
|
|
dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||
|
|
dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS
|
||
|
|
dnl
|
||
|
|
-AC_DEFUN(AM_PATH_GDK_PIXBUF,
|
||
|
|
+AC_DEFUN([AM_PATH_GDK_PIXBUF],
|
||
|
|
[dnl
|
||
|
|
dnl Get the cflags and libraries from the gdk-pixbuf-config script
|
||
|
|
dnl
|
||
|
|
--- gdk-pixbuf/Makefile.am
|
||
|
|
+++ gdk-pixbuf/Makefile.am
|
||
|
|
@@ -18,7 +18,7 @@
|
||
|
|
|
||
|
|
libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS)
|
||
|
|
|
||
|
|
-libexecdir = $(libdir)/gdk-pixbuf/loaders
|
||
|
|
+loaderdir = $(libdir)/gdk-pixbuf/loaders
|
||
|
|
|
||
|
|
#
|
||
|
|
# The PNG plugin.
|
||
|
|
@@ -118,7 +118,7 @@
|
||
|
|
|
||
|
|
if BUILD_DYNAMIC_MODULES
|
||
|
|
|
||
|
|
-libexec_LTLIBRARIES = \
|
||
|
|
+loader_LTLIBRARIES = \
|
||
|
|
$(PNG_LIB) \
|
||
|
|
$(JPEG_LIB) \
|
||
|
|
$(GIF_LIB) \
|
||
|
|
@@ -134,7 +134,7 @@
|
||
|
|
extra_sources =
|
||
|
|
|
||
|
|
else
|
||
|
|
-libexec_LTLIBRARIES =
|
||
|
|
+loader_LTLIBRARIES =
|
||
|
|
|
||
|
|
extra_sources = $(libpixbufloader_png_la_SOURCES) \
|
||
|
|
$(libpixbufloader_jpeg_la_SOURCES) \
|
||
|
|
@@ -159,7 +159,7 @@
|
||
|
|
-I$(top_builddir)/gdk-pixbuf \
|
||
|
|
$(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS)
|
||
|
|
|
||
|
|
-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
|
||
|
|
+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\""
|
||
|
|
|
||
|
|
LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
||
|
|
|
||
|
|
@@ -211,7 +211,7 @@
|
||
|
|
gdk-pixbuf-parse-color.c \
|
||
|
|
$(extra_sources)
|
||
|
|
|
||
|
|
-libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS)
|
||
|
|
+libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS)
|
||
|
|
libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS)
|
||
|
|
|
||
|
|
|
||
|
|
--- gdk-pixbuf/io-bmp.c
|
||
|
|
+++ gdk-pixbuf/io-bmp.c
|
||
|
|
@@ -28,6 +28,7 @@
|
||
|
|
#include <stdlib.h>
|
||
|
|
#include <unistd.h>
|
||
|
|
#include <string.h>
|
||
|
|
+#include <stdlib.h>
|
||
|
|
#include "gdk-pixbuf-private.h"
|
||
|
|
#include "gdk-pixbuf-io.h"
|
||
|
|
|