Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

22
graphics/imlib2/DESCR Normal file
View File

@@ -0,0 +1,22 @@
Imlib 2 is the successor to Imlib. It is NOT a newer version - it is a
completely new library. Imlib 2 can be installed alongside Imlib 1.x
without any problems since they are effectively different libraries - BUT
they have very similar functionality.
Imlib 2 does the following:
* Load/Save image files from disk in one of many formats
* Render image data onto other images or an X-Windows drawable
* Produce pixmaps and pixmap masks of Images
* Apply filters and transformations to images
* Accept RGBA Data for images and apply colour correction/modifications
* Alpha blend Images on other images or drawables
* Render truetype anti-aliased text straight and at angles
* Render rectangles, anti-aliased lines, and multi-coloured gradients
* Cache data intelligently for maximum performance
* Allocate colours automatically
* Allow full control over caching and color allocation
* Provide highly optimized MMX assembly for core routines
* Provide plug-in filter interface
* Provide on-the-fly runtime plug-in image loading and saving interface
* Fastest image compositing, rendering and manipulation library for X

50
graphics/imlib2/Makefile Normal file
View File

@@ -0,0 +1,50 @@
# $NetBSD: Makefile,v 1.66 2013/06/04 22:16:20 tron Exp $
DISTNAME= imlib2-1.4.5
PKGREVISION= 6
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://docs.enlightenment.org/api/imlib2/html/
COMMENT= Image manipulation library
USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= imlib2.pc.in
LIBS.SunOS+= -lm
.include "../../mk/bsd.prefs.mk"
.if ${OBJECT_FMT} == "SOM"
SHLIB_SUFFIX= sl
.else
SHLIB_SUFFIX= so
.endif
SUBST_CLASSES+= shlib rpath
SUBST_STAGE.shlib= post-patch
SUBST_MESSAGE.shlib= Replacing shared library suffix
SUBST_FILES.shlib+= src/lib/image.c
SUBST_SED.shlib+= -e 's,"\.so",".${SHLIB_SUFFIX}",'
SUBST_STAGE.rpath= pre-configure
SUBST_MESSAGE.rpath= Replacing COMPILER_RPATH_FLAG
SUBST_FILES.rpath= imlib2-config.in
SUBST_VARS.rpath= COMPILER_RPATH_FLAG
.include "options.mk"
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/giflib.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

50
graphics/imlib2/PLIST Normal file
View File

@@ -0,0 +1,50 @@
@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:59:18 joerg Exp $
bin/imlib2-config
${PLIST.x11}bin/imlib2_bumpmap
${PLIST.x11}bin/imlib2_colorspace
bin/imlib2_conv
${PLIST.x11}bin/imlib2_grab
${PLIST.x11}bin/imlib2_poly
${PLIST.x11}bin/imlib2_show
${PLIST.x11}bin/imlib2_test
${PLIST.x11}bin/imlib2_view
include/Imlib2.h
lib/imlib2/filters/bumpmap.la
lib/imlib2/filters/colormod.la
lib/imlib2/filters/testfilter.la
lib/imlib2/loaders/argb.la
lib/imlib2/loaders/bmp.la
lib/imlib2/loaders/bz2.la
lib/imlib2/loaders/gif.la
lib/imlib2/loaders/jpeg.la
lib/imlib2/loaders/lbm.la
lib/imlib2/loaders/png.la
lib/imlib2/loaders/pnm.la
lib/imlib2/loaders/tga.la
lib/imlib2/loaders/tiff.la
lib/imlib2/loaders/xpm.la
lib/imlib2/loaders/zlib.la
lib/libImlib2.la
lib/pkgconfig/imlib2.pc
share/imlib2/data/fonts/cinema.ttf
share/imlib2/data/fonts/grunge.ttf
share/imlib2/data/fonts/morpheus.ttf
share/imlib2/data/fonts/notepad.ttf
share/imlib2/data/images/audio.png
share/imlib2/data/images/bg.png
share/imlib2/data/images/bulb.png
share/imlib2/data/images/cal.png
share/imlib2/data/images/calc.png
share/imlib2/data/images/folder.png
share/imlib2/data/images/globe.png
share/imlib2/data/images/imlib2.png
share/imlib2/data/images/lock.png
share/imlib2/data/images/mail.png
share/imlib2/data/images/menu.png
share/imlib2/data/images/mush.png
share/imlib2/data/images/paper.png
share/imlib2/data/images/sh1.png
share/imlib2/data/images/sh2.png
share/imlib2/data/images/sh3.png
share/imlib2/data/images/stop.png
share/imlib2/data/images/tnt.png

View File

@@ -0,0 +1,37 @@
# $NetBSD: buildlink3.mk,v 1.34 2013/06/04 22:16:20 tron Exp $
BUILDLINK_TREE+= imlib2
.if !defined(IMLIB2_BUILDLINK3_MK)
IMLIB2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.1.0nb2
BUILDLINK_ABI_DEPENDS.imlib2+= imlib2>=1.4.5nb6
BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/giflib.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../mk/bsd.fast.prefs.mk"
_IMLIB2_PRE_X11_OPTION!= \
if ${PKG_INFO} -qe 'imlib2<=1.4.0'; then \
${ECHO} yes; \
else \
${ECHO} no; \
fi
pkgbase := imlib2
.include "../../mk/pkg-build-options.mk"
.if ${_IMLIB2_PRE_X11_OPTION} == "yes" || !empty(PKG_BUILD_OPTIONS.imlib2:Mx11)
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.endif
.endif # IMLIB2_BUILDLINK3_MK
BUILDLINK_TREE+= -imlib2

12
graphics/imlib2/distinfo Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: distinfo,v 1.30 2013/03/02 18:07:14 joerg Exp $
SHA1 (imlib2-1.4.5.tar.bz2) = af86a2c38f4bc3806db57e64e74dc9814ad474a0
RMD160 (imlib2-1.4.5.tar.bz2) = 3b8fd51a854f628f8e8b38612da6c99a0609c6aa
Size (imlib2-1.4.5.tar.bz2) = 895624 bytes
SHA1 (patch-ab) = 9ec9287a8003760e3c330b6a751c0d28bef19afc
SHA1 (patch-ac) = 4f5e05fd921499c2ef679135e42bd8dc6f71d2de
SHA1 (patch-ad) = 3dc74b7804fde49f6fa0f0b8fe8c1bd87b37535a
SHA1 (patch-ae) = 9a2838ebfebe2db8bcd1f5fbe13a680122f0f8c0
SHA1 (patch-imlib2-config.in) = 621831f2fe661db1d78632b4c1c0b36ab2e8916d
SHA1 (patch-src_lib_amd64__blend.S) = 226de814e6c890ec1fea105641e036416e670a9f
SHA1 (patch-src_lib_amd64__blend__cmod.S) = a02c7b101cc16889002101cfc689e8e39cb04016

View File

@@ -0,0 +1,37 @@
# $NetBSD: options.mk,v 1.11 2012/10/23 10:24:06 wiz Exp $
.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.imlib2
PKG_SUPPORTED_OPTIONS= x11
PKG_SUGGESTED_OPTIONS= x11
.if ${MACHINE_ARCH} == "i386"
PKG_SUPPORTED_OPTIONS+= mmx
.elif ${MACHINE_ARCH} == "x86_64"
PKG_SUPPORTED_OPTIONS+= imlib2-amd64
PKG_SUGGESTED_OPTIONS+= imlib2-amd64
.endif
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mmmx)
CONFIGURE_ARGS+= --enable-mmx
.else
CONFIGURE_ARGS+= --disable-mmx
.endif
.if !empty(PKG_OPTIONS:Mimlib2-amd64)
CONFIGURE_ARGS+= --enable-amd64
.else
CONFIGURE_ARGS+= --disable-amd64
.endif
PLIST_VARS+= x11
.if !empty(PKG_OPTIONS:Mx11)
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
PLIST.x11= yes
.else
CONFIGURE_ARGS+= --without-x
.endif

View File

@@ -0,0 +1,32 @@
$NetBSD: patch-ab,v 1.12 2011/11/07 12:14:15 drochner Exp $
This patch makes imlib2 compile on systems that don't have an lround
function, which is defined in C99.
Needed at least for NetBSD-1.6.2 and NetBSD-2.0.
--- src/lib/color_helpers.c.orig 2005-01-08 08:55:02.000000000 +0100
+++ src/lib/color_helpers.c 2006-07-19 18:11:42.222074773 +0200
@@ -1,4 +1,22 @@
+#include <math.h>
+#include <stdlib.h>
+
#include "color_helpers.h"
+
+#ifdef __DragonFly__
+#include <sys/param.h>
+#endif
+
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__INTERIX) || \
+ (defined(__DragonFly__) && __DragonFly_version <= 130002) \
+ || defined(__sun) && defined(__SunOS_5_8)
+#define lround(x) my_lround(x)
+static long my_lround(double x)
+{
+ return (long) ((x) >= 0 ? (x) + 0.5 : (x) - 0.5);
+}
+#endif
+
/*
* Color space conversion helper routines
* Convert between rgb and hsv and between rgb and hls

View File

@@ -0,0 +1,41 @@
$NetBSD: patch-ac,v 1.8 2011/11/07 12:14:15 drochner Exp $
Add minimalist #ifndef blocks to rip out XShm support on Interix.
--- src/lib/grab.c.orig 2011-04-15 22:05:28.000000000 +0000
+++ src/lib/grab.c
@@ -530,7 +530,9 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
int i;
int src_x, src_y, src_w, src_h, origw, origh;
int width, height, clipx, clipy;
+#ifndef __INTERIX
XShmSegmentInfo shminfo, mshminfo;
+#endif
XImage *xim, *mxim;
XColor cols[256];
@@ -665,11 +667,13 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
__imlib_ShmCheck(d);
xim = NULL;
+#ifndef __INTERIX
if (x_does_shm)
{
xim = __imlib_ShmGetXImage(d, v, p, xatt.depth, x, y, w, h, &shminfo);
is_shm = ! !xim;
}
+#endif /* !__INTERIX */
if (!xim)
xim = XGetImage(d, p, x, y, w, h, 0xffffffff, ZPixmap);
if (!xim)
@@ -740,8 +744,10 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
d, xim, mxim, v, xatt.depth, x, y, w, h, 0);
/* destroy the Ximage */
+#ifndef __INTERIX
if (is_shm)
__imlib_ShmDetach(d, &shminfo);
+#endif /* !__INTERIX */
XDestroyImage(xim);
if (mxim)
{

View File

@@ -0,0 +1,39 @@
$NetBSD: patch-ad,v 1.5 2011/01/31 10:22:26 wiz Exp $
Use my_lround() on Interix too.
Add minimalist #ifndef blocks to rip out XShm support on Interix.
--- src/lib/rend.c.orig 2004-11-01 04:39:42.000000000 -0500
+++ src/lib/rend.c
@@ -495,24 +495,30 @@ __imlib_RenderImage(Display * d, ImlibIm
gcm = XCreateGC(d, m, GCGraphicsExposures, &gcv);
}
/* write the mask */
+#ifndef __INTERIX
if (shm)
/* write shm XImage */
XShmPutImage(d, m, gcm, mxim, 0, 0, dx, dy, dw, dh, False);
/* write regular XImage */
else
+#endif /* !__INTERIX */
XPutImage(d, m, gcm, mxim, 0, 0, dx, dy, dw, dh);
}
/* write the image */
+#ifndef __INTERIX
if (shm)
/* write shm XImage */
XShmPutImage(d, w, gc, xim, 0, 0, dx, dy, dw, dh, False);
/* write regular XImage */
else
+#endif /* !__INTERIX */
XPutImage(d, w, gc, xim, 0, 0, dx, dy, dw, dh);
/* free the XImage and put onto our free list */
/* wait for the write to be done */
+#ifndef __INTERIX
if (shm)
XSync(d, False);
+#endif /* !__INTERIX */
__imlib_ConsumeXImage(d, xim);
if (m)
__imlib_ConsumeXImage(d, mxim);

View File

@@ -0,0 +1,49 @@
$NetBSD: patch-ae,v 1.6 2011/05/18 10:04:26 drochner Exp $
Add minimalist #ifndef blocks to rip out XShm support on Interix.
--- src/lib/ximage.c.orig 2010-05-05 18:25:50.000000000 +0000
+++ src/lib/ximage.c
@@ -36,11 +36,13 @@ TmpXError(Display * d, XErrorEvent * ev)
void
__imlib_ShmCheck(Display * d)
{
+#ifndef __INTERIX
/* if its there set x_does_shm flag */
if (XShmQueryExtension(d))
x_does_shm = 2; /* 2: __imlib_ShmGetXImage tests first XShmAttach */
/* clear the flag - no shm at all */
else
+#endif /* !__INTERIX */
x_does_shm = 0;
}
@@ -185,11 +187,13 @@ __imlib_FlushXImage(Display * d)
xim = list_xim[i];
list_mem_use -= xim->bytes_per_line * xim->height;
+#ifndef __INTERIX
if (list_si[i])
{
__imlib_ShmDetach(d, list_si[i]);
free(list_si[i]);
}
+#endif /* !__INTERIX */
XDestroyImage(xim);
list_num--;
for (j = i; j < list_num; j++)
@@ -316,12 +320,14 @@ __imlib_ProduceXImage(Display * d, Visua
/* work on making a shared image */
xim = NULL;
+#ifndef __INTERIX
/* if the server does shm */
if (x_does_shm)
{
xim = __imlib_ShmGetXImage(d, v, None, depth, 0, 0, w, h,
list_si[list_num - 1]);
}
+#endif /* !__INTERIX */
/* ok if xim == NULL it all failed - fall back to XImages */
if (xim)
{

View File

@@ -0,0 +1,14 @@
$NetBSD: patch-imlib2-config.in,v 1.1 2013/03/02 18:07:14 joerg Exp $
--- imlib2-config.in.orig 2013-03-01 19:12:59.000000000 +0000
+++ imlib2-config.in
@@ -45,8 +45,7 @@ while test $# -gt 0; do
echo $includes
;;
--libs)
- libdirs=-L@libdir@
- echo $libdirs -lImlib2 @my_libs@
+ echo -L@libdir@ @COMPILER_RPATH_FLAG@@libdir@ -lImlib2 @my_libs@
;;
*)
echo "${usage}" 1>&2

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_lib_amd64__blend.S,v 1.1 2012/06/15 18:52:26 joerg Exp $
--- src/lib/amd64_blend.S.orig 2012-06-15 15:25:04.000000000 +0000
+++ src/lib/amd64_blend.S
@@ -78,8 +78,6 @@ FN_(imlib_amd64_reshade_copy_rgba_to_rgb
FN_(imlib_amd64_reshade_copy_rgba_to_rgba)
FN_(imlib_amd64_reshade_copy_rgb_to_rgba)
-.extern pow_lut
-
/*\ SSE register use:
|*| %xmm1 = Source value
|*| %xmm2 = Destination value

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_lib_amd64__blend__cmod.S,v 1.1 2012/06/15 18:52:26 joerg Exp $
--- src/lib/amd64_blend_cmod.S.orig 2012-06-15 15:25:46.000000000 +0000
+++ src/lib/amd64_blend_cmod.S
@@ -86,8 +86,6 @@ FN_(imlib_amd64_reshade_copy_rgba_to_rgb
FN_(imlib_amd64_reshade_copy_rgba_to_rgba_cmod)
FN_(imlib_amd64_reshade_copy_rgb_to_rgba_cmod)
-.extern pow_lut
-
/*\ SSE register use:
|*| %xmm1 = Source value
|*| %xmm2 = Destination value