Mercurial > mxe-octave
annotate src/msvc-gdk-pixbuf-1.patch @ 3256:7fb479d0241c
Update build tools for native mingw
* src/build-m4.mk: do nothing for native mingw build
* Makefile.in:
- add bison, m4 as natve mingw, and python as jit build requirements.
- remove build-bison as a mingw build dependancy
* index.html: Add msys-bison to mingw required packages and mention ghostscript and python.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Thu, 26 Sep 2013 21:18:39 -0400 |
parents | e19ca43b6edd |
children |
rev | line source |
---|---|
3165
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1 diff -ur gdk-pixbuf-2.28.2-orig/configure.ac gdk-pixbuf-2.28.2/configure.ac |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
2 --- gdk-pixbuf-2.28.2-orig/configure.ac 2013-07-22 11:33:34 -0400 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
3 +++ gdk-pixbuf-2.28.2/configure.ac 2013-07-22 11:33:50 -0400 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
4 @@ -633,7 +633,7 @@ |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
5 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
6 dnl Test for libjasper |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
7 if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
8 - AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg -lm) |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
9 + AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg) |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
10 fi |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
11 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
12 if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
13 diff -ur gdk-pixbuf-2.28.2-orig/gdk-pixbuf/Makefile.am gdk-pixbuf-2.28.2/gdk-pixbuf/Makefile.am |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
14 --- gdk-pixbuf-2.28.2-orig/gdk-pixbuf/Makefile.am 2013-01-19 13:54:09 -0500 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
15 +++ gdk-pixbuf-2.28.2/gdk-pixbuf/Makefile.am 2013-07-22 11:35:26 -0400 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 @@ -11,7 +11,7 @@ |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 if OS_WIN32 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 gdk_pixbuf_def = gdk_pixbuf.def |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 -gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 +gdk_pixbuf_symbols = -export-symbols-regex "xXx" -Wl,$(srcdir)/gdk_pixbuf.def |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
24 gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 @@ -207,8 +207,8 @@ |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 # MinGW doesn't come with any import library for gdiplus.dll, so |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
27 # create a partial one that's enough for our use. |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 -libgdiplus = libgdiplus.dll.a |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 -gdiplus_ldflag = -Wl,$(libgdiplus) |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 +#libgdiplus = libgdiplus.dll.a |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 +gdiplus_ldflag = -lgdiplus |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 libgdiplus.dll.a: gdiplus.def |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 $(AM_V_GEN)$(DLLTOOL) --kill-at --dllname gdiplus.dll --input-def $(srcdir)/gdiplus.def --output-lib $@ |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 @@ -756,7 +756,7 @@ |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
37 # that makes the install target for the loader libraries a dependency on |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
38 # install-data-am, and not install-exec-am. We need to ensure this gets run |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
39 # after the libraries are installed in their final locations. |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
40 -install-data-hook: install-ms-lib install-def-file |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 +install-data-hook: install-def-file |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 @if $(RUN_QUERY_LOADER_TEST) ; then \ |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 $(mkinstalldirs) $(DESTDIR)$(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION) ; \ |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders$(EXEEXT) > $(DESTDIR)$(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION)/loaders.cache ; \ |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 @@ -769,7 +769,7 @@ |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 echo "***" ; \ |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 fi |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 -uninstall-local: uninstall-ms-lib uninstall-def-file |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
50 +uninstall-local: uninstall-def-file |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
51 rm -f $(DESTDIR)$(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION)/loaders.cache |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 |
e19ca43b6edd
[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 if CROSS_COMPILING |