kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Version 1.4.6

Browse source 
- TGA loader: Fix for corrupt RLE format.
- Fix drawing of closed polygons in certain situations (ticket 2309).
- Set warning options when using gcc.
- Silence compiler warnings.
- Don't set -std=gnu99.
- XPM loader: Simplify and fix certain case of cpp > 2.
This commit is contained in:
adam 2014-05-17 09:25:01 +00:00
parent 0490b6aea3
commit af5916ee54
5 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
graphics/imlib2/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.68 2013/12/23 11:57:04 wiz Exp $
# $NetBSD: Makefile,v 1.69 2014/05/17 09:25:01 adam Exp $
DISTNAME= imlib2-1.4.5
PKGREVISION= 7
DISTNAME= imlib2-1.4.6
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
EXTRACT_SUFX= .tar.bz2
@ -10,9 +9,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://docs.enlightenment.org/api/imlib2/html/
COMMENT= Image manipulation library
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= imlib2.pc.in
@ -46,5 +45,4 @@ SUBST_VARS.rpath= COMPILER_RPATH_FLAG
.include "../../mk/giflib.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

11
graphics/imlib2/distinfo
View file

@ -1,13 +1,14 @@
$NetBSD: distinfo,v 1.32 2014/05/16 10:19:11 obache Exp $
$NetBSD: distinfo,v 1.33 2014/05/17 09:25:01 adam 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 (imlib2-1.4.6.tar.bz2) = 20e111d822074593e8d657ecf8aafe504e9e2967
RMD160 (imlib2-1.4.6.tar.bz2) = e0dc6f59f54ce7ef17b25dae5b3d013040939441
Size (imlib2-1.4.6.tar.bz2) = 872717 bytes
SHA1 (patch-ab) = 9ec9287a8003760e3c330b6a751c0d28bef19afc
SHA1 (patch-ac) = 4f5e05fd921499c2ef679135e42bd8dc6f71d2de
SHA1 (patch-ac) = b570d72992643d88edbd00126cf77b5ffcd79d49
SHA1 (patch-ad) = 3dc74b7804fde49f6fa0f0b8fe8c1bd87b37535a
SHA1 (patch-ae) = 9a2838ebfebe2db8bcd1f5fbe13a680122f0f8c0
SHA1 (patch-imlib2-config.in) = 621831f2fe661db1d78632b4c1c0b36ab2e8916d
SHA1 (patch-src_lib_Makefile.in) = ffc1d054121196f5f663c4f6b06f4d15b89ea15a
SHA1 (patch-src_lib_amd64__blend.S) = 226de814e6c890ec1fea105641e036416e670a9f
SHA1 (patch-src_lib_amd64__blend__cmod.S) = a02c7b101cc16889002101cfc689e8e39cb04016
SHA1 (patch-src_modules_loaders_loader__gif.c) = fc4b01b32d277a8aa8b471fa800b3797371ccc90

4
graphics/imlib2/options.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.11 2012/10/23 10:24:06 wiz Exp $
# $NetBSD: options.mk,v 1.12 2014/05/17 09:25:01 adam Exp $
.include "../../mk/bsd.prefs.mk"
@ -7,7 +7,7 @@ PKG_SUPPORTED_OPTIONS= x11
PKG_SUGGESTED_OPTIONS= x11
.if ${MACHINE_ARCH} == "i386"
PKG_SUPPORTED_OPTIONS+= mmx
.elif ${MACHINE_ARCH} == "x86_64"
.elif ${MACHINE_ARCH} == "x86_64" && empty(PKGSRC_COMPILER:Mclang)
PKG_SUPPORTED_OPTIONS+= imlib2-amd64
PKG_SUGGESTED_OPTIONS+= imlib2-amd64
.endif

12
graphics/imlib2/patches/patch-ac
View file

@ -1,12 +1,12 @@
$NetBSD: patch-ac,v 1.8 2011/11/07 12:14:15 drochner Exp $
$NetBSD: patch-ac,v 1.9 2014/05/17 09:25:01 adam 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.orig 2013-12-21 10:16:10.000000000 +0000
+++ src/lib/grab.c
@@ -530,7 +530,9 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
@@ -528,7 +528,9 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
int i;
int src_x, src_y, src_w, src_h, origw, origh;
int src_x, src_y, src_w, src_h;
int width, height, clipx, clipy;
+#ifndef __INTERIX
XShmSegmentInfo shminfo, mshminfo;
@ -14,7 +14,7 @@ Add minimalist #ifndef blocks to rip out XShm support on Interix.
XImage *xim, *mxim;
XColor cols[256];
@@ -665,11 +667,13 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
@@ -661,11 +663,13 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
__imlib_ShmCheck(d);
xim = NULL;
@ -28,7 +28,7 @@ Add minimalist #ifndef blocks to rip out XShm support on Interix.
if (!xim)
xim = XGetImage(d, p, x, y, w, h, 0xffffffff, ZPixmap);
if (!xim)
@@ -740,8 +744,10 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
@@ -736,8 +740,10 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
d, xim, mxim, v, xatt.depth, x, y, w, h, 0);
/* destroy the Ximage */

16
graphics/imlib2/patches/patch-src_lib_Makefile.in Normal file
View file

@ -0,0 +1,16 @@
$NetBSD: patch-src_lib_Makefile.in,v 1.1 2014/05/17 09:25:01 adam Exp $
Don't link against X11 libs, when X11 support has been disabled.
--- src/lib/Makefile.in.orig 2014-05-17 07:59:57.000000000 +0000
+++ src/lib/Makefile.in
@@ -443,7 +443,8 @@ amd64_blend_cmod.S
MMX_OBJS = $(MMX_SRCS:.S=.lo)
AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S
-MY_LIBS = -lXext -lX11 $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
+@BUILD_X11_FALSE@MY_LIBS = $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
+@BUILD_X11_TRUE@MY_LIBS = -lXext -lX11 $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
@BUILD_AMD64_FALSE@@BUILD_MMX_FALSE@libImlib2_la_LIBADD = $(MY_LIBS)
@BUILD_AMD64_TRUE@@BUILD_MMX_FALSE@libImlib2_la_LIBADD = $(AMD64_OBJS) $(MY_LIBS)
@BUILD_MMX_TRUE@libImlib2_la_LIBADD = $(MMX_OBJS) $(MY_LIBS)