cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to imlib 1.9.14

Browse Source
This commit is contained in:
brad 2002-05-17 02:42:15 +00:00
parent 3a764b4705
commit 119b94b130
10 changed files with 50 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
graphics/imlib/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.42 2002/05/13 23:31:24 espie Exp $
# $OpenBSD: Makefile,v 1.43 2002/05/17 02:42:15 brad Exp $
# $FreeBSD: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $
COMMENT= "image manipulation library for X11"
DISTNAME= imlib-1.9.11
DISTNAME= imlib-1.9.14
CATEGORIES= graphics devel
NEED_VERSION= 1.522
NEED_VERSION= 1.525
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/imlib/}
MODULES= gettext
@ -14,8 +14,6 @@ LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
ungif.5::graphics/libungif \
png.2::graphics/png \
tiff.35::graphics/tiff
BUILD_DEPENDS= ::graphics/jpeg
RUN_DEPENDS= ::graphics/jpeg
MAINTAINER= Brad Smith <brad@openbsd.org>
@ -24,19 +22,17 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
VMEM_WARNING= Yes
USE_X11= Yes
USE_GMAKE= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --disable-modules
CONFIGURE_ENV= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert" \
ac_cv_path_GIFTOPNM_PROG="${LOCALBASE}/bin/giftopnm" \
CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
VMEM_WARNING= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal
${INSTALL_DATA} ${WRKSRC}/imlib.m4 ${PREFIX}/share/aclocal

6
graphics/imlib/distinfo
View File

@ -1,3 +1,3 @@
MD5 (imlib-1.9.11.tar.gz) = ed50588bb7dbc00b177ba61926e6e0d0
RMD160 (imlib-1.9.11.tar.gz) = 927e3fc68117103ceb3a2531ea0aabc98aef5f21
SHA1 (imlib-1.9.11.tar.gz) = 30b48d9f3745547d2186750ecbd3a391d3f805ed
MD5 (imlib-1.9.14.tar.gz) = 1fa54011e4e1db532d7eadae3ced6a8c
RMD160 (imlib-1.9.14.tar.gz) = 06895acc88ba63ab64df861dcc6b3cb6acbb57d1
SHA1 (imlib-1.9.14.tar.gz) = 3c8c8c3aaec3cc5a9fc924060a71223862a313f6

16
graphics/imlib/patches/patch-Imlib_Makefile_in
View File

@ -1,12 +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
$OpenBSD: patch-Imlib_Makefile_in,v 1.2 2002/05/17 02:42:15 brad Exp $
--- Imlib/Makefile.in.orig Mon Mar 25 11:50:26 2002
+++ Imlib/Makefile.in Thu May 16 21:56:33 2002
@@ -120,7 +120,7 @@ include_HEADERS = Imlib.h Imlib_private.
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:11:9
+libImlib_la_LDFLAGS = -version-info 19:11:0
-libImlib_la_LDFLAGS = -version-info 10:14:9
+libImlib_la_LDFLAGS = -version-info 19:14:0
#libImlib_la_LDDADD = $(SUPPORT_LIBS)
libImlib_la_LIBADD = $(SUPPORT_LIBS)
libImlib_la_LIBADD = $(SUPPORT_LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)

12
graphics/imlib/patches/patch-Imlib_load_c
View File

@ -1,6 +1,6 @@
--- Imlib/load.c.orig Tue Jul 31 18:15:16 2001
+++ Imlib/load.c Tue Oct 30 21:49:59 2001
@@ -241,7 +241,8 @@ _LoadPNG(ImlibData * id, FILE * f, int *
--- Imlib/load.c.orig Fri Mar 22 09:43:04 2002
+++ Imlib/load.c Thu May 16 22:12:55 2002
@@ -254,7 +254,8 @@ _LoadPNG(ImlibData * id, FILE * f, int *
png_read_image(png_ptr, lines);
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
ptr = data;
@ -10,7 +10,7 @@
{
for (y = 0; y < *h; y++)
{
@@ -266,6 +267,7 @@ _LoadPNG(ImlibData * id, FILE * f, int *
@@ -279,6 +280,7 @@ _LoadPNG(ImlibData * id, FILE * f, int *
}
}
}
@ -18,7 +18,7 @@
else if (color_type == PNG_COLOR_TYPE_GRAY)
{
for (y = 0; y < *h; y++)
@@ -281,6 +283,7 @@ _LoadPNG(ImlibData * id, FILE * f, int *
@@ -294,6 +296,7 @@ _LoadPNG(ImlibData * id, FILE * f, int *
}
}
}
@ -26,7 +26,7 @@
else
{
for (y = 0; y < *h; y++)
@@ -623,9 +626,9 @@ _LoadBMP(ImlibData * id, FILE *file, int
@@ -645,9 +648,9 @@ _LoadBMP(ImlibData * id, FILE *file, int
planes = (int)word;
fread(&word, 2, 1, file);
bpp = (int)word;

6
graphics/imlib/patches/patch-config_Makefile_in
View File

@ -1,6 +1,6 @@
--- 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@
--- config/Makefile.in.orig Mon Mar 25 11:50:27 2002
+++ config/Makefile.in Thu May 16 22:12:55 2002
@@ -23,7 +23,7 @@ bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@

106
graphics/imlib/patches/patch-configure
View File

@ -1,104 +1,6 @@
--- configure.orig Tue Oct 30 22:36:28 2001
+++ configure Tue Oct 30 22:54:55 2001
@@ -1902,6 +1902,16 @@ newos6*)
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
+openbsd*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ else
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -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
--- configure.orig Thu May 16 21:59:15 2002
+++ configure Thu May 16 22:01:57 2002
@@ -7365,8 +7365,6 @@ else
GX_LIBS="$GTK_LIBS"
fi
@ -107,7 +9,7 @@
SUPPORT_LIBS=""
if test "x$enable_shm" = "xyes"; then
@@ -7795,8 +7840,8 @@ rm -f conftest*
@@ -7670,8 +7668,8 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6

20
graphics/imlib/patches/patch-gdk_imlib_Makefile_in
View File

@ -1,14 +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
$OpenBSD: patch-gdk_imlib_Makefile_in,v 1.2 2002/05/17 02:42:15 brad Exp $
--- gdk_imlib/Makefile.in.orig Mon Mar 25 11:50:24 2002
+++ gdk_imlib/Makefile.in Thu May 16 22:11:45 2002
@@ -147,8 +147,8 @@ lib_LTLIBRARIES = libgdk_imlib.la $(
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: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)
-libgdk_imlib_la_LDFLAGS = -version-info 10:14:9
-libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
+libgdk_imlib_la_LDFLAGS = -version-info 19:14:0
+libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) $(SUPPORT_LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h

8
graphics/imlib/patches/patch-gdk_imlib_io-png_c
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-gdk_imlib_io-png_c,v 1.2 2002/05/17 02:42:15 brad Exp $
--- gdk_imlib/io-png.c.orig Mon Mar 4 12:06:29 2002
+++ gdk_imlib/io-png.c Thu May 16 22:12:55 2002
@@ -299,7 +299,8 @@ inline_png(unsigned char *data, int data
im->rgb_width = ww;
im->rgb_height = hh;
/* Setup Translators */

51
graphics/imlib/patches/patch-ltmain_sh
View File

@ -1,51 +1,6 @@
--- 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\""
--- ltmain.sh.orig Thu May 16 22:05:01 2002
+++ ltmain.sh Thu May 16 22:06:29 2002
@@ -4543,40 +4543,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0

6
graphics/imlib/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2001/11/10 20:45:48 brad Exp $
lib/libImlib.so.19.11
lib/libgdk_imlib.so.19.11
@comment $OpenBSD: PFRAG.shared,v 1.5 2002/05/17 02:42:15 brad Exp $
lib/libImlib.so.19.14
lib/libgdk_imlib.so.19.14
DYNLIBDIR(%B)