[Midnightbsd-cvs] mports: mports/graphics: Add GTK pixbuf, which is used by GTK 1.2.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 24 19:51:30 EDT 2008
Log Message:
-----------
Add GTK pixbuf, which is used by GTK 1.2. Older versions of xfce use it.
Modified Files:
--------------
mports/graphics:
Makefile (r1.79 -> r1.80)
Added Files:
-----------
mports/graphics/gdk-pixbuf:
Makefile (r1.1)
distinfo (r1.1)
pkg-descr (r1.1)
pkg-plist (r1.1)
mports/graphics/gdk-pixbuf/files:
patch-aa (r1.1)
patch-ab (r1.1)
patch-ac (r1.1)
patch-ad (r1.1)
patch-gdk-pixbuf::pixops::have_mmx.S (r1.1)
patch-ltmain.sh (r1.1)
patch-pixbuf-security (r1.1)
-------------- next part --------------
--- /dev/null
+++ graphics/gdk-pixbuf/pkg-descr
@@ -0,0 +1,8 @@
+The GdkPixBuf library provides a number of features:
+
+ - Image loading facilities.
+ - Rendering of a GdkPixBuf into various formats:
+ drawables (windows, pixmaps), GdkRGB buffers.
+ - A cache interface
+
+WWW: http://developer.gnome.org/arch/imaging/gdkpixbuf.html
--- /dev/null
+++ graphics/gdk-pixbuf/pkg-plist
@@ -0,0 +1,54 @@
+ at comment $MidnightBSD: mports/graphics/gdk-pixbuf/pkg-plist,v 1.1 2008/09/24 23:51:27 laffer1 Exp $
+bin/gdk-pixbuf-config
+etc/gdk_pixbufConf.sh
+etc/gdk_pixbuf_xlibConf.sh
+include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h
+include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h
+include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlib.h
+include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
+include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h
+lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so
+lib/gdk-pixbuf/loaders/libpixbufloader-gif.so
+lib/gdk-pixbuf/loaders/libpixbufloader-ico.so
+lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so
+lib/gdk-pixbuf/loaders/libpixbufloader-png.so
+lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so
+lib/gdk-pixbuf/loaders/libpixbufloader-ras.so
+lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so
+lib/gdk-pixbuf/loaders/libpixbufloader-xbm.so
+lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so
+lib/libgdk_pixbuf.a
+lib/libgdk_pixbuf.so
+lib/libgdk_pixbuf.so.2
+lib/libgdk_pixbuf_xlib.a
+lib/libgdk_pixbuf_xlib.so
+lib/libgdk_pixbuf_xlib.so.2
+share/aclocal/gdk-pixbuf.m4
+%%DOCSDIR%%/a3696.html
+%%DOCSDIR%%/compiling.html
+%%DOCSDIR%%/extra-configuration-options.html
+%%DOCSDIR%%/gdk-pixbuf-animation.html
+%%DOCSDIR%%/gdk-pixbuf-creating.html
+%%DOCSDIR%%/gdk-pixbuf-file-loading.html
+%%DOCSDIR%%/gdk-pixbuf-from-drawables.html
+%%DOCSDIR%%/gdk-pixbuf-gdk-pixbuf-xlib-from-drawables.html
+%%DOCSDIR%%/gdk-pixbuf-gdk-pixbuf-xlib-init.html
+%%DOCSDIR%%/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html
+%%DOCSDIR%%/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html
+%%DOCSDIR%%/gdk-pixbuf-gdk-pixbuf.html
+%%DOCSDIR%%/gdk-pixbuf-refcounting.html
+%%DOCSDIR%%/gdk-pixbuf-rendering.html
+%%DOCSDIR%%/gdk-pixbuf-scaling.html
+%%DOCSDIR%%/gdk-pixbuf-util.html
+%%DOCSDIR%%/gdkpixbufloader.html
+%%DOCSDIR%%/gnomecanvaspixbuf.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/license.html
+%%DOCSDIR%%/r27.html
+%%DOCSDIR%%/x3715.html
+%%DOCSDIR%%/x3767.html
+ at dirrm %%DOCSDIR%%
+ at dirrm lib/gdk-pixbuf/loaders
+ at dirrm lib/gdk-pixbuf
+ at dirrm include/gdk-pixbuf-1.0/gdk-pixbuf
+ at dirrm include/gdk-pixbuf-1.0
--- /dev/null
+++ graphics/gdk-pixbuf/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for: gdk-pixbuf
+# Date created: September 24, 2008
+# Whom: laffer1
+#
+# $MidnightBSD: mports/graphics/gdk-pixbuf/Makefile,v 1.1 2008/09/24 23:51:27 laffer1 Exp $
+
+PORTNAME?= gdk-pixbuf
+PORTVERSION= 0.22.0
+CATEGORIES?= graphics
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.22
+DISTNAME= gdk-pixbuf-${PORTVERSION}
+DIST_SUBDIR= gnome
+
+MAINTAINER= ports at MidnightBSD.org
+COMMENT?= A graphic library for GTK+
+LICENSE= gpl2
+
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
+ tiff.4:${PORTSDIR}/graphics/tiff \
+ jpeg.9:${PORTSDIR}/graphics/jpeg
+
+USE_AUTOTOOLS= libtool:15
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_XORG= xt xi x11
+USE_GNOME+= gnomehack gtk12
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
+ --disable-gtk-doc --enable-shared=yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib" \
+ BUILD_CANVAS="${BUILD_CANVAS}"
+CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd6.0 \
+ --build=${ARCH}-unknown-freebsd6.0 \
+ --host=${ARCH}-unknown-freebsd6.0
+
+BUILD_CANVAS?= no
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
+ -e 's/freebsd/freebsd*|midnightbsd/' \
+ ${WRKSRC}/configure
+
+.include <bsd.port.mk>
--- /dev/null
+++ graphics/gdk-pixbuf/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome/gdk-pixbuf-0.22.0.tar.bz2) = 05fcb68ceaa338614ab650c775efc2f2
+SHA256 (gnome/gdk-pixbuf-0.22.0.tar.bz2) = 411f2a1c27c3afadc5d034f2213d9f6c3a37f564eb5989cf6e8a53729280ae22
+SIZE (gnome/gdk-pixbuf-0.22.0.tar.bz2) = 398208
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/Makefile,v
retrieving revision 1.79
retrieving revision 1.80
diff -L graphics/Makefile -L graphics/Makefile -u -r1.79 -r1.80
--- graphics/Makefile
+++ graphics/Makefile
@@ -18,6 +18,7 @@
SUBDIR += feh
SUBDIR += gd
SUBDIR += gdchart
+ SUBDIR += gdk-pixbuf
SUBDIR += giblib
SUBDIR += gimp-app
SUBDIR += gle
--- /dev/null
+++ graphics/gdk-pixbuf/files/patch-ltmain.sh
@@ -0,0 +1,33 @@
+--- ltmain.sh.orig Sun Jan 20 16:11:07 2002
++++ ltmain.sh Tue Jan 22 13:34:20 2002
+@@ -1060,6 +1060,7 @@
+
+ -module)
+ module=yes
++ build_old_libs=no
+ continue
+ ;;
+
+@@ -2442,6 +2443,9 @@
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+ if test $build_libtool_need_lc = "yes"; then
+@@ -4208,10 +4212,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
--- /dev/null
+++ graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S
@@ -0,0 +1,11 @@
+--- gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:34:50 1.1
++++ gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:35:21
+@@ -19,6 +19,8 @@
+ popfl
+ pushfl
+ popl %eax
++ pushl %ebx
++ popfl
+
+ cmpl %eax, %ebx
+
--- /dev/null
+++ graphics/gdk-pixbuf/files/patch-ac
@@ -0,0 +1,118 @@
+--- gdk-pixbuf/Makefile.in.orig Sat Oct 5 01:29:29 2002
++++ gdk-pixbuf/Makefile.in Sat Oct 5 01:32:30 2002
+@@ -132,71 +132,71 @@
+ # The PNG plugin.
+ #
+ libpixbufloader_png_la_SOURCES = io-png.c
+-libpixbufloader_png_la_LDFLAGS = -module -avoid-version
+-libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS)
++libpixbufloader_png_la_LDFLAGS = -avoid-version -module
++libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+ #
+ # The JPEG loader
+ #
+ libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
+-libpixbufloader_jpeg_la_LDFLAGS = -module -avoid-version
+-libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS)
++libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module
++libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+ #
+ # The XPM loader
+ #
+ libpixbufloader_xpm_la_SOURCES = io-xpm.c
+-libpixbufloader_xpm_la_LDFLAGS = -module -avoid-version
+-libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
++libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module
++libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+ #
+ # The GIF loader
+ #
+ libpixbufloader_gif_la_SOURCES = io-gif.c
+-libpixbufloader_gif_la_LDFLAGS = -module -avoid-version
+-libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
++libpixbufloader_gif_la_LDFLAGS = -avoid-version -module
++libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+ #
+ # The ICO loader
+ #
+ libpixbufloader_ico_la_SOURCES = io-ico.c
+-libpixbufloader_ico_la_LDFLAGS = -module -avoid-version
+-libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
++libpixbufloader_ico_la_LDFLAGS = -avoid-version -module
++libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+ #
+ # The RAS loader
+ #
+ libpixbufloader_ras_la_SOURCES = io-ras.c
+-libpixbufloader_ras_la_LDFLAGS = -module -avoid-version
+-libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
++libpixbufloader_ras_la_LDFLAGS = -avoid-version -module
++libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+ #
+ # The TIFF loader
+ #
+ libpixbufloader_tiff_la_SOURCES = io-tiff.c
+-libpixbufloader_tiff_la_LDFLAGS = -module -avoid-version
+-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS)
++libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module
++libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+ #
+ # The PNM loader
+ #
+ libpixbufloader_pnm_la_SOURCES = io-pnm.c
+-libpixbufloader_pnm_la_LDFLAGS = -module -avoid-version
+-libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
++libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module
++libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+ #
+ # The BMP loader
+ #
+ libpixbufloader_bmp_la_SOURCES = io-bmp.c
+-libpixbufloader_bmp_la_LDFLAGS = -module -avoid-version
+-libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
++libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module
++libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+ #
+ # The XBM loader
+ #
+ libpixbufloader_xbm_la_SOURCES = io-xbm.c
+-libpixbufloader_xbm_la_LDFLAGS = -module -avoid-version
+-libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
++libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module
++libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+ @HAVE_PNG_TRUE at PNG_LIB = @HAVE_PNG_TRUE at libpixbufloader-png.la
+
+@@ -259,11 +259,11 @@
+
+ LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
+
+-test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
+-testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
++test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
++testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
+ testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
+ testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS)
+-testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
++testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
+
+ GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS)
+
+@@ -400,7 +400,7 @@
+ libpixbufloader_bmp_la_OBJECTS = io-bmp.lo
+ libpixbufloader_xbm_la_DEPENDENCIES = libgdk_pixbuf.la
+ libpixbufloader_xbm_la_OBJECTS = io-xbm.lo
+-noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
++noinst_PROGRAMS = # test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
+ testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \
+ testpixbuf-scale$(EXEEXT)
+ PROGRAMS = $(noinst_PROGRAMS)
--- /dev/null
+++ graphics/gdk-pixbuf/files/patch-pixbuf-security
@@ -0,0 +1,41 @@
+--- gdk-pixbuf/io-ico.c.orig Mon Oct 11 15:44:43 2004
++++ gdk-pixbuf/io-ico.c Mon Oct 11 15:47:29 2004
+@@ -330,6 +330,10 @@
+
+ State->HeaderSize+=I;
+
++ if (State->HeaderSize < 0) {
++ return FALSE;
++ }
++
+ if (State->HeaderSize>State->BytesInHeaderBuf) {
+ guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize);
+ if (!tmp)
+--- gdk-pixbuf/io-xpm.c.orig Thu Mar 1 15:16:28 2001
++++ gdk-pixbuf/io-xpm.c Sun Oct 17 17:05:38 2004
+@@ -352,16 +352,21 @@
+ return NULL;
+ }
+ sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp);
+- if (cpp >= 32) {
+- g_warning ("XPM has more than 31 chars per pixel.");
++ if (cpp <= 0 || cpp >= 32) {
++ g_warning ("XPM has invalid number of chars per pixel");
++ return NULL;
++ }
++
++ if (n_col <= 0 || n_col >= G_MAXINT / (cpp + 1)) {
++ g_warning ("XPM file has invalid number of colors");
+ return NULL;
+ }
+
+ /* The hash is used for fast lookups of color from chars */
+ color_hash = g_hash_table_new (g_str_hash, g_str_equal);
+
+- name_buf = g_new (gchar, n_col * (cpp + 1));
+- colors = g_new (_XPMColor, n_col);
++ name_buf = (gchar *) g_malloc (n_col * (cpp + 1));
++ colors = (_XPMColor *) g_malloc (sizeof (_XPMColor) * n_col);
+
+ for (cnt = 0; cnt < n_col; cnt++) {
+ gchar *color_name;
--- /dev/null
+++ graphics/gdk-pixbuf/files/patch-ab
@@ -0,0 +1,28 @@
+--- Makefile.in.orig Sat Oct 5 01:19:24 2002
++++ Makefile.in Sat Oct 5 01:20:58 2002
+@@ -115,22 +115,10 @@
+
+ bin_SCRIPTS = gdk-pixbuf-config
+
+-confexecdir = $(libdir)
+-confexec_DATA = \
+- gdk_pixbufConf.sh \
+- gdk_pixbuf_xlibConf.sh \
+- gnomecanvaspixbufConf.sh
+-
+-
+-EXTRA_DIST = \
+- gdk_pixbufConf.sh.in \
+- gdk_pixbuf_xlibConf.sh.in \
+- gnomecanvaspixbufConf.sh.in \
+- gdk-pixbuf-config.in \
+- gdk-pixbuf.m4 \
+- gdk-pixbuf.spec \
+- gdk-pixbuf.spec.in
++confexecdir = $(sysconfdir)
++confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh @BUILD_CANVAS_ITEM_TRUE at gnomecanvaspixbufConf.sh
+
++EXTRA_DIST = gdk_pixbufConf.sh.in gdk_pixbuf_xlibConf.sh.in gdk-pixbuf-config.in gdk-pixbuf.m4 gdk-pixbuf.spec gdk-pixbuf.spec.in @BUILD_CANVAS_ITEM_TRUE at gnomecanvaspixbufConf.sh.in
+
+ m4datadir = $(prefix)/share/aclocal
+ m4data_DATA = gdk-pixbuf.m4
--- /dev/null
+++ graphics/gdk-pixbuf/files/patch-ad
@@ -0,0 +1,16 @@
+--- gdk-pixbuf-config.in.orig Tue Oct 23 20:44:44 2001
++++ gdk-pixbuf-config.in Fri Oct 26 11:06:32 2001
+@@ -40,11 +40,11 @@
+ ;;
+ --cflags)
+ includes=-I at includedir@/gdk-pixbuf-1.0
+- echo $includes `gtk-config --cflags`
++ echo $includes `@GTK_CONFIG@ --cflags`
+ ;;
+ --libs)
+ libdirs=-L at libdir@
+- echo $libdirs -lgdk_pixbuf `gtk-config --libs`
++ echo $libdirs -lgdk_pixbuf `@GTK_CONFIG@ --libs`
+ ;;
+ *)
+ echo "${usage}" 1>&2
--- /dev/null
+++ graphics/gdk-pixbuf/files/patch-aa
@@ -0,0 +1,41 @@
+--- configure.orig Thu Apr 18 18:52:49 2002
++++ configure Fri Apr 19 12:40:56 2002
+@@ -8849,6 +8849,7 @@
+ fi
+ STRIP_DUMMY=
+
++if [ x"$BUILD_CANVAS" != x"no" ]; then
+ # Extract the first word of "gnome-config", so it can be a program name with args.
+ set dummy gnome-config; ac_word=$2
+ echo "$as_me:8854: checking for $ac_word" >&5
+@@ -8878,6 +8879,10 @@
+ esac
+ fi
+ GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG
++else
++GNOME_CONFIG="no"
++fi
++
+
+ if test -n "$GNOME_CONFIG"; then
+ echo "$as_me:8883: result: $GNOME_CONFIG" >&5
+@@ -8994,8 +8999,8 @@
+ #define USE_GMODULE 1
+ EOF
+
+- GMODULE_LIBS="`glib-config --libs gmodule`"
+- GMODULE_FLAGS="`glib-config --cflags gmodule`"
++ GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`"
++ GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`"
+
+ echo "$as_me:9000: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+@@ -10104,7 +10109,7 @@
+ fi;
+
+ if test "x$with_html_dir" = "x" ; then
+- HTML_DIR='${datadir}/gnome/html'
++ HTML_DIR='${datadir}/html'
+ else
+ HTML_DIR=$with_html_dir
+ fi
More information about the Midnightbsd-cvs
mailing list