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

Update to 2.4.3.

Browse Source 
From (and based on previous 2.4.1 submission) Giovanni Bechis.
sse enabled and tested for amd64 by fgsch@.

ok fgsch@
This commit is contained in:
kili 2007-12-20 22:54:28 +00:00
parent 8e66a80a27
commit 3a659725b2
12 changed files with 566 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
graphics/gimp/stable/Makefile
View File

@ -1,27 +1,28 @@
# $OpenBSD: Makefile,v 1.27 2007/11/13 17:10:25 steven Exp $
# $OpenBSD: Makefile,v 1.28 2007/12/20 22:54:28 kili Exp $
COMMENT= GNU Image Manipulation Program
DISTNAME= gimp-2.2.17
PKGNAME= ${DISTNAME}p0
SHARED_LIBS= gimp-2.0 200.17 \
gimpbase-2.0 200.17 \
gimpcolor-2.0 200.17 \
gimpmath-2.0 200.17 \
gimpmodule-2.0 200.17 \
gimpthumb-2.0 200.17 \
gimpui-2.0 200.17 \
gimpwidgets-2.0 200.17
DISTNAME= gimp-2.4.3
SHARED_LIBS= gimp-2.0 243.00 \
gimpbase-2.0 243.00 \
gimpcolor-2.0 243.00 \
gimpconfig-2.0 243.00 \
gimpmath-2.0 243.00 \
gimpmodule-2.0 243.00 \
gimpthumb-2.0 243.00 \
gimpui-2.0 243.00 \
gimpwidgets-2.0 243.00
CATEGORIES= graphics
DIR= gimp/v2.2
DIR= gimp/v2.4
MASTER_SITES= ftp://ftp.gimp.org/pub/${DIR}/ \
ftp://ftp.sunet.se/pub/gnu/${DIR}/ \
ftp://ftp.cs.umn.edu/pub/${DIR}/ \
ftp://ftp.funet.fi/pub/sci/graphics/packages/gimp/${DIR}/
ftp://ftp.cs.umn.edu/pub/gimp/pub/${DIR}/
HOMEPAGE= http://www.gimp.org/
EXTRACT_SUFX= .tar.bz2
BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser
RUN_DEPENDS= :wget-*:net/wget
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
@ -30,7 +31,8 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
exif::graphics/libexif \
mng::graphics/libmng \
tiff.>=35::graphics/tiff \
wmf.>=6,wmflite.>=6::graphics/libwmf
wmf.>=6,wmflite.>=6::graphics/libwmf \
poppler.>=3,poppler-glib.>=3::print/poppler
# GPL
PERMIT_PACKAGE_CDROM= Yes
@ -43,8 +45,9 @@ WANTLIB= ICE SM X11 Xext Xmu Xpm Xrender Xt atk-1.0 c \
fontconfig freetype glib-2.0 gmodule-2.0 \
gobject-2.0 jpeg.>=62 lcms.>=1 m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 png.>=4 \
pthread ncurses xml2 z cairo glitz
WANTLIB += Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr expat
pthread ncurses xml2 z cairo glitz \
Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr \
expat Xcomposite Xdamage gthread-2.0 pcre
MODULES= devel/gettext
@ -56,10 +59,11 @@ AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --disable-print --without-gtkhtml2 --without-librsvg \
--disable-sse
CONFIGURE_ARGS+=--without-gtkhtml2 --without-librsvg --without-print \
--without-gnomevfs --without-libcurl --without-dbus \
--disable-python
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
FLAVORS= altivec
FLAVOR?=
@ -73,6 +77,11 @@ CONFIGURE_ARGS+= --disable-altivec
.if ${MACHINE_ARCH} == "i386" || ${MACHINE} == "amd64"
CONFIGURE_ARGS+= --enable-mmx
.if ${MACHINE_ARCH} == "amd64"
CONFIGURE_ARGS+= --enable-sse
.else
CONFIGURE_ARGS+= --disable-sse
.endif
.endif
.include <bsd.port.mk>

10
graphics/gimp/stable/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gimp-2.2.17.tar.gz) = AYmqN3qKvONP3KhW0bEa1g==
RMD160 (gimp-2.2.17.tar.gz) = lt+XayY+GnQZtfm0u4AETy+Md5E=
SHA1 (gimp-2.2.17.tar.gz) = XxQeSLbPojIcxytmVTce1+mqU+4=
SHA256 (gimp-2.2.17.tar.gz) = NYI0KA1BfTJqRZplosIOzraP1umsyLxziuR24mahdbI=
SIZE (gimp-2.2.17.tar.gz) = 18789023
MD5 (gimp-2.4.3.tar.bz2) = lYmIrAJkLi39p619BF4qhA==
RMD160 (gimp-2.4.3.tar.bz2) = UrUImnDWgXe1qBkXI6A7rSJarc0=
SHA1 (gimp-2.4.3.tar.bz2) = K+emHRHIbaQeRkX+5Rinv+lRMCo=
SHA256 (gimp-2.4.3.tar.bz2) = C0mJeK7GBUAIyyQp5ANmCuhpAGiCDV/9Cn0MxU1tL9U=
SIZE (gimp-2.4.3.tar.bz2) = 17737035

11
graphics/gimp/stable/patches/patch-app_Makefile_in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-app_Makefile_in,v 1.2 2007/07/01 15:42:17 steven Exp $
--- app/Makefile.in.orig Sat May 26 16:12:22 2007
+++ app/Makefile.in Wed Jun 27 08:39:08 2007
@@ -555,6 +555,7 @@ INCLUDES = \
gimp_2_2_LDFLAGS = $(mwindows)
gimp_2_2_LDADD = \
+ -pthread \
gui/libappgui.a \
actions/libappactions.a \
dialogs/libappdialogs.a \

67
graphics/gimp/stable/patches/patch-configure_in
View File

@ -1,59 +1,32 @@
$OpenBSD: patch-configure_in,v 1.3 2007/07/01 15:42:17 steven Exp $
--- configure.in.orig Sat May 26 16:10:46 2007
+++ configure.in Wed Jun 27 08:39:08 2007
@@ -896,7 +896,7 @@ AC_ARG_WITH(libtiff, [ --without-libtiff build
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
AC_CHECK_LIB(tiff, TIFFReadScanline,
[AC_CHECK_HEADER(tiffio.h,
- TIFF='tiff$(EXEEXT)'; LIBTIFF='-ltiff',
+ TIFF='tiff$(EXEEXT)'; LIBTIFF='-ltiff -ljpeg -lz',
[AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)])],
[AC_CHECK_LIB(tiff, TIFFWriteScanline,
[AC_CHECK_HEADER(tiffio.h,
@@ -906,7 +906,7 @@ AC_ARG_WITH(libtiff, [ --without-libtiff build
[AC_CHECK_HEADER(tiffio.h,
TIFF='tiff$(EXEEXT)'; LIBTIFF='-ltiff34 -ljpeg -lz',
[AC_MSG_WARN(*** TIFF plug-in 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 plug-in will not be built (TIFF library not found) ***)], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -ljpeg -lz -lm)
fi
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
@@ -1032,9 +1032,9 @@ AC_ARG_WITH(libmng, [ --without-libmng build
$OpenBSD: patch-configure_in,v 1.4 2007/12/20 22:54:28 kili Exp $
--- configure.in.orig Wed Oct 31 09:06:02 2007
+++ configure.in Sat Nov 3 11:09:13 2007
@@ -1102,10 +1102,10 @@ AC_ARG_WITH(libmng, [ --without-libmng build
if test "x$with_libmng" != xno && test -z "$LIBMNG" &&
test -n "$LIBPNG" && test -n "$LIBJPEG" && test -n "$LIBZ"; then
AC_CHECK_LIB(mng, mng_create,
[AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
- [AC_MSG_WARN(*** MNG plug-in will not be built (MNG library not found) ***)], -lz -lm)
+ [AC_MSG_WARN(*** MNG plug-in will not be built (MNG library not found) ***)], -llcms $LIBJPEG -lz -lm)
- [AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
- [have_libmng="no (MNG library not found)"], -lz -lm)
+ [AC_CHECK_HEADER(libmng.h, mng_ok=yes, $LIBJPEG -lz -lm -llcms)],
+ [have_libmng="no (MNG library not found)"], $LIBJPEG -lz -lm -llcms)
if test "$mng_ok" = yes; then
- MNG='mng$(EXEEXT)'; LIBMNG="-lmng $LIBJPEG $LIBPNG"
+ MNG='mng$(EXEEXT)'; LIBMNG="-lmng -llcms $LIBJPEG $LIBPNG"
+ MNG='mng$(EXEEXT)'; LIBMNG="-lmng $LIBJPEG $LIBPNG -llcms"
else
AC_MSG_WARN(*** MNG plug-in will not be built (MNG header file not found) ***)
have_libmng="no (MNG header file not found)"
fi
@@ -1071,9 +1071,9 @@ AC_ARG_WITH(aa, [ --without-aa do not bui
if test x$with_aa != xno && test -z "$LIBAA"; then
AC_CHECK_LIB(aa, aa_printf,
[AC_CHECK_HEADER(aalib.h,
- AA='aa$(EXEEXT)'; LIBAA='-laa',
+ AA='aa$(EXEEXT)'; LIBAA='-laa -L/usr/X11R6/lib -lX11',
[AC_MSG_WARN(*** AA plug-in will not be built (AA header file not found) ***)])],
- [AC_MSG_WARN(*** AA plug-in will not be built (AA library not found) ***)])
+ [AC_MSG_WARN(*** AA plug-in will not be built (AA library not found) ***)], -L/usr/X11R6/lib -lX11)
fi
AC_SUBST(AA)
@@ -1224,10 +1224,10 @@ if test "x$with_lcms" != xno; then
@@ -1374,11 +1374,11 @@ if test "x$with_lcms" != xno; then
have_lcms=yes
AC_DEFINE(HAVE_LCMS_LCMS_H, 1,
[Define to 1 if the lcms header must be included as lcms/lcms.h]))
- ])
- ])
+ ], , -lm)
+ ], , -lm)
if test $have_lcms = yes; then
- LCMS_LIBS="-llcms"
+ LCMS_LIBS="-llcms -lm"
+ ], ,-lm)
+ ], ,-lm)
if test "x$have_lcms" = xyes; then
AC_DEFINE(HAVE_LCMS, 1, [Define to 1 if lcms is available])
- LIBLCMS="-llcms"
+ LIBLCMS="-lm -llcms"
LCMS='lcms$(EXEEXT)'
else
AC_MSG_WARN([*** color proof module will not be built (lcms not found or unusable) ***])
fi
have_lcms="no (lcms not found or unusable)"

10
graphics/gimp/stable/patches/patch-etc_Makefile_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-etc_Makefile_in,v 1.5 2007/07/01 15:42:17 steven Exp $
--- etc/Makefile.in.orig Sat May 26 16:12:31 2007
+++ etc/Makefile.in Wed Jun 27 08:39:08 2007
@@ -367,7 +367,7 @@ exec_prefix = @exec_prefix@
gimpdatadir = @gimpdatadir@
$OpenBSD: patch-etc_Makefile_in,v 1.6 2007/12/20 22:54:28 kili Exp $
--- etc/Makefile.in.orig Fri Dec 14 15:57:54 2007
+++ etc/Makefile.in Thu Dec 20 14:45:15 2007
@@ -404,7 +404,7 @@ gimpdatadir = @gimpdatadir@
gimpdir = @gimpdir@
gimplocaledir = @gimplocaledir@
gimpplugindir = @gimpplugindir@
-gimpsysconfdir = @gimpsysconfdir@
+gimpsysconfdir = ${datadir}/examples/gimp/@GIMP_SYSCONF_VERSION@

21
graphics/gimp/stable/patches/patch-plug-ins_common_compressor_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-plug-ins_common_compressor_c,v 1.2 2007/07/01 15:42:17 steven Exp $
--- plug-ins/common/compressor.c.orig Tue Apr 17 23:11:23 2007
+++ plug-ins/common/compressor.c Wed Jun 27 08:39:03 2007
@@ -414,7 +414,7 @@ save_image (const Compressor *compressor,
/* and compress into it */
execlp (compressor->save_program,
compressor->save_program,
- compressor->save_options, tmpname, NULL);
+ compressor->save_options, tmpname, (char *)NULL);
g_message ("execlp(\"%s %s\") failed: %s",
compressor->save_program,
@@ -566,7 +566,7 @@ load_image (const Compressor *compressor,
/* and uncompress into it */
execlp (compressor->load_program,
compressor->load_program,
- compressor->load_options, filename, NULL);
+ compressor->load_options, filename, (char *)NULL);
g_message ("execlp(\"%s %s\") failed: %s",
compressor->load_program,

12
graphics/gimp/stable/patches/patch-plug-ins_common_mail_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plug-ins_common_mail_c,v 1.2 2005/07/08 07:50:56 fgsch Exp $
--- plug-ins/common/mail.c.orig Fri Jun 24 12:21:59 2005
+++ plug-ins/common/mail.c Fri Jun 24 12:22:09 2005
@@ -402,7 +402,7 @@ save_image (const gchar *filename,
g_message ("dup2() failed: %s", g_strerror (errno));
}
- execlp (UUENCODE, UUENCODE, tmpname, filename, NULL);
+ execlp (UUENCODE, UUENCODE, tmpname, filename, (char *)NULL);
/* What are we doing here? exec must have failed */
g_message ("exec failed: uuencode: %s", g_strerror (errno));

16
graphics/gimp/stable/patches/patch-plug-ins_common_psd_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plug-ins_common_psd_c,v 1.2 2007/08/01 06:25:10 steven Exp $
--- plug-ins/common/psd.c.orig Fri Jul 13 12:22:08 2007
+++ plug-ins/common/psd.c Wed Aug 1 07:22:14 2007
@@ -1237,6 +1237,12 @@ seek_to_and_unpack_pixeldata(FILE* fd, gint layeri, gi
gimp_quit ();
}
+ if (width > G_MAXINT16 || height > G_MAXINT16)
+ {
+ g_message ("Error: Invalid channel dimensions");
+ gimp_quit ();
+ }
+
IFDBG
{
printf("\t\t\tLayer (%d) Channel (%d:%d) Compression: %d (%s)\n",

12
graphics/gimp/stable/patches/patch-plug-ins_common_url_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plug-ins_common_url_c,v 1.3 2006/01/27 07:28:41 steven Exp $
--- plug-ins/common/url.c.orig Sun Jan 22 11:41:00 2006
+++ plug-ins/common/url.c Sun Jan 22 11:41:29 2006
@@ -188,7 +188,7 @@ load_image (const gchar *filename,
execlp ("wget",
"wget", "-v", "-e", "server-response=off", "-T", TIMEOUT,
- filename, "-O", tmpname, NULL);
+ filename, "-O", tmpname, (char *)NULL);
g_message ("exec() failed: wget: %s", g_strerror (errno));
g_free (tmpname);
_exit (127);

61
graphics/gimp/stable/patches/patch-plug-ins_gflare_gflare_c
View File

@ -1,61 +0,0 @@
$OpenBSD: patch-plug-ins_gflare_gflare_c,v 1.1 2005/07/08 07:50:56 fgsch Exp $
--- plug-ins/gflare/gflare.c.orig Tue Jun 28 14:06:04 2005
+++ plug-ins/gflare/gflare.c Tue Jun 28 14:09:07 2005
@@ -1347,7 +1347,7 @@ static void
gflare_read_double (gdouble *dblvar,
GFlareFile *gf)
{
- gchar buf[30];
+ gchar buf[31];
if (gf->error)
return;
@@ -1362,14 +1362,14 @@ static void
gflare_read_gradient_name (GradientName name,
GFlareFile *gf)
{
- gchar tmp[1024], dec[1024];
+ gchar tmp[1025], dec[1025];
if (gf->error)
return;
/* FIXME: this is buggy */
- if (fscanf (gf->fp, "%s", tmp) == 1)
+ if (fscanf (gf->fp, "%1024s", tmp) == 1)
{
/* @GRADIENT_NAME */
gradient_name_decode (dec, tmp);
@@ -1383,13 +1383,13 @@ static void
gflare_read_shape (GFlareShape *shape,
GFlareFile *gf)
{
- gchar tmp[1024];
+ gchar tmp[1025];
gint i;
if (gf->error)
return;
- if (fscanf (gf->fp, "%s", tmp) == 1)
+ if (fscanf (gf->fp, "%1024s", tmp) == 1)
{
for (i = 0; i < GF_NUM_SHAPES; i++)
if (strcmp (tmp, gflare_shapes[i]) == 0)
@@ -1405,13 +1405,13 @@ static void
gflare_read_mode (GFlareMode *mode,
GFlareFile *gf)
{
- gchar tmp[1024];
+ gchar tmp[1025];
gint i;
if (gf->error)
return;
- if (fscanf (gf->fp, "%s", tmp) == 1)
+ if (fscanf (gf->fp, "%1024s", tmp) == 1)
{
for (i = 0; i < GF_NUM_MODES; i++)
if (strcmp (tmp, gflare_modes[i]) == 0)

4
graphics/gimp/stable/pkg/PFRAG.shared
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/27 18:08:45 steven Exp $
@comment $OpenBSD: PFRAG.shared,v 1.7 2007/12/20 22:54:28 kili Exp $
lib/gimp/2.0/modules/libcdisplay_colorblind.so
lib/gimp/2.0/modules/libcdisplay_gamma.so
lib/gimp/2.0/modules/libcdisplay_highcontrast.so
lib/gimp/2.0/modules/libcdisplay_lcms.so
lib/gimp/2.0/modules/libcdisplay_proof.so
lib/gimp/2.0/modules/libcolorsel_cmyk.so
lib/gimp/2.0/modules/libcolorsel_triangle.so
@ -10,6 +11,7 @@ lib/gimp/2.0/modules/libcontroller_midi.so
@lib lib/libgimp-2.0.so.${LIBgimp-2.0_VERSION}
@lib lib/libgimpbase-2.0.so.${LIBgimpbase-2.0_VERSION}
@lib lib/libgimpcolor-2.0.so.${LIBgimpcolor-2.0_VERSION}
@lib lib/libgimpconfig-2.0.so.${LIBgimpconfig-2.0_VERSION}
@lib lib/libgimpmath-2.0.so.${LIBgimpmath-2.0_VERSION}
@lib lib/libgimpmodule-2.0.so.${LIBgimpmodule-2.0_VERSION}
@lib lib/libgimpthumb-2.0.so.${LIBgimpthumb-2.0_VERSION}

841
graphics/gimp/stable/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff