put gdk-pixbuf 0.17.0 back in the tree.

--
Workaround for the libtool relinking problem thanks to Marc Matteo
This commit is contained in:
brad 2002-05-31 02:41:44 +00:00
parent c05cd374ef
commit 6683772531
13 changed files with 202 additions and 63 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.18 2002/05/31 00:03:35 brad Exp $
# $OpenBSD: Makefile,v 1.19 2002/05/31 02:41:44 brad Exp $
COMMENT= "GdkPixbuf graphics library"
COMMENT-gnome= "GdkPixbuf graphics library (GNOME Canvas)"
VERSION= 0.10.1
VERSION= 0.17.0
DISTNAME= gdk-pixbuf-${VERSION}
FULLPKGNAME= ${DISTNAME}p1
FULLPKGNAME-gnome= gdk-pixbuf-gnome-${VERSION}p1
FULLPKGNAME= ${DISTNAME}
FULLPKGNAME-gnome= gdk-pixbuf-gnome-${VERSION}
CATEGORIES= graphics
NEED_VERSION= 1.525
MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
@ -20,16 +20,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh \
patch-*
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_NEW= Yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static \
--disable-modules \
--disable-mmx
--disable-mmx \
--with-html-dir="${PREFIX}/share/html"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@ -61,9 +59,4 @@ LIB_DEPENDS+= gnome.36,art_lgpl,gnomesupport,gnomeui::x11/gnome/libs
CONFIGURE_ARGS+= --with-gnome
.endif
pre-patch:
@find ${WRKSRC} -name "Makefile.in" | xargs perl -pi -e \
's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g'
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (gdk-pixbuf-0.10.1.tar.gz) = eb554077f6f176da32e263dcacfe34c4
RMD160 (gdk-pixbuf-0.10.1.tar.gz) = 787f996d8ae6fe8896d8c4d5ca84aea8782a7454
SHA1 (gdk-pixbuf-0.10.1.tar.gz) = d91342c6a13efcab572fc670ba7613c47dc42023
MD5 (gdk-pixbuf-0.17.0.tar.gz) = 021914ad9104f265527c28220315e542
RMD160 (gdk-pixbuf-0.17.0.tar.gz) = 32d72514580416f0f30b0e5ad828f15e13f47cbb
SHA1 (gdk-pixbuf-0.17.0.tar.gz) = afff9706b5ff81bb1eaf631507ed331e0a5b7313

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2002/05/31 00:03:35 brad Exp $
--- Makefile.in.orig Sun Dec 9 20:07:05 2001
+++ Makefile.in Sun Dec 9 20:09:49 2001
@@ -473,6 +473,9 @@ gdk_pixbufConf.sh: gdk_pixbufConf.sh.in
$OpenBSD: patch-Makefile_in,v 1.4 2002/05/31 02:41:44 brad Exp $
--- Makefile.in.orig Thu Apr 18 21:25:39 2002
+++ Makefile.in Sun May 26 12:11:19 2002
@@ -481,6 +481,9 @@ gdk_pixbufConf.sh: gdk_pixbufConf.sh.in
-e 's?\@GDK_PIXBUF_INCLUDEDIR\@?$(GDK_PIXBUF_INCLUDEDIR)?g' \
-e 's?\@VERSION\@?$(VERSION)?g' \
-e 's?\@GDK_PIXBUF_LIBS\@?$(GDK_PIXBUF_LIBS)?g' \
@ -11,7 +11,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2002/05/31 00:03:35 brad Exp $
< $(srcdir)/gdk_pixbufConf.sh.in > gdk_pixbufConf.tmp \
&& mv gdk_pixbufConf.tmp gdk_pixbufConf.sh
@@ -481,6 +484,9 @@ gdk_pixbuf_xlibConf.sh: gdk_pixbuf_xlibC
@@ -489,6 +492,9 @@ gdk_pixbuf_xlibConf.sh: gdk_pixbuf_xlibC
-e 's?\@GDK_PIXBUF_XLIB_INCLUDEDIR\@?$(GDK_PIXBUF_XLIB_INCLUDEDIR)?g' \
-e 's?\@VERSION\@?$(VERSION)?g' \
-e 's?\@GDK_PIXBUF_XLIB_LIBS\@?$(GDK_PIXBUF_XLIB_LIBS)?g' \
@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2002/05/31 00:03:35 brad Exp $
< $(srcdir)/gdk_pixbuf_xlibConf.sh.in > gdk_pixbuf_xlibConf.tmp \
&& mv gdk_pixbuf_xlibConf.tmp gdk_pixbuf_xlibConf.sh
@@ -489,6 +495,9 @@ gnomecanvaspixbufConf.sh: gnomecanvaspix
@@ -497,6 +503,9 @@ gnomecanvaspixbufConf.sh: gnomecanvaspix
-e 's?\@GNOMECANVASPIXBUF_INCLUDEDIR\@?$(GNOMECANVASPIXBUF_INCLUDEDIR)?g' \
-e 's?\@VERSION\@?$(VERSION)?g' \
-e 's?\@GNOMECANVASPIXBUF_LIBS\@?$(GNOMECANVASPIXBUF_LIBS)?g' \

View File

@ -0,0 +1,107 @@
$OpenBSD: patch-aclocal_m4,v 1.3 2002/05/31 02:41:44 brad Exp $
--- aclocal.m4.orig Thu Apr 18 18:52:35 2002
+++ aclocal.m4 Sun May 26 12:45:36 2002
@@ -863,8 +863,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
fi
# Allow CC to be a program name with arguments.
@@ -1259,7 +1266,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
extract_expsyms_cmds=
case $host_os in
-cygwin* | mingw* | pw32* )
+cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -1267,7 +1274,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -1671,10 +1680,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}-rpath,$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}-rpath,$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -2148,9 +2171,19 @@ 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
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ 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'
@@ -3281,6 +3314,16 @@ newos6*)
[lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
lt_cv_file_magic_cmd=/usr/bin/file
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*)

View File

@ -0,0 +1,11 @@
--- configure.in.orig Thu Apr 18 18:48:40 2002
+++ configure.in Sun May 26 12:11:19 2002
@@ -231,7 +231,7 @@ AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG"
AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
GDK_PIXBUF_LIBDIR='-L${libdir}'
-GDK_PIXBUF_INCLUDEDIR="-I${includedir}/gdk-pixbuf-1.0 $GTK_CFLAGS"
+GDK_PIXBUF_INCLUDEDIR="-I${includedir} $GTK_CFLAGS"
GDK_PIXBUF_LIBS="$GLIB_LIBS -lgdk_pixbuf $GTK_LIBS"
AC_SUBST(STATIC_LIB_DEPS)
STATIC_LIB_DEPS="$deps"

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.4 2002/05/31 00:03:35 brad Exp $
--- doc/Makefile.in.orig Wed Mar 14 09:52:24 2001
+++ doc/Makefile.in Wed Mar 14 09:52:37 2001
@@ -300,8 +300,6 @@ install-data-local:
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
- echo '-- Installing $(srcdir)/html/index.sgml' ; \
- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
echo '-- Fixing Crossreferences' ; \
gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
fi)
$OpenBSD: patch-doc_Makefile_in,v 1.5 2002/05/31 02:41:44 brad Exp $
--- doc/Makefile.in.orig Thu Apr 18 21:25:44 2002
+++ doc/Makefile.in Sun May 26 12:11:19 2002
@@ -231,7 +231,7 @@ install-am: all-am
install: install-am
uninstall-am:
uninstall: uninstall-am
-all-am: Makefile all-local
+all-am: Makefile $(DATA)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install

View File

@ -1,12 +1,19 @@
$OpenBSD: patch-gdk-pixbuf-config_in,v 1.3 2002/05/31 00:03:35 brad Exp $
--- gdk-pixbuf-config.in.orig Thu Mar 15 09:13:23 2001
+++ gdk-pixbuf-config.in Thu Mar 15 09:14:20 2001
@@ -46,7 +46,7 @@ while test $# -gt 0; do
--- gdk-pixbuf-config.in.orig Thu Oct 25 04:00:14 2001
+++ gdk-pixbuf-config.in Sun May 26 12:11:19 2002
@@ -39,13 +39,13 @@ while test $# -gt 0; do
echo @GDK_PIXBUF_VERSION@
;;
--cflags)
- includes=-I@includedir@/gdk-pixbuf-1.0
+ includes=-I@includedir@
echo $includes `gtk-config --cflags`
;;
--libs)
libdirs=-L@libdir@
- echo $libdirs -lgdk_pixbuf `gtk-config --libs`
- ;;
+ echo $libdirs -lgdk_pixbuf `gtk-config --libs` @LIBTIFF@ @LIBJPEG@ @LIBPNG@
;;
+;;
*)
echo "${usage}" 1>&2
exit 1

View File

@ -1,7 +1,12 @@
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.7 2002/05/31 00:03:35 brad Exp $
--- gdk-pixbuf/Makefile.in.orig Sun Dec 9 19:39:10 2001
+++ gdk-pixbuf/Makefile.in Sun Dec 9 19:39:11 2001
@@ -247,7 +247,7 @@ libgdk_pixbufincludedir = $(includedir)/
--- gdk-pixbuf/Makefile.in.orig Thu Apr 18 21:25:41 2002
+++ gdk-pixbuf/Makefile.in Sun May 26 12:11:19 2002
@@ -246,12 +246,12 @@ GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIB
# The GdkPixBuf library
#
-libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf-1.0/gdk-pixbuf
+libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf
libgdk_pixbuf_la_SOURCES = gdk-pixbuf.c gdk-pixbuf-animation.c gdk-pixbuf-data.c gdk-pixbuf-drawable.c gdk-pixbuf-io.c gdk-pixbuf-loader.c gdk-pixbuf-render.c gdk-pixbuf-scale.c gdk-pixbuf-util.c gdk-pixbuf-parse-color.c $(extra_sources)
@ -10,12 +15,12 @@ $OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.7 2002/05/31 00:03:35 brad Exp $
libgdk_pixbuf_la_LIBADD = pixops/libpixops.la
#
@@ -257,7 +257,7 @@ libgdk_pixbuf_la_LIBADD = pixops/libpixo
@@ -261,7 +261,7 @@ libgdk_pixbuf_la_LIBADD = pixops/libpixo
libgdk_pixbuf_xlib_la_SOURCES = gdk-pixbuf.c gdk-pixbuf-xlib.c gdk-pixbuf-animation.c gdk-pixbuf-data.c gdk-pixbuf-io.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-scale.c gdk-pixbuf-util.c gdk-pixbuf-xlibrgb.c 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) $(X11_LIBS) $(LIBPNG) $(LIBJPEG) $(LIBTIFF)
libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la
libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS)
libgdk_pixbufinclude_HEADERS = gdk-pixbuf.h gdk-pixbuf-loader.h gdk-pixbuf-features.h gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.h $(CANVAS_PIXBUF_HEADERFILES)

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-gdk_pixbufConf_sh_in,v 1.3 2002/05/31 00:03:35 brad Exp $
--- gdk_pixbufConf.sh.in.orig Sun Dec 9 19:44:36 2001
+++ gdk_pixbufConf.sh.in Sun Dec 9 19:45:26 2001
$OpenBSD: patch-gdk_pixbufConf_sh_in,v 1.4 2002/05/31 02:41:44 brad Exp $
--- gdk_pixbufConf.sh.in.orig Sun May 26 14:39:23 2002
+++ gdk_pixbufConf.sh.in Sun May 26 14:39:57 2002
@@ -2,6 +2,6 @@
# Configuration file for using the gdk-pixbuf library in GNOME applications
#
GDK_PIXBUF_LIBDIR="@GDK_PIXBUF_LIBDIR@ "
-GDK_PIXBUF_LIBS="@GDK_PIXBUF_LIBS@ "
+GDK_PIXBUF_LIBS="@GDK_PIXBUF_LIBS@ @LIBTIFF@ @LIBJPEG@ @LIBPNG@ "
+GDK_PIXBUF_LIBS="@GDK_PIXBUF_LIBS@ @LIBTIFF@ @LIBJPEG@ @LIBPNG@"
GDK_PIXBUF_INCLUDEDIR="@GDK_PIXBUF_INCLUDEDIR@ "
MODULE_VERSION="gdk-pixbuf-@VERSION@"

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gdk_pixbuf_xlibConf_sh_in,v 1.3 2002/05/31 00:03:35 brad Exp $
--- gdk_pixbuf_xlibConf.sh.in.orig Sun Dec 9 20:11:21 2001
+++ gdk_pixbuf_xlibConf.sh.in Sun Dec 9 20:11:40 2001
$OpenBSD: patch-gdk_pixbuf_xlibConf_sh_in,v 1.4 2002/05/31 02:41:44 brad Exp $
--- gdk_pixbuf_xlibConf.sh.in.orig Sun May 26 14:42:36 2002
+++ gdk_pixbuf_xlibConf.sh.in Sun May 26 14:43:20 2002
@@ -2,6 +2,6 @@
# Configuration file for using the gdk-pixbuf library in Xlib applications
#

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gnomecanvaspixbufConf_sh_in,v 1.3 2002/05/31 00:03:35 brad Exp $
--- gnomecanvaspixbufConf.sh.in.orig Sun Dec 9 20:10:23 2001
+++ gnomecanvaspixbufConf.sh.in Sun Dec 9 20:10:53 2001
$OpenBSD: patch-gnomecanvaspixbufConf_sh_in,v 1.4 2002/05/31 02:41:44 brad Exp $
--- gnomecanvaspixbufConf.sh.in.orig Sun May 26 14:46:32 2002
+++ gnomecanvaspixbufConf.sh.in Sun May 26 14:46:46 2002
@@ -2,6 +2,6 @@
# Configuration file for using the gnomecanvaspixbuf library in GNOME applications
#

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2002/05/31 02:41:44 brad Exp $
--- ltmain.sh.orig Thu May 30 22:04:26 2002
+++ ltmain.sh Thu May 30 22:04:51 2002
@@ -1725,11 +1725,6 @@ compiler."
continue
fi
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2002/05/31 00:03:35 brad Exp $
@comment $OpenBSD: PLIST,v 1.13 2002/05/31 02:41:44 brad Exp $
bin/gdk-pixbuf-config
include/gdk-pixbuf/gdk-pixbuf-features.h
include/gdk-pixbuf/gdk-pixbuf-loader.h
@ -13,15 +13,12 @@ lib/libgdk_pixbuf_xlib.a
lib/libgdk_pixbuf_xlib.la
%%SHARED%%
share/aclocal/gdk-pixbuf.m4
share/html/gdk-pixbuf-decl.txt
share/html/gdk-pixbuf-sections.txt
share/html/gdk-pixbuf.hierarchy
share/html/gdk-pixbuf.html
share/html/gdk-pixbuf.types
share/html/gdk-pixbuf/a2605.html
share/html/gdk-pixbuf/a3640.html
share/html/gdk-pixbuf/a3652.html
share/html/gdk-pixbuf/a3657.html
share/html/gdk-pixbuf/a3694.html
share/html/gdk-pixbuf/a3696.html
share/html/gdk-pixbuf/a3716.html
share/html/gdk-pixbuf/book1.html
share/html/gdk-pixbuf/compiling.html
@ -49,11 +46,15 @@ share/html/gdk-pixbuf/x2624.html
share/html/gdk-pixbuf/x2676.html
share/html/gdk-pixbuf/x3659.html
share/html/gdk-pixbuf/x3671.html
share/html/gdk-pixbuf/x3676.html
share/html/gdk-pixbuf/x3711.html
share/html/gdk-pixbuf/x3713.html
share/html/gdk-pixbuf/x3715.html
share/html/gdk-pixbuf/x3723.html
share/html/gdk-pixbuf/x3728.html
share/html/gdk-pixbuf/x3735.html
share/html/gdk-pixbuf/x3765.html
share/html/gdk-pixbuf/x3767.html
share/html/gdk-pixbuf/x3787.html
@dirrm share/html/gdk-pixbuf
@dirrm share/html