Mercurial > mxe-octave

annotate src/graphicsmagick-3-user32.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents 8a8a240f3590
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5633
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 diff -ur GraphicsMagick-1.3.36.orig/configure.ac GraphicsMagick-1.3.36/configure.ac
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 --- GraphicsMagick-1.3.36.orig/configure.ac 2021-01-01 09:35:17.966994198 -0500
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 +++ GraphicsMagick-1.3.36/configure.ac 2021-01-01 14:21:04.736125338 -0500
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 @@ -2752,7 +2752,8 @@
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 found_libgdi32=0
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 AC_CHECK_HEADER([windows.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 AC_CHECK_HEADER([wingdi.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[#include <windows.h>])
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 - AC_CHECK_LIB([gdi32],[OpenClipboard],[found_libgdi32=`expr $found_libgdi32 + 1`],,)
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9 + AC_CHECK_LIB([user32],[OpenClipboard],[found_libuser32=`expr $found_libuser32 + 1`],[],[])
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 + AC_CHECK_LIB([gdi32],[CreateDIBSection],[found_libgdi32=`expr $found_libgdi32 + 1`],[],[])
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 if test $found_libgdi32 -gt 0
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 then
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 passed=`expr $passed + 1`
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 @@ -2767,7 +2768,7 @@
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 AC_MSG_RESULT([no -- some components failed test])
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 have_gdi32='no (failed tests)'
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 else
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 - LIB_GDI32='-lgdi32'
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 + LIB_GDI32='-lgdi32 -luser32'
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 LIBS="$LIB_GDI32 $LIBS"
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 AC_DEFINE([HasWINGDI32],[1],[Define to use the Windows GDI32 library])
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 AC_MSG_RESULT([yes])
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 diff -ur GraphicsMagick-1.3.36.orig/magick/nt_feature.c GraphicsMagick-1.3.36/magick/nt_feature.c
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 --- GraphicsMagick-1.3.36.orig/magick/nt_feature.c 2021-01-01 09:35:18.045998572 -0500
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 +++ GraphicsMagick-1.3.36/magick/nt_feature.c 2021-01-01 14:22:55.233205368 -0500
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 @@ -78,6 +78,7 @@
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 %
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 %
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 */
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 +#if defined(HasWINGDI32)
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 MagickExport void *CropImageToHBITMAP(Image *image,
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 const RectangleInfo *geometry,ExceptionInfo *exception)
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 {
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 @@ -217,6 +218,7 @@
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36 return (void *)bitmapH;
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 }
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 +#endif
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
40 /*
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
41 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
42 @@ -612,6 +614,7 @@
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
43 %
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
44 %
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
45 */
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
46 +#if defined(HasWINGDI32)
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
47 MagickExport void *ImageToHBITMAP(Image* image)
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
48 {
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
49 unsigned long
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
50 @@ -696,5 +699,6 @@
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
51
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
52 return (void *)bitmapH;
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
53 }
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
54 +#endif
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
55
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
56 #endif
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
57 diff -ur GraphicsMagick-1.3.36.orig/magick/nt_feature.h GraphicsMagick-1.3.36/magick/nt_feature.h
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
58 --- GraphicsMagick-1.3.36.orig/magick/nt_feature.h 2021-01-01 09:35:18.038998185 -0500
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
59 +++ GraphicsMagick-1.3.36/magick/nt_feature.h 2021-01-01 14:23:42.008779169 -0500
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
60 @@ -23,9 +23,11 @@
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
61 extern MagickExport char
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
62 *NTRegistryKeyLookup(const char *key);
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
63
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
64 +#if defined(HasWINGDI32)
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
65 extern MagickExport void
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
66 *CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *),
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
67 *ImageToHBITMAP(Image* image);
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
68 +#endif
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
69
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
70 #if !defined(XS_VERSION)
8a8a240f3590 Add src/graphicsmagick-3-user32.patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
71