upgrade to imlib 1.9.11
This commit is contained in:
brad
parent
8387d164b4
commit
4ae5a965e3
@ -1,22 +1,22 @@
|
|||||||
# $OpenBSD: Makefile,v 1.36 2001/11/10 11:13:49 heko Exp $
|
# $OpenBSD: Makefile,v 1.37 2001/11/10 20:45:48 brad Exp $
|
||||||
# $FreeBSD: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $
|
# $FreeBSD: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $
|
||||||
|
|
||||||
COMMENT= "image manipulation library for X11"
|
COMMENT= "image manipulation library for X11"
|
||||||
|
|
||||||
DISTNAME= imlib-1.9.8.1
|
DISTNAME= imlib-1.9.11
|
||||||
CATEGORIES= devel graphics
|
CATEGORIES= devel graphics
|
||||||
NEED_VERSION= 1.486
|
NEED_VERSION= 1.486
|
||||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||||
MASTER_SITE_SUBDIR= stable/sources/imlib
|
MASTER_SITE_SUBDIR= stable/sources/imlib
|
||||||
|
|
||||||
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
|
MODULES= gettext
|
||||||
|
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
|
||||||
jpeg.62::graphics/jpeg \
|
jpeg.62::graphics/jpeg \
|
||||||
ungif.5::graphics/libungif \
|
ungif.5::graphics/libungif \
|
||||||
png.2::graphics/png \
|
png.2::graphics/png \
|
||||||
tiff.35::graphics/tiff
|
tiff.35::graphics/tiff
|
||||||
BUILD_DEPENDS= ::graphics/netpbm
|
BUILD_DEPENDS= ::graphics/jpeg
|
||||||
RUN_DEPENDS= ::graphics/jpeg \
|
RUN_DEPENDS= ::graphics/jpeg
|
||||||
::graphics/netpbm
|
|
||||||
|
|
||||||
MAINTAINER= Brad Smith <brad@openbsd.org>
|
MAINTAINER= Brad Smith <brad@openbsd.org>
|
||||||
|
|
||||||
@ -31,13 +31,11 @@ SEPARATE_BUILD= concurrent
|
|||||||
CONFIGURE_STYLE= gnu
|
CONFIGURE_STYLE= gnu
|
||||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||||
CONFIGURE_ARGS+= --enable-static --disable-modules
|
CONFIGURE_ARGS+= --enable-static --disable-modules
|
||||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
CONFIGURE_ENV= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert" \
|
||||||
|
ac_cv_path_GIFTOPNM_PROG="${LOCALBASE}/bin/giftopnm" \
|
||||||
|
CPPFLAGS="-I${LOCALBASE}/include" \
|
||||||
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
|
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
|
||||||
|
|
||||||
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltconfig \
|
|
||||||
${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltmain_sh \
|
|
||||||
patch-*
|
|
||||||
|
|
||||||
pre-build:
|
pre-build:
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "*** WARNING: you may see an error such as"
|
@echo "*** WARNING: you may see an error such as"
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
MD5 (imlib-1.9.8.1.tar.gz) = 224948ee96653990cd96daec090a5599
|
MD5 (imlib-1.9.11.tar.gz) = ed50588bb7dbc00b177ba61926e6e0d0
|
||||||
RMD160 (imlib-1.9.8.1.tar.gz) = b9736d1c99615fc6d42d0cded14e97805b8f12f3
|
RMD160 (imlib-1.9.11.tar.gz) = 927e3fc68117103ceb3a2531ea0aabc98aef5f21
|
||||||
SHA1 (imlib-1.9.8.1.tar.gz) = bf091ac5bf18524582e6c285014ba648f77c5215
|
SHA1 (imlib-1.9.11.tar.gz) = 30b48d9f3745547d2186750ecbd3a391d3f805ed
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
--- Imlib/Makefile.in.orig Sat May 20 02:51:31 2000
|
|
||||||
+++ Imlib/Makefile.in Sat Aug 12 01:46:36 2000
|
|
||||||
@@ -124,7 +124,7 @@
|
|
||||||
libImlib_la_SOURCES = cache.c colors.c load.c misc.c rend.c utils.c save.c snprintf.c
|
|
||||||
|
|
||||||
|
|
||||||
-libImlib_la_LDFLAGS = -version-info 10:8:9
|
|
||||||
+libImlib_la_LDFLAGS = -version-info 19:8:0
|
|
||||||
#libImlib_la_LDDADD = $(SUPPORT_LIBS)
|
|
||||||
libImlib_la_LIBADD = $(SUPPORT_LIBS)
|
|
||||||
|
|
||||||
12
graphics/imlib/patches/patch-Imlib_Makefile_in
Normal file
12
graphics/imlib/patches/patch-Imlib_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
$OpenBSD: patch-Imlib_Makefile_in,v 1.1 2001/11/10 20:45:48 brad Exp $
|
||||||
|
--- Imlib/Makefile.in.orig Tue Jul 31 19:34:50 2001
|
||||||
|
+++ Imlib/Makefile.in Tue Oct 30 21:54:53 2001
|
||||||
|
@@ -138,7 +138,7 @@ libImlib_la_SOURCES = \
|
||||||
|
snprintf.c
|
||||||
|
|
||||||
|
|
||||||
|
-libImlib_la_LDFLAGS = -version-info 10:11:9
|
||||||
|
+libImlib_la_LDFLAGS = -version-info 19:11:0
|
||||||
|
#libImlib_la_LDDADD = $(SUPPORT_LIBS)
|
||||||
|
libImlib_la_LIBADD = $(SUPPORT_LIBS)
|
||||||
|
|
||||||
@ -1,7 +1,32 @@
|
|||||||
$OpenBSD: patch-Imlib_load_c,v 1.1 2001/03/13 20:28:59 espie Exp $
|
--- Imlib/load.c.orig Tue Jul 31 18:15:16 2001
|
||||||
--- Imlib/load.c.orig Tue Mar 13 19:54:26 2001
|
+++ Imlib/load.c Tue Oct 30 21:49:59 2001
|
||||||
+++ Imlib/load.c Tue Mar 13 19:54:44 2001
|
@@ -241,7 +241,8 @@ _LoadPNG(ImlibData * id, FILE * f, int *
|
||||||
@@ -628,9 +628,9 @@ _LoadBMP(ImlibData * id, FILE *file, int
|
png_read_image(png_ptr, lines);
|
||||||
|
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
|
||||||
|
ptr = data;
|
||||||
|
- if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
||||||
|
+ if (color_type == PNG_COLOR_TYPE_GRAY
|
||||||
|
+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
||||||
|
{
|
||||||
|
for (y = 0; y < *h; y++)
|
||||||
|
{
|
||||||
|
@@ -266,6 +267,7 @@ _LoadPNG(ImlibData * id, FILE * f, int *
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+#if 0
|
||||||
|
else if (color_type == PNG_COLOR_TYPE_GRAY)
|
||||||
|
{
|
||||||
|
for (y = 0; y < *h; y++)
|
||||||
|
@@ -281,6 +283,7 @@ _LoadPNG(ImlibData * id, FILE * f, int *
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (y = 0; y < *h; y++)
|
||||||
|
@@ -623,9 +626,9 @@ _LoadBMP(ImlibData * id, FILE *file, int
|
||||||
planes = (int)word;
|
planes = (int)word;
|
||||||
fread(&word, 2, 1, file);
|
fread(&word, 2, 1, file);
|
||||||
bpp = (int)word;
|
bpp = (int)word;
|
||||||
|
|||||||
@ -1,39 +0,0 @@
|
|||||||
--- config/Makefile.in.orig Sat May 20 02:51:32 2000
|
|
||||||
+++ config/Makefile.in Sat Aug 12 01:52:17 2000
|
|
||||||
@@ -124,21 +124,21 @@
|
|
||||||
|
|
||||||
install-sysconfDATA: $(sysconf_DATA)
|
|
||||||
@$(NORMAL_INSTALL)
|
|
||||||
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
|
|
||||||
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/imlib
|
|
||||||
@list='$(sysconf_DATA)'; for p in $$list; do \
|
|
||||||
if test -f $(srcdir)/$$p; then \
|
|
||||||
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
|
|
||||||
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
|
|
||||||
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/examples/imlib/$$p"; \
|
|
||||||
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/examples/imlib/$$p; \
|
|
||||||
else if test -f $$p; then \
|
|
||||||
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
|
|
||||||
- $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
|
|
||||||
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/examples/imlib/$$p"; \
|
|
||||||
+ $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/examples/imlib/$$p; \
|
|
||||||
fi; fi; \
|
|
||||||
done
|
|
||||||
|
|
||||||
uninstall-sysconfDATA:
|
|
||||||
@$(NORMAL_UNINSTALL)
|
|
||||||
list='$(sysconf_DATA)'; for p in $$list; do \
|
|
||||||
- rm -f $(DESTDIR)$(sysconfdir)/$$p; \
|
|
||||||
+ rm -f $(DESTDIR)$(datadir)/examples/imlib/$$p; \
|
|
||||||
done
|
|
||||||
tags: TAGS
|
|
||||||
TAGS:
|
|
||||||
@@ -183,7 +183,7 @@
|
|
||||||
install-strip:
|
|
||||||
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
|
|
||||||
installdirs:
|
|
||||||
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
|
|
||||||
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/imlib
|
|
||||||
|
|
||||||
|
|
||||||
mostlyclean-generic:
|
|
||||||
11
graphics/imlib/patches/patch-config_Makefile_in
Normal file
11
graphics/imlib/patches/patch-config_Makefile_in
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- config/Makefile.in.orig Tue Jul 31 19:34:50 2001
|
||||||
|
+++ config/Makefile.in Tue Oct 30 22:14:36 2001
|
||||||
|
@@ -25,7 +25,7 @@ bindir = @bindir@
|
||||||
|
sbindir = @sbindir@
|
||||||
|
libexecdir = @libexecdir@
|
||||||
|
datadir = @datadir@
|
||||||
|
-sysconfdir = @sysconfdir@
|
||||||
|
+sysconfdir = $(datadir)/examples/imlib
|
||||||
|
sharedstatedir = @sharedstatedir@
|
||||||
|
localstatedir = @localstatedir@
|
||||||
|
libdir = @libdir@
|
||||||
@ -1,20 +1,120 @@
|
|||||||
--- configure.orig Sat May 20 02:50:50 2000
|
--- configure.orig Tue Oct 30 22:36:28 2001
|
||||||
+++ configure Sat Aug 12 02:03:07 2000
|
+++ configure Tue Oct 30 22:54:55 2001
|
||||||
@@ -3886,7 +3886,7 @@
|
@@ -1902,6 +1902,16 @@ newos6*)
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
lt_cv_file_magic_test_file=/usr/lib/libnls.so
|
||||||
else
|
;;
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
-LIBS="-lXext $X_LIBS $LIBS"
|
+openbsd*)
|
||||||
+LIBS="-lXext -lX11 $X_LIBS $LIBS"
|
+ lt_cv_file_magic_cmd=/usr/bin/file
|
||||||
cat > conftest.$ac_ext <<EOF
|
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||||
#line 3892 "configure"
|
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||||
#include "confdefs.h"
|
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
||||||
@@ -4221,7 +4221,7 @@
|
+ else
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||||
else
|
+ fi
|
||||||
ac_save_LIBS="$LIBS"
|
+ ;;
|
||||||
-LIBS="-ltiff $GX_LIBS $LIBS"
|
+
|
||||||
+LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS"
|
osf3* | osf4* | osf5*)
|
||||||
cat > conftest.$ac_ext <<EOF
|
# this will be overridden with pass_all, but let us keep it just in case
|
||||||
#line 4227 "configure"
|
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
|
||||||
#include "confdefs.h"
|
@@ -2667,7 +2677,14 @@ old_postuninstall_cmds=
|
||||||
|
|
||||||
|
if test -n "$RANLIB"; then
|
||||||
|
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
||||||
|
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||||
|
+ case "$host_os" in
|
||||||
|
+ openbsd*)
|
||||||
|
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Allow CC to be a program name with arguments.
|
||||||
|
@@ -3164,7 +3181,9 @@ cygwin* | mingw* | pw32* )
|
||||||
|
with_gnu_ld=no
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
-
|
||||||
|
+openbsd*)
|
||||||
|
+ with_gnu_ld=no
|
||||||
|
+ ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
ld_shlibs=yes
|
||||||
|
@@ -3568,10 +3587,24 @@ else
|
||||||
|
;;
|
||||||
|
|
||||||
|
openbsd*)
|
||||||
|
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||||
|
- hardcode_libdir_flag_spec='-R$libdir'
|
||||||
|
hardcode_direct=yes
|
||||||
|
hardcode_shlibpath_var=no
|
||||||
|
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||||
|
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||||
|
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||||
|
+ export_dynamic_flag_spec='${wl}-E'
|
||||||
|
+ else
|
||||||
|
+ case "$host_os" in
|
||||||
|
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
||||||
|
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||||
|
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||||
|
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
os2*)
|
||||||
|
@@ -4048,9 +4081,23 @@ newsos6)
|
||||||
|
|
||||||
|
openbsd*)
|
||||||
|
version_type=sunos
|
||||||
|
- if test "$with_gnu_ld" = yes; then
|
||||||
|
- need_lib_prefix=no
|
||||||
|
- need_version=no
|
||||||
|
+
|
||||||
|
+ need_lib_prefix=no
|
||||||
|
+ need_version=no
|
||||||
|
+ sys_lib_search_path_spec="/usr/lib"
|
||||||
|
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
|
||||||
|
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||||
|
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
||||||
|
+ case "$host_os" in
|
||||||
|
+ openbsd2.[89] | openbsd2.[89].*)
|
||||||
|
+ shlibpath_overrides_runpath=no
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ shlibpath_overrides_runpath=yes
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ else
|
||||||
|
+ shlibpath_overrides_runpath=yes
|
||||||
|
fi
|
||||||
|
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||||
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||||
|
@@ -7490,8 +7537,6 @@ else
|
||||||
|
GX_LIBS="$GTK_LIBS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
-CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include"
|
||||||
|
-
|
||||||
|
SUPPORT_LIBS=""
|
||||||
|
|
||||||
|
if test "x$enable_shm" = "xyes"; then
|
||||||
|
@@ -7795,8 +7840,8 @@ rm -f conftest*
|
||||||
|
fi
|
||||||
|
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||||
|
echo "$ac_t""yes" 1>&6
|
||||||
|
- TIFFLIBS="-ltiff"
|
||||||
|
- SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; cat >> confdefs.h <<\EOF
|
||||||
|
+ TIFFLIBS="-ltiff -ljpeg -lz"
|
||||||
|
+ SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"; cat >> confdefs.h <<\EOF
|
||||||
|
#define HAVE_LIBTIFF 1
|
||||||
|
EOF
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
--- gdk_imlib/Makefile.in.orig Sat May 20 02:51:29 2000
|
|
||||||
+++ gdk_imlib/Makefile.in Sat Aug 12 02:00:30 2000
|
|
||||||
@@ -151,7 +151,7 @@
|
|
||||||
libgdk_imlib_la_SOURCES = cache.c colors.c globals.c load.c misc.c rend.c utils.c save.c modules.c
|
|
||||||
|
|
||||||
|
|
||||||
-libgdk_imlib_la_LDFLAGS = -version-info 10:8:9
|
|
||||||
+libgdk_imlib_la_LDFLAGS = -version-info 19:8:0
|
|
||||||
libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
|
|
||||||
|
|
||||||
include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
|
|
||||||
14
graphics/imlib/patches/patch-gdk_imlib_Makefile_in
Normal file
14
graphics/imlib/patches/patch-gdk_imlib_Makefile_in
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
$OpenBSD: patch-gdk_imlib_Makefile_in,v 1.1 2001/11/10 20:45:48 brad Exp $
|
||||||
|
--- gdk_imlib/Makefile.in.orig Tue Jul 31 19:34:50 2001
|
||||||
|
+++ gdk_imlib/Makefile.in Tue Oct 30 22:39:49 2001
|
||||||
|
@@ -175,8 +175,8 @@ libgdk_imlib_la_SOURCES = \
|
||||||
|
modules.c
|
||||||
|
|
||||||
|
|
||||||
|
-libgdk_imlib_la_LDFLAGS = -version-info 10:11:9
|
||||||
|
-libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
|
||||||
|
+libgdk_imlib_la_LDFLAGS = -version-info 19:11:0
|
||||||
|
+libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) $(SUPPORT_LIBS)
|
||||||
|
|
||||||
|
include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
|
||||||
|
|
||||||
13
graphics/imlib/patches/patch-gdk_imlib_io-png_c
Normal file
13
graphics/imlib/patches/patch-gdk_imlib_io-png_c
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
$OpenBSD: patch-gdk_imlib_io-png_c,v 1.1 2001/11/10 20:45:48 brad Exp $
|
||||||
|
--- gdk_imlib/io-png.c.orig Tue Oct 30 21:31:24 2001
|
||||||
|
+++ gdk_imlib/io-png.c Tue Oct 30 21:42:53 2001
|
||||||
|
@@ -297,7 +297,8 @@ inline_png(unsigned char *data, int data
|
||||||
|
im->rgb_width = ww;
|
||||||
|
im->rgb_height = hh;
|
||||||
|
/* Setup Translators */
|
||||||
|
- if (color_type == PNG_COLOR_TYPE_PALETTE)
|
||||||
|
+ if ((color_type == PNG_COLOR_TYPE_PALETTE) ||
|
||||||
|
+ (color_type == PNG_COLOR_TYPE_GRAY))
|
||||||
|
png_set_expand(png_ptr);
|
||||||
|
png_set_strip_16(png_ptr);
|
||||||
|
png_set_packing(png_ptr);
|
||||||
88
graphics/imlib/patches/patch-ltmain_sh
Normal file
88
graphics/imlib/patches/patch-ltmain_sh
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
--- ltmain.sh.orig Tue Jul 31 19:34:47 2001
|
||||||
|
+++ ltmain.sh Tue Oct 30 23:07:11 2001
|
||||||
|
@@ -1031,12 +1031,34 @@ compiler."
|
||||||
|
# These systems don't actually have a C library (as such)
|
||||||
|
test "X$arg" = "X-lc" && continue
|
||||||
|
;;
|
||||||
|
+ *-*-openbsd*)
|
||||||
|
+ # Do not include libc due to us having libc/libc_r.
|
||||||
|
+ test "X$arg" = "X-lc" && continue
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ elif test "X$arg" = "X-lc_r"; then
|
||||||
|
+ case $host in
|
||||||
|
+ *-*-openbsd*)
|
||||||
|
+ # Do not include libc_r directly, use -pthread flag.
|
||||||
|
+ continue
|
||||||
|
+ ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
deplibs="$deplibs $arg"
|
||||||
|
continue
|
||||||
|
;;
|
||||||
|
|
||||||
|
+ -pthread)
|
||||||
|
+ case $host in
|
||||||
|
+ *-*-openbsd*)
|
||||||
|
+ deplibs="$deplibs $arg"
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ continue
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
-module)
|
||||||
|
module=yes
|
||||||
|
continue
|
||||||
|
@@ -2408,6 +2430,9 @@ compiler."
|
||||||
|
*-*-netbsd*)
|
||||||
|
# Don't link with libc until the a.out ld.so is fixed.
|
||||||
|
;;
|
||||||
|
+ *-*-openbsd*)
|
||||||
|
+ # Do not include libc due to us having libc/libc_r.
|
||||||
|
+ ;;
|
||||||
|
*)
|
||||||
|
# Add libc to deplibs on all other systems if necessary.
|
||||||
|
if test $build_libtool_need_lc = "yes"; then
|
||||||
|
@@ -4412,40 +4437,6 @@ relink_command=\"$relink_command\""
|
||||||
|
# Exit here if they wanted silent mode.
|
||||||
|
test "$show" = ":" && exit 0
|
||||||
|
|
||||||
|
- echo "----------------------------------------------------------------------"
|
||||||
|
- echo "Libraries have been installed in:"
|
||||||
|
- for libdir in $libdirs; do
|
||||||
|
- echo " $libdir"
|
||||||
|
- done
|
||||||
|
- echo
|
||||||
|
- echo "If you ever happen to want to link against installed libraries"
|
||||||
|
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||||
|
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
||||||
|
- echo "flag during linking and do at least one of the following:"
|
||||||
|
- if test -n "$shlibpath_var"; then
|
||||||
|
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||||
|
- echo " during execution"
|
||||||
|
- fi
|
||||||
|
- if test -n "$runpath_var"; then
|
||||||
|
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||||
|
- echo " during linking"
|
||||||
|
- fi
|
||||||
|
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||||
|
- libdir=LIBDIR
|
||||||
|
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||||
|
-
|
||||||
|
- echo " - use the \`$flag' linker flag"
|
||||||
|
- fi
|
||||||
|
- if test -n "$admincmds"; then
|
||||||
|
- echo " - have your system administrator run these commands:$admincmds"
|
||||||
|
- fi
|
||||||
|
- if test -f /etc/ld.so.conf; then
|
||||||
|
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||||
|
- fi
|
||||||
|
- echo
|
||||||
|
- echo "See any operating system documentation about shared libraries for"
|
||||||
|
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||||
|
- echo "----------------------------------------------------------------------"
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
@comment $OpenBSD: PFRAG.shared,v 1.3 2000/10/03 08:18:44 brad Exp $
|
@comment $OpenBSD: PFRAG.shared,v 1.4 2001/11/10 20:45:48 brad Exp $
|
||||||
lib/libImlib.so.19.8
|
lib/libImlib.so.19.11
|
||||||
lib/libgdk_imlib.so.19.8
|
lib/libgdk_imlib.so.19.11
|
||||||
DYNLIBDIR(%B)
|
DYNLIBDIR(%B)
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
@comment $OpenBSD: PLIST,v 1.8 2000/10/03 08:18:44 brad Exp $
|
@comment $OpenBSD: PLIST,v 1.9 2001/11/10 20:45:48 brad Exp $
|
||||||
bin/imlib-config
|
bin/imlib-config
|
||||||
bin/imlib_config
|
bin/imlib_config
|
||||||
include/Imlib.h
|
include/Imlib.h
|
||||||
@ -12,6 +12,8 @@ lib/libImlib.la
|
|||||||
lib/libgdk_imlib.a
|
lib/libgdk_imlib.a
|
||||||
lib/libgdk_imlib.la
|
lib/libgdk_imlib.la
|
||||||
%%SHARED%%
|
%%SHARED%%
|
||||||
|
man/man1/imlib-config.1
|
||||||
|
man/man1/imlib_config.1
|
||||||
share/aclocal/imlib.m4
|
share/aclocal/imlib.m4
|
||||||
share/examples/imlib/im_palette-small.pal
|
share/examples/imlib/im_palette-small.pal
|
||||||
share/examples/imlib/im_palette-tiny.pal
|
share/examples/imlib/im_palette-tiny.pal
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user