diff options
Diffstat (limited to 'graphics/imlib2/patches')
5 files changed, 13 insertions, 91 deletions
diff --git a/graphics/imlib2/patches/patch-imlib2-config.in b/graphics/imlib2/patches/patch-imlib2-config.in index 03b5acf5f98..0651099511a 100644 --- a/graphics/imlib2/patches/patch-imlib2-config.in +++ b/graphics/imlib2/patches/patch-imlib2-config.in @@ -1,14 +1,15 @@ -$NetBSD: patch-imlib2-config.in,v 1.2 2014/05/20 16:18:38 adam Exp $ +$NetBSD: patch-imlib2-config.in,v 1.3 2016/01/22 21:07:00 leot Exp $ ---- imlib2-config.in.orig 2013-03-01 19:12:59.000000000 +0000 +Add the COMPILER_RPATH_FLAG to imlib2-config. + +--- imlib2-config.in.orig 2014-12-20 16:19:20.000000000 +0000 +++ imlib2-config.in -@@ -45,8 +45,7 @@ while test $# -gt 0; do +@@ -45,7 +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 ++ libdirs="-L@libdir@ @COMPILER_RPATH_FLAG@@libdir@" + echo $libdirs -lImlib2 ;; *) - echo "${usage}" 1>&2 diff --git a/graphics/imlib2/patches/patch-src_lib_Makefile.in b/graphics/imlib2/patches/patch-src_lib_Makefile.in deleted file mode 100644 index 8abae0f8039..00000000000 --- a/graphics/imlib2/patches/patch-src_lib_Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -$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) diff --git a/graphics/imlib2/patches/patch-src_lib_amd64__blend.S b/graphics/imlib2/patches/patch-src_lib_amd64__blend.S index 342a32c53ce..7fc827f0173 100644 --- a/graphics/imlib2/patches/patch-src_lib_amd64__blend.S +++ b/graphics/imlib2/patches/patch-src_lib_amd64__blend.S @@ -1,4 +1,6 @@ -$NetBSD: patch-src_lib_amd64__blend.S,v 1.1 2012/06/15 18:52:26 joerg Exp $ +$NetBSD: patch-src_lib_amd64__blend.S,v 1.2 2016/01/22 21:07:00 leot Exp $ + +Drop .extern, it is ignored by GNU as and not supported by LLVM. --- src/lib/amd64_blend.S.orig 2012-06-15 15:25:04.000000000 +0000 +++ src/lib/amd64_blend.S diff --git a/graphics/imlib2/patches/patch-src_lib_amd64__blend__cmod.S b/graphics/imlib2/patches/patch-src_lib_amd64__blend__cmod.S index 5915b089eba..f67244ebb26 100644 --- a/graphics/imlib2/patches/patch-src_lib_amd64__blend__cmod.S +++ b/graphics/imlib2/patches/patch-src_lib_amd64__blend__cmod.S @@ -1,4 +1,6 @@ -$NetBSD: patch-src_lib_amd64__blend__cmod.S,v 1.1 2012/06/15 18:52:26 joerg Exp $ +$NetBSD: patch-src_lib_amd64__blend__cmod.S,v 1.2 2016/01/22 21:07:00 leot Exp $ + +Drop .extern, it is ignored by GNU as and not supported by LLVM. --- src/lib/amd64_blend_cmod.S.orig 2012-06-15 15:25:46.000000000 +0000 +++ src/lib/amd64_blend_cmod.S diff --git a/graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c b/graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c deleted file mode 100644 index bff55a98dc0..00000000000 --- a/graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-src_modules_loaders_loader__gif.c,v 1.2 2014/05/16 10:19:11 obache Exp $ - -* Fix build with giflib>=5.1. - ---- src/modules/loaders/loader_gif.c.orig 2011-04-15 22:05:28.000000000 +0000 -+++ src/modules/loaders/loader_gif.c -@@ -36,7 +36,7 @@ load(ImlibImage * im, ImlibProgressFunct - #endif - if (fd < 0) - return 0; -- gif = DGifOpenFileHandle(fd); -+ gif = DGifOpenFileHandle(fd, NULL); - if (!gif) - { - close(fd); -@@ -60,13 +60,13 @@ load(ImlibImage * im, ImlibProgressFunct - h = gif->Image.Height; - if (!IMAGE_DIMENSIONS_OK(w, h)) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - return 0; - } - rows = malloc(h * sizeof(GifRowType *)); - if (!rows) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - return 0; - } - for (i = 0; i < h; i++) -@@ -78,7 +78,7 @@ load(ImlibImage * im, ImlibProgressFunct - rows[i] = malloc(w * sizeof(GifPixelType)); - if (!rows[i]) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - if (rows[i]) -@@ -150,7 +150,7 @@ load(ImlibImage * im, ImlibProgressFunct - im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); - if (!im->data) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - free(rows); - return 0; - } -@@ -181,7 +181,7 @@ load(ImlibImage * im, ImlibProgressFunct - last_per = (int)per; - if (!(progress(im, (int)per, 0, last_y, w, i))) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - free(rows[i]); -@@ -198,7 +198,7 @@ load(ImlibImage * im, ImlibProgressFunct - { - progress(im, 100, 0, last_y, w, h); - } -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - free(rows[i]); |