# HG changeset patch # User Volker Grabsch # Date 1333098167 -7200 # Node ID 082cd6e86b6b304936058504bd5262763a67e1ce # Parent 97d5a5c48c12c22470d6373ba8fbeb2ac3e01334# Parent ee19a47935e1f4e56af741a1254d4f18ff45ddcd merge diff -r 97d5a5c48c12 -r 082cd6e86b6b .gitignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.gitignore Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,5 @@ +usr/ +log/ +pkg/ +dist/ +wip/ diff -r 97d5a5c48c12 -r 082cd6e86b6b .hgignore --- a/.hgignore Fri Mar 30 11:02:24 2012 +0200 +++ b/.hgignore Fri Mar 30 11:02:47 2012 +0200 @@ -2,3 +2,4 @@ ^log($|/) ^pkg($|/) ^dist($|/) +^wip($|/) diff -r 97d5a5c48c12 -r 082cd6e86b6b CNAME --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CNAME Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,1 @@ +mxe.cc diff -r 97d5a5c48c12 -r 082cd6e86b6b Makefile --- a/Makefile Fri Mar 30 11:02:24 2012 +0200 +++ b/Makefile Fri Mar 30 11:02:47 2012 +0200 @@ -1,10 +1,22 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. JOBS := 1 TARGET := i686-pc-mingw32 SOURCEFORGE_MIRROR := kent.dl.sourceforge.net +SHELL := bash +INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install +LIBTOOL := $(shell glibtool --help >/dev/null 2>&1 && echo g)libtool +LIBTOOLIZE := $(shell glibtoolize --help >/dev/null 2>&1 && echo g)libtoolize +PATCH := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch +SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed + +REQUIREMENTS := autoconf automake bash bison bzip2 cmake flex \ + gcc intltoolize $(LIBTOOL) $(LIBTOOLIZE) \ + $(MAKE) openssl $(PATCH) $(PERL) pkg-config \ + scons $(SED) unzip wget xz yasm + PWD := $(shell pwd) PREFIX := $(PWD)/usr LOG_DIR := $(PWD)/log @@ -14,21 +26,10 @@ TMP_DIR = $(PWD)/tmp-$(1) MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) TOP_DIR := $(patsubst %/,%,$(dir $(MAKEFILE))) +PKGS := $(shell $(SED) -n 's/^.* id="\([^"]*\)-package".*$$/\1/p' '$(TOP_DIR)/index.html') PATH := $(PREFIX)/bin:$(PATH) -SHELL := bash -INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install -LIBTOOL := $(shell glibtool --help >/dev/null 2>&1 && echo g)libtool -LIBTOOLIZE := $(shell glibtoolize --help >/dev/null 2>&1 && echo g)libtoolize -PATCH := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch -SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed -VERSION := $(shell $(SED) -n 's,^.*\([^<]*\).*$$,\1,p' '$(TOP_DIR)/doc/index.html') -REQUIREMENTS := autoconf automake bash bison bzip2 cmake flex \ - gcc intltoolize $(LIBTOOL) $(LIBTOOLIZE) \ - $(MAKE) openssl $(PATCH) $(PERL) pkg-config \ - scons $(SED) unzip wget xz yasm - -CMAKE_TOOLCHAIN_FILE := $(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake +CMAKE_TOOLCHAIN_FILE := $(PREFIX)/$(TARGET)/share/cmake/mxe-conf.cmake # unexport any environment variables that might cause trouble unexport AR CC CFLAGS C_INCLUDE_PATH CPATH CPLUS_INCLUDE_PATH CPP @@ -39,9 +40,6 @@ SHORT_PKG_VERSION = \ $(word 1,$(subst ., ,$($(1)_VERSION))).$(word 2,$(subst ., ,$($(1)_VERSION))) -PKGS := $(sort $(patsubst $(TOP_DIR)/src/%.mk,%,$(wildcard $(TOP_DIR)/src/*.mk))) -include $(TOP_DIR)/src/*.mk - UNPACK_ARCHIVE = \ $(if $(filter %.tgz, $(1)),tar xzf '$(1)', \ $(if $(filter %.tar.gz, $(1)),tar xzf '$(1)', \ @@ -79,7 +77,19 @@ echo; \ echo 'Missing requirement: $(1)'; \ echo; \ - echo 'Please have a look at "doc/index.html" to ensure'; \ + echo 'Please have a look at "index.html" to ensure'; \ + echo 'that your system meets all requirements.'; \ + echo; \ + exit 1; \ + fi + +endef +define CHECK_REQUIREMENT_VERSION + @if ! $(1) --version | head -1 | grep ' \($(2)\)$$' >/dev/null; then \ + echo; \ + echo 'Wrong version of requirement: $(1)'; \ + echo; \ + echo 'Please have a look at "index.html" to ensure'; \ echo 'that your system meets all requirements.'; \ echo; \ exit 1; \ @@ -90,9 +100,23 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE) @echo '[check requirements]' $(foreach REQUIREMENT,$(REQUIREMENTS),$(call CHECK_REQUIREMENT,$(REQUIREMENT))) + $(call CHECK_REQUIREMENT_VERSION,autoconf,2\.6[4-9]\|2\.[7-9][0-9]) + $(call CHECK_REQUIREMENT_VERSION,automake,1\.[1-9][0-9]\.[0-9]\+) @[ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed' @touch '$@' +define newline + + +endef +$(eval $(subst #,$(newline),$(shell \ + $(SED) -n \ + 's/^.* id="\([A-Za-z0-9_+-]*\)-version">\([^<]*\)<.*$$/\1_VERSION := \2#/p' \ + '$(TOP_DIR)/index.html' \ +))) + +include $(TOP_DIR)/src/*.mk + .PHONY: download download: $(addprefix download-,$(PKGS)) @@ -154,6 +178,7 @@ $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(1)-*.patch)), (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) $$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test) + (du -k -d 0 '$(2)' 2>/dev/null || du -k --max-depth 0 '$(2)') | $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p' rm -rfv '$(2)' ,) [ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed' @@ -161,30 +186,6 @@ endef $(foreach PKG,$(PKGS),$(eval $(call PKG_RULE,$(PKG),$(call TMP_DIR,$(PKG))))) -.PHONY: strip -strip: - rm -rf \ - '$(PREFIX)/include' \ - '$(PREFIX)/info' \ - '$(PREFIX)/lib/libiberty.a' \ - '$(PREFIX)/man' \ - '$(PREFIX)/share' \ - '$(PREFIX)/$(TARGET)/etc' \ - '$(PREFIX)/$(TARGET)/doc' \ - '$(PREFIX)/$(TARGET)/info' \ - '$(PREFIX)/$(TARGET)/lib'/*.def \ - '$(PREFIX)/$(TARGET)/man' \ - '$(PREFIX)/$(TARGET)/sbin' - -strip -Sx \ - '$(PREFIX)/bin'/* \ - '$(PREFIX)/libexec/gcc/$(TARGET)'/*/* \ - '$(PREFIX)/$(TARGET)/bin'/* - -$(TARGET)-strip -S \ - '$(PREFIX)/lib/gcc/$(TARGET)'/*/*.a \ - '$(PREFIX)/lib/gcc/$(TARGET)'/*/*.o \ - '$(PREFIX)/$(TARGET)/lib'/*.a \ - '$(PREFIX)/$(TARGET)/lib'/*.o - .PHONY: clean clean: rm -rf $(call TMP_DIR,*) $(PREFIX)/* @@ -204,9 +205,9 @@ $(if $(filter $(2),$($(1)_VERSION)), $(info . $(1) $(2)), $(info NEW $(1) $($(1)_VERSION) --> $(2)) - $(SED) 's/^\([^ ]*_VERSION *:=\).*/\1 $(2)/' -i '$(TOP_DIR)/src/$(1).mk' + $(SED) -i 's/\( id="$(1)-version"\)>[^<]*/\1>$(2)/' '$(TOP_DIR)/index.html' $(MAKE) -f '$(MAKEFILE)' 'update-checksum-$(1)' \ - || { $(SED) 's/^\([^ ]*_VERSION *:=\).*/\1 $($(1)_VERSION)/' -i '$(TOP_DIR)/src/$(1).mk'; \ + || { $(SED) -i 's/\( id="$(1)-version"\)>[^<]*/\1>$($(1)_VERSION)/' '$(TOP_DIR)/index.html'; \ exit 1; })), $(error Unable to update version number of package $(1))) @@ -216,50 +217,21 @@ update-checksum-%: $(call DOWNLOAD_PKG_ARCHIVE,$*) - $(SED) 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' -i '$(TOP_DIR)/src/$*.mk' + $(SED) -i 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' '$(TOP_DIR)/src/$*.mk' -.PHONY: dist -dist: - rm -rf '$(DIST_DIR)' - mkdir -p '$(DIST_DIR)' - mkdir '$(DIST_DIR)/mingw-cross-env-$(VERSION)' - mkdir '$(DIST_DIR)/mingw-cross-env-$(VERSION)/doc' - mkdir '$(DIST_DIR)/mingw-cross-env-$(VERSION)/src' - ( \ - $(SED) -n '1,/';)) && \ - $(SED) -n '/
$(PKG)$($(PKG)_VERSION)
\1,') && \ - $(SED) '1,/
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Autoconf≥ 2.64
Automake≥ 1.10
Bash
Bison
Bzip2
CMake≥ 2.8.0
Flex≥ 2.5.31
GCC (gcc, g++)
GNU Make≥ 3.81
GNU Sed
Intltool≥ 0.40
LibC for 32-bit
Libtool≥ 2.2
OpenSSL-dev
Patch
Perl
Perl XML::Parser
Pkg-config≥ 0.16
SCons≥ 0.98
UnZip
Wget
XZ Utils
Yasm
- -

Debian

- - - 
aptitude install -R autoconf automake bash bison bzip2 \
-                    cmake flex g++ intltool make sed \
-                    libtool libltdl-dev openssl libssl-dev \
-                    libxml-parser-perl patch perl \
-                    pkg-config scons unzip wget \
-                    xz-utils yasm
- -

- On 64-bit Debian, install also: -

- 
aptitude install -R g++-multilib
- -

Fedora

- - - 
yum install autoconf automake bash bison bzip2 cmake \
-            flex gcc-c++ intltool make sed libtool \
-            openssl-devel patch perl pkgconfig scons \
-            yasm unzip wget xz
- -

- On 64-bit Fedora, - there are open issues with the NSIS package. -

- -

FreeBSD

- - - 
pkg_add -r automake111 autoconf268 bash bison cmake \
-           flex gmake gsed intltool libtool openssl \
-           patch perl p5-XML-Parser pkg-config scons \
-           unzip wget yasm
- -

- Ensure that /usr/local/bin precedes /usr/bin in your $PATH: -

-

- For C style shells, edit .cshrc -

- 
setenv PATH /usr/local/bin:$PATH
-

- For Bourne shells, edit .profile -

- 
export PATH = /usr/local/bin:$PATH
-

- On 64-bit FreeBSD, - there are open issues with the NSIS package. -

- -

Frugalware

- - - 
pacman-g2 -S autoconf automake bash bzip2 bison cmake \
-             flex gcc intltool make sed libtool openssl \
-             patch perl perl-xml-parser pkgconfig scons \
-             unzip wget xz xz-lzma yasm
- -

- On 64-bit Frugalware, - there are open issues with the NSIS package. -

- -

Gentoo

- - - 
emerge sys-devel/autoconf sys-devel/automake \
-       app-shells/bash sys-devel/bison app-arch/bzip2 \
-       dev-util/cmake sys-devel/flex sys-devel/gcc \
-       dev-util/intltool sys-devel/make sys-apps/sed \
-       sys-devel/libtool dev-libs/openssl sys-devel/patch \
-       dev-lang/perl dev-perl/XML-Parser \
-       dev-util/pkgconfig dev-util/scons app-arch/unzip \
-       net-misc/wget app-arch/xz-utils dev-lang/yasm
- -

Mac OS X

- -

- Install - Xcode 3 - and - MacPorts, - then run: -

- - 
sudo port install autoconf automake bison cmake flex \
-                  gsed intltool libtool openssl \
-                  p5-xml-parser pkgconfig scons \
-                  wget xz yasm
-

- On Mac OS X ≤ 10.5, also select a more recent GCC: -

- 
sudo port install gcc_select
-sudo gcc_select gcc42
-

- Xcode 4 is not supported yet. -

- -

openSUSE

- - - 
zypper install -R autoconf automake bash bison bzip2 \
-                  cmake flex gcc-c++ gettext-tools \
-                  intltool libtool make openssl \
-                  libopenssl-devel patch perl \
-                  perl-XML-Parser pkg-config scons \
-                  sed unzip wget xz yasm
- -

- On 64-bit openSUSE, install also: -

- 
zypper install -R gcc-32bit glibc-devel-32bit \
-                  libgcc45-32bit libgomp45-32bit \
-                  libstdc++45-devel-32bit
- -

Open Issues with NSIS

- -

- The NSIS package contains some native tools that are - currently 32-bit only. In order to build these on a - 64-bit system, multi-lib support must be enabled in the - compiler toolchain. However, not all operating systems - support this. -

-

- Since no other packages depend on it, the remainder of - mingw-cross-env can be successfully built by simply - removing the package: -

- 
rm where mingw-cross-env is unpacked/src/nsis.mk
- - -
-

Usage

- -

- All build commands also download the packages if necessary. -

-

- In a BSD userland, substitute "make" with "gmake". -

-
- -
make
- -
- build all packages, - non-parallel -
- -
make gcc
- -
- build a minimal useful set of packages, - i.e. the cross compilers - and the most basic packages, - non-parallel -
- -
make foo bar
- -
- build packages "foo", "bar" and their dependencies, - non-parallel -
- -
make foo bar -j 4 JOBS=2
- -
- build packages "foo", "bar" and their dependencies, - where up to 4 packages are build in parallel, - each with up to 2 compiler processes running in parallel -
- -
make check-requirements
- -
- check most of the - requirements - if necessary - – executed automatically - before building packages -
- -
make download
- -
- download all packages, - non-parallel, - such that subsequent builds work without internet access -
- -
make download-foo download-bar
- -
- download packages "foo", "bar" and their dependencies, - non-parallel -
- -
make download-foo download-bar -j 4
- -
- download packages "foo", "bar" and their dependencies, - where up to 4 packages are downloaded in parallel -
- -
make strip
- -
- strip all package builds and remove unnecessary files -
- -
make clean
- -
- remove all package builds - – use with caution! -
- -
make clean-pkg
- -
- remove all unused package files, - handy after a successful update -
- -
make update
- -
- for internal use only! - – - update the version numbers of all packages, - download the new versions and note their checksums -
- -
make dist
- -
- build a source distribution tarball and the website -
- -
-
- -
-

List of Packages

- -

- See something missing? Feel free to create a new package. -

- -
-
- -
-

Guidelines for Creating Packages

- -
    -
  1. -

    - The package should be a - free - software - library - that is really used by one of your applications. -

    - -

    - BTW, we're always curious about the applications people are porting. - We maintain a - list of projects - which use mingw-cross-env. - No matter whether your project is free or proprietary - – as long as it has its own website, - we'd be happy to link to it. -

    - -

    - Also, feel free to link to us. :-) -

    -
    2. - -
  2. -

    - Grep through the src/*.mk files - to find a project that is most similar to yours. - (Really, grep is your friend here.) -

    - -

    - For instance, - when adding a GNU library, - you should take a package like - gettext.mk - or - libiconv.mk - as the base of your work. - When using a SourceForge project, - you could start with a copy of - xmlwrapp.mk. - And so on. -

    -
    3. - -
  3. -

    - Adjust the comments, - fill in the $(PKG)_* fields. -

    - -

    - Be especially careful with the $(PKG)_DEPS section. - The easiest way to get the dependencies right - is to start with a minimal setup. - That is, - initialize mingw-cross-env with make gcc only, - then check whether your package builds successfully. -

    - -

    - Always list the dependency on gcc explicitly: -

    - 
    $(PKG)_DEPS     := gcc ...
    -
    4. - -
  4. -

    - Write your $(PKG)_BUILD. - If your library has a ./configure script, - enable/disable all dependency libraries explicitly - via "--enable-*" and "--disable-*" options. -

    -
    5. - -
  5. -

    - You might also have to provide a patch for it. - In that case, have a look at other patches such as - sdl-2-fix-dinput.patch. - In particular, each patch file should be named as: -

    - 
    PACKAGE-PATCHNUMBER-DESCRIPTION.patch
    -

    - and should start with: -

    - 
    This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-https://...
    -

    - where the URL points to the - bugtracker entry, - mailing list entry or - website - you took the patch from. -

    - -

    - If you created the patch yourself, - please offer it to the upstream project first, - and point to that URL, - using the same wording: - "This patch has been taken from:". -

    - -

    - Depending on the feedback you get from the upstream project, - you might want to improve your patch. -

    -
    6. - -
  6. -

    - If you find some time, - please provide a minimal test program for it. - It should be - simple, - stand alone and - should work unmodified for many (all?) future versions of the library. - Test programs are named as: -

    - 
    PACKAGE-test.c
    - or - 
    PACKAGE-test.cpp
    -

    - depending on whether it is a C or C++ library. - To get a clue, - please have a look at existing test programs such as - sdl-test.c. -

    - -

    - At the very end of your *.mk file - you should build the test program in a generic way, - using strict compiler flags. - The last few lines of - sdl.mk - will give you a clue. -

    -
    7. - -
  7. -

    - You could also try to provide a $(PKG)_UPDATE section. - However, that requires some experience and "feeling" for it. - So it is perfectly okay if you leave the $(PKG)_UPDATE section empty. - We'll fill that in for you. - It's a funny exercise. -

    -
    8. - -
  8. -

    - Check that you don't have "dirty stuff" in your *.mk files, - such as TAB characters or trailing spaces at lines endings. - Have a look at random *.mk files - to get a feeling for the coding style. -

    - -

    - The same holds for your test program. -

    - -

    - However, patch files should always appear - in the same coding style as the files they are patching. -

    - -

    - Finally, in your $(PKG)_BUILD section, - please check that you use our portability variables: -

    - - - - - - - - -
    bash →$(SHELL)
    install →$(INSTALL)
    libtool →$(LIBTOOL)
    libtoolize→$(LIBTOOLIZE)
    make →$(MAKE)
    patch →$(PATCH)
    sed →$(SED)
    -
    9. - -
  9. -

    - Check whether everything runs fine. - If you have some trouble, - don't hesitate to ask on the - mailing list, - providing your *.mk file so far. -

    -
    10. - -
  10. -

    - Propose your final *.mk file to the mailing list. - Don't forget to tell us - if there are some pieces in your *.mk file - you feel unsure about. - We'll then have a specific look at those parts, - which avoids trouble for you and us in the future. -

    -
    11. -
-
- -
- - - - -

(contact via the - project mailing list)

- -

- Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject - to the following conditions: -

- -

- The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. -

- -

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -

-
- -
-

History

- -
- -
2011-04-05 – Release 2.20
-
-

- Download | - Changelog -

- -

- This release fixes a download error caused by the pixman project - (a sudden change of their URL scheme without proper redirects). - That sort of thing should never happen! -

-
- -
2011-03-19 – Release 2.19
-
-

- Download | - Changelog -

- -

- The download mechanisms are improved. -

- -

- A CMake toolchain file is provided - to simplify cross-compiling projects which use CMake. -

- -

- Support for Debian/Lenny is dropped. -

- -

- Package gtk is renamed to gtk2. -

- -

- Almost all packages are updated to their latest version. -

- -

- New packages are supported: - dbus, graphicsmagick, libical, liboauth, physfs, and vigra. -

- -

- Note for boost::filesystem users: - Version 3 is a major revision - and now the default in 1.46. -

-
- -
2010-12-15 – Release 2.18
-
-

- Download | - Changelog -

- -

- This release fixes a checksum error caused by the atkmm project - (a sudden change of their current source tarball). - That sort of thing should never happen! -

-
- -
2010-12-11 – Release 2.17
-
-

- Download | - Changelog -

- -

- This release provides some improvements of the build system - such as an automatic check for most of the requirements. -

- -

- All packages are updated to their latest version. -

- -

- New packages are supported: - bfd, blas, cblas, dcmtk, ftgl, lapack, lcms1, - mingw-utils, mxml, suitesparse and tinyxml. -

-
- -
2010-10-27 – Release 2.16
-
-

- Download | - Changelog -

- -

- This release provides lots of improvements to - the build system as well as the documentation. -

- -

- Support for OpenSolaris is dropped. -

- -

- Almost all packages are updated to their latest version. -

- -

- Many new packages are supported: - atkmm, cairomm, cunit, faac, faad2, ffmpeg, gdk-pixbuf, glibmm, - gtkglextmm, gtkmm, gtksourceview, gtksourceviewmm, imagemagick, - lame, libsigc++, libvpx, matio, openal, opencore-amr, pangomm, - pfstools, plotmm, sdl_sound and x264. -

-
- -
2010-06-16 – Release 2.15
-
-

- Download | - Changelog -

- -

- This release fixes download errors caused by the Qt project - (a sudden change of their current source tarball). -

- -

- Almost all packages are updated to their latest version. -

-
- -
2010-06-08 – Release 2.14
-
-

- Download | - Changelog -

- -

- This release fixes download errors caused by the MinGW project - (a sudden change of their URL scheme without proper redirects). - That sort of thing should never happen! -

- -

- Almost all packages are updated to their latest version. -

- -

- New packages are supported: - libarchive, libgee and xvidcore. -

-
- -
2010-05-31 – Release 2.13
-
-

- Download | - Changelog -

- -

- This release switches back from TDM to the official GCC, - thus supporting the current GCC 4.5. -

- -

- The set of DirectX headers is improved and more complete. -

- -

- The deadlock issues with Pthreads-w32 are fixed. -

- -

- A static build of GDB is provided, - i.e. a standalone "gdb.exe" - that doesn't require any extra DLLs. -

- -

- More packages are backed by test programs. -

- -

- Many "sed hacks" are replaced by proper portability patches. -

- -

- Almost all packages are updated to their latest version. -

- -

- Many new packages are supported: - fribidi, gc, gdb, gmp, gsl, gst-plugins-base, gst-plugins-good, - gstreamer, gtkglext, guile, libcroco, libffi, liboil, libpaper, - libshout, libunistring and xine-lib. -

-
- -
2010-02-21 – Release 2.12
-
-

- Download | - Changelog -

- -

- This release fixes some minor build issues, - and contains a first small set of test programs - to check the package builds. -

- -

- The build rules are simplified - by calling generators like Autotools and Flex, - instead of patching the generated files. -

- -

- Almost all packages are updated to their latest version. -

- -

- Many new packages are supported: - aubio, devil, directx, exiv2, fftw, freeimage, gsoap, - id3lib, liblo, libpano13, librsvg, libsamplerate, - muparser, openscenegraph, portaudio and sdl_pango. -

-
- -
2010-02-20 – Release 2.11
-
-

- Download | - Changelog -

- -

- This release contains a packaging bug. - Please use release 2.12 instead. -

-
- -
2009-12-23 – Release 2.10
-
-

- Download | - Changelog -

- -

- This release adds support for many new packages: - flac, libmad, libsndfile, sdl_net, speex, postgresql, - freetds, openssl, plotutils, taglib, lcms, freeglut, - xerces and zziplib. -

- -

- Almost all packages are updated to their latest version. -

- -

- In addition to the libraries - some command line tools such as psql.exe are built, too. -

- -

- The placements of logfiles, as well as many other build details, have been improved. -

-
- -
2009-10-24 – Release 2.9
-
-

- Download | - Changelog -

- -

- This release adds support for Qt, VMime and libmng. -

- -

- The target triplet is updated to i686-pc-mingw32. -

- -

- OpenMP support is enabled in GCC. -

- -

- Almost all packages are updated to their latest version. -

-
- -
2009-09-11 – Release 2.8
-
-

- Download | - Changelog -

- -

- This release comes with a better look & feel - by providing a highlevel overview of the build process. -

- -

- The detailed build messages are stored into - separate log files for each package, - so parallel builds don't intermix them anymore. -

- -

- The download URLs of SourceForge packages - are adjusted to ensure that - the selected SourceForge mirror is really used - and not circumvalented via HTTP redirects to other mirrors. -

- -

- Almost all packages are updated to their latest version. -

- -

- The whole mingw-cross-env project has moved to - Savannah. - So all URIs have changed, - but the old URIs - redirect to the new locations seamlessly. -

- -

- Everyone is invited to join the freshly created - project mailing list. -

-
- -
2009-08-11 – Release 2.7
-
-

- Download | - Changelog -

- -

- This release - provides an improved version recognition - for SourceForge packages. - SourceForge changed their page layout - in a way that makes it much harder - to identify the current version of a package. -

- -

- Additionally, - almost all packages are updated to their latest version. -

-
- -
2009-06-19 – Release 2.6
-
-

- Download | - Changelog -

- -

- This release contains some portability fixes - which allow it to run on a wider range of systems - such as Frugalware. -

- -

- The documentation and website are completely revised. -

- -

- New packages such as - CppUnit, libUsb, NSIS, Popt, SQLite and Theora - are supported. -

- -

- Almost all packages are updated to their latest version. -

- -

- A new command "make download" is implemented. -

-
- -
2009-04-06 – Release 2.5
-
-

- Download | - Changelog -

- -

- This release fixes a download error caused by the MinGW project. - They suddenly changed the names of their source tarballs. - That sort of thing should never happen! -

- -

- This release also contains some bugfixes - which allow it to run on a wider range of systems. -

- -

- All downloaded files are now - verified by their SHA-1 checksums. -

- -

- New versions of various packages are supported. -

-
- -
2009-03-08 – Release 2.4
-
-

- Download | - Changelog -

- -

- This release provides many new libraries such as - wxWidgets, GTK+ and OpenEXR. -

- -

- In addition, new versions of various packages - are supported. -

-
- -
2009-02-09 – Release 2.3
-
-

- Download | - Changelog -

- -

- This release fixes some serious build problems on FreeBSD and MacOS-X. -

- -

- The Makefile has a new target "clean-pkg" - and allows to be called from a separate build directory - via "make -f .../Makefile". -

- -

- Some new versions of the packages are supported, - especially GCC-4.3 by switching from MinGW GCC to - TDM-GCC. -

-
- -
2009-01-31 – Release 2.2
-
-

- Download | - Changelog -

- -

- This release fixes some minor build problems. -

- -

- It also supports some new packages and - some newer versions of the already supported packages. -

- -

- Parallelization is now disabled by default. -

-
- -
2008-12-13 – Release 2.1
-
-

- Download | - Changelog -

- -

- This release fixes a download error caused by the GDAL project. - They suddenly changed their download URLs. - That sort of thing should never happen! -

- -

- In addition, some newer versions of various packages are supported. -

- -

- There is also a small compatibility fix for OS X. -

-
- -
2008-11-10 – Release 2.0
-
-

- Download | - Changelog -

- -

- The shell script has been rewritten as Makefile - and supports partial builds and parallel builds. -

- -

- As usual, - this release also supports some new packages and - some newer versions of the already supported packages. -

-
- -
2008-01-11 – Release 1.4
-
-

- Download | - Changelog -

- -

- This release now includes a tutorial by Hans Bezemer - and has improved compile options of FLTK. - As usual, it supports some newer versions of the libraries. -

- -

- At the request of its author, - libowfat is no longer supported from this release on. -

- -

- The script now uses a specific SourceForge mirror - instead of randomly chosen ones, - because the download phase - often stumbled on some very slow mirrors. -

-
- -
2007-12-23 – Release 1.3
-
-

- Download | - Changelog -

- -

- A sudden change in the download URLs of GEOS - made the automatic download fail. - Such changes should never happen! - But it happened, - and this quick release is an attempt to limit the damage. -

- -

- This release also supports some newer versions of the libraries - including support for fontconfig-2.5.0. -

-
- -
2007-12-13 – Release 1.2
-
-

- Download | - Changelog -

- -

- This release is a switch from gcc-3 to gcc-4. - It also supports a new library and - some newer versions of the already supported libraries. -

-
- -
2007-07-24 – Release 1.1
-
-

- Download | - Changelog -

- -

- This release is the result of the public attention the release 1.0 got. - It contains many improvements suggested by its first users, - and adds support for many new libraries. -

- -

- Thanks to Rocco Rutte who contributed many code snippets. -

-
- -
2007-06-19 – Release 1.0
-
-

- Download | - Changelog -

- -

- This first release has been created in a 7-day-sprint. -

-
- -
2007-06-12 – Project start
-
-
- -
-
- -
-

See also

- -

This project

- - - -

Related projects

- - - -

Related articles

- - -
- -
-

Projects which use mingw-cross-env

- - -
- - - diff -r 97d5a5c48c12 -r 082cd6e86b6b index.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/index.html Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,2967 @@ + + + + + + + MXE (M cross environment) + + + + + + + + +
+

Introduction

+ +

+ MXE (M cross environment) is a Makefile that + compiles a cross compiler and cross compiles + many free libraries such as SDL and Qt. Thus, + it provides a nice cross compiling environment + for various target platforms, which +

+ + +
+ +
+

Screenshots

+ +

+ Cross compiling + 4tH: +

+ 4th-compile + +

+ and running it: +

+ 4th-run +
+ +
+

Tutorial

+ +

Step 1: Download and Unpack

+ +

+ First, you should ensure that your system meets + MXE's + requirements. + You will almost certainly have to install some stuff. +

+ +

+ When everything is fine, download the + current stable version: +

+ 
git clone -b stable https://github.com/mxe/mxe.git
+ +

+ If you don't mind installing it in your home directory, + just skip the following step and go straight to step 3. +

+ +

Step 2: System-wide Installation (optional)

+ +

+ Now you should save any previous installation + of the MXE. + Assuming you've installed it under + /opt/mxe (any other directory will do as well), + you should execute the following commands: +

+ 
su
+mv /opt/mxe /opt/mxe.old
+exit
+ +

+ Then you need to transfer the entire directory to its definitive location. + We will assume again you use /opt/mxe, + but feel free to use any other directory if you like. +

+ 
su
+mv mxe /opt/mxe
+exit
+ +

+ We're almost done. + Just change to your newly created directory and get going: +

+ 
cd /opt/mxe
+ +

Step 3: Build MXE

+ +

+ Enter the directory where you've downloaded the MXE. + Now it depends on what you actually want – or need. +

+ +

+ If you choose to enter: +

+ 
make
+

+ you're in for a long wait, + because it compiles + a lot of packages. + On the other hand it doesn't require any intervention, + so you're free to do whatever you like + – like watch a movie or go for a night on the town. + When it's done you'll find that you've installed + a very capable Win32 cross compiler onto your system. +

+ +

+ If you only need the most basic tools you can also use: +

+ 
make gcc
+

+ and add any additional packages you need later on. + You can also supply a host of packages on the + command line, + e.g.: +

+ 
make gtk lua libidn
+

+ You'll always end up with a consistent cross compiling environment. +

+ +

+ After you're done it just needs a little post-installation. +

+ +

Step 4: Environment Variables

+ +

+ Edit your .bashrc script in order to change $PATH: +

+ 
export PATH=/where MXE is installed/usr/bin:$PATH
+ +

+ In case you are using custom $PKG_CONFIG_PATH entries, + you can add separate entries for cross builds: +

+ 
export PKG_CONFIG_PATH="entries for native builds"
+ 
export PKG_CONFIG_PATH_i686_pc_mingw32="entries for MXE builds"
+

+ Remember to use i686-pc-mingw32-pkg-config + instead of pkg-config for cross builds. + The Autotools do that automatically for you. +

+ +

+ Note that any other compiler related environment variables + (like $CC, $LDFLAGS, etc.) + may spoil your compiling pleasure, + so be sure to delete or disable those. +

+ +

+ Congratulations! + You're ready to cross compile anything you like. +

+ +

Step 5a: Cross compile your Project (Autotools)

+ +

+ If you use the + Autotools, + all you have to do is: +

+ 
./configure --host=i686-pc-mingw32
+make
+ +

+ If you build a library, you might also want to enforce a static build: +

+ 
./configure --host=i686-pc-mingw32 --enable-static --disable-shared
+make
+ +

+ Don't worry about a warning like this: +

+ 
configure: WARNING: If you wanted to set the --build type, don't use --host.
+If a cross compiler is detected then cross compile mode will be used.
+

+ Everything will be just fine. +

+ +

Step 5b: Cross compile your Project (CMake)

+ +

+ If you have a + CMake project, + you can use the provided toolchain file: +

+ 
cmake ... -DCMAKE_TOOLCHAIN_FILE=/where MXE is installed/usr/i686-pc-mingw32/share/cmake/mingw-cross-env-conf.cmake
+ +

Step 5c: Cross compile your Project (Qt)

+ +

+ If you have a + Qt application, + all you have to do is: +

+ 
i686-pc-mingw32-qmake
+make
+

+ If you are using Qt plugins + such as the svg or ico image handlers, + you should also have a look at the + Qt documentation about static plugins. +

+

+ Note the sql drivers (-qt-sql-*) + and the image handlers for jpeg, tiff, gif and mng + are built-in, not plugins. +

+ +

Step 5d: Cross compile your Project (Makefile)

+ +

+ If you have a handwritten Makefile, + you probably will have to make a few adjustments to it: +

+ 
CC=$(CROSS)gcc
+LD=$(CROSS)ld
+AR=$(CROSS)ar
+PKG_CONFIG=$(CROSS)pkg-config
+

+ You may have to add a few others, depending on your project. +

+ +

+ Then, all you have to do is: +

+ 
make CROSS=i686-pc-mingw32-
+

+ That's it! +

+ +

Step 5e: Cross compile your Project (OSG)

+ +

+ Using static OpenSceneGraph libraries requires a few changes to your source. + The graphics subsystem and all plugins required by your application must be + referenced explicitly. Use a code block like the following: +

+ 
#ifdef OSG_LIBRARY_STATIC
+USE_GRAPHICSWINDOW()
+USE_OSGPLUGIN(<plugin1>)
+USE_OSGPLUGIN(<plugin2>)
+...
+#endif
+

+ Look at examples/osgstaticviewer/osgstaticviewer.cpp in the + OpenSceneGraph source distribution for an example. This example can be + compiled with the following command: +

+ 
i686-pc-mingw32-g++ \
+    -o osgstaticviewer.exe examples/osgstaticviewer/osgstaticviewer.cpp \
+    `i686-pc-mingw32-pkg-config --cflags openscenegraph-osgViewer openscenegraph-osgPlugins` \
+    `i686-pc-mingw32-pkg-config --libs openscenegraph-osgViewer openscenegraph-osgPlugins`
+

+ The i686-pc-mingw32-pkg-config command from MXE will + automatically add -DOSG_LIBRARY_STATIC to your compiler flags. +

+ +

Further Steps

+ +

+ If you need further assistance, + feel free to join the + project mailing list + where you'll get in touch with + the MXE developers + and other users. +

+
+ +
+
+
+

Download

+ +

+ To obtain the current stable version, run: +

+ + 
git clone -b stable https://github.com/mxe/mxe.git
+ +

+ The development version can be obtained by: +

+ + 
git clone -b master https://github.com/mxe/mxe.git
+ +

+ To retrieve updates, run: +

+ + 
git pull
+ +

+ You can also browse the + web repository. +

+ +

+ In addition, + feel free to join the + project mailing list + and to propose new packages. +

+ +

+ For the sake of simplicity, there are just two + branches, "master" and "stable". Although it might + seem obvious, here's an overview of the types of + changes that go into each branch: +

+ + +
+ +
+

Requirements

+ +

+ Mingw-cross-env requires a recent Unix system where + all components as stated in the table below + are installed. + Detailed instructions are available for: +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Autoconf≥ 2.64
Automake≥ 1.10
Bash
Bison
Bzip2
CMake≥ 2.8.0
Flex≥ 2.5.31
GCC (gcc, g++)
Git≥ 1.7
GNU Gettext
GNU Make≥ 3.81
GNU Sed
Intltool≥ 0.40
LibC for 32-bit
Libtool≥ 2.2
OpenSSL-dev
Patch
Perl
Perl XML::Parser
Pkg-config≥ 0.16
SCons≥ 0.98
UnZip
Wget
XZ Utils
Yasm
+ +

Debian (GNU/kFreeBSD & GNU/Linux)

+ + + 
aptitude install -R autoconf automake bash bison bzip2 \
+                    cmake flex gettext git g++ intltool \
+                    libtool libltdl-dev openssl libssl-dev \
+                    libxml-parser-perl make patch perl \
+                    pkg-config scons sed unzip wget \
+                    xz-utils yasm
+ +

+ On 64-bit Debian, install also: +

+ 
aptitude install -R g++-multilib
+ +

Fedora

+ + + 
yum install autoconf automake bash bison bzip2 cmake \
+            flex gcc-c++ gettext git intltool make sed \
+            libtool openssl-devel patch perl pkgconfig \
+            scons yasm unzip wget xz
+ +

+ On 64-bit Fedora, + there are open issues with the NSIS package. +

+ +

FreeBSD

+ + + 
pkg_add -r automake111 autoconf268 bash bison cmake \
+           flex gettext git gmake gsed intltool libtool \
+           openssl patch perl p5-XML-Parser pkg-config \
+           scons unzip wget yasm
+ +

+ Ensure that /usr/local/bin precedes /usr/bin in your $PATH: +

+

+ For C style shells, edit .cshrc +

+ 
setenv PATH /usr/local/bin:$PATH
+

+ For Bourne shells, edit .profile +

+ 
export PATH = /usr/local/bin:$PATH
+

+ On 64-bit FreeBSD, + there are open issues with the NSIS package. +

+ +

Frugalware

+ + + 
pacman-g2 -S autoconf automake bash bzip2 bison cmake \
+             flex gcc gettext git intltool make sed libtool \
+             openssl patch perl perl-xml-parser pkgconfig \
+             scons unzip wget xz xz-lzma yasm
+ +

+ On 64-bit Frugalware, + there are open issues with the NSIS package. +

+ +

Gentoo

+ + + 
emerge sys-devel/autoconf sys-devel/automake \
+       app-shells/bash sys-devel/bison app-arch/bzip2 \
+       dev-util/cmake sys-devel/flex sys-devel/gcc \
+       sys-devel/gettext dev-vcs/git \
+       dev-util/intltool sys-devel/make sys-apps/sed \
+       sys-devel/libtool dev-libs/openssl sys-devel/patch \
+       dev-lang/perl dev-perl/XML-Parser \
+       dev-util/pkgconfig dev-util/scons app-arch/unzip \
+       net-misc/wget app-arch/xz-utils dev-lang/yasm
+ +

Mac OS X

+ +

+ Install + Xcode 4 + and + MacPorts, + then run: +

+ + 
sudo port install autoconf automake bison cmake flex \
+                  gettext git-core gsed intltool libtool \
+                  openssl p5-xml-parser pkgconfig scons \
+                  wget xz yasm
+

+ Mac OS X versions ≤ 10.6 are no longer supported. +

+ +

openSUSE

+ + + 
zypper install -R autoconf automake bash bison bzip2 \
+                  cmake flex gcc-c++ gettext-tools git \
+                  intltool libtool make openssl \
+                  libopenssl-devel patch perl \
+                  perl-XML-Parser pkg-config scons \
+                  sed unzip wget xz yasm
+ +

+ On 64-bit openSUSE, install also: +

+ 
zypper install -R gcc-32bit glibc-devel-32bit \
+                  libgcc46-32bit libgomp46-32bit \
+                  libstdc++46-devel-32bit
+ +

Open Issues with NSIS

+ +

+ The NSIS package contains some native tools that are + currently 32-bit only. In order to build these on a + 64-bit system, multi-lib support must be enabled in the + compiler toolchain. However, not all operating systems + support this. +

+

+ Since no other packages depend on it, the remainder of + MXE can be successfully built by simply + removing the package: +

+ 
rm where MXE is downloaded/src/nsis.mk
+
+ +
+

Usage

+ +

+ All build commands also download the packages if necessary. +

+

+ In a BSD userland, substitute "make" with "gmake". +

+
+ +
make
+ +
+ build all packages, + non-parallel +
+ +
make gcc
+ +
+ build a minimal useful set of packages, + i.e. the cross compilers + and the most basic packages, + non-parallel +
+ +
make foo bar
+ +
+ build packages "foo", "bar" and their dependencies, + non-parallel +
+ +
make foo bar -j 4 JOBS=2
+ +
+ build packages "foo", "bar" and their dependencies, + where up to 4 packages are build in parallel, + each with up to 2 compiler processes running in parallel +
+ +
make check-requirements
+ +
+ check most of the + requirements + if necessary + – executed automatically + before building packages +
+ +
make download
+ +
+ download all packages, + non-parallel, + such that subsequent builds work without internet access +
+ +
make download-foo download-bar
+ +
+ download packages "foo", "bar" and their dependencies, + non-parallel +
+ +
make download-foo download-bar -j 4
+ +
+ download packages "foo", "bar" and their dependencies, + where up to 4 packages are downloaded in parallel +
+ +
make clean
+ +
+ remove all package builds + – use with caution! +
+ +
make clean-pkg
+ +
+ remove all unused package files, + handy after a successful update +
+ +
make update
+ +
+ for internal use only! + – + update the version numbers of all packages, + download the new versions and note their checksums +
+ +
make cleanup-style
+ +
+ for internal use only! + – + cleanup coding style +
+ +
+
+ +
+

List of Packages

+ +

+ See something missing? Feel free to create a new package. +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
agg2.5Anti-Grain Geometry
atk2.2.0ATK
atkmm2.22.6ATKmm
aubio0.3.2aubio
bfd2.22Binary File Descriptor library
binutils2.22GNU Binutils
blas1blas
boost1.49.0Boost C++ Library
bzip21.0.6bzip2
cairo1.10.2cairo
cairomm1.10.0cairomm
cblas1cblas
cgal4.0cgal
cppunit1.12.1CppUnit
cunit2.1-2cunit
curl7.25.0cURL
dbus1.5.12dbus
dcmtk3.6.0DCMTK
devil1.7.8DevIL
eigen2.0.17eigen
exiv20.22Exiv2
expat2.1.0Expat XML Parser
faad22.7faad2
ffmpeg0.10.2ffmpeg
fftw3.3.1fftw
file5.11file
flac1.2.1FLAC
fltk1.3.0FLTK
fontconfig2.9.0fontconfig
freeglut2.8.0freeglut
freeimage3.15.3FreeImage
freetds0.91FreeTDS
freetype2.4.9freetype
fribidi0.19.2FriBidi
ftgl2.1.3~rc5ftgl
gc7.1gc
gcc4.7.0GCC
gcc-gmp5.0.4GMP for GCC
gcc-mpc0.9MPC for GCC
gcc-mpfr3.1.0MPFR for GCC
gd2.0.35GD (without support for xpm)
gdal1.9.0GDAL
gdb7.4gdb
gdk-pixbuf2.22.1GDK-pixbuf
geos3.3.2GEOS
gettext0.18.1.1gettext
giflib4.1.6giflib
glew1.7.0GLEW
glib2.28.8GLib
glibmm2.28.2GLibmm
gmp5.0.4GMP
gnutls3.0.17GnuTLS
graphicsmagick1.3.14GraphicsMagick
gsl1.14GSL
gsoap2.8.8gSOAP
gst-plugins-base0.10.35gst-plugins-base
gst-plugins-good0.10.30gst-plugins-good
gstreamer0.10.35gstreamer
gta1.0.2gta
gtk22.24.4GTK+
gtkglext1.2.0GtkGLExt
gtkglextmm1.2.0GtkGLExtmm
gtkmm22.24.0GTKMM
gtksourceview2.10.5GTKSourceView
gtksourceviewmm22.10.1GtkSourceViewmm
guile1.8.7GNU Guile
id3lib3.8.3id3lib
ilmbase1.0.2IlmBase
imagemagick6.7.2-7ImageMagick
jasper1.900.1JasPer
jpeg8djpeg
json-c0.9json-c
lame3.99lame
lapack3.4.0lapack
lcms2.3lcms
lcms11.19lcms1
libarchive3.0.3Libarchive
libass0.10.0libass
libcroco0.6.2Libcroco
libdnet1.11libdnet
libevent2.0.18libevent
libffi3.0.10libffi
libgcrypt1.5.0libgcrypt
libgee0.5.0libgee
libgeotiff1.3.0GeoTiff
libgnurx2.5.1libgnurx
libgomp4.7.0GCC-libgomp
libgpg_error1.10libgpg-error
libgsasl1.6.1Libgsasl
libgsf1.14.22libgsf
libharu2.2.1libharu
libiberty2.22libiberty
libical0.48libical
libiconv1.14libiconv
libidn1.24Libidn
libircclient1.6libircclient
liblo0.26liblo
libmad0.15.1blibmad
libmikmod3.2.0-beta2libMikMod
libmng1.0.10libmng
libntlm1.3Libntlm
liboauth0.9.6liboauth
libodbc++0.2.5libodbc++
liboil0.3.17liboil
libpano132.9.18_rc2libpano13
libpaper1.1.24+nmu1libpaper
libpng1.5.10libpng
librsvg2.36.0librsvg
libsamplerate0.1.8libsamplerate
libshout2.2.2libshout
libsigc++2.2.10libsigc++
libsndfile1.0.25libsndfile
libssh21.4.0libssh2
libtool2.4.2GNU Libtool
libunistring0.9.3libunistring
libusb1.2.6.0LibUsb
libvpx1.0.0vpx
libxml++2.35.2libxml2
libxml22.7.8libxml2
libxslt1.1.26libxslt
llvm3.0llvm
lua5.1.4Lua
lzo2.06lzo
matio1.3.4matio
mingw-utils0.4-1MinGW Utilities
mingwrt3.20MinGW Runtime
mpfr3.1.0mpfr
muparser1.34muParser
mxml2.7Mini-XML
nettle2.4nettle
nsis2.46NSIS
ogg1.3.0OGG
old0.17old
openal1.13openal
opencore-amr0.1.2opencore-amr
opencsg1.3.2opencsg
openexr1.7.0OpenEXR
openscenegraph3.0.1OpenSceneGraph
openssl1.0.1openssl
pango1.29.3Pango
pangomm2.28.2Pangomm
pcre8.30PCRE
pdcurses3.4PDcurses
pdflib_lite7.0.5PDFlib Lite
pfstools1.8.5pfstools
physfs2.0.2physfs
pixman0.25.2pixman
plotmm0.1.2PlotMM
plotutils2.6plotutils
poco1.4.3p1POCO C++ Libraries
popt1.16popt
portaudio19_20071207portaudio
postgresql9.1.3PostgreSQL
proj4.8.0proj
pthreads2-8-0Pthreads-w32
qjson0.7.1QJson
qt4.8.1Qt
qwtplot3d0.2.7QwtPlot3D
readline6.2Readline
sdl1.2.15SDL
sdl_image1.2.12SDL_image
sdl_mixer1.2.12SDL_mixer
sdl_net1.2.8SDL_net
sdl_pango0.1.2SDL_Pango
sdl_sound1.0.3SDL_sound
sdl_ttf2.0.11SDL_ttf
smpeg0.4.5+cvs20030824smpeg
speex1.2rc1Speex
sqlite3071100SQLite
suitesparse3.7.0SuiteSparse
t4k_common0.1.1t4k_common
taglib1.7.1TagLib
theora1.1.1Theora
tiff4.0.1LibTIFF
tinyxml2.6.2tinyxml
tre0.8.0TRE
vigra1.8.0vigra
vmime0.9.1VMime
vorbis1.3.2Vorbis
vtk5.8.0vtk
w32api3.17MinGW Windows API
winpcap4_1_2WinPcap
wt3.2.0Wt
wxwidgets2.8.12wxWidgets
x26420111018-2245x264
xerces3.1.1Xerces-C++
xine-lib1.1.20.1xine-lib
xmlwrapp0.6.2xmlwrapp
xvidcore1.3.2xvidcore
xz5.0.3XZ
zlib1.2.6zlib
zziplib0.13.59ZZIPlib
+
+ +
+

Guidelines for Creating Packages

+ +
    +
  1. +

    + The package should be a + free + software + library + that is really used by one of your applications. +

    + +

    + BTW, we're always curious about the applications people are porting. + We maintain a + list of projects + which use MXE. + No matter whether your project is free or proprietary + – as long as it has its own website, + we'd be happy to link to it. +

    + +

    + Also, feel free to link to us. :-) +

    +
    2. + +
  2. +

    + Grep through the src/*.mk files + to find a project that is most similar to yours. + (Really, grep is your friend here.) +

    + +

    + For instance, + when adding a GNU library, + you should take a package like + gettext.mk + or + libiconv.mk + as the base of your work. + When using a SourceForge project, + you could start with a copy of + xmlwrapp.mk. + And so on. +

    +
    3. + +
  3. +

    + Adjust the comments, + fill in the $(PKG)_* fields. +

    + +

    + Be especially careful with the $(PKG)_DEPS section. + The easiest way to get the dependencies right + is to start with a minimal setup. + That is, + initialize MXE with make gcc only, + then check whether your package builds successfully. +

    + +

    + Always list the dependency on gcc explicitly: +

    + 
    $(PKG)_DEPS     := gcc ...
    +
    4. + +
  4. +

    + Write your $(PKG)_BUILD. + If your library has a ./configure script, + enable/disable all dependency libraries explicitly + via "--enable-*" and "--disable-*" options. +

    +
    5. + +
  5. +

    + You might also have to provide a patch for it. + In that case, have a look at other patches such as + sdl-2-fix-dinput.patch. + In particular, each patch file should be named as: +

    + 
    PACKAGE-PATCHNUMBER-DESCRIPTION.patch
    +

    + and should start with: +

    + 
    This file is part of MXE.
+See index.html for further information.
+
+This patch has been taken from:
+https://...
    +

    + where the URL points to the + bugtracker entry, + mailing list entry or + website + you took the patch from. +

    + +

    + If you created the patch yourself, + please offer it to the upstream project first, + and point to that URL, + using the same wording: + "This patch has been taken from:". +

    + +

    + Depending on the feedback you get from the upstream project, + you might want to improve your patch. +

    +
    6. + +
  6. +

    + If you find some time, + please provide a minimal test program for it. + It should be + simple, + stand alone and + should work unmodified for many (all?) future versions of the library. + Test programs are named as: +

    + 
    PACKAGE-test.c
    + or + 
    PACKAGE-test.cpp
    +

    + depending on whether it is a C or C++ library. + To get a clue, + please have a look at existing test programs such as + sdl-test.c. +

    + +

    + At the very end of your *.mk file + you should build the test program in a generic way, + using strict compiler flags. + The last few lines of + sdl.mk + will give you a clue. +

    +
    7. + +
  7. +

    + You could also try to provide a $(PKG)_UPDATE section. + However, that requires some experience and "feeling" for it. + So it is perfectly okay if you leave the $(PKG)_UPDATE section empty. + We'll fill that in for you. + It's a funny exercise. +

    +
    8. + +
  8. +

    + Check that you don't have "dirty stuff" in your *.mk files, + such as TAB characters or trailing spaces at lines endings. + Have a look at random *.mk files + to get a feeling for the coding style. +

    + +

    + The same holds for your test program. +

    + +

    + However, patch files should always appear + in the same coding style as the files they are patching. +

    + +

    + Finally, in your $(PKG)_BUILD section, + please check that you use our portability variables: +

    + + + + + + + + +
    bash →$(SHELL)
    install →$(INSTALL)
    libtool →$(LIBTOOL)
    libtoolize→$(LIBTOOLIZE)
    make →$(MAKE)
    patch →$(PATCH)
    sed →$(SED)
    +
    9. + +
  9. +

    + Check whether everything runs fine. + If you have some trouble, + don't hesitate to ask on the + mailing list, + providing your *.mk file so far. +

    +
    10. + +
  10. +

    + Propose your final *.mk file to the mailing list. + Don't forget to tell us + if there are some pieces in your *.mk file + you feel unsure about. + We'll then have a specific look at those parts, + which avoids trouble for you and us in the future. +

    +
    11. +
+
+ +
+ + + + +

(contact via the + project mailing list)

+ +

+ Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject + to the following conditions: +

+ +

+ The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. +

+ +

+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +

+
+ +
+

History

+ +
+ +
2012-xx-xx – Release 2.22
+
+

+ Download | + Changelog +

+ +

+ The project has been + renamed + from mingw-cross-env to MXE (M cross environment). +

+ +

+ The release tarballs have been replaced with a Git checkout. +

+ +

+ Most packages were updated to their latest version. +

+ +

+ New packages are supported: + agg, cgal, eigen, file, gta, json-c, libgnurx, libharu, + libircclient, libssh2, libxml++, llvm, lzo, mpfr, nettle, + opencsg, qjson, qwtplot3d, vtk, and wt. +

+
+ +
2011-06-07 – Release 2.21
+
+

+ Download | + Changelog +

+ +

+ Minor bugfixes in several packages. +

+ +

+ Almost all packages are updated to their latest version. +

+ +

+ Packages gtkmm and gtksourceviewmm have been renamed to gtkmm2 and gtksourceviewmm2. +

+ +

+ New packages are supported: + libass, poco, and t4k_common. +

+
+ +
2011-04-05 – Release 2.20
+
+

+ Download | + Changelog +

+ +

+ This release fixes a download error caused by the pixman project + (a sudden change of their URL scheme without proper redirects). + That sort of thing should never happen! +

+
+ +
2011-03-19 – Release 2.19
+
+

+ Download | + Changelog +

+ +

+ The download mechanisms are improved. +

+ +

+ A CMake toolchain file is provided + to simplify cross-compiling projects which use CMake. +

+ +

+ Support for Debian/Lenny is dropped. +

+ +

+ Package gtk is renamed to gtk2. +

+ +

+ Almost all packages are updated to their latest version. +

+ +

+ New packages are supported: + dbus, graphicsmagick, libical, liboauth, physfs, and vigra. +

+ +

+ Note for boost::filesystem users: + Version 3 is a major revision + and now the default in 1.46. +

+
+ +
2010-12-15 – Release 2.18
+
+

+ Download | + Changelog +

+ +

+ This release fixes a checksum error caused by the atkmm project + (a sudden change of their current source tarball). + That sort of thing should never happen! +

+
+ +
2010-12-11 – Release 2.17
+
+

+ Download | + Changelog +

+ +

+ This release provides some improvements of the build system + such as an automatic check for most of the requirements. +

+ +

+ All packages are updated to their latest version. +

+ +

+ New packages are supported: + bfd, blas, cblas, dcmtk, ftgl, lapack, lcms1, + mingw-utils, mxml, suitesparse and tinyxml. +

+
+ +
2010-10-27 – Release 2.16
+
+

+ Download | + Changelog +

+ +

+ This release provides lots of improvements to + the build system as well as the documentation. +

+ +

+ Support for OpenSolaris is dropped. +

+ +

+ Almost all packages are updated to their latest version. +

+ +

+ Many new packages are supported: + atkmm, cairomm, cunit, faac, faad2, ffmpeg, gdk-pixbuf, glibmm, + gtkglextmm, gtkmm, gtksourceview, gtksourceviewmm, imagemagick, + lame, libiberty, libsigc++, libvpx, matio, openal, opencore-amr, + pangomm, pfstools, plotmm, sdl_sound and x264. +

+
+ +
2010-06-16 – Release 2.15
+
+

+ Download | + Changelog +

+ +

+ This release fixes download errors caused by the Qt project + (a sudden change of their current source tarball). +

+ +

+ Almost all packages are updated to their latest version. +

+
+ +
2010-06-08 – Release 2.14
+
+

+ Download | + Changelog +

+ +

+ This release fixes download errors caused by the MinGW project + (a sudden change of their URL scheme without proper redirects). + That sort of thing should never happen! +

+ +

+ Almost all packages are updated to their latest version. +

+ +

+ New packages are supported: + libarchive, libgee and xvidcore. +

+
+ +
2010-05-31 – Release 2.13
+
+

+ Download | + Changelog +

+ +

+ This release switches back from TDM to the official GCC, + thus supporting the current GCC 4.5. +

+ +

+ The set of DirectX headers is improved and more complete. +

+ +

+ The deadlock issues with Pthreads-w32 are fixed. +

+ +

+ A static build of GDB is provided, + i.e. a standalone "gdb.exe" + that doesn't require any extra DLLs. +

+ +

+ More packages are backed by test programs. +

+ +

+ Many "sed hacks" are replaced by proper portability patches. +

+ +

+ Almost all packages are updated to their latest version. +

+ +

+ Many new packages are supported: + fribidi, gc, gdb, gmp, gsl, gst-plugins-base, gst-plugins-good, + gstreamer, gtkglext, guile, libcroco, libffi, liboil, libpaper, + libshout, libunistring and xine-lib. +

+
+ +
2010-02-21 – Release 2.12
+
+

+ Download | + Changelog +

+ +

+ This release fixes some minor build issues, + and contains a first small set of test programs + to check the package builds. +

+ +

+ The build rules are simplified + by calling generators like Autotools and Flex, + instead of patching the generated files. +

+ +

+ Almost all packages are updated to their latest version. +

+ +

+ Many new packages are supported: + aubio, devil, directx, exiv2, fftw, freeimage, gsoap, + id3lib, liblo, libpano13, librsvg, libsamplerate, + muparser, openscenegraph, portaudio and sdl_pango. +

+
+ +
2010-02-20 – Release 2.11
+
+

+ Download | + Changelog +

+ +

+ This release contains a packaging bug. + Please use release 2.12 instead. +

+
+ +
2009-12-23 – Release 2.10
+
+

+ Download | + Changelog +

+ +

+ This release adds support for many new packages: + flac, libmad, libsndfile, sdl_net, speex, postgresql, + freetds, openssl, plotutils, taglib, lcms, freeglut, + xerces and zziplib. +

+ +

+ Almost all packages are updated to their latest version. +

+ +

+ In addition to the libraries + some command line tools such as psql.exe are built, too. +

+ +

+ The placements of logfiles, as well as many other build details, have been improved. +

+
+ +
2009-10-24 – Release 2.9
+
+

+ Download | + Changelog +

+ +

+ This release adds support for Qt, VMime and libmng. +

+ +

+ The target triplet is updated to i686-pc-mingw32. +

+ +

+ OpenMP support is enabled in GCC. +

+ +

+ Almost all packages are updated to their latest version. +

+
+ +
2009-09-11 – Release 2.8
+
+

+ Download | + Changelog +

+ +

+ This release comes with a better look & feel + by providing a highlevel overview of the build process. +

+ +

+ The detailed build messages are stored into + separate log files for each package, + so parallel builds don't intermix them anymore. +

+ +

+ The download URLs of SourceForge packages + are adjusted to ensure that + the selected SourceForge mirror is really used + and not circumvalented via HTTP redirects to other mirrors. +

+ +

+ Almost all packages are updated to their latest version. +

+ +

+ The whole mingw-cross-env project has moved to + Savannah. + So all URIs have changed, + but the old URIs + redirect to the new locations seamlessly. +

+ +

+ Everyone is invited to join the freshly created + project mailing list. +

+
+ +
2009-08-11 – Release 2.7
+
+

+ Download | + Changelog +

+ +

+ This release + provides an improved version recognition + for SourceForge packages. + SourceForge changed their page layout + in a way that makes it much harder + to identify the current version of a package. +

+ +

+ Additionally, + almost all packages are updated to their latest version. +

+
+ +
2009-06-19 – Release 2.6
+
+

+ Download | + Changelog +

+ +

+ This release contains some portability fixes + which allow it to run on a wider range of systems + such as Frugalware. +

+ +

+ The documentation and website are completely revised. +

+ +

+ New packages such as + CppUnit, libUsb, NSIS, Popt, SQLite and Theora + are supported. +

+ +

+ Almost all packages are updated to their latest version. +

+ +

+ A new command "make download" is implemented. +

+
+ +
2009-04-06 – Release 2.5
+
+

+ Download | + Changelog +

+ +

+ This release fixes a download error caused by the MinGW project. + They suddenly changed the names of their source tarballs. + That sort of thing should never happen! +

+ +

+ This release also contains some bugfixes + which allow it to run on a wider range of systems. +

+ +

+ All downloaded files are now + verified by their SHA-1 checksums. +

+ +

+ New versions of various packages are supported. +

+
+ +
2009-03-08 – Release 2.4
+
+

+ Download | + Changelog +

+ +

+ This release provides many new libraries such as + wxWidgets, GTK+ and OpenEXR. +

+ +

+ In addition, new versions of various packages + are supported. +

+
+ +
2009-02-09 – Release 2.3
+
+

+ Download | + Changelog +

+ +

+ This release fixes some serious build problems on FreeBSD and MacOS-X. +

+ +

+ The Makefile has a new target "clean-pkg" + and allows to be called from a separate build directory + via "make -f .../Makefile". +

+ +

+ Some new versions of the packages are supported, + especially GCC-4.3 by switching from MinGW GCC to + TDM-GCC. +

+
+ +
2009-01-31 – Release 2.2
+
+

+ Download | + Changelog +

+ +

+ This release fixes some minor build problems. +

+ +

+ It also supports some new packages and + some newer versions of the already supported packages. +

+ +

+ Parallelization is now disabled by default. +

+
+ +
2008-12-13 – Release 2.1
+
+

+ Download | + Changelog +

+ +

+ This release fixes a download error caused by the GDAL project. + They suddenly changed their download URLs. + That sort of thing should never happen! +

+ +

+ In addition, some newer versions of various packages are supported. +

+ +

+ There is also a small compatibility fix for OS X. +

+
+ +
2008-11-10 – Release 2.0
+
+

+ Download | + Changelog +

+ +

+ The shell script has been rewritten as Makefile + and supports partial builds and parallel builds. +

+ +

+ As usual, + this release also supports some new packages and + some newer versions of the already supported packages. +

+
+ +
2008-01-11 – Release 1.4
+
+

+ Download | + Changelog +

+ +

+ This release now includes a tutorial by Hans Bezemer + and has improved compile options of FLTK. + As usual, it supports some newer versions of the libraries. +

+ +

+ At the request of its author, + libowfat is no longer supported from this release on. +

+ +

+ The script now uses a specific SourceForge mirror + instead of randomly chosen ones, + because the download phase + often stumbled on some very slow mirrors. +

+
+ +
2007-12-23 – Release 1.3
+
+

+ Download | + Changelog +

+ +

+ A sudden change in the download URLs of GEOS + made the automatic download fail. + Such changes should never happen! + But it happened, + and this quick release is an attempt to limit the damage. +

+ +

+ This release also supports some newer versions of the libraries + including support for fontconfig-2.5.0. +

+
+ +
2007-12-13 – Release 1.2
+
+

+ Download | + Changelog +

+ +

+ This release is a switch from gcc-3 to gcc-4. + It also supports a new library and + some newer versions of the already supported libraries. +

+
+ +
2007-07-24 – Release 1.1
+
+

+ Download | + Changelog +

+ +

+ This release is the result of the public attention the release 1.0 got. + It contains many improvements suggested by its first users, + and adds support for many new libraries. +

+ +

+ Thanks to Rocco Rutte who contributed many code snippets. +

+
+ +
2007-06-19 – Release 1.0
+
+

+ Download | + Changelog +

+ +

+ This first release has been created in a 7-day-sprint. +

+
+ +
2007-06-12 – Project start
+
+
+ +
+
+ +
+

See also

+ +

This project

+ + + +

Related projects

+ + + +

Related articles

+ + +
+ +
+

Projects which use MXE

+ + +
+ + + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/agg.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/agg.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,28 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := agg +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 08f23da64da40b90184a0414369f450115cdb328 +$(PKG)_SUBDIR := agg-$($(PKG)_VERSION) +$(PKG)_FILE := agg-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://www.antigrain.com/$($(PKG)_FILE) +$(PKG)_DEPS := gcc freetype sdl + +define $(PKG)_UPDATE + wget -q -O- 'http://www.antigrain.com/download/index.html' | \ + $(SED) -n 's,.* '$(PREFIX)/$(TARGET)/share/config.site' + cd '$(1)' && ./configure \ --target='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)' \ --with-gcc \ --with-gnu-ld \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/blas.mk --- a/src/blas.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/blas.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# blas PKG := blas $(PKG)_IGNORE := -$(PKG)_VERSION := 1 $(PKG)_CHECKSUM := a643b737c30a0a5b823e11e33c9d46a605122c61 $(PKG)_SUBDIR := BLAS $(PKG)_FILE := $(PKG).tgz -$(PKG)_WEBSITE := http://www.netlib.org/$(PKG)/ $(PKG)_URL := http://www.netlib.org/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.eq.uc.pt/pub/software/math/netlib/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/boost-test.cpp --- a/src/boost-test.cpp Fri Mar 30 11:02:24 2012 +0200 +++ b/src/boost-test.cpp Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/boost.mk --- a/src/boost.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/boost.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Boost C++ Library PKG := boost $(PKG)_IGNORE := -$(PKG)_VERSION := 1.46.1 -$(PKG)_CHECKSUM := 3ca6e173ec805e5126868d8a03618e587aa26aef +$(PKG)_CHECKSUM := 26a52840e9d12f829e3008589abf0a925ce88524 $(PKG)_SUBDIR := boost_$(subst .,_,$($(PKG)_VERSION)) $(PKG)_FILE := boost_$(subst .,_,$($(PKG)_VERSION)).tar.bz2 -$(PKG)_WEBSITE := http://www.boost.org/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/boost/boost/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib bzip2 expat @@ -24,8 +21,8 @@ # make the build script generate .a library files instead of .lib $(SED) -i 's,windows : lib ;,windows : a ;,' '$(1)/tools/build/v2/tools/types/lib.jam' # compile boost jam - cd '$(1)/tools/build/v2/engine/src' && ./build.sh - cd '$(1)' && tools/build/v2/engine/src/bin.*/bjam \ + cd '$(1)/tools/build/v2/engine' && ./build.sh + cd '$(1)' && tools/build/v2/engine/bin.*/bjam \ -j '$(JOBS)' \ --ignore-site-config \ --user-config=user-config.jam \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/bzip2.mk --- a/src/bzip2.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/bzip2.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# bzip2 PKG := bzip2 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.6 $(PKG)_CHECKSUM := 3f89f861209ce81a6bab1fd1998c0ef311712002 $(PKG)_SUBDIR := bzip2-$($(PKG)_VERSION) $(PKG)_FILE := bzip2-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.bzip.org/ $(PKG)_URL := http://www.bzip.org/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/cairo.mk --- a/src/cairo.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/cairo.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# cairo PKG := cairo $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10.2 $(PKG)_CHECKSUM := ccce5ae03f99c505db97c286a0c9a90a926d3c6e $(PKG)_SUBDIR := cairo-$($(PKG)_VERSION) $(PKG)_FILE := cairo-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://cairographics.org/ $(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib libpng fontconfig freetype pixman diff -r 97d5a5c48c12 -r 082cd6e86b6b src/cairomm.mk --- a/src/cairomm.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/cairomm.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# cairomm PKG := cairomm $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10.0 $(PKG)_CHECKSUM := f08bf8a331067f0d1e876523f07238fba6b26b99 $(PKG)_SUBDIR := cairomm-$($(PKG)_VERSION) $(PKG)_FILE := cairomm-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://cairographics.org/cairomm/ $(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc cairo libsigc++ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/cblas.mk --- a/src/cblas.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/cblas.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# cblas PKG := cblas $(PKG)_IGNORE := -$(PKG)_VERSION := 1 $(PKG)_CHECKSUM := d6970cf52592ef67674a61c78bbd055a4e9d4680 $(PKG)_SUBDIR := CBLAS $(PKG)_FILE := $(PKG).tgz -$(PKG)_WEBSITE := http://www.netlib.org/blas/ $(PKG)_URL := http://www.netlib.org/blas/blast-forum/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.eq.uc.pt/pub/software/math/netlib/blas/blast-forum/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -23,7 +20,7 @@ $(SED) -i 's,FC =.*,FC = $(TARGET)-gfortran,g' '$(1)/Makefile.MINGW32' $(SED) -i 's, make , $(MAKE) ,g' '$(1)/Makefile' rm '$(1)/Makefile.in' - ln -s '$(1)/Makefile.MINGW32' '$(1)/Makefile.in' + ln -sf '$(1)/Makefile.MINGW32' '$(1)/Makefile.in' mkdir '$(1)/MINGW32' $(MAKE) -C '$(1)' -j '$(JOBS)' alllib cd '$(1)' && $(TARGET)-ar cr libcblas.a src/*.o diff -r 97d5a5c48c12 -r 082cd6e86b6b src/cgal-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cgal-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,331 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From a2df8b5dea68d02643faa69b7119628eb1751d5e Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 21 Oct 2011 23:08:52 +0200 +Subject: [PATCH 1/3] adjustments for MXE + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a0ef19a..bb8c02f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -359,6 +359,8 @@ message( STATUS "System: ${CMAKE_SYSTEM_NAME}" ) + # + #-------------------------------------------------------------------------------------------------- + ++uniquely_add_flags( CXXFLAGS "-DBOOST_THREAD_USE_LIB;-DBoost_USE_STATIC_LIBS" ) ++SET(CMAKE_CXX_FLAGS_RELEASE "-DBOOST_THREAD_USE_LIB -DBoost_USE_STATIC_LIBS -O3 -DNDEBUG" CACHE STRING blah FORCE) + if( MSVC ) + + uniquely_add_flags ( CGAL_CXX_FLAGS "-D_CRT_SECURE_NO_DEPRECATE;-D_SCL_SECURE_NO_DEPRECATE;-D_CRT_SECURE_NO_WARNINGS;-D_SCL_SECURE_NO_WARNINGS" ) +diff --git a/TryRunResults.cgal.cmake b/TryRunResults.cgal.cmake +new file mode 100644 +index 0000000..299de90 +--- /dev/null ++++ b/TryRunResults.cgal.cmake +@@ -0,0 +1,198 @@ ++SET( GCC_RUN_RES ++ 0 ++ CACHE STRING "version=4.7.0" FORCE) ++SET( GCC_RUN_RES__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING "version=4.7.0" FORCE) ++SET( GMP_RUN_RES ++ 0 ++ CACHE STRING "version=5.0.2" FORCE) ++SET( GMP_RUN_RES__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING "version=5.0.2" FORCE) ++SET( MPFR_RUN_RES ++ 0 ++ CACHE STRING "version=3.1.0" FORCE) ++SET( MPFR_RUN_RES__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING "version=3.1.0" FORCE) ++SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_DENORMALS_COMPILE_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_DENORMALS_COMPILE_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_IEEE_754_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_IEEE_754_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_ISTREAM_INT_BUG ++ 0 ++ CACHE STRING "7812" FORCE) ++SET( CGAL_CFG_ISTREAM_INT_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING "7812" FORCE) ++SET( CGAL_CFG_LONGNAME_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_LONGNAME_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_MATCHING_BUG_5 ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_MATCHING_BUG_5__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_MATCHING_BUG_6 ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_MATCHING_BUG_6__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG ++ 0 ++ CACHE STRING "A's do_something\nC's do_something\nB's do_something\nC's do_something" FORCE) ++SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING "A's do_something\nC's do_something\nB's do_something\nC's do_something" FORCE) ++SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_CPP0X_ISFINITE ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_CPP0X_ISFINITE__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_CPP0X_LONG_LONG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_CPP0X_LONG_LONG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_LIMITS ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_LIMITS__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_NEXTAFTER ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_NEXTAFTER__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_STL ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_STL__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_TR1_ARRAY ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_TR1_ARRAY__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_TR1_TUPLE ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_TR1_TUPLE__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NUMERIC_LIMITS_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NUMERIC_LIMITS_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2 ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) ++SET( ZLIB_RUN_RES ++ 0 ++ CACHE STRING "version=1.2.5" FORCE) ++SET( ZLIB_RUN_RES__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING "version=1.2.5" FORCE) ++SET( QT4_RUN_RES ++ 0 ++ CACHE STRING "version=4.8.0" FORCE) ++SET( QT4_RUN_RES__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING "version=4.8.0" FORCE) +diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake +index fbdde88..5d8a0a9 100644 +--- a/cmake/modules/FindBoost.cmake ++++ b/cmake/modules/FindBoost.cmake +@@ -167,6 +167,7 @@ + # + + include( CGAL_VersionUtils ) ++set(Boost_USE_STATIC_LIBS ON) + + + #------------------------------------------------------------------------------- +@@ -706,7 +707,9 @@ ELSE (_boost_IN_CACHE) + ENDIF( Boost_USE_STATIC_LIBS ) + + # Find libraries (search in user defined directories first) ++ SET ( _boost_COMPILER "_win32") + SET ( _boost_${UPPERCOMPONENT}_LIBRARY_RELEASE_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION} +diff --git a/include/CGAL/Constrained_Delaunay_triangulation_2.h b/include/CGAL/Constrained_Delaunay_triangulation_2.h +index bb59f8c..9cebb51 100644 +--- a/include/CGAL/Constrained_Delaunay_triangulation_2.h ++++ b/include/CGAL/Constrained_Delaunay_triangulation_2.h +@@ -390,7 +390,7 @@ is_flipable(Face_handle f, int i, bool perturb) const + Face_handle ni = f->neighbor(i); + if (is_infinite(f) || is_infinite(ni)) return false; + if (f->is_constrained(i)) return false; +- return (side_of_oriented_circle(ni, f->vertex(i)->point(), perturb) ++ return (this->side_of_oriented_circle(ni, f->vertex(i)->point(), perturb) + == ON_POSITIVE_SIDE); + } + +@@ -494,7 +494,7 @@ test_conflict(const Point& p, Face_handle fh) const + // return true if P is inside the circumcircle of fh + // if fh is infinite, return true when p is in the positive + // halfspace or on the boundary and in the finite edge of fh +- Oriented_side os = side_of_oriented_circle(fh,p,true); ++ Oriented_side os = this->side_of_oriented_circle(fh,p,true); + if (os == ON_POSITIVE_SIDE) return true; + + if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) { +-- +1.7.7 + + +From 7393c43ef7534fc8a9289992cdcb9ebefa293680 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 18 Nov 2011 00:08:25 +0100 +Subject: [PATCH 2/3] prevent Qt's moc from choking on BOOST_JOIN + +Taken from: +https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html + +diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake +index 62d0485..852fcc9 100644 +--- a/cmake/modules/CGAL_Macros.cmake ++++ b/cmake/modules/CGAL_Macros.cmake +@@ -174,9 +174,9 @@ if( NOT CGAL_MACROS_FILE_INCLUDED ) + if ( ${LIB}_RUN_RES EQUAL "0" ) + + string( REGEX MATCH "version=.*\$" ${LIB}_VERSION_LINE ${${LIB}_OUTPUT} ) +- string( REPLACE "\n" "" ${LIB}_VERSION_LINE2 ${${LIB}_VERSION_LINE} ) +- string( REPLACE "\r" "" ${LIB}_VERSION_LINE3 ${${LIB}_VERSION_LINE2} ) +- string( REPLACE "version=" "" ${LIB}_VERSION ${${LIB}_VERSION_LINE3} ) ++ string( REPLACE "\n" "" "${LIB}_VERSION_LINE2" "${${LIB}_VERSION_LINE}" ) ++ string( REPLACE "\r" "" "${LIB}_VERSION_LINE3" "${${LIB}_VERSION_LINE2}" ) ++ string( REPLACE "version=" "" "${LIB}_VERSION" "${${LIB}_VERSION_LINE3}" ) + + else() + +-- +1.7.7 + + +From ac8a99188725f1cb848c6cec3e33c52363754797 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Wed, 28 Mar 2012 00:25:48 +1100 +Subject: [PATCH 3/3] Cmake min version 2.8.6 is only for Windows DLLs + +http://www.cgal.org/Manual/latest/doc_html/installation_manual/Chapter_installation_manual.html + +Section 3: +"On Windows, CMake version 2.8.6 or higher is required, for a proper support of DLLs generation." + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bb8c02f..1f0a4cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ + project(CGAL CXX) + + # Minimal version of CMake: +-if(WIN32) ++if(WIN32 AND BUILD_SHARED_LIBS) + cmake_minimum_required(VERSION 2.8.6) + else() + cmake_minimum_required(VERSION 2.6.2) +-- +1.7.7 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/cgal.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cgal.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,47 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := cgal +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := d1f3f328bc5cb026ddb825cb585c7ae27a8856f7 +$(PKG)_SUBDIR := CGAL-$($(PKG)_VERSION) +$(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := https://gforge.inria.fr/frs/download.php/30385/$($(PKG)_FILE) +$(PKG)_DEPS := gcc boost gmp mpfr qt + +define $(PKG)_UPDATE + wget -q --no-check-certificate -O- 'https://gforge.inria.fr/frs/?group_id=52' | \ + grep 'CGAL-' | \ + $(SED) -n 's,.*CGAL-\([0-9][^>a-z]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && cmake \ + -DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" \ + -DCMAKE_BUILD_TYPE:STRING="Release" \ + -DCGAL_INSTALL_INC_DIR:STRING="include" \ + -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-3.9" \ + -DCGAL_INSTALL_BIN_DIR:STRING="bin" \ + -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \ + -DWITH_CGAL_Qt3:BOOL="0" \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DBOOST_COMPILER=_win32 \ + -DBOOST_THREAD_USE_LIB=1 \ + -DBOOST_USE_STATIC_LIBS=1 \ + -DBUILD_SHARED_LIBS=0 \ + -C TryRunResults.cgal.cmake . + $(MAKE) -C '$(1)' -j $(JOBS) + cd '$(1)/examples/AABB_tree' && cmake \ + -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \ + -DWITH_CGAL_Qt3:BOOL="0" \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DBOOST_COMPILER=_win32 \ + -DBOOST_THREAD_USE_LIB=1 \ + -DBOOST_USE_STATIC_LIBS=1 \ + -DBUILD_SHARED_LIBS=0 \ + -DCGAL_DIR:STRING="../.." . + $(MAKE) -C '$(1)/examples/AABB_tree' -j $(JOBS) + $(MAKE) -C '$(1)' -j $(JOBS) install + $(INSTALL) '$(1)/examples/AABB_tree/AABB_polyhedron_edge_example.exe' '$(PREFIX)/$(TARGET)/bin/test-cgal.exe' +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/cppunit.mk --- a/src/cppunit.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/cppunit.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# CppUnit PKG := cppunit $(PKG)_IGNORE := -$(PKG)_VERSION := 1.12.1 $(PKG)_CHECKSUM := f1ab8986af7a1ffa6760f4bacf5622924639bf4a $(PKG)_SUBDIR := cppunit-$($(PKG)_VERSION) $(PKG)_FILE := cppunit-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://apps.sourceforge.net/mediawiki/$(PKG)/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/cunit.mk --- a/src/cunit.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/cunit.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# cunit PKG := cunit $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1-2 $(PKG)_CHECKSUM := 6c2d0627eb64c09c7140726d6bf814cf531a3ce0 $(PKG)_SUBDIR := CUnit-$($(PKG)_VERSION) $(PKG)_FILE := CUnit-$($(PKG)_VERSION)-src.tar.bz2 -$(PKG)_WEBSITE := http://cunit.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/cunit/CUnit/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/curl-1-fix-static.patch --- a/src/curl-1-fix-static.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://sourceforge.net/tracker/?func=detail&aid=3016471&group_id=976&atid=100976 - -diff -r f9016ca5bace include/curl/curlbuild.h.in ---- a/include/curl/curlbuild.h.in Tue Jun 15 13:55:53 2010 +0200 -+++ b/include/curl/curlbuild.h.in Tue Jun 15 14:00:13 2010 +0200 -@@ -111,6 +111,9 @@ - /* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ - /* ================================================================ */ - -+/* Configure process defines this to 1 when static linking is requested. */ -+#undef CURL_STATICLIB -+ - /* Configure process defines this to 1 when it finds out that system */ - /* header file ws2tcpip.h must be included by the external interface. */ - #undef CURL_PULL_WS2TCPIP_H diff -r 97d5a5c48c12 -r 082cd6e86b6b src/curl-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/curl-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,33 @@ +This file is part of MXE. +See index.html for further information. + +Commits backported (cherry-picked) from upstream. +http://github.com/bagder/curl +Also contains MXE specific fixes. + +From ee69c33117cf616c19e9cd288f08eb4c91bf190d Mon Sep 17 00:00:00 2001 +From: Volker Grabsch +Date: Fri, 28 Oct 2011 13:48:04 +0200 +Subject: [PATCH] static linking for MXE + +--- + include/curl/curlbuild.h.in | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/include/curl/curlbuild.h.in b/include/curl/curlbuild.h.in +index fe348f4..c428273 100644 +--- a/include/curl/curlbuild.h.in ++++ b/include/curl/curlbuild.h.in +@@ -111,6 +111,9 @@ + /* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ + /* ================================================================ */ + ++/* Configure process defines this to 1 when static linking is requested. */ ++#undef CURL_STATICLIB ++ + /* Configure process defines this to 1 when it finds out that system */ + /* header file ws2tcpip.h must be included by the external interface. */ + #undef CURL_PULL_WS2TCPIP_H +-- +1.7.8.3 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/curl-test.c --- a/src/curl-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/curl-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/curl.mk --- a/src/curl.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/curl.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,13 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# cURL PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.21.6 -$(PKG)_CHECKSUM := 049a3aff13d283f6e4ea1f9aa3aa6abc067fd42e +$(PKG)_CHECKSUM := f6016a24051d98806ca3ddf754592701cb66e00c $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://curl.haxx.se/libcurl/ $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) -$(PKG)_DEPS := gcc gnutls libidn +$(PKG)_DEPS := gcc gnutls libidn libssh2 define $(PKG)_UPDATE wget -q -O- 'http://curl.haxx.se/download/?C=M;O=D' | \ @@ -19,16 +16,17 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' + cd '$(1)' && ./buildconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-gnutls \ --with-libidn \ - LIBS="-lgcrypt -liconv `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs`" - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + --enable-sspi \ + --with-libssh2 + $(MAKE) -C '$(1)' -j '$(JOBS)' install '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/dbus-1-fixes.patch --- a/src/dbus-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/dbus-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,17 +1,19 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. -From 7241e09abbfc2021f2a7e5cbded70222023fa7e6 Mon Sep 17 00:00:00 2001 -From: Mark Brand +From 9c99802fc9d0e3b2c90b00ba877ae8be9bab615f Mon Sep 17 00:00:00 2001 +From: MXE Date: Tue, 4 Jan 2011 00:47:49 +0100 -Subject: [PATCH 1/1] always static in mingw-cross-env +Subject: [PATCH 1/2] always static in MXE diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h -index d1e40ec..3a32355 100644 +index dcd3eeb..8324278 100644 --- a/dbus/dbus-macros.h +++ b/dbus/dbus-macros.h -@@ -158,6 +158,7 @@ +@@ -172,6 +172,7 @@ */ #if defined(_WIN32) @@ -20,5 +22,35 @@ # define DBUS_EXPORT # elif defined(dbus_1_EXPORTS) -- -1.7.1 +1.7.6.3 + + +From d7bc1aff67132c09d154999c282e1b391bbe7a39 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 23 Sep 2011 16:24:46 +0200 +Subject: [PATCH 2/2] add missing MemoryBarrier (MXE specific) + +Windows API has this, but it's not in MinGW. +See http://lists-archives.org/mingw-users/15935-missing-definition-of-memorybarrier.html +diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c +index b492b09..082225f 100644 +--- a/dbus/dbus-sysdeps-win.c ++++ b/dbus/dbus-sysdeps-win.c +@@ -55,6 +55,13 @@ + #include + #include + ++__CRT_INLINE VOID MemoryBarrier(VOID) ++{ ++ LONG Barrier = 0; ++ __asm__ __volatile__("xchgl %%eax,%0 " ++ :"=r" (Barrier)); ++} ++ + /* Declarations missing in mingw's headers */ + extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR StringSid, PSID *Sid); + extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid); +-- +1.7.6.3 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/dbus.mk --- a/src/dbus.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/dbus.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,27 +1,25 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# dbus PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.0 -$(PKG)_CHECKSUM := 4f0c82af6de628d7359dcdbc0da402f8e369e367 +$(PKG)_CHECKSUM := 3140ea452337d664dbe6d30f0d990c756d101694 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://$(PKG).freedesktop.org/ $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc expat define $(PKG)_UPDATE wget -q -O- 'http://cgit.freedesktop.org/dbus/dbus/refs/tags' | \ $(SED) -n "s,.* +Date: Thu, 17 Nov 2011 16:13:14 +0000 +Subject: [PATCH] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang + compiler) quiet. + +(cherry picked from commit dbadc0d8f3760f65504406c8b2cb8633f868a258) + +Conflicts: + + CHANGES.361 + ofstd/libsrc/ofchrenc.cc +--- + dcmimage/include/dcmtk/dcmimage/diargpxt.h | 25 ++++++++++++++----------- + dcmimage/include/dcmtk/dcmimage/dicmypxt.h | 11 +++++++---- + dcmimage/include/dcmtk/dcmimage/dicocpt.h | 11 +++++++---- + dcmimage/include/dcmtk/dcmimage/dicoflt.h | 17 ++++++++++------- + dcmimage/include/dcmtk/dcmimage/dicorot.h | 17 ++++++++++------- + dcmimage/include/dcmtk/dcmimage/dicosct.h | 13 ++++++++----- + dcmimage/include/dcmtk/dcmimage/dihsvpxt.h | 11 +++++++---- + dcmimage/include/dcmtk/dcmimage/dipalpxt.h | 11 +++++++---- + dcmimage/include/dcmtk/dcmimage/dirgbpxt.h | 15 +++++++++------ + dcmimage/include/dcmtk/dcmimage/diybrpxt.h | 15 +++++++++------ + dcmimage/include/dcmtk/dcmimage/diyf2pxt.h | 11 +++++++---- + dcmimage/include/dcmtk/dcmimage/diyp2pxt.h | 11 +++++++---- + dcmimgle/include/dcmtk/dcmimgle/diflipt.h | 11 +++++++---- + dcmimgle/include/dcmtk/dcmimgle/dimoflt.h | 15 +++++++++------ + dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h | 13 ++++++++----- + dcmimgle/include/dcmtk/dcmimgle/dimorot.h | 15 +++++++++------ + dcmimgle/include/dcmtk/dcmimgle/dimosct.h | 11 +++++++---- + dcmimgle/include/dcmtk/dcmimgle/dirotat.h | 11 +++++++---- + dcmimgle/include/dcmtk/dcmimgle/discalet.h | 19 +++++++++++-------- + ofstd/include/dcmtk/ofstd/ofoset.h | 13 ++++++++----- + 20 files changed, 168 insertions(+), 108 deletions(-) + +diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.h +index 7e3894d..1ed9291 100644 +--- a/dcmimage/include/dcmtk/dcmimage/diargpxt.h ++++ b/dcmimage/include/dcmtk/dcmimage/diargpxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomARGBPixelTemplate (Header) - UNTESTED !!! + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.21 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.22 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -91,7 +91,7 @@ class DiARGBPixelTemplate + const unsigned long planeSize, + const int bits) + { // not very much optimized, but no one really uses ARGB !! +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + register T2 value; + const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1)); +@@ -103,9 +103,9 @@ class DiARGBPixelTemplate + /* + register const T1 *a = pixel; // points to alpha plane + const T1 *rgb[3]; +- rgb[0] = a + this->InputCount; // points to red plane +- rgb[1] = rgb[0] + this->InputCount; // points to green plane +- rgb[2] = rgb[1] + this->InputCount; // points to blue plane ++ rgb[0] = a + this->InputCount; // points to red plane ++ rgb[1] = rgb[0] + this->InputCount; // points to green plane ++ rgb[2] = rgb[1] + this->InputCount; // points to blue plane + for (i = 0; i < count; ++i) + { + value = OFstatic_cast(T2, *(a++)); // get alpha value +@@ -141,10 +141,10 @@ class DiARGBPixelTemplate + /* convert a single frame */ + for (l = planeSize; (l != 0) && (i < count); --l, ++i) + { +- value = OFstatic_cast(T2, *(a++)); // get alpha value ++ value = OFstatic_cast(T2, *(a++)); // get alpha value + if (value > 0) + { +- for (int j = 0; j < 3; ++j) // set palette color ++ for (int j = 0; j < 3; ++j) // set palette color + { + if (value <= palette[j]->getFirstEntry(value)) + this->Data[j][i] = OFstatic_cast(T3, palette[j]->getFirstValue()); +@@ -152,12 +152,12 @@ class DiARGBPixelTemplate + this->Data[j][i] = OFstatic_cast(T3, palette[j]->getLastValue()); + else + this->Data[j][i] = OFstatic_cast(T3, palette[j]->getValue(value)); +- ++rgb[j]; // skip RGB values ++ ++rgb[j]; // skip RGB values + } + } + else + { +- for (int j = 0; j < 3; ++j) // copy RGB values ++ for (int j = 0; j < 3; ++j) // copy RGB values + this->Data[j][i] = OFstatic_cast(T3, removeSign(*(rgb[j]++), offset)); + } + } +@@ -204,6 +204,9 @@ class DiARGBPixelTemplate + * + * CVS/RCS Log: + * $Log: diargpxt.h,v $ ++ * Revision 1.22 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.21 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h +index 5357780..bf1161e 100644 +--- a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h ++++ b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomCMYKPixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.20 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.21 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -87,7 +87,7 @@ class DiCMYKPixelTemplate + const unsigned long planeSize, + const int bits) + { +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + // use the number of input pixels derived from the length of the 'PixelData' + // attribute), but not more than the size of the intermediate buffer +@@ -157,6 +157,9 @@ class DiCMYKPixelTemplate + * + * CVS/RCS Log: + * $Log: dicmypxt.h,v $ ++ * Revision 1.21 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.20 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/dicocpt.h b/dcmimage/include/dcmtk/dcmimage/dicocpt.h +index 0c06de7..3f03b6b 100644 +--- a/dcmimage/include/dcmtk/dcmimage/dicocpt.h ++++ b/dcmimage/include/dcmtk/dcmimage/dicocpt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomColorCopyTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.12 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.13 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -86,7 +86,7 @@ class DiColorCopyTemplate + inline void copy(const T *pixel[3], + const unsigned long offset) + { +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + for (int j = 0; j < 3; j++) + OFBitmanipTemplate::copyMem(pixel[j] + offset, this->Data[j], this->getCount()); +@@ -102,6 +102,9 @@ class DiColorCopyTemplate + * + * CVS/RCS Log: + * $Log: dicocpt.h,v $ ++ * Revision 1.13 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.12 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/dicoflt.h b/dcmimage/include/dcmtk/dcmimage/dicoflt.h +index a5bed81..bc809ab 100644 +--- a/dcmimage/include/dcmtk/dcmimage/dicoflt.h ++++ b/dcmimage/include/dcmtk/dcmimage/dicoflt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomColorFlipTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.15 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.16 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -98,14 +98,14 @@ class DiColorFlipTemplate + const int horz, + const int vert) + { +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + if (horz && vert) +- flipHorzVert(pixel, this->Data); ++ this->flipHorzVert(pixel, this->Data); + else if (horz) +- flipHorz(pixel, this->Data); ++ this->flipHorz(pixel, this->Data); + else if (vert) +- flipVert(pixel, this->Data); ++ this->flipVert(pixel, this->Data); + } + } + }; +@@ -118,6 +118,9 @@ class DiColorFlipTemplate + * + * CVS/RCS Log: + * $Log: dicoflt.h,v $ ++ * Revision 1.16 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.15 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/dicorot.h b/dcmimage/include/dcmtk/dcmimage/dicorot.h +index 2bcd71e..c8afd70 100644 +--- a/dcmimage/include/dcmtk/dcmimage/dicorot.h ++++ b/dcmimage/include/dcmtk/dcmimage/dicorot.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomColorRotateTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.15 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.16 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -98,14 +98,14 @@ class DiColorRotateTemplate + inline void rotate(const T *pixel[3], + const int degree) + { +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + if (degree == 90) +- rotateRight(pixel, this->Data); ++ this->rotateRight(pixel, this->Data); + else if (degree == 180) +- rotateTopDown(pixel, this->Data); ++ this->rotateTopDown(pixel, this->Data); + else if (degree == 270) +- rotateLeft(pixel, this->Data); ++ this->rotateLeft(pixel, this->Data); + } + } + }; +@@ -118,6 +118,9 @@ class DiColorRotateTemplate + * + * CVS/RCS Log: + * $Log: dicorot.h,v $ ++ * Revision 1.16 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.15 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/dicosct.h b/dcmimage/include/dcmtk/dcmimage/dicosct.h +index 006a829..3bccc45 100644 +--- a/dcmimage/include/dcmtk/dcmimage/dicosct.h ++++ b/dcmimage/include/dcmtk/dcmimage/dicosct.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomColorScaleTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.21 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.22 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -107,8 +107,8 @@ class DiColorScaleTemplate + inline void scale(const T *pixel[3], + const int interpolate) + { +- if (Init(pixel)) +- scaleData(pixel, this->Data, interpolate); ++ if (this->Init(pixel)) ++ this->scaleData(pixel, this->Data, interpolate); + } + }; + +@@ -120,6 +120,9 @@ class DiColorScaleTemplate + * + * CVS/RCS Log: + * $Log: dicosct.h,v $ ++ * Revision 1.22 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.21 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h +index 10d8b70..52580ec 100644 +--- a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h ++++ b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomHSVPixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.25 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.26 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -87,7 +87,7 @@ class DiHSVPixelTemplate + const unsigned long planeSize, + const int bits) + { +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + register T2 *r = this->Data[0]; + register T2 *g = this->Data[1]; +@@ -221,6 +221,9 @@ class DiHSVPixelTemplate + * + * CVS/RCS Log: + * $Log: dihsvpxt.h,v $ ++ * Revision 1.26 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.25 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h +index 2e5eef7..1ae2352 100644 +--- a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h ++++ b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomPalettePixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.24 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.25 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -92,7 +92,7 @@ class DiPalettePixelTemplate + void convert(const T1 *pixel, + DiLookupTable *palette[3]) + { // can be optimized if necessary ! +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + register const T1 *p = pixel; + register T2 value = 0; +@@ -126,6 +126,9 @@ class DiPalettePixelTemplate + * + * CVS/RCS Log: + * $Log: dipalpxt.h,v $ ++ * Revision 1.25 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.24 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h +index 85f973d..d9cc7ed 100644 +--- a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h ++++ b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomRGBPixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:30 $ +- * CVS/RCS Revision: $Revision: 1.18 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.19 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -87,7 +87,7 @@ class DiRGBPixelTemplate + const unsigned long planeSize, + const int bits) + { +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + // use the number of input pixels derived from the length of the 'PixelData' + // attribute), but not more than the size of the intermediate buffer +@@ -129,9 +129,9 @@ class DiRGBPixelTemplate + { + register int j; + register unsigned long i; +- for (i = 0; i < count; ++i) /* for all pixel ... */ ++ for (i = 0; i < count; ++i) /* for all pixel ... */ + for (j = 0; j < 3; ++j) +- this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ ++ this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ + } + } + } +@@ -145,6 +145,9 @@ class DiRGBPixelTemplate + * + * CVS/RCS Log: + * $Log: dirgbpxt.h,v $ ++ * Revision 1.19 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.18 2010-10-14 13:16:30 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h +index 6b523fb..ecd2038 100644 +--- a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h ++++ b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomYBRPixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:30 $ +- * CVS/RCS Revision: $Revision: 1.19 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.20 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -91,7 +91,7 @@ class DiYBRPixelTemplate + const int bits, + const OFBool rgb) + { +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1)); + // use the number of input pixels derived from the length of the 'PixelData' +@@ -266,9 +266,9 @@ class DiYBRPixelTemplate + { + register int j; + register unsigned long i; +- for (i = 0; i < count; ++i) /* for all pixel ... */ ++ for (i = 0; i < count; ++i) /* for all pixel ... */ + for (j = 0; j < 3; ++j) +- this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ ++ this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ + } + } + } +@@ -295,6 +295,9 @@ class DiYBRPixelTemplate + * + * CVS/RCS Log: + * $Log: diybrpxt.h,v $ ++ * Revision 1.20 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.19 2010-10-14 13:16:30 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h +index ed27796..93d28cc 100644 +--- a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h ++++ b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomYBR422PixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:30 $ +- * CVS/RCS Revision: $Revision: 1.25 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.26 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -95,7 +95,7 @@ class DiYBR422PixelTemplate + const int bits, + const OFBool rgb) + { +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1)); + register unsigned long i; +@@ -167,6 +167,9 @@ class DiYBR422PixelTemplate + * + * CVS/RCS Log: + * $Log: diyf2pxt.h,v $ ++ * Revision 1.26 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.25 2010-10-14 13:16:30 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h +index 518fed7..0dd9d5b 100644 +--- a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h ++++ b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomYBRPart422PixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:30 $ +- * CVS/RCS Revision: $Revision: 1.23 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.24 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -91,7 +91,7 @@ class DiYBRPart422PixelTemplate + void convert(const T1 *pixel, + const int bits) + { +- if (Init(pixel)) ++ if (this->Init(pixel)) + { + register T2 *r = this->Data[0]; + register T2 *g = this->Data[1]; +@@ -147,6 +147,9 @@ class DiYBRPart422PixelTemplate + * + * CVS/RCS Log: + * $Log: diyp2pxt.h,v $ ++ * Revision 1.24 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.23 2010-10-14 13:16:30 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h +index 4933fe1..05c198c 100644 +--- a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h ++++ b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomFlipTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:26 $ +- * CVS/RCS Revision: $Revision: 1.23 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.24 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -129,7 +129,7 @@ class DiFlipTemplate + else if (vert) + flipVert(src, dest); + else +- copyPixel(src, dest); ++ this->copyPixel(src, dest); + } + } + +@@ -345,6 +345,9 @@ class DiFlipTemplate + * + * CVS/RCS Log: + * $Log: diflipt.h,v $ ++ * Revision 1.24 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.23 2010-10-14 13:16:26 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h +index a88ab9d..52d71a3 100644 +--- a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h ++++ b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomMonochromeFlipTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:26 $ +- * CVS/RCS Revision: $Revision: 1.15 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.16 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -106,11 +106,11 @@ class DiMonoFlipTemplate + if (this->Data != NULL) + { + if (horz && vert) +- flipHorzVert(&pixel, &this->Data); ++ this->flipHorzVert(&pixel, &this->Data); + else if (horz) +- flipHorz(&pixel, &this->Data); ++ this->flipHorz(&pixel, &this->Data); + else if (vert) +- flipVert(&pixel, &this->Data); ++ this->flipVert(&pixel, &this->Data); + } + } + } +@@ -124,6 +124,9 @@ class DiMonoFlipTemplate + * + * CVS/RCS Log: + * $Log: dimoflt.h,v $ ++ * Revision 1.16 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.15 2010-10-14 13:16:26 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h +index e815e90..c190dd6 100644 +--- a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h ++++ b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomMonochromeInputPixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:26 $ +- * CVS/RCS Revision: $Revision: 1.40 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.41 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -76,10 +76,10 @@ class DiMonoInputPixelTemplate + else if ((this->Modality != NULL) && this->Modality->hasRescaling()) + { + rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept()); +- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); ++ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); + } else { + rescale(pixel); // "copy" or reference pixel data +- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); ++ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); + } + } + } +@@ -280,6 +280,9 @@ class DiMonoInputPixelTemplate + * + * CVS/RCS Log: + * $Log: dimoipxt.h,v $ ++ * Revision 1.41 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.40 2010-10-14 13:16:26 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h +index 4ef277d..e729424 100644 +--- a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h ++++ b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomMonochromeRotateTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:26 $ +- * CVS/RCS Revision: $Revision: 1.16 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.17 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -105,11 +105,11 @@ class DiMonoRotateTemplate + if (this->Data != NULL) + { + if (degree == 90) +- rotateRight(&pixel, &(this->Data)); ++ this->rotateRight(&pixel, &(this->Data)); + else if (degree == 180) +- rotateTopDown(&pixel, &(this->Data)); ++ this->rotateTopDown(&pixel, &(this->Data)); + else if (degree == 270) +- rotateLeft(&pixel, &(this->Data)); ++ this->rotateLeft(&pixel, &(this->Data)); + } + } + } +@@ -123,6 +123,9 @@ class DiMonoRotateTemplate + * + * CVS/RCS Log: + * $Log: dimorot.h,v $ ++ * Revision 1.17 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.16 2010-10-14 13:16:26 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h +index 60c9abb..8f89855 100644 +--- a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h ++++ b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomMonochromeScaleTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:26 $ +- * CVS/RCS Revision: $Revision: 1.20 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.21 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -124,7 +124,7 @@ class DiMonoScaleTemplate + { + const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) * + OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES))); +- scaleData(&pixel, &this->Data, interpolate, value); ++ this->scaleData(&pixel, &this->Data, interpolate, value); + } + } + } +@@ -138,6 +138,9 @@ class DiMonoScaleTemplate + * + * CVS/RCS Log: + * $Log: dimosct.h,v $ ++ * Revision 1.21 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.20 2010-10-14 13:16:26 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h +index edb452e..2e7e3a0 100644 +--- a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h ++++ b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomRotateTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:27 $ +- * CVS/RCS Revision: $Revision: 1.21 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.22 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -132,7 +132,7 @@ class DiRotateTemplate + else if (degree == 270) + rotateLeft(src, dest); + else +- copyPixel(src, dest); ++ this->copyPixel(src, dest); + } + + +@@ -358,6 +358,9 @@ class DiRotateTemplate + * + * CVS/RCS Log: + * $Log: dirotat.h,v $ ++ * Revision 1.22 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.21 2010-10-14 13:16:27 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/dcmimgle/include/dcmtk/dcmimgle/discalet.h b/dcmimgle/include/dcmtk/dcmimgle/discalet.h +index 758dde2..0bcbc70 100644 +--- a/dcmimgle/include/dcmtk/dcmimgle/discalet.h ++++ b/dcmimgle/include/dcmtk/dcmimgle/discalet.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomScaleTemplates (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:27 $ +- * CVS/RCS Revision: $Revision: 1.35 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.36 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -206,12 +206,12 @@ class DiScaleTemplate + (Left >= OFstatic_cast(signed long, Columns)) || (Top >= OFstatic_cast(signed long, Rows))) + { // no image to be displayed + DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries"); +- fillPixel(dest, value); // ... fill bitmap ++ this->fillPixel(dest, value); // ... fill bitmap + } + else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling + { + if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y)) +- copyPixel(src, dest); // copying ++ this->copyPixel(src, dest); // copying + else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) && + (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows)) + clipPixel(src, dest); // clipping +@@ -567,7 +567,7 @@ class DiScaleTemplate + if ((xtemp == NULL) || (xvalue == NULL)) + { + DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling"); +- clearPixel(dest); ++ this->clearPixel(dest); + } else { + for (int j = 0; j < this->Planes; ++j) + { +@@ -905,7 +905,7 @@ class DiScaleTemplate + if (pTemp == NULL) + { + DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling"); +- clearPixel(dest); ++ this->clearPixel(dest); + } else { + + /* +@@ -1029,7 +1029,7 @@ class DiScaleTemplate + if (pTemp == NULL) + { + DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling"); +- clearPixel(dest); ++ this->clearPixel(dest); + } else { + + /* +@@ -1190,6 +1190,9 @@ class DiScaleTemplate + * + * CVS/RCS Log: + * $Log: discalet.h,v $ ++ * Revision 1.36 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.35 2010-10-14 13:16:27 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * +diff --git a/ofstd/include/dcmtk/ofstd/ofoset.h b/ofstd/include/dcmtk/ofstd/ofoset.h +index 1a7f208..a534ebf 100644 +--- a/ofstd/include/dcmtk/ofstd/ofoset.h ++++ b/ofstd/include/dcmtk/ofstd/ofoset.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 2002-2010, OFFIS e.V. ++ * Copyright (C) 2002-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -19,8 +19,8 @@ + * of an arbitrary type. + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:15:50 $ +- * CVS/RCS Revision: $Revision: 1.11 $ ++ * Update Date: $Date: 2011-11-17 16:13:18 $ ++ * CVS/RCS Revision: $Revision: 1.12 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -146,7 +146,7 @@ template class OFOrderedSet : public OFSet + { + // if size equals num, we need more space + if( this->size == this->num ) +- Resize( this->size * 2 ); ++ this->Resize( this->size * 2 ); + + // copy item + T *newItem = new T( item ); +@@ -189,7 +189,7 @@ template class OFOrderedSet : public OFSet + { + // if size equals num, we need more space + if( this->size == this->num ) +- Resize( this->size * 2 ); ++ this->Resize( this->size * 2 ); + + // copy item + T *newItem = new T( item ); +@@ -508,6 +508,9 @@ template class OFOrderedSet : public OFSet + /* + ** CVS/RCS Log: + ** $Log: ofoset.h,v $ ++** Revision 1.12 2011-11-17 16:13:18 joergr ++** Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++** + ** Revision 1.11 2010-10-14 13:15:50 joergr + ** Updated copyright header. Added reference to COPYRIGHT file. + ** +-- +1.7.9.2 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/dcmtk.mk --- a/src/dcmtk.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/dcmtk.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# DCMTK PKG := dcmtk $(PKG)_IGNORE := -$(PKG)_VERSION := 3.6.0 $(PKG)_CHECKSUM := 469e017cffc56f36e834aa19c8612111f964f757 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://dicom.offis.de/dcmtk.php.en $(PKG)_URL := ftp://dicom.offis.de/pub/dicom/offis/software/$(PKG)/$(PKG)$(subst .,,$($(PKG)_VERSION))/$($(PKG)_FILE) $(PKG)_DEPS := gcc openssl tiff libpng libxml2 zlib diff -r 97d5a5c48c12 -r 082cd6e86b6b src/devil-1-png.patch --- a/src/devil-1-png.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/devil-1-png.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. diff -urN devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c --- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 08:10:09.000000000 +0100 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/devil.mk --- a/src/devil.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/devil.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# DevIL PKG := devil $(PKG)_IGNORE := -$(PKG)_VERSION := 1.7.8 $(PKG)_CHECKSUM := bc27e3e830ba666a3af03548789700d10561fcb1 $(PKG)_SUBDIR := devil-$($(PKG)_VERSION) $(PKG)_FILE := DevIL-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://openil.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/openil/DevIL/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc freeglut zlib openexr jpeg jasper lcms libmng libpng tiff sdl @@ -21,10 +18,9 @@ define $(PKG)_BUILD $(SED) -i 's,__declspec(dllimport),,' '$(1)/include/IL/il.h' - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-ILU \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/eigen.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eigen.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := eigen +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 7e1674420a8eef7e90e1875ef5b9e828fb9db381 +$(PKG)_SUBDIR := $(PKG)-$(PKG)-b23437e61a07 +$(PKG)_FILE := $($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://bitbucket.org/$(PKG)/$(PKG)/get/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + wget -q -O- 'http://eigen.tuxfamily.org/index.php?title=Main_Page#Download' | \ + grep 'eigen/get/' | \ + $(SED) -n 's,.*eigen/get/\(2[^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && \ + cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/exiv2-r2469.patch --- a/src/exiv2-r2469.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. - -This patch has been taken from: -http://dev.exiv2.org/issues/764 - -Index: trunk/src/psdimage.cpp -=================================================================== ---- trunk/src/psdimage.cpp (revision 2468) -+++ trunk/src/psdimage.cpp (revision 2469) -@@ -400,7 +400,7 @@ - uint32_t resourceType = getULong(buf, bigEndian); - - if (resourceType != kPhotoshopResourceType) { -- break; // bad resource type -+ throw Error(3, "Photoshop"); // bad resource type - } - uint16_t resourceId = getUShort(buf + 4, bigEndian); - uint32_t resourceNameLength = buf[6]; -@@ -416,13 +416,13 @@ - if (io_->read(buf, 4) != 4) throw Error(3, "Photoshop"); - - uint32_t resourceSize = getULong(buf, bigEndian); -+ uint32_t pResourceSize = (resourceSize + 1) & ~1; // padded resource size - uint32_t curOffset = io_->tell(); - - // Write IPTC_NAA resource block - if ((resourceId == kPhotoshopResourceID_IPTC_NAA || - resourceId > kPhotoshopResourceID_IPTC_NAA) && iptcDone == false) { - newResLength += writeIptcData(iptcData_, outIo); -- resourceSize = (resourceSize + 1) & ~1; // adjust for padding - iptcDone = true; - } - -@@ -430,7 +430,6 @@ - else if ((resourceId == kPhotoshopResourceID_ExifInfo || - resourceId > kPhotoshopResourceID_ExifInfo) && exifDone == false) { - newResLength += writeExifData(exifData_, outIo); -- resourceSize = (resourceSize + 1) & ~1; // adjust for padding - exifDone = true; - } - -@@ -438,7 +437,6 @@ - else if ((resourceId == kPhotoshopResourceID_XMPPacket || - resourceId > kPhotoshopResourceID_XMPPacket) && xmpDone == false) { - newResLength += writeXmpData(xmpData_, outIo); -- resourceSize = (resourceSize + 1) & ~1; // adjust for padding - xmpDone = true; - } - -@@ -467,10 +465,9 @@ - - readTotal = 0; - toRead = 0; -- resourceSize = (resourceSize + 1) & ~1; // pad to even -- while (readTotal < resourceSize) { -- toRead = static_cast(resourceSize - readTotal) < lbuf.size_ -- ? static_cast(resourceSize - readTotal) : lbuf.size_; -+ while (readTotal < pResourceSize) { -+ toRead = static_cast(pResourceSize - readTotal) < lbuf.size_ -+ ? static_cast(pResourceSize - readTotal) : lbuf.size_; - if (io_->read(lbuf.pData_, toRead) != toRead) { - throw Error(3, "Photoshop"); - } -@@ -478,11 +475,11 @@ - if (outIo.write(lbuf.pData_, toRead) != toRead) throw Error(21); - } - if (outIo.error()) throw Error(21); -- newResLength += resourceSize + adjResourceNameLen + 12; -+ newResLength += pResourceSize + adjResourceNameLen + 12; - } - -- io_->seek(curOffset + resourceSize, BasicIo::beg); -- oldResLength -= (12 + adjResourceNameLen + resourceSize); -+ io_->seek(curOffset + pResourceSize, BasicIo::beg); -+ oldResLength -= (12 + adjResourceNameLen + pResourceSize); - } - - // Append IPTC_NAA resource block, if not yet written diff -r 97d5a5c48c12 -r 082cd6e86b6b src/exiv2-r2472.patch --- a/src/exiv2-r2472.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. - -This patch has been taken from: -http://dev.exiv2.org/issues/767 - -Index: trunk/config/configure.ac -=================================================================== ---- trunk/config/configure.ac (revision 2471) -+++ trunk/config/configure.ac (revision 2472) -@@ -31,12 +31,6 @@ - AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_CANONICAL_HOST --# Add flag for DLL on Windows --case "$host_os" in --*mingw* | *cygwin*) -- LDFLAGS="$LDFLAGS -no-undefined" -- ;; --esac - - # --------------------------------------------------------------------------- - # i18n support -@@ -204,6 +198,17 @@ - fi - AC_SUBST(EXV_LIB_STATIC) - -+# Add flag for DLL on Windows -+# -+# This must happen after all other configure checks, because -+# the "-no-undefined" flag is only for libtool and may not be -+# passed to GCC by accident. -+case "$host_os" in -+*mingw* | *cygwin*) -+ LDFLAGS="$LDFLAGS -no-undefined" -+ ;; -+esac -+ - # --------------------------------------------------------------------------- - # Create output files. - # --------------------------------------------------------------------------- diff -r 97d5a5c48c12 -r 082cd6e86b6b src/exiv2-r2619.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/exiv2-r2619.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,49 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from: +http://dev.exiv2.org/projects/exiv2/repository/revisions/2619 + +Index: trunk/src/epsimage.cpp +=================================================================== +--- trunk/src/epsimage.cpp (revision 2618) ++++ trunk/src/epsimage.cpp (revision 2619) +@@ -393,6 +393,7 @@ + unsigned int depth = 0; + const unsigned int maxDepth = UINT_MAX; + bool illustrator8 = false; ++ bool corelDraw = false; + bool implicitPage = false; + bool implicitPageTrailer = false; + bool inDefaultsPreviewPrologSetup = false; +@@ -547,6 +548,8 @@ + posAi7ThumbnailEndData = startPos; + } else if (posEndComments == posEndEps && line == "%%EndComments") { + posEndComments = startPos; ++ } else if (inDefaultsPreviewPrologSetup && startsWith(line, "%%BeginResource: procset wCorel")) { ++ corelDraw = true; + } else if (line == "%%EndPreview") { + inDefaultsPreviewPrologSetup = false; + } else if (line == "%%EndDefaults") { +@@ -922,6 +925,10 @@ + writeTemp(*tempIo, "%%BeginPageSetup" + lineEnding); + } + writeTemp(*tempIo, "%Exiv2BeginXMP: Before %%EndPageSetup" + lineEnding); ++ if (corelDraw) { ++ writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by CorelDRAW." + lineEnding); ++ writeTemp(*tempIo, "@rs" + lineEnding); ++ } + if (posBeginPhotoshop != posEndEps) { + writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by Photoshop." + lineEnding); + writeTemp(*tempIo, "%begin_xml_code" + lineEnding); +@@ -953,6 +960,10 @@ + writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by Photoshop." + lineEnding); + writeTemp(*tempIo, "%end_xml_code" + lineEnding); + } ++ if (corelDraw) { ++ writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by CorelDRAW." + lineEnding); ++ writeTemp(*tempIo, "@sv" + lineEnding); ++ } + writeTemp(*tempIo, "%Exiv2EndXMP" + lineEnding); + if (line != "%%EndPageSetup") { + writeTemp(*tempIo, "%%EndPageSetup" + lineEnding); diff -r 97d5a5c48c12 -r 082cd6e86b6b src/exiv2-r2646.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/exiv2-r2646.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,175 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from: +http://dev.exiv2.org/projects/exiv2/repository/revisions/2646 + +Index: trunk/src/jpgimage.cpp +=================================================================== +--- trunk/src/jpgimage.cpp (revision 2645) ++++ trunk/src/jpgimage.cpp (revision 2646) +@@ -86,10 +86,21 @@ + const char JpegBase::xmpId_[] = "http://ns.adobe.com/xap/1.0/\0"; + + const char Photoshop::ps3Id_[] = "Photoshop 3.0\0"; +- const char Photoshop::bimId_[] = "8BIM"; ++ const char* Photoshop::irbId_[] = {"8BIM", "AgHg", "DCSR", "PHUT"}; + const uint16_t Photoshop::iptc_ = 0x0404; + const uint16_t Photoshop::preview_ = 0x040c; + ++ bool Photoshop::isIrb(const byte* pPsData, ++ long sizePsData) ++ { ++ if (sizePsData < 4) return false; ++ for (size_t i = 0; i < (sizeof irbId_) / (sizeof *irbId_); i++) { ++ assert(strlen(irbId_[i]) == 4); ++ if (memcmp(pPsData, irbId_[i], 4) == 0) return true; ++ } ++ return false; ++ } ++ + bool Photoshop::valid(const byte* pPsData, + long sizePsData) + { +@@ -126,8 +137,7 @@ + std::cerr << "Photoshop::locateIrb: "; + #endif + // Data should follow Photoshop format, if not exit +- while ( position <= sizePsData - 12 +- && memcmp(pPsData + position, Photoshop::bimId_, 4) == 0) { ++ while (position <= sizePsData - 12 && isIrb(pPsData + position, 4)) { + const byte *hrd = pPsData + position; + position += 4; + uint16_t type = getUShort(pPsData + position, bigEndian); +@@ -237,7 +247,7 @@ + DataBuf rawIptc = IptcParser::encode(iptcData); + if (rawIptc.size_ > 0) { + byte tmpBuf[12]; +- std::memcpy(tmpBuf, Photoshop::bimId_, 4); ++ std::memcpy(tmpBuf, Photoshop::irbId_[0], 4); + us2Data(tmpBuf + 4, iptc_, bigEndian); + tmpBuf[6] = 0; + tmpBuf[7] = 0; +Index: trunk/src/jpgimage.hpp +=================================================================== +--- trunk/src/jpgimage.hpp (revision 2645) ++++ trunk/src/jpgimage.hpp (revision 2646) +@@ -64,11 +64,21 @@ + struct EXIV2API Photoshop { + // Todo: Public for now + static const char ps3Id_[]; //!< %Photoshop marker +- static const char bimId_[]; //!< %Photoshop marker ++ static const char* irbId_[]; //!< %Photoshop IRB markers + static const uint16_t iptc_; //!< %Photoshop IPTC marker + static const uint16_t preview_; //!< %Photoshop preview marker + + /*! ++ @brief Checks an IRB ++ ++ @param pPsData Existing IRB buffer ++ @param sizePsData Size of the IRB buffer ++ @return true if the IRB marker is known and the buffer is big enough to check this;
++ false otherwise ++ */ ++ static bool isIrb(const byte* pPsData, ++ long sizePsData); ++ /*! + @brief Validates all IRBs + + @param pPsData Existing IRB buffer +Index: trunk/src/psdimage.cpp +=================================================================== +--- trunk/src/psdimage.cpp (revision 2645) ++++ trunk/src/psdimage.cpp (revision 2646) +@@ -39,6 +39,7 @@ + # include "exv_conf.h" + #endif + #include "psdimage.hpp" ++#include "jpgimage.hpp" + #include "image.hpp" + #include "basicio.hpp" + #include "error.hpp" +@@ -56,11 +57,9 @@ + // Extend this helper to a proper class with all required functionality, + // then move it here or into a separate file? + +-const uint32_t kPhotoshopResourceType = 0x3842494d; // '8BIM' +- + //! @cond IGNORE + struct PhotoshopResourceBlock { +- uint32_t resourceType; // always kPhotoshopResourceType ++ uint32_t resourceType; // one of the markers in Photoshop::irbId_[] + uint16_t resourceId; + unsigned char resourceName[2]; // Pascal string (length byte + characters), padded to an even size -- this assumes the empty string + uint32_t resourceDataSize; +@@ -215,14 +214,11 @@ + throw Error(3, "Photoshop"); + } + +- // read resource type and ID +- uint32_t resourceType = getULong(buf, bigEndian); +- uint16_t resourceId = getUShort(buf + 4, bigEndian); +- +- if (resourceType != kPhotoshopResourceType) ++ if (!Photoshop::isIrb(buf, 4)) + { + break; // bad resource type + } ++ uint16_t resourceId = getUShort(buf + 4, bigEndian); + uint32_t resourceNameLength = buf[6] & ~1; + + // skip the resource name, plus any padding +@@ -447,7 +443,8 @@ + // read resource type and ID + uint32_t resourceType = getULong(buf, bigEndian); + +- if (resourceType != kPhotoshopResourceType) { ++ if (!Photoshop::isIrb(buf, 4)) ++ { + throw Error(3, "Photoshop"); // bad resource type + } + uint16_t resourceId = getUShort(buf + 4, bigEndian); +@@ -493,11 +490,12 @@ + && resourceId != kPhotoshopResourceID_ExifInfo + && resourceId != kPhotoshopResourceID_XMPPacket) { + #ifdef DEBUG ++ std::cerr << std::hex << "copy : resourceType: " << resourceType << "\n"; + std::cerr << std::hex << "copy : resourceId: " << resourceId << "\n"; + std::cerr << std::dec; + #endif + // Copy resource block to new PSD file +- ul2Data(buf, kPhotoshopResourceType, bigEndian); ++ ul2Data(buf, resourceType, bigEndian); + if (outIo.write(buf, 4) != 4) throw Error(21); + us2Data(buf, resourceId, bigEndian); + if (outIo.write(buf, 2) != 2) throw Error(21); +@@ -577,8 +575,7 @@ + std::cerr << std::hex << "write: resourceId: " << kPhotoshopResourceID_IPTC_NAA << "\n"; + std::cerr << std::dec << "Writing IPTC_NAA: size: " << rawIptc.size_ << "\n"; + #endif +- ul2Data(buf, kPhotoshopResourceType, bigEndian); +- if (out.write(buf, 4) != 4) throw Error(21); ++ if (out.write(reinterpret_cast(Photoshop::irbId_[0]), 4) != 4) throw Error(21); + us2Data(buf, kPhotoshopResourceID_IPTC_NAA, bigEndian); + if (out.write(buf, 2) != 2) throw Error(21); + us2Data(buf, 0, bigEndian); // NULL resource name +@@ -618,8 +615,7 @@ + std::cerr << std::hex << "write: resourceId: " << kPhotoshopResourceID_ExifInfo << "\n"; + std::cerr << std::dec << "Writing ExifInfo: size: " << blob.size() << "\n"; + #endif +- ul2Data(buf, kPhotoshopResourceType, bigEndian); +- if (out.write(buf, 4) != 4) throw Error(21); ++ if (out.write(reinterpret_cast(Photoshop::irbId_[0]), 4) != 4) throw Error(21); + us2Data(buf, kPhotoshopResourceID_ExifInfo, bigEndian); + if (out.write(buf, 2) != 2) throw Error(21); + us2Data(buf, 0, bigEndian); // NULL resource name +@@ -663,8 +659,7 @@ + std::cerr << std::hex << "write: resourceId: " << kPhotoshopResourceID_XMPPacket << "\n"; + std::cerr << std::dec << "Writing XMPPacket: size: " << xmpPacket.size() << "\n"; + #endif +- ul2Data(buf, kPhotoshopResourceType, bigEndian); +- if (out.write(buf, 4) != 4) throw Error(21); ++ if (out.write(reinterpret_cast(Photoshop::irbId_[0]), 4) != 4) throw Error(21); + us2Data(buf, kPhotoshopResourceID_XMPPacket, bigEndian); + if (out.write(buf, 2) != 2) throw Error(21); + us2Data(buf, 0, bigEndian); // NULL resource name diff -r 97d5a5c48c12 -r 082cd6e86b6b src/exiv2-r2650.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/exiv2-r2650.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,30 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from: +http://dev.exiv2.org/projects/exiv2/repository/revisions/2650 + +Index: trunk/src/jpgimage.cpp +=================================================================== +--- trunk/src/jpgimage.cpp (revision 2649) ++++ trunk/src/jpgimage.cpp (revision 2650) +@@ -87,6 +87,7 @@ namespace Exiv2 { + + const char Photoshop::ps3Id_[] = "Photoshop 3.0\0"; + const char* Photoshop::irbId_[] = {"8BIM", "AgHg", "DCSR", "PHUT"}; ++ const char Photoshop::bimId_[] = "8BIM"; // deprecated + const uint16_t Photoshop::iptc_ = 0x0404; + const uint16_t Photoshop::preview_ = 0x040c; + +Index: trunk/src/jpgimage.hpp +=================================================================== +--- trunk/src/jpgimage.hpp (revision 2649) ++++ trunk/src/jpgimage.hpp (revision 2650) +@@ -65,6 +65,7 @@ namespace Exiv2 { + // Todo: Public for now + static const char ps3Id_[]; //!< %Photoshop marker + static const char* irbId_[]; //!< %Photoshop IRB markers ++ static const char bimId_[]; //!< %Photoshop IRB marker (deprecated) + static const uint16_t iptc_; //!< %Photoshop IPTC marker + static const uint16_t preview_; //!< %Photoshop preview marker + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/exiv2.mk --- a/src/exiv2.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/exiv2.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Exiv2 PKG := exiv2 $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.1 -$(PKG)_CHECKSUM := d33e0efbad5d6a7af7f2e6d1d0beb6e7c941cfca +$(PKG)_CHECKSUM := 35211d853a986fe1b008fca14db090726e8dcce3 $(PKG)_SUBDIR := exiv2-$($(PKG)_VERSION) $(PKG)_FILE := exiv2-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.exiv2.org/ $(PKG)_URL := http://www.exiv2.org/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv zlib expat @@ -20,19 +17,14 @@ endef define $(PKG)_BUILD - # rebuild configure script as one of the patches modifies configure.ac - $(MAKE) -C '$(1)/config' -f config.make - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-visibility \ --disable-nls \ --with-expat - # fix pkg-config linker flags - $(SED) -i 's,-no-undefined,,' '$(1)/config/exiv2.pc' $(MAKE) -C '$(1)/xmpsdk/src' -j '$(JOBS)' $(MAKE) -C '$(1)/src' -j '$(JOBS)' install-lib endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/expat.mk --- a/src/expat.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/expat.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Expat XML Parser PKG := expat $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.1 -$(PKG)_CHECKSUM := 663548c37b996082db1f2f2c32af060d7aa15c2d +$(PKG)_CHECKSUM := b08197d146930a5543a7b99e871cba3da614f6f0 $(PKG)_SUBDIR := expat-$($(PKG)_VERSION) $(PKG)_FILE := expat-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://expat.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/faad2-1-uint.patch --- a/src/faad2-1-uint.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/faad2-1-uint.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. --- ./frontend/main.c.backup 2010-07-01 16:53:48.563042615 +0200 +++ ./frontend/main.c 2010-07-01 16:54:03.379043126 +0200 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/faad2.mk --- a/src/faad2.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/faad2.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# faad2 PKG := faad2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7 $(PKG)_CHECKSUM := 80eaaa5cc576c35dd28863767b795c50cbcc0511 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.audiocoding.com/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/faac/$(PKG)-src/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/ffmpeg-1-pkgconfig.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ffmpeg-1-pkgconfig.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,20 @@ +This file is part of MXE. +See index.html for further information. + +This patch adds a libswresample dependency to libavfilter.pc, and a libavfilter +dependency to libavdevice.pc. Both issues have patches upstream, so this patch +can be dropped for the next FFmpeg version. + +--- ffmpeg-0.10/configure.orig 2012-03-09 21:18:38.403806202 +0100 ++++ ffmpeg-0.10/configure 2012-03-09 21:19:37.175808737 +0100 +@@ -3749,8 +3749,8 @@ + pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM" + pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" + pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" +-pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" +-pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" ++pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION, libavfilter = $LIBAVFILTER_VERSION" ++pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "libswresample = $LIBSWRESAMPLE_VERSION" + pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" + pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" + pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" diff -r 97d5a5c48c12 -r 082cd6e86b6b src/ffmpeg.mk --- a/src/ffmpeg.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/ffmpeg.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# ffmpeg PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 0.7-rc1 -$(PKG)_CHECKSUM := d15c005f46483fbfc3b678cb1c89123762b56b82 +$(PKG)_CHECKSUM := 743f44a71f93b14c9b26ca2424b0da8457cef4be $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.ffmpeg.org/ $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) $(PKG)_URL_2 := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE) $(PKG)_DEPS := gcc bzip2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib @@ -36,6 +33,7 @@ --enable-postproc \ --disable-pthreads \ --enable-w32threads \ + --enable-avisynth \ --enable-libspeex \ --enable-libtheora \ --enable-libvorbis \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/fftw.mk --- a/src/fftw.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/fftw.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# fftw PKG := fftw $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.2 -$(PKG)_CHECKSUM := d43b799eedfb9408f62f9f056f5e8a645618467b +$(PKG)_CHECKSUM := 3fecc492f576503a6a509d2073bd82b3fe0aef13 $(PKG)_SUBDIR := fftw-$($(PKG)_VERSION) $(PKG)_FILE := fftw-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.fftw.org/ $(PKG)_URL := http://www.fftw.org/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/file-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/file-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,16 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include +#include + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + fprintf(stdout, "magic file from %s\n", magic_getpath(NULL, 0)); + return 0; +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/file.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/file.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,41 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := file +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := df8ffe8759ec8cd85a98dc98e858563ea2555f64 +$(PKG)_SUBDIR := file-$($(PKG)_VERSION) +$(PKG)_FILE := file-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := ftp://ftp.astron.com/pub/file/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libgnurx + +define $(PKG)_UPDATE + wget -q -O- 'ftp://ftp.astron.com/pub/file/' | \ + grep 'file-' | \ + $(SED) -n 's,.*file-\([0-9][^>]*\)\.tar.*,\1,p' | \ + tail -1 +endef + +define $(PKG)_BUILD + # "file" needs a runnable version of the "file" utility + # itself. This must match the source code regarding its + # version. Therefore we build a native one ourselves first. + + cp -Rp '$(1)' '$(1).native' + cd '$(1).native' && ./configure \ + --disable-shared + $(MAKE) -C '$(1).native/src' -j '$(JOBS)' file + + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --build="`config.guess`" \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= FILE_COMPILE='$(1).native/src/file' + $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-file.exe' \ + -lmagic -lgnurx -lshlwapi +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/flac-1-win32.patch --- a/src/flac-1-win32.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/flac-1-win32.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. diff -ru flac-1.2.1.orig/include/share/alloc.h flac-1.2.1/include/share/alloc.h --- flac-1.2.1.orig/include/share/alloc.h 2007-09-12 07:32:21.000000000 +0200 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/flac-2-lwsock32.patch --- a/src/flac-2-lwsock32.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/flac-2-lwsock32.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. diff -urN flac-1.2.1.orig/src/libFLAC/flac.pc.in flac-1.2.1/src/libFLAC/flac.pc.in --- flac-1.2.1.orig/src/libFLAC/flac.pc.in 2007-02-07 12:07:32.000000000 +1100 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/flac.mk --- a/src/flac.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/flac.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# FLAC PKG := flac $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.1 $(PKG)_CHECKSUM := bd54354900181b59db3089347cc84ad81e410b38 $(PKG)_SUBDIR := flac-$($(PKG)_VERSION) $(PKG)_FILE := flac-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.xiph.org/ogg/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/flac/flac-src/flac-$($(PKG)_VERSION)-src/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv ogg diff -r 97d5a5c48c12 -r 082cd6e86b6b src/fltk-1-darwin-cross-compile.patch --- a/src/fltk-1-darwin-cross-compile.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/fltk-1-darwin-cross-compile.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: diff -r 97d5a5c48c12 -r 082cd6e86b6b src/fltk-test.cpp --- a/src/fltk-test.cpp Fri Mar 30 11:02:24 2012 +0200 +++ b/src/fltk-test.cpp Fri Mar 30 11:02:47 2012 +0200 @@ -1,20 +1,24 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + * + * This is a slightly modified version of: + * http://www.fltk.org/doc-1.3/basics.html + */ -/* http://www.fltk.org/doc-1.3/basics.html */ #include #include #include int main(int argc, char **argv) { - Fl_Window *window = new Fl_Window(340,180); - Fl_Box *box = new Fl_Box(20,40,300,100,"Hello, World!"); - box->box(FL_UP_BOX); - box->labelfont(FL_BOLD+FL_ITALIC); - box->labelsize(36); - box->labeltype(FL_SHADOW_LABEL); - window->end(); - window->show(argc, argv); - return Fl::run(); -} \ No newline at end of file + Fl_Window *window = new Fl_Window(340,180); + Fl_Box *box = new Fl_Box(20,40,300,100,"Hello, World!"); + box->box(FL_UP_BOX); + box->labelfont(FL_BOLD+FL_ITALIC); + box->labelsize(36); + box->labeltype(FL_SHADOW_LABEL); + window->end(); + window->show(argc, argv); + return Fl::run(); +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/fltk.mk --- a/src/fltk.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/fltk.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,15 +1,12 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# FLTK PKG := fltk $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.x-r8659 -$(PKG)_CHECKSUM := 97d5002f1f3a32bf78634954e63c491483e727ac +$(PKG)_CHECKSUM := 720f2804be6132ebae9909d4e74dedcc00b39d25 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 -$(PKG)_WEBSITE := http://www.fltk.org/ -$(PKG)_URL := http://ftp.easysw.com/pub/fltk/snapshots/$($(PKG)_FILE) +$(PKG)_FILE := $($(PKG)_SUBDIR)-source.tar.gz +$(PKG)_URL := http://ftp.easysw.com/pub/fltk/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib jpeg libpng pthreads define $(PKG)_UPDATE @@ -22,10 +19,9 @@ define $(PKG)_BUILD cd '$(1)' && autoconf $(SED) -i 's,\$$uname,MINGW,g' '$(1)/configure' - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \ @@ -33,8 +29,8 @@ # enable exceptions, because disabling them doesn't make any sense on PCs $(SED) -i 's,-fno-exceptions,,' '$(1)/makeinclude' $(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src LIBCOMMAND='$(TARGET)-ar cr' - ln -sf $(PREFIX)/$(TARGET)/bin/fltk-config $(PREFIX)/bin/$(TARGET)-fltk-config - + ln -sf '$(PREFIX)/$(TARGET)/bin/fltk-config' '$(PREFIX)/bin/$(TARGET)-fltk-config' + '$(TARGET)-g++' \ -W -Wall -Werror -pedantic -ansi \ '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-fltk.exe' \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/fontconfig.mk --- a/src/fontconfig.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/fontconfig.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# fontconfig PKG := fontconfig $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.0 -$(PKG)_CHECKSUM := 570fb55eb14f2c92a7b470b941e9d35dbfafa716 +$(PKG)_CHECKSUM := 1ab2f437c2261028ae7969892277af2d8d8db489 $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://fontconfig.org/ $(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE) $(PKG)_DEPS := gcc freetype expat @@ -22,11 +19,10 @@ # ensure there is no (buggy) attempt to install the *.dll.a file # (remove this line of you want to link dynamically) $(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(1)/src/Makefile.in' - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' $(SED) -i 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' '$(1)/fontconfig.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-arch='$(TARGET)' \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/freeglut-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/freeglut-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,65 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 87a791a05687c7737d1c50381a0de30ba1acf96e Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 24 Oct 2011 09:40:10 +0200 +Subject: [PATCH] add pkg-config support + +based on +http://old.nabble.com/-PATCH--Add-pkgconfig-file-td23312302.html + +proposed to upstream +https://sourceforge.net/tracker/?func=detail&aid=3511842&group_id=1032&atid=101032 +--- + Makefile.am | 3 +++ + configure.ac | 1 + + glut.pc.in | 12 ++++++++++++ + 3 files changed, 16 insertions(+), 0 deletions(-) + create mode 100644 glut.pc.in + +diff --git a/Makefile.am b/Makefile.am +index 39c5628..b504bc6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -68,3 +68,6 @@ dist-hook: + + libtool: $(LIBTOOL_DEPS) + $(SHELL) ./config.status --recheck ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = glut.pc +diff --git a/configure.ac b/configure.ac +index 15dc997..2f25bcb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,5 +119,6 @@ AC_CONFIG_FILES([ + progs/demos/spaceball/Makefile + progs/demos/subwin/Makefile + src/Makefile ++ glut.pc + ]) + AC_OUTPUT +diff --git a/glut.pc.in b/glut.pc.in +new file mode 100644 +index 0000000..ea57c4a +--- /dev/null ++++ b/glut.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@/@PACKAGE@ ++ ++Name: glut ++Description: A freely licensed alternative to the GLUT library ++Version: @VERSION@ ++Libs: -L${libdir} -lglut ++Libs.private: -lglu32 -lopengl32 -lwinmm -lgdi32 -mwindows ++Cflags: -DFREEGLUT_STATIC -I${includedir} ++ +-- +1.7.8 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/freeglut-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/freeglut-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,22 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include + +#include + +int main(int argc, char *argv[]) +{ + glutInit(&argc, argv); + glutInitWindowSize(640,480); + glutInitWindowPosition(10,10); + glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); + + glutCreateWindow("FreeGLUT Shapes"); + + glutMainLoop(); + + return(0); +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/freeglut.mk --- a/src/freeglut.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/freeglut.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,15 +1,12 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# freeglut PKG := freeglut $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6.0 -$(PKG)_CHECKSUM := 68306c4486c13d005a4e4d54035e0c0b1bdc220b +$(PKG)_CHECKSUM := 4debbe559c6c9841ce1abaddc9d461d17c6083b1 $(PKG)_SUBDIR := freeglut-$(word 1,$(subst -, ,$($(PKG)_VERSION))) $(PKG)_FILE := freeglut-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://freeglut.sourceforge.net/ -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PKG)_FILE) +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE @@ -19,10 +16,7 @@ endef define $(PKG)_BUILD - $(SED) -i 's,Windows\.h,windows.h,' '$(1)/src/freeglut_internal.h' - $(SED) -i 's,WindowsX\.h,windowsx.h,' '$(1)/src/freeglut_internal.h' - $(SED) -i 's,MMSystem\.h,mmsystem.h,' '$(1)/src/freeglut_internal.h' - $(SED) -i 's,Windows\.h,windows.h,' '$(1)/include/GL/freeglut_std.h' + cd '$(1)' && ./autogen.sh cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ @@ -31,5 +25,10 @@ --disable-debug \ --without-progs \ --without-x - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= EXPORT_FLAGS='-DFREEGLUT_STATIC' + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-freeglut.exe' \ + `'$(TARGET)-pkg-config' glut --cflags --libs` endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/freeimage-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/freeimage-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,118 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 7b90b53e9d48aa13aaa42d60b060fb3ff9a5f11c Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 20 Feb 2012 09:02:05 +0100 +Subject: [PATCH 1/3] add missing header for mingw + +taken from +https://sourceforge.net/tracker/?func=detail&aid=3489514&group_id=11504&atid=311504 +--- + .../Source/LibRawLite/src/libraw_datastream.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Source/LibRawLite/src/libraw_datastream.cpp b/Source/LibRawLite/src/libraw_datastream.cpp +index 33a81b9..c5d57f6 100644 +--- a/Source/LibRawLite/src/libraw_datastream.cpp ++++ b/Source/LibRawLite/src/libraw_datastream.cpp +@@ -8,7 +8,10 @@ + #else + #define NO_JASPER + #endif +- ++#ifdef __MINGW32__ ++#include ++#include ++#endif + + LibRaw_byte_buffer::LibRaw_byte_buffer(unsigned sz) + { +-- +1.7.9.2 + +From fa251a7e33ac1c73992a5825a1f1f2fa888af93c Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 20 Feb 2012 08:58:53 +0100 +Subject: [PATCH 2/3] makefile workarounds (MXE) + +--- + FreeImage/Makefile.gnu | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +diff --git a/Makefile.gnu b/Makefile.gnu +index e6007ae..631eb82 100644 +--- a/Makefile.gnu ++++ b/Makefile.gnu +@@ -9,7 +9,7 @@ INCDIR ?= $(DESTDIR)/usr/include + INSTALLDIR ?= $(DESTDIR)/usr/lib + + # Converts cr/lf to just lf +-DOS2UNIX = dos2unix ++DOS2UNIX = echo 'dos2unix not needed ' + + LIBRARIES = -lstdc++ + +@@ -40,13 +40,12 @@ all: dist + + dist: FreeImage + cp *.a Dist +- cp *.so Dist + cp Source/FreeImage.h Dist + + dos2unix: + @$(DOS2UNIX) $(SRCS) $(INCLS) + +-FreeImage: $(STATICLIB) $(SHAREDLIB) ++FreeImage: $(STATICLIB) + + .c.o: + $(CC) $(CFLAGS) -c $< -o $@ +@@ -62,12 +61,8 @@ $(SHAREDLIB): $(MODULES) + + install: + install -d $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) +- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) +- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) +-# ldconfig ++ install -m 644 $(HEADER) $(INCDIR) ++ install -m 644 $(STATICLIB) $(INSTALLDIR) + + clean: + rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) +-- +1.7.9.2 + +From 5f52e869fdcc5a18592a6b87b83ce1f6c15a3ac0 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 20 Feb 2012 09:47:08 +0100 +Subject: [PATCH 3/3] required win version (MXE) + +--- + FreeImage/Makefile.gnu | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.gnu b/Makefile.gnu +index 631eb82..1809017 100644 +--- a/Makefile.gnu ++++ b/Makefile.gnu +@@ -15,9 +15,9 @@ LIBRARIES = -lstdc++ + + MODULES = $(SRCS:.c=.o) + MODULES := $(MODULES:.cpp=.o) +-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS ++CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS -DWINVER=0x0501 + CFLAGS += $(INCLUDE) +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy ++CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -DWINVER=0x0501 + CXXFLAGS += $(INCLUDE) + + ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) +-- +1.7.9.2 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/freeimage-1-no-shared.patch --- a/src/freeimage-1-no-shared.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -urN a/Makefile.gnu b/Makefile.gnu ---- a/Makefile.gnu 2010-04-29 11:16:50.000000000 +0200 -+++ b/Makefile.gnu 2010-09-03 18:38:07.330351960 +0200 -@@ -9,7 +9,7 @@ - INSTALLDIR ?= $(DESTDIR)/usr/lib - - # Converts cr/lf to just lf --DOS2UNIX = dos2unix -+DOS2UNIX = echo 'dos2unix not needed ' - - LIBRARIES = -lstdc++ - -@@ -40,13 +40,12 @@ - - dist: FreeImage - cp *.a Dist -- cp *.so Dist - cp Source/FreeImage.h Dist - - dos2unix: - @$(DOS2UNIX) $(SRCS) $(INCLS) - --FreeImage: $(STATICLIB) $(SHAREDLIB) -+FreeImage: $(STATICLIB) - - .c.o: - $(CC) $(CFLAGS) -c $< -o $@ -@@ -62,12 +61,8 @@ - - install: - install -d $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g root $(HEADER) $(INCDIR) -- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) -- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) -- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) -- ldconfig -+ install -m 644 $(HEADER) $(INCDIR) -+ install -m 644 $(STATICLIB) $(INSTALLDIR) - - clean: - rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) diff -r 97d5a5c48c12 -r 082cd6e86b6b src/freeimage.mk --- a/src/freeimage.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/freeimage.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# FreeImage PKG := freeimage $(PKG)_IGNORE := -$(PKG)_VERSION := 3.15.0 -$(PKG)_CHECKSUM := ec2faa01d1b312aab68d77afe62861759c790100 +$(PKG)_CHECKSUM := 083ef40a1734e33cc34c55ba87019bf5cce9ca4a $(PKG)_SUBDIR := FreeImage $(PKG)_FILE := FreeImage$(subst .,,$($(PKG)_VERSION)).zip -$(PKG)_WEBSITE := http://freeimage.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeimage/Source Distribution/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/freetds.mk --- a/src/freetds.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/freetds.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,15 +1,12 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# FreeTDS PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 0.91.dev.20110523RC2 -$(PKG)_CHECKSUM := c5848c9bf940782730dddf24a3bff141c9c9c369 +$(PKG)_CHECKSUM := 3ab06c8e208e82197dc25d09ae353d9f3be7db52 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.freetds.org/ -$(PKG)_URL := https://bitbucket.org/mabrand/mingw-cross-env/downloads/$($(PKG)_FILE) +$(PKG)_URL := http://ibiblio.org/pub/Linux/ALPHA/$(PKG)/stable/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv gnutls define $(PKG)_UPDATE @@ -25,12 +22,10 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' - cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-rpath \ --disable-dependency-tracking \ --disable-shared \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/freetype.mk --- a/src/freetype.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/freetype.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# freetype PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.4.4 -$(PKG)_CHECKSUM := 1d136cbc51c67b212c91ba04dc5db797f35e64e6 +$(PKG)_CHECKSUM := 5cb80ab9d369c4e81a2221bcf45adcea2c996b9b $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://freetype.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib diff -r 97d5a5c48c12 -r 082cd6e86b6b src/fribidi-1-fix-gassert.patch --- a/src/fribidi-1-fix-gassert.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/fribidi-1-fix-gassert.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. diff -ru fribidi-0.19.2.orig/lib/fribidi-common.h fribidi-0.19.2/lib/fribidi-common.h --- fribidi-0.19.2.orig/lib/fribidi-common.h 2007-04-05 18:13:24.000000000 +0200 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/fribidi.mk --- a/src/fribidi.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/fribidi.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# FriBidi PKG := fribidi $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19.2 $(PKG)_CHECKSUM := 3889469d96dbca3d8522231672e14cca77de4d5e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://fribidi.org/ $(PKG)_URL := http://fribidi.org/download/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib diff -r 97d5a5c48c12 -r 082cd6e86b6b src/ftgl.mk --- a/src/ftgl.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/ftgl.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# ftgl PKG := ftgl $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1.3~rc5 $(PKG)_CHECKSUM := 8508f26c84001d7bc949246affa03744fa1fd22e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$(subst ~,-,$($(PKG)_VERSION)).tar.bz2 -$(PKG)_WEBSITE := http://sourceforge.net/projects/$(PKG)/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/FTGL Source/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc freetype diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gc.mk --- a/src/gc.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gc.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# gc PKG := gc $(PKG)_IGNORE := -$(PKG)_VERSION := 7.1 $(PKG)_CHECKSUM := e84cba5d18f4ea5ed4e5fd3f1dc6a46bc190ff6f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.hpl.hp.com/personal/Hans_Boehm/$(PKG)/ $(PKG)_URL := http://www.hpl.hp.com/personal/Hans_Boehm/$(PKG)/$(PKG)_source/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gcc-1-mingw-float.patch --- a/src/gcc-1-mingw-float.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gcc-1-mingw-float.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html @@ -8,7 +8,7 @@ diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h --- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 +++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 -@@ -236,3 +236,7 @@ +@@ -275,3 +275,7 @@ #endif /* __STDC_WANT_DEC_FP__ */ #endif /* _FLOAT_H___ */ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gcc-2-darwin-no-pie.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gcc-2-darwin-no-pie.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,28 @@ +This file is part of MXE. +See index.html for further information. + +MXE specific workaround for OSX Lion's new ASLR +causing problems with pre-compiled headers. + +1. more recent native compilers don't solve the problem +2. there isn't an equivalent sysctl for "kernel.randomize_va_space" +3. there isn't an equivalent command for "setarch -R" +4. Apple's version of gcc (based on 4.2) uses custom Makefiles that set "-fno-pic" + +Patch below achieves a similar result to 4, without drifting +too far from standard gcc. + +--- a/configure ++++ b/configure +@@ -30,6 +30,11 @@ else + esac + fi + ++case `uname -sr` in ++ Darwin*11*) ++ LDFLAGS="$LDFLAGS -Wl,-no_pie" ++ ;; ++esac + + as_nl=' + ' diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gcc-gmp.mk --- a/src/gcc-gmp.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gcc-gmp.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GMP for GCC PKG := gcc-gmp $(PKG)_IGNORE = $(gmp_IGNORE) -$(PKG)_VERSION = $(gmp_VERSION) $(PKG)_CHECKSUM = $(gmp_CHECKSUM) $(PKG)_SUBDIR = $(gmp_SUBDIR) $(PKG)_FILE = $(gmp_FILE) -$(PKG)_WEBSITE = $(gmp_WEBSITE) $(PKG)_URL = $(gmp_URL) $(PKG)_URL_2 = $(gmp_URL_2) $(PKG)_DEPS := diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gcc-mpc.mk --- a/src/gcc-mpc.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gcc-mpc.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,15 +1,12 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# MPC for GCC PKG := gcc-mpc $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9 $(PKG)_CHECKSUM := 229722d553030734d49731844abfef7617b64f1a $(PKG)_SUBDIR := mpc-$($(PKG)_VERSION) $(PKG)_FILE := mpc-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.multiprecision.org/ -$(PKG)_URL := $($(PKG)_WEBSITE)/mpc/download/$($(PKG)_FILE) +$(PKG)_URL := http://www.multiprecision.org/mpc/download/$($(PKG)_FILE) $(PKG)_URL_2 := http://ftp.debian.org/debian/pool/main/m/mpclib/mpclib_$($(PKG)_VERSION).orig.tar.gz $(PKG)_DEPS := diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gcc-mpfr.mk --- a/src/gcc-mpfr.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gcc-mpfr.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,20 +1,15 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# MPFR for GCC PKG := gcc-mpfr -$(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.1 -$(PKG)_CHECKSUM := fbf402fc196724ae60ef01eb6ca8490b1ea4db69 -$(PKG)_SUBDIR := mpfr-$($(PKG)_VERSION) -$(PKG)_FILE := mpfr-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.mpfr.org/ -$(PKG)_URL := http://www.mpfr.org/mpfr-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_URL_2 := http://ftp.gnu.org/gnu/mpfr/$($(PKG)_FILE) +$(PKG)_IGNORE = $(mpfr_IGNORE) +$(PKG)_CHECKSUM = $(mpfr_CHECKSUM) +$(PKG)_SUBDIR = $(mpfr_SUBDIR) +$(PKG)_FILE = $(mpfr_FILE) +$(PKG)_URL = $(mpfr_URL) +$(PKG)_URL_2 = $(mpfr_URL_2) $(PKG)_DEPS := define $(PKG)_UPDATE - wget -q --no-check-certificate -O- 'https://gforge.inria.fr/scm/viewvc.php/tags/?root=mpfr&sortby=date' | \ - $(SED) -n 's,.* '$(PREFIX)/bin/$(TARGET)-pkg-config' chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' - + # create the CMake toolchain file [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' (echo 'set(BUILD_SHARED_LIBS OFF)'; \ echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ + echo 'set(MSYS 1)'; \ echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \ echo 'set(CMAKE_C_COMPILER $(PREFIX)/bin/$(TARGET)-gcc)'; \ echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \ + echo 'set(CMAKE_Fortran_COMPILER $(PREFIX)/bin/$(TARGET)-gfortran)'; \ echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \ echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ + echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/bin/$(TARGET)-qmake)'; \ echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ > '$(CMAKE_TOOLCHAIN_FILE)' diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gd-1-libpng15.patch --- a/src/gd-1-libpng15.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gd-1-libpng15.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. This patch has been taken from: http://bugs.gentoo.org/show_bug.cgi?id=305101 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gd-test.c --- a/src/gd-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gd-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,7 +1,10 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ - -/* modified from /examples/arc.c */ +/* + * This file is part of MXE. + * See index.html for further information. + * + * This is a slightly modified version of: + * examples/arc.c + */ #include "gd.h" #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gd.mk --- a/src/gd.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gd.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GD (without support for xpm) PKG := gd $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.35 $(PKG)_CHECKSUM := ccf34a610abff2dbf133a20c4d2a4aa94939018a $(PKG)_SUBDIR := gd-$($(PKG)_VERSION) $(PKG)_FILE := gd-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.libgd.org/ $(PKG)_URL := http://www.libgd.org/releases/$($(PKG)_FILE) $(PKG)_URL_2 := http://ftp.uni-magdeburg.de/aftp/mirror/linux/slackware/source/l/gd/$($(PKG)_FILE) $(PKG)_DEPS := gcc freetype libpng jpeg libxml2 pthreads diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gdal-1-png.patch --- a/src/gdal-1-png.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -http://trac.osgeo.org/gdal/changeset/21526 -Index: /branches/1.8/gdal/frmts/png/pngdataset.cpp -=================================================================== ---- a/frmts/png/pngdataset.cpp (revision 21032) -+++ b/frmts/png/pngdataset.cpp (revision 21526) -@@ -1316,5 +1316,5 @@ - */ - check = (png_size_t)VSIFReadL(data, (png_size_t)1, length, -- (VSILFILE*)png_ptr->io_ptr); -+ (VSILFILE*)png_get_io_ptr(png_ptr)); - - if (check != length) -@@ -1331,5 +1331,5 @@ - png_uint_32 check; - -- check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_ptr->io_ptr)); -+ check = VSIFWriteL(data, 1, length, (VSILFILE*)png_get_io_ptr(png_ptr)); - - if (check != length) -@@ -1342,5 +1342,5 @@ - static void png_vsi_flush(png_structp png_ptr) - { -- VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) ); -+ VSIFFlushL( (VSILFILE*)png_get_io_ptr(png_ptr) ); - } - -@@ -1358,5 +1358,5 @@ - // semantics. Ugg. - -- jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr; -+ jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr); - if (psSetJmpContext) - { diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gdal.mk --- a/src/gdal.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gdal.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,17 +1,14 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GDAL PKG := gdal $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.0 -$(PKG)_CHECKSUM := e5a2802933054050c6fb0b0a0e1f46b5dd195b0a +$(PKG)_CHECKSUM := e2eaaf0fba39137b40c0d3069ac41dfb6f3c76db $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.gdal.org/ $(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/gdal/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib libpng tiff libgeotiff jpeg jasper giflib expat sqlite curl geos postgresql +$(PKG)_DEPS := gcc zlib libpng tiff libgeotiff jpeg jasper giflib expat sqlite curl geos postgresql gta define $(PKG)_UPDATE wget -q -O- 'http://trac.osgeo.org/gdal/wiki/DownloadSource' | \ @@ -43,6 +40,7 @@ --with-curl='$(PREFIX)/$(TARGET)/bin/curl-config' \ --with-geos='$(PREFIX)/$(TARGET)/bin/geos-config' \ --with-pg='$(PREFIX)/bin/$(TARGET)-pg_config' \ + --with-gta='$(PREFIX)/$(TARGET)' \ --without-odbc \ --without-static-proj4 \ --without-xerces \ @@ -76,7 +74,7 @@ --without-ruby \ --without-python \ --without-macosx-framework \ - LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl`" + LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" $(MAKE) -C '$(1)' -j 1 lib-target $(MAKE) -C '$(1)' -j 1 install-lib $(MAKE) -C '$(1)/port' -j 1 install @@ -85,5 +83,5 @@ $(MAKE) -C '$(1)/alg' -j 1 install $(MAKE) -C '$(1)/ogr' -j 1 install OGR_ENABLED= $(MAKE) -C '$(1)/apps' -j 1 install BIN_LIST= - ln -sf $(PREFIX)/$(TARGET)/bin/gdal-config $(PREFIX)/bin/$(TARGET)-gdal-config + ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config' endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gdb-1-fix-shell.patch --- a/src/gdb-1-fix-shell.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gdb-1-fix-shell.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://sourceware.org/bugzilla/show_bug.cgi?id=9098 --- a/gdb/gdbserver/Makefile.in 2010-01-05 02:03:00.000000000 +1100 +++ b/gdb/gdbserver/Makefile.in 2010-05-21 23:49:45.960860228 +1000 -@@ -43,7 +43,7 @@ +@@ -41,7 +41,7 @@ htmldir = $(prefix)/html includedir = @includedir@ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gdb-2-fix-makeinfo.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gdb-2-fix-makeinfo.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,94 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from: +http://sourceware.org/bugzilla/show_bug.cgi?id=13638 + +=================================================================== +RCS file: /cvs/src/src/gdb/configure,v +retrieving revision 1.335.2.2 +retrieving revision 1.335.2.3 +diff -u -r1.335.2.2 -r1.335.2.3 +--- src/gdb/configure 2012/02/21 22:03:47 1.335.2.2 ++++ src/gdb/configure 2012/02/21 22:07:40 1.335.2.3 +@@ -995,6 +995,8 @@ + LIBS + CPPFLAGS + CPP ++MAKEINFO ++MAKEINFOFLAGS + YACC + YFLAGS + XMKMF' +@@ -1696,6 +1698,9 @@ + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor ++ MAKEINFO Parent configure detects if it is of sufficient version. ++ MAKEINFOFLAGS ++ Parameters for MAKEINFO. + YACC The `Yet Another C Compiler' implementation to use. Defaults to + the first program found out of: `bison -y', `byacc', `yacc'. + YFLAGS The list of arguments that will be passed by default to $YACC. +@@ -7158,59 +7163,9 @@ + + + +-# Do we have a single-tree copy of texinfo? Even if we do, we can't +-# rely on it - libiberty is built before texinfo. +-# Extract the first word of "makeinfo", so it can be a program name with args. +-set dummy makeinfo; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_MAKEINFO+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$MAKEINFO"; then +- ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_MAKEINFO="makeinfo" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-MAKEINFO=$ac_cv_prog_MAKEINFO +-if test -n "$MAKEINFO"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5 +-$as_echo "$MAKEINFO" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-if test "x$MAKEINFO" = "x"; then +- as_fn_error "makeinfo is required for compilation" "$LINENO" 5 +-else +- case "$MAKEINFO" in +- */missing\ makeinfo*) +- as_fn_error "makeinfo is required for compilation" "$LINENO" 5 +- ;; +- esac +-fi +- ++# We never need to detect it in this sub-configure. ++# But preserve it for config.status --recheck. + +-# --split-size=5000000 may be already in $MAKEINFO from parent configure. +-# Re-running configure in gdb/ would lose it so ensure it stays present. +-MAKEINFOFLAGS=${MAKEINFOFLAGS---split-size=5000000} + + + MAKEINFO_EXTRA_FLAGS="" diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gdb.mk --- a/src/gdb.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gdb.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,13 +1,10 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# gdb PKG := gdb -$(PKG)_VERSION := 7.2 -$(PKG)_CHECKSUM := 14daf8ccf1307f148f80c8db17f8e43f545c2691 +$(PKG)_CHECKSUM := 43a3ee582eae4d69c2babea4f8700b7bec8e37fa $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) -$(PKG)_FILE := gdb-$($(PKG)_VERSION)a.tar.bz2 -$(PKG)_WEBSITE := http://www.gnu.org/software/gdb/ +$(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc expat libiconv zlib @@ -15,6 +12,8 @@ define $(PKG)_UPDATE wget -q -O- 'http://ftp.gnu.org/gnu/gdb/?C=M;O=D' | \ $(SED) -n 's,.* Date: Mon, 24 Jan 2011 10:39:22 +0000 -Subject: Use png_jmpbuf macro +Subject: [PATCH 2/3] Use png_jmpbuf macro This makes the png loader compatible with libpng 1.5 --- + gdk-pixbuf/io-png.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c index 79c81fd..76f3304 100644 --- a/gdk-pixbuf/io-png.c @@ -96,5 +103,31 @@ success = FALSE; goto cleanup; } --- -cgit v0.8.3.4 +-- +1.7.8 + + +From 98b7ca46c998a497a1bc6cd563e0201d0cd65de0 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Fri, 23 Dec 2011 18:54:01 +0100 +Subject: [PATCH 3/3] add libtiff-4 to Requires.private + +--- + gdk-pixbuf-2.0.pc.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in +index 7e61775..bc33627 100644 +--- a/gdk-pixbuf-2.0.pc.in ++++ b/gdk-pixbuf-2.0.pc.in +@@ -12,6 +12,7 @@ Name: GdkPixbuf + Description: Image loading and scaling + Version: @VERSION@ + Requires: gobject-2.0 gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ ++Requires.private: libtiff-4 + Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@ + Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@ + +-- +1.7.8 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gdk-pixbuf.mk --- a/src/gdk-pixbuf.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gdk-pixbuf.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GDK-pixbuf PKG := gdk-pixbuf $(PKG)_IGNORE := -$(PKG)_VERSION := 2.22.1 $(PKG)_CHECKSUM := b452208963ddd84f7280865695b50255fcafaa2e $(PKG)_SUBDIR := gdk-pixbuf-$($(PKG)_VERSION) $(PKG)_FILE := gdk-pixbuf-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.gdk-pixbuf.org/ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib libpng jpeg tiff jasper libiconv @@ -21,13 +18,13 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-modules \ - --with-included-loaders + --with-included-loaders \ + LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/geos-test.c --- a/src/geos-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/geos-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/geos.mk --- a/src/geos.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/geos.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GEOS PKG := geos $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.0rc1 -$(PKG)_CHECKSUM := 6a8f7153d887d7a5085dcee62251b6f9c82a2283 +$(PKG)_CHECKSUM := 942b0bbc61a059bd5269fddd4c0b44a508670cb3 $(PKG)_SUBDIR := geos-$($(PKG)_VERSION) $(PKG)_FILE := geos-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://trac.osgeo.org/geos/ $(PKG)_URL := http://download.osgeo.org/geos/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/geos/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gettext.mk --- a/src/gettext.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gettext.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# gettext PKG := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.18.1.1 $(PKG)_CHECKSUM := 5009deb02f67fc3c59c8ce6b82408d1d35d4e38f $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.gnu.org/software/gettext/ $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv diff -r 97d5a5c48c12 -r 082cd6e86b6b src/giflib.mk --- a/src/giflib.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/giflib.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# giflib PKG := giflib $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.6 $(PKG)_CHECKSUM := 22680f604ec92065f04caf00b1c180ba74fb8562 $(PKG)_SUBDIR := giflib-$($(PKG)_VERSION) $(PKG)_FILE := giflib-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://sourceforge.net/projects/libungif/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/giflib/giflib 4.x/giflib-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/glew-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glew-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,33 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include +#include + +#ifdef GLEW_MX +/* We are using the multi-context variant of libGLEW */ +GLEWContext glew_context; +GLEWContext* glewGetContext() +{ + return &glew_context; +} +#endif + +int main(int argc, char *argv[]) +{ + GLenum err; + + (void)argc; + (void)argv; + + err = glewInit(); + if (GLEW_OK != err) + { + fprintf(stderr, "Error: %s\n", glewGetErrorString(err)); + } + fprintf(stdout, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION)); + + return 0; +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/glew.mk --- a/src/glew.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/glew.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GLEW PKG := glew $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.0 -$(PKG)_CHECKSUM := ed555d15d0f01239b262c4cf803e97d60d8a18b6 +$(PKG)_CHECKSUM := 9266f2360c1687a96f2ea06419671d370b2928d1 $(PKG)_SUBDIR := glew-$($(PKG)_VERSION) $(PKG)_FILE := glew-$($(PKG)_VERSION).tgz -$(PKG)_WEBSITE := http://glew.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/glew/glew/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -19,6 +16,7 @@ endef define $(PKG)_BUILD + # Build libGLEW cd '$(1)' && $(TARGET)-gcc -O2 -DGLEW_STATIC -Iinclude -c -o glew.o src/glew.c cd '$(1)' && $(TARGET)-ar cr libGLEW.a glew.o $(TARGET)-ranlib '$(1)/libGLEW.a' @@ -31,12 +29,40 @@ -e "s|@cflags@|-DGLEW_STATIC|g" \ -e "s|-l@libname@|-lGLEW -lopengl32|g" \ < '$(1)'/glew.pc.in > '$(1)'/glew.pc + + # Build libGLEWmx + cd '$(1)' && $(TARGET)-gcc -O2 -DGLEW_STATIC -DGLEW_MX -Iinclude -c -o glewmx.o src/glew.c + cd '$(1)' && $(TARGET)-ar cr libGLEWmx.a glewmx.o + $(TARGET)-ranlib '$(1)/libGLEWmx.a' + $(SED) \ + -e "s|@prefix@|$(PREFIX)/$(TARGET)|g" \ + -e "s|@libdir@|$(PREFIX)/$(TARGET)/lib|g" \ + -e "s|@exec_prefix@|$(PREFIX)/$(TARGET)/bin|g" \ + -e "s|@includedir@|$(PREFIX)/$(TARGET)/include/GL|g" \ + -e "s|@version@|$(glew_VERSION)|g" \ + -e "s|@cflags@|-DGLEW_STATIC -DGLEW_MX|g" \ + -e "s|-l@libname@|-lGLEWmx -lopengl32|g" \ + < '$(1)'/glew.pc.in > '$(1)'/glewmx.pc + + # Install $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' $(INSTALL) -m644 '$(1)/libGLEW.a' '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -m644 '$(1)/libGLEW.a' '$(PREFIX)/$(TARGET)/lib/libglew32s.a' + $(INSTALL) -m644 '$(1)/libGLEWmx.a' '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' $(INSTALL) -m644 '$(1)/glew.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' + $(INSTALL) -m644 '$(1)/glewmx.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/GL' $(INSTALL) -m644 '$(1)/include/GL/glew.h' '$(1)/include/GL/wglew.h' '$(PREFIX)/$(TARGET)/include/GL/' + + # Test + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-glew.exe' \ + `'$(TARGET)-pkg-config' glew --cflags --libs` + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-glewmx.exe' \ + `'$(TARGET)-pkg-config' glewmx --cflags --libs` endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/glib-1-fixes.patch --- a/src/glib-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/glib-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. Contains ad hoc patches for cross building. From 4693f62d3f01f7b7d26607e6eed843202cbf90f7 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:36:04 +0200 -Subject: [PATCH 1/7] no gtk doc check +Subject: [PATCH 1/5] no gtk doc check diff --git a/configure.ac b/configure.ac @@ -27,9 +27,9 @@ From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:41:51 +0200 -Subject: [PATCH 2/7] optional gettext +Subject: [PATCH 2/5] optional gettext diff --git a/configure.ac b/configure.ac @@ -69,9 +69,9 @@ From 3473b5183b2e59d247cd1db053efc6c9ecaf2aab Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:42:46 +0200 -Subject: [PATCH 3/7] fix tool paths +Subject: [PATCH 3/5] fix tool paths diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in @@ -96,9 +96,9 @@ From 0e57514812500d5d4dee03e1be8059a25876dd99 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:45:50 +0200 -Subject: [PATCH 4/7] fix dependency libs +Subject: [PATCH 4/5] fix dependency libs diff --git a/configure.ac b/configure.ac @@ -130,9 +130,9 @@ From 87931c81f6401fb0c25064ec0ba2edca9ec53924 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sat, 25 Sep 2010 00:07:33 +0200 -Subject: [PATCH 5/7] add -ldnsapi to gio-2.0.pc +Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in @@ -149,56 +149,3 @@ Cflags: -- 1.7.1 - - -From 58d20f08e876298e795f7282ddc6cfccbe6f05fe Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Sun, 3 Oct 2010 20:24:46 +0200 -Subject: [PATCH 6/7] darwin config libiconv - - -diff --git a/configure.ac b/configure.ac -index e472768..a681285 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -374,6 +374,12 @@ dnl *********************** - dnl - dnl We do this before the gettext checks, to avoid distortion - -+case $host in -+ *-*-darwin*) -+ with_libiconv=native -+ ;; -+esac -+ - dnl On Windows we use a native implementation - - if test x"$glib_native_win32" = xyes; then --- -1.7.1 - - -From a340fa1dfbf9a8ac58cd1b026bd26de30d7fc581 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Sun, 3 Oct 2010 20:25:32 +0200 -Subject: [PATCH 7/7] apple iconv - -This patch has been taken from: -http://mail.gnome.org/archives/gtk-list/2009-August/msg00146.html - -diff --git a/glib/gconvert.c b/glib/gconvert.c -index 52a3dd8..d8b4f89 100644 ---- a/glib/gconvert.c -+++ b/glib/gconvert.c -@@ -61,7 +61,7 @@ - #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) - #error GNU libiconv in use but included iconv.h not from libiconv - #endif --#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) -+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined(__APPLE__) - #error GNU libiconv not in use but included iconv.h is from libiconv - #endif - --- -1.7.1 - diff -r 97d5a5c48c12 -r 082cd6e86b6b src/glib.mk --- a/src/glib.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/glib.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GLib PKG := glib $(PKG)_IGNORE := -$(PKG)_VERSION := 2.28.6 -$(PKG)_CHECKSUM := 51996339c823cf36ba28c774c4afad933d5f5744 +$(PKG)_CHECKSUM := 20cd63705a8805260da0320c65b979233f2e3c18 $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.gtk.org/ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc gettext pcre libiconv zlib dbus @@ -53,10 +50,9 @@ $(INSTALL) -m755 '$(1).native/gio/glib-compile-schemas' '$(PREFIX)/$(TARGET)/bin/' # cross build - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-threads=win32 \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/glibmm.mk --- a/src/glibmm.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/glibmm.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GLibmm PKG := glibmm $(PKG)_IGNORE := -$(PKG)_VERSION := 2.28.1 -$(PKG)_CHECKSUM := 76cfba52d8fb1e3f46d14c3fea31269deb49e2fc +$(PKG)_CHECKSUM := d15bc0fed7dea6fec73746370653687f74e02592 $(PKG)_SUBDIR := glibmm-$($(PKG)_VERSION) $(PKG)_FILE := glibmm-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.gtkmm.org/ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/glibmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib libsigc++ @@ -20,11 +17,9 @@ endef define $(PKG)_BUILD - # cross build - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ CXX='$(TARGET)-c++' \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gmp.mk --- a/src/gmp.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gmp.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GMP PKG := gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 5.0.2 -$(PKG)_CHECKSUM := 2968220e1988eabb61f921d11e5d2db5431e0a35 +$(PKG)_CHECKSUM := ea4ea7c3f10436ef5ae7a75b3fad163a8b86edc0 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.gmplib.org/ $(PKG)_URL := ftp://ftp.gmplib.org/pub/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gnutls-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gnutls-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,49 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 6e89465f1e792f5d527708544cce1ef92ae4669b Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 28 Oct 2011 09:23:41 +0200 +Subject: [PATCH 1/2] add missing static library linking + + +diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in +index c45f8f3..57d0dbb 100644 +--- a/lib/gnutls.pc.in ++++ b/lib/gnutls.pc.in +@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system + URL: http://www.gnu.org/software/gnutls/ + Version: @VERSION@ + Libs: -L${libdir} -lgnutls +-Libs.private: @LTLIBNETTLE@ ++Libs.private: @LTLIBNETTLE@ @LIBS@ + @GNUTLS_REQUIRES_PRIVATE@ + Cflags: -I${includedir} +-- +1.7.9.2 + + +From aa11a6f645ce93f80fbffd7e72c6964bdfd68542 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Thu, 24 Nov 2011 15:06:06 +0100 +Subject: [PATCH 2/2] disable doc and test (MXE specific) + + +diff --git a/Makefile.am b/Makefile.am +index 0afe4bd..da7436a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests + + SUBDIRS = gl lib extra po + +-SUBDIRS += src doc tests ++SUBDIRS += src + + if HAVE_GUILE + SUBDIRS += guile +-- +1.7.9.2 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gnutls-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gnutls-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,18 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + gnutls_global_init (); + + gnutls_global_deinit (); + + return 0; +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gnutls.mk --- a/src/gnutls.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gnutls.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,30 +1,30 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GnuTLS PKG := gnutls -$(PKG)_VERSION := 2.12.5 -$(PKG)_CHECKSUM := dd45d4fb7c365d18803b9eafef838b310c899d67 +$(PKG)_CHECKSUM := 2e2adc41e0c75d8170fdca5955bd007ae93ceada $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) -$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/ -$(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gnutls/$($(PKG)_FILE) +$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnupg.org/gcrypt/gnutls/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib libgcrypt +$(PKG)_DEPS := gcc nettle zlib define $(PKG)_UPDATE wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=tags' | \ grep ']*>gnutls_\([0-9]*_[0-9]*[02468]_[^<]*\)<.*,\1,p' | \ $(SED) 's,_,.,g' | \ + grep -v '^2\.' | \ head -1 endef define $(PKG)_BUILD - echo '/* DEACTIVATED */' > '$(1)/gl/gai_strerror.c' - $(SED) -i 's/^\(SUBDIRS.*\) tests/\1/;' '$(1)/Makefile.in' - $(SED) -i 's/^\(SUBDIRS.*\) doc/\1/;' '$(1)/Makefile.in' - $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.in' + $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am' + cd '$(1)' && aclocal -I m4 -I gl/m4 -I src/libopts/m4 --install + cd '$(1)' && autoconf + cd '$(1)' && automake + # AI_ADDRCONFIG referenced by src/serv.c but not provided by mingw. + # Value taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms737530%28v=vs.85%29.aspx cd '$(1)' && ./configure \ --host='$(TARGET)' \ --enable-static \ @@ -34,9 +34,15 @@ --disable-guile \ --with-included-libtasn1 \ --with-included-libcfg \ - --with-included-pakchois \ - --with-libgcrypt \ - --without-lzo \ - LIBS='-lz' - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA= + --without-p11-kit \ + --disable-silent-rules \ + CPPFLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400' \ + LIBS='-lws2_32' \ + ac_cv_prog_AR='$(TARGET)-ar' + $(MAKE) -C '$(1)' -j '$(JOBS)' install + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gnutls.exe' \ + `'$(TARGET)-pkg-config' gnutls --cflags --libs` endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/graphicsmagick-1-fix-xml2-config.patch --- a/src/graphicsmagick-1-fix-xml2-config.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/graphicsmagick-1-fix-xml2-config.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,13 +1,14 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://sourceforge.net/tracker/?func=detail&aid=3130497&group_id=73485&atid=537937 -diff -r 89c7abc7139f configure.ac ---- a/configure.ac Mon Dec 06 15:42:37 2010 +0100 -+++ b/configure.ac Mon Dec 06 16:39:59 2010 +0100 -@@ -2135,12 +2135,13 @@ +diff --git a/configure.ac b/configure.ac +index 979d2c4..12d4555 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -2388,12 +2388,13 @@ then # Debian installs libxml headers under /usr/include/libxml2/libxml with # the shared library installed under /usr/lib, whereas the package # installs itself under $prefix/libxml and $prefix/lib. @@ -22,7 +23,7 @@ fi failed=0 passed=0 -@@ -2156,8 +2157,9 @@ +@@ -2416,8 +2417,9 @@ then LDFLAGS="$OLD_LDFLAGS" CPPFLAGS="$OLD_CPPFLAGS" else @@ -33,10 +34,11 @@ AC_DEFINE(HasXML,1,Define if you have XML library) AC_MSG_RESULT(yes) have_xml='yes' -diff -r 89c7abc7139f magick/GraphicsMagick.pc.in ---- a/magick/GraphicsMagick.pc.in Mon Dec 06 15:42:37 2010 +0100 -+++ b/magick/GraphicsMagick.pc.in Mon Dec 06 16:39:59 2010 +0100 -@@ -8,4 +8,5 @@ +diff --git a/magick/GraphicsMagick.pc.in b/magick/GraphicsMagick.pc.in +index 5757b37..87e3fd4 100644 +--- a/magick/GraphicsMagick.pc.in ++++ b/magick/GraphicsMagick.pc.in +@@ -8,4 +8,5 @@ Name: GraphicsMagick Version: @PACKAGE_VERSION@ Description: GraphicsMagick image processing library Libs: -L${libdir} -lGraphicsMagick diff -r 97d5a5c48c12 -r 082cd6e86b6b src/graphicsmagick-2-libpng1.5.patch --- a/src/graphicsmagick-2-libpng1.5.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1986 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/coders/png.c.diff?r1=1.457;r2=1.410.2.4 - ---- GraphicsMagick/coders/png.c 2010/03/07 21:23:50 1.410.2.4 -+++ GraphicsMagick/coders/png.c 2010/09/19 23:35:45 1.457 -@@ -88,26 +88,7 @@ - #include "zlib.h" - - --/* -- * TO DO: rewrite using png_get_tRNS() instead of direct access to the -- * ping and ping_info structs. -- */ --#if PNG_LIBPNG_VER < 10400 --# define trans_color trans_values /* Changed at libpng-1.4.0beta35 */ --# define trans_alpha trans /* Changed at libpng-1.4.0beta74 */ --#else -- /* We could parse PNG_LIBPNG_VER_STRING here but it's too much bother.. -- * Just don't use libpng-1.4.0beta32-34 or beta67-73 -- */ --# ifndef PNG_USER_CHUNK_CACHE_MAX /* Added at libpng-1.4.0beta32 */ --# define trans_color trans_values /* Changed at libpng-1.4.0beta35 */ --# endif --# ifndef PNG_TRANSFORM_GRAY_TO_RGB /* Added at libpng-1.4.0beta67 */ --# define trans_alpha trans /* Changed at libpng-1.4.0beta74 */ --# endif --#endif -- --#if PNG_LIBPNG_VER > 95 -+#if PNG_LIBPNG_VER > 10011 - /* - Optional declarations. Define or undefine them as you like. - */ -@@ -164,10 +145,6 @@ static SemaphoreInfo - PNG_MNG_FEATURES_SUPPORTED is disabled by default in libpng-1.0.9 and - will be enabled by default in libpng-1.2.0. - */ --#if (PNG_LIBPNG_VER == 10009) /* work around libpng-1.0.9 bug */ --# undef PNG_READ_EMPTY_PLTE_SUPPORTED --# undef PNG_WRITE_EMPTY_PLTE_SUPPORTED --#endif - #ifdef PNG_MNG_FEATURES_SUPPORTED - # ifndef PNG_READ_EMPTY_PLTE_SUPPORTED - # define PNG_READ_EMPTY_PLTE_SUPPORTED -@@ -244,6 +221,16 @@ static png_byte FARDATA mng_tIME[5]={116 - static png_byte FARDATA mng_zTXt[5]={122, 84, 88, 116, '\0'}; - */ - -+typedef struct _UShortPixelPacket -+{ -+ unsigned short -+ red, -+ green, -+ blue, -+ opacity, -+ index; -+} UShortPixelPacket; -+ - typedef struct _MngBox - { - long -@@ -492,7 +479,6 @@ static const char* PngColorTypeToString( - return result; - } - --#if PNG_LIBPNG_VER > 95 - #if defined(PNG_SORT_PALETTE) - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@@ -785,7 +771,6 @@ static MagickPassFail CompressColormapTr - return(MagickPass); - } - #endif --#endif /* PNG_LIBPNG_VER > 95 */ - #endif /* HasPNG */ - - /* -@@ -907,7 +892,7 @@ static MagickPassFail IsPNG(const unsign - extern "C" { - #endif - --#if (PNG_LIBPNG_VER > 95) -+#if (PNG_LIBPNG_VER > 10011) - static size_t WriteBlobMSBULong(Image *image,const unsigned long value) - { - unsigned char -@@ -956,13 +941,13 @@ static void LogPNGChunk(int logging, png - " Writing %c%c%c%c chunk, length: %lu", - type[0],type[1],type[2],type[3],length); - } --#endif /* PNG_LIBPNG_VER > 95 */ -+#endif /* PNG_LIBPNG_VER > 10011 */ - - #if defined(__cplusplus) || defined(c_plusplus) - } - #endif - --#if PNG_LIBPNG_VER > 95 -+#if PNG_LIBPNG_VER > 10011 - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % % -@@ -1351,7 +1336,11 @@ static void PNGErrorHandler(png_struct * - " libpng-%.1024s error: %.1024s", - PNG_LIBPNG_VER_STRING, message); - (void) ThrowException2(&image->exception,CoderError,message,image->filename); -+#if (PNG_LIBPNG_VER < 10500) - longjmp(ping->jmpbuf,1); -+#else -+ png_longjmp(ping,1); -+#endif - } - - static void PNGWarningHandler(png_struct *ping,png_const_charp message) -@@ -1372,19 +1361,8 @@ static void PNGWarningHandler(png_struct - #ifdef PNG_USER_MEM_SUPPORTED - static png_voidp png_IM_malloc(png_structp png_ptr,png_uint_32 size) - { --#if (PNG_LIBPNG_VER < 10011) -- png_voidp -- ret; -- -- png_ptr=png_ptr; -- ret=MagickAllocateMemory(png_voidp,(size_t) size); -- if (ret == NULL) -- png_error("Insufficient memory."); -- return (ret); --#else - png_ptr=png_ptr; - return MagickAllocateMemory(png_voidp,(size_t) size); --#endif - } - - /* -@@ -1560,11 +1538,24 @@ static Image *ReadOnePNGImage(MngInfo *m - logging, - num_text, - num_passes, -- pass; -+ pass, -+ ping_bit_depth, -+ ping_colortype, -+ ping_interlace_method, -+ ping_compression_method, -+ ping_filter_method, -+ ping_num_trans; - -- PixelPacket -+ UShortPixelPacket - transparent_color; - -+ png_bytep -+ ping_trans_alpha; -+ -+ png_color_16p -+ ping_background, -+ ping_trans_color; -+ - png_info - *end_info, - *ping_info; -@@ -1572,6 +1563,11 @@ static Image *ReadOnePNGImage(MngInfo *m - png_struct - *ping; - -+ png_uint_32 -+ ping_rowbytes, -+ ping_width, -+ ping_height; -+ - png_textp - text; - -@@ -1619,23 +1615,12 @@ static Image *ReadOnePNGImage(MngInfo *m - LockSemaphoreInfo(png_semaphore); - #endif - --#if (PNG_LIBPNG_VER < 10007) -+#if (PNG_LIBPNG_VER < 10012) - if (image_info->verbose) - printf("Your PNG library (libpng-%s) is rather old.\n", - PNG_LIBPNG_VER_STRING); - #endif - --#if (PNG_LIBPNG_VER >= 10400) --# ifndef PNG_TRANSFORM_GRAY_TO_RGB /* Added at libpng-1.4.0beta67 */ -- if (image_info->verbose) -- { -- printf("Your PNG library (libpng-%s) is an old beta version.\n", -- PNG_LIBPNG_VER_STRING); -- printf("Please update it.\n"); -- } --# endif --#endif -- - image=mng_info->image; - - /* -@@ -1665,7 +1650,7 @@ static Image *ReadOnePNGImage(MngInfo *m - ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image); - } - png_pixels=(unsigned char *) NULL; -- if (setjmp(ping->jmpbuf)) -+ if (setjmp(png_jmpbuf(ping))) - { - /* - PNG image is corrupt. -@@ -1740,18 +1725,32 @@ static Image *ReadOnePNGImage(MngInfo *m - - png_read_info(ping,ping_info); - -+ (void) png_get_IHDR(ping,ping_info, -+ &ping_width, -+ &ping_height, -+ &ping_bit_depth, -+ &ping_colortype, -+ &ping_interlace_method, -+ &ping_compression_method, -+ &ping_filter_method); -+ -+ (void) png_get_tRNS(ping, ping_info, &ping_trans_alpha, &ping_num_trans, -+ &ping_trans_color); -+ -+ (void) png_get_bKGD(ping, ping_info, &ping_background); -+ - #if (QuantumDepth == 8) - image->depth=8; - #else -- if (ping_info->bit_depth > 8) -+ if (ping_bit_depth > 8) - image->depth=16; - else - image->depth=8; - #endif - -- if (ping_info->bit_depth < 8) -+ if (ping_bit_depth < 8) - { -- if ((ping_info->color_type == PNG_COLOR_TYPE_PALETTE)) -+ if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - { - png_set_packing(ping); - image->depth=8; -@@ -1761,21 +1760,22 @@ static Image *ReadOnePNGImage(MngInfo *m - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG width: %lu, height: %lu", -- (unsigned long)ping_info->width, -- (unsigned long)ping_info->height); -+ (unsigned long)ping_width, -+ (unsigned long)ping_height); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG color_type: %d, bit_depth: %d", -- ping_info->color_type, ping_info->bit_depth); -+ ping_colortype, ping_bit_depth); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG compression_method: %d", -- ping_info->compression_type); -+ ping_compression_method); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG interlace_method: %d, filter_method: %d", -- ping_info->interlace_type,ping_info->filter_type); -+ ping_interlace_method, -+ ping_filter_method); - } - --#if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) -- if (ping_info->valid & PNG_INFO_iCCP) -+#if defined(PNG_READ_iCCP_SUPPORTED) -+ if (png_get_valid(ping, ping_info, PNG_INFO_iCCP)) - { - int - compression; -@@ -1803,15 +1803,19 @@ static Image *ReadOnePNGImage(MngInfo *m - } - } - } --#endif /* #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) */ -+#endif /* #if defined(PNG_READ_iCCP_SUPPORTED) */ - #if defined(PNG_READ_sRGB_SUPPORTED) - { - int - intent; - -- if (mng_info->have_global_srgb) -- image->rendering_intent=(RenderingIntent) -- (mng_info->global_srgb_intent+1); -+ if (!png_get_sRGB(ping,ping_info,&intent)) -+ { -+ if (mng_info->have_global_srgb) -+ { -+ png_set_sRGB(ping,ping_info,(mng_info->global_srgb_intent+1)); -+ } -+ } - if (png_get_sRGB(ping,ping_info,&intent)) - { - image->rendering_intent=(RenderingIntent) (intent+1); -@@ -1827,8 +1831,11 @@ static Image *ReadOnePNGImage(MngInfo *m - double - file_gamma; - -- if (mng_info->have_global_gama) -- image->gamma=mng_info->global_gamma; -+ if (!png_get_gAMA(ping,ping_info,&file_gamma)) -+ { -+ if (mng_info->have_global_gama) -+ png_set_gAMA(ping,ping_info,mng_info->global_gamma); -+ } - if (png_get_gAMA(ping,ping_info,&file_gamma)) - { - image->gamma=(float) file_gamma; -@@ -1838,9 +1845,20 @@ static Image *ReadOnePNGImage(MngInfo *m - file_gamma); - } - } -- if (mng_info->have_global_chrm) -- image->chromaticity=mng_info->global_chrm; -- if (ping_info->valid & PNG_INFO_cHRM) -+ if (!png_get_valid(ping, ping_info, PNG_INFO_cHRM)) -+ { -+ if (mng_info->have_global_chrm) -+ (void) png_set_cHRM(ping,ping_info, -+ mng_info->global_chrm.white_point.x, -+ mng_info->global_chrm.white_point.y, -+ mng_info->global_chrm.red_primary.x, -+ mng_info->global_chrm.red_primary.y, -+ mng_info->global_chrm.green_primary.x, -+ mng_info->global_chrm.green_primary.y, -+ mng_info->global_chrm.blue_primary.x, -+ mng_info->global_chrm.blue_primary.y); -+ } -+ if (png_get_valid(ping, ping_info, PNG_INFO_cHRM)) - { - (void) png_get_cHRM(ping,ping_info, - &image->chromaticity.white_point.x, -@@ -1867,12 +1885,9 @@ static Image *ReadOnePNGImage(MngInfo *m - image->chromaticity.white_point.x=0.3127f; - image->chromaticity.white_point.y=0.3290f; - } -- if (mng_info->have_global_gama || image->rendering_intent) -- ping_info->valid|=PNG_INFO_gAMA; -- if (mng_info->have_global_chrm || image->rendering_intent) -- ping_info->valid|=PNG_INFO_cHRM; - #if defined(PNG_oFFs_SUPPORTED) -- if (mng_info->mng_type == 0 && (ping_info->valid & PNG_INFO_oFFs)) -+ if (mng_info->mng_type == 0 && (png_get_valid(ping, ping_info, -+ PNG_INFO_oFFs))) - { - image->page.x=png_get_x_offset_pixels(ping, ping_info); - image->page.y=png_get_y_offset_pixels(ping, ping_info); -@@ -1885,7 +1900,17 @@ static Image *ReadOnePNGImage(MngInfo *m - } - #endif - #if defined(PNG_pHYs_SUPPORTED) -- if (ping_info->valid & PNG_INFO_pHYs) -+ if (!png_get_valid(ping, ping_info, PNG_INFO_pHYs)) -+ { -+ if (mng_info->have_global_phys) -+ { -+ png_set_pHYs(ping,ping_info, -+ mng_info->global_x_pixels_per_unit, -+ mng_info->global_y_pixels_per_unit, -+ mng_info->global_phys_unit_type); -+ } -+ } -+ if (png_get_valid(ping, ping_info, PNG_INFO_pHYs)) - { - int - unit_type; -@@ -1915,25 +1940,8 @@ static Image *ReadOnePNGImage(MngInfo *m - (unsigned long)y_resolution, - unit_type); - } -- else -- { -- if (mng_info->have_global_phys) -- { -- image->x_resolution=(float) mng_info->global_x_pixels_per_unit; -- image->y_resolution=(float) mng_info->global_y_pixels_per_unit; -- if (mng_info->global_phys_unit_type == PNG_RESOLUTION_METER) -- { -- image->units=PixelsPerCentimeterResolution; -- image->x_resolution=(double) -- mng_info->global_x_pixels_per_unit/100.0; -- image->y_resolution=(double) -- mng_info->global_y_pixels_per_unit/100.0; -- } -- ping_info->valid|=PNG_INFO_pHYs; -- } -- } - #endif -- if (ping_info->valid & PNG_INFO_PLTE) -+ if (png_get_valid(ping, ping_info, PNG_INFO_PLTE)) - { - int - number_colors; -@@ -1942,14 +1950,14 @@ static Image *ReadOnePNGImage(MngInfo *m - palette; - - (void) png_get_PLTE(ping,ping_info,&palette,&number_colors); -- if (number_colors == 0 && ping_info->color_type == -+ if (number_colors == 0 && ping_colortype == - PNG_COLOR_TYPE_PALETTE) - { - if (mng_info->global_plte_length) - { - png_set_PLTE(ping,ping_info,mng_info->global_plte, - (int) mng_info->global_plte_length); -- if (!(ping_info->valid & PNG_INFO_tRNS)) -+ if (!(png_get_valid(ping, ping_info, PNG_INFO_tRNS))) - if (mng_info->global_trns_length) - { - if (mng_info->global_trns_length > -@@ -1966,7 +1974,7 @@ static Image *ReadOnePNGImage(MngInfo *m - #ifndef PNG_READ_EMPTY_PLTE_SUPPORTED - mng_info->have_saved_bkgd_index || - #endif -- ping_info->valid & PNG_INFO_bKGD) -+ png_get_valid(ping, ping_info, PNG_INFO_bKGD)) - { - png_color_16 - background; -@@ -1974,9 +1982,9 @@ static Image *ReadOnePNGImage(MngInfo *m - #ifndef PNG_READ_EMPTY_PLTE_SUPPORTED - if (mng_info->have_saved_bkgd_index) - background.index=mng_info->saved_bkgd_index; -- else - #endif -- background.index=ping_info->background.index; -+ if (png_get_valid(ping, ping_info, PNG_INFO_bKGD)) -+ background.index=ping_background->index; - background.red=(png_uint_16) - mng_info->global_plte[background.index].red; - background.green=(png_uint_16) -@@ -1995,34 +2003,76 @@ static Image *ReadOnePNGImage(MngInfo *m - } - - #if defined(PNG_READ_bKGD_SUPPORTED) -- if (mng_info->have_global_bkgd && !(ping_info->valid & PNG_INFO_bKGD)) -+ if (mng_info->have_global_bkgd && -+ !(png_get_valid(ping,ping_info, PNG_INFO_bKGD))) - image->background_color=mng_info->mng_global_bkgd; -- if (ping_info->valid & PNG_INFO_bKGD) -+ if (png_get_valid(ping, ping_info, PNG_INFO_bKGD)) - { - /* - Set image background color. - */ -+ - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Reading PNG bKGD chunk."); -- if (ping_info->bit_depth <= QuantumDepth) -+ -+ if (ping_bit_depth == QuantumDepth) - { -- image->background_color.red=ping_info->background.red; -- image->background_color.green=ping_info->background.green; -- image->background_color.blue=ping_info->background.blue; -+ image->background_color.red = ping_background->red; -+ image->background_color.green= ping_background->green; -+ image->background_color.blue = ping_background->blue; - } -- else -+ else /* Scale background components to 16-bit */ - { -+ unsigned int -+ bkgd_scale; -+ -+ if (logging != MagickFalse) -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " raw ping_background=(%d,%d,%d).",ping_background->red, -+ ping_background->green,ping_background->blue); -+ -+ bkgd_scale = 1; -+ if (ping_bit_depth == 1) -+ bkgd_scale = 255; -+ else if (ping_bit_depth == 2) -+ bkgd_scale = 85; -+ else if (ping_bit_depth == 4) -+ bkgd_scale = 17; -+ if (ping_bit_depth <= 8) -+ bkgd_scale *= 257; -+ -+ ping_background->red *= bkgd_scale; -+ ping_background->green *= bkgd_scale; -+ ping_background->blue *= bkgd_scale; -+ -+ if (logging != MagickFalse) -+ { -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " bkgd_scale=%d.",bkgd_scale); -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " ping_background=(%d,%d,%d).",ping_background->red, -+ ping_background->green,ping_background->blue); -+ } -+ - image->background_color.red= -- ScaleShortToQuantum(ping_info->background.red); -+ ScaleShortToQuantum(ping_background->red); - image->background_color.green= -- ScaleShortToQuantum(ping_info->background.green); -+ ScaleShortToQuantum(ping_background->green); - image->background_color.blue= -- ScaleShortToQuantum(ping_info->background.blue); -+ ScaleShortToQuantum(ping_background->blue); -+ image->background_color.opacity=OpaqueOpacity; -+ -+ if (logging != MagickFalse) -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " image->background_color=(%d,%d,%d).", -+ image->background_color.red, -+ image->background_color.green,image->background_color.blue); - } - } - #endif -- if (ping_info->valid & PNG_INFO_tRNS) -+ -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - { - int - bit_mask; -@@ -2031,49 +2081,70 @@ static Image *ReadOnePNGImage(MngInfo *m - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Reading PNG tRNS chunk."); - -- bit_mask = (1 << ping_info->bit_depth) - 1; -+ bit_mask = (1 << ping_bit_depth) - 1; - - /* - Image has a transparent background. - */ -+ - transparent_color.red= -- (Quantum)(ping_info->trans_color.red & bit_mask); -+ (unsigned short)(ping_trans_color->red & bit_mask); - transparent_color.green= -- (Quantum) (ping_info->trans_color.green & bit_mask); -+ (unsigned short) (ping_trans_color->green & bit_mask); - transparent_color.blue= -- (Quantum) (ping_info->trans_color.blue & bit_mask); -+ (unsigned short) (ping_trans_color->blue & bit_mask); - transparent_color.opacity= -- (Quantum) (ping_info->trans_color.gray & bit_mask); -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ (unsigned short) (ping_trans_color->gray & bit_mask); -+ -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - { -+#if (Quantum_depth == 8) -+ if (ping_bit_depth < Quantum_depth) -+#endif -+ transparent_color.opacity=(unsigned short) ( -+ ping_trans_color->gray * -+ (65535L/((1UL << ping_bit_depth)-1))); -+ -+#if (Quantum_depth == 8) -+ else -+ transparent_color.opacity=(unsigned short) ( -+ (ping_trans_color->gray * 65535L)/ -+ ((1UL << ping_bit_depth)-1)); -+#endif -+ if (logging != MagickFalse) -+ { -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " Raw tRNS graylevel is %d.",ping_trans_color->gray); -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " scaled graylevel is %d.",transparent_color.opacity); -+ } - transparent_color.red=transparent_color.opacity; - transparent_color.green=transparent_color.opacity; - transparent_color.blue=transparent_color.opacity; - } - } - #if defined(PNG_READ_sBIT_SUPPORTED) -- if (mng_info->have_global_sbit) -- { -- int -- not_valid; -- not_valid=!ping_info->valid; -- if (not_valid & PNG_INFO_sBIT) -+ if (!png_get_valid(ping, ping_info, PNG_INFO_sBIT)) -+ if (mng_info->have_global_sbit) - png_set_sBIT(ping,ping_info,&mng_info->global_sbit); -- } - #endif - num_passes=png_set_interlace_handling(ping); -+ - png_read_update_info(ping,ping_info); -+ -+ ping_rowbytes=png_get_rowbytes(ping,ping_info); -+ - /* - Initialize image structure. - */ - mng_info->image_box.left=0; -- mng_info->image_box.right=(long) ping_info->width; -+ mng_info->image_box.right=(long) ping_width; - mng_info->image_box.top=0; -- mng_info->image_box.bottom=(long) ping_info->height; -+ mng_info->image_box.bottom=(long) ping_height; - if (mng_info->mng_type == 0) - { -- mng_info->mng_width=ping_info->width; -- mng_info->mng_height=ping_info->height; -+ mng_info->mng_width=ping_width; -+ mng_info->mng_height=ping_height; - mng_info->frame=mng_info->image_box; - mng_info->clip=mng_info->image_box; - } -@@ -2082,14 +2153,14 @@ static Image *ReadOnePNGImage(MngInfo *m - image->page.y=mng_info->y_off[mng_info->object_id]; - } - image->compression=ZipCompression; -- image->columns=ping_info->width; -- image->rows=ping_info->height; -- if ((ping_info->color_type == PNG_COLOR_TYPE_PALETTE) || -- (ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) || -- (ping_info->color_type == PNG_COLOR_TYPE_GRAY)) -+ image->columns=ping_width; -+ image->rows=ping_height; -+ if ((ping_colortype == PNG_COLOR_TYPE_PALETTE) || -+ (ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA) || -+ (ping_colortype == PNG_COLOR_TYPE_GRAY)) - { - image->storage_class=PseudoClass; -- image->colors=1 << ping_info->bit_depth; -+ image->colors=1 << ping_bit_depth; - #if (QuantumDepth == 8) - if (image->colors > 256) - image->colors=256; -@@ -2097,7 +2168,7 @@ static Image *ReadOnePNGImage(MngInfo *m - if (image->colors > 65536L) - image->colors=65536L; - #endif -- if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - { - int - number_colors; -@@ -2121,7 +2192,7 @@ static Image *ReadOnePNGImage(MngInfo *m - */ - if (!AllocateImageColormap(image,image->colors)) - ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image); -- if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - { - int - number_colors; -@@ -2142,7 +2213,7 @@ static Image *ReadOnePNGImage(MngInfo *m - unsigned long - scale; - -- scale=(MaxRGB/((1 << ping_info->bit_depth)-1)); -+ scale=(MaxRGB/((1 << ping_bit_depth)-1)); - if (scale < 1) - scale=1; - for (i=0; i < (long) image->colors; i++) -@@ -2182,10 +2253,9 @@ static Image *ReadOnePNGImage(MngInfo *m - " Reading PNG IDAT chunk(s)"); - if (num_passes > 1) - png_pixels=MagickAllocateMemory(unsigned char *, -- ping_info->rowbytes*image->rows); -+ ping_rowbytes*image->rows); - else -- png_pixels=MagickAllocateMemory(unsigned char *, -- ping_info->rowbytes); -+ png_pixels=MagickAllocateMemory(unsigned char *, ping_rowbytes); - if (png_pixels == (unsigned char *) NULL) - ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image); - -@@ -2205,20 +2275,20 @@ static Image *ReadOnePNGImage(MngInfo *m - int - depth; - -- depth=(long) ping_info->bit_depth; -+ depth=(long) ping_bit_depth; - #endif -- image->matte=((ping_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) || -- (ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) || -- (ping_info->valid & PNG_INFO_tRNS)); -+ image->matte=((ping_colortype == PNG_COLOR_TYPE_RGB_ALPHA) || -+ (ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA) || -+ (png_get_valid(ping, ping_info, PNG_INFO_tRNS))); - - for (y=0; y < (long) image->rows; y++) - { - if (num_passes > 1) -- row_offset=ping_info->rowbytes*y; -+ row_offset=ping_rowbytes*y; - else - row_offset=0; - png_read_row(ping,png_pixels+row_offset,NULL); -- if (!SetImagePixels(image,0,y,image->columns,1)) /* Was GetImagePixels() */ -+ if (!SetImagePixels(image,0,y,image->columns,1)) - break; - #if (QuantumDepth == 8) - if (depth == 16) -@@ -2229,13 +2299,13 @@ static Image *ReadOnePNGImage(MngInfo *m - - r=png_pixels+row_offset; - p=r; -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - { - for (x=(long) image->columns; x > 0; x--) - { - *r++=*p++; - p++; -- if ((ping_info->valid & PNG_INFO_tRNS) && -+ if ((png_get_valid(ping, ping_info, PNG_INFO_tRNS)) && - (((*(p-2) << 8)|*(p-1)) - == transparent_color.opacity)) - { -@@ -2246,9 +2316,9 @@ static Image *ReadOnePNGImage(MngInfo *m - *r++=OpaqueOpacity; - } - } -- else if (ping_info->color_type == PNG_COLOR_TYPE_RGB) -+ else if (ping_colortype == PNG_COLOR_TYPE_RGB) - { -- if (ping_info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - for (x=(long) image->columns; x > 0; x--) - { - *r++=*p++; -@@ -2282,25 +2352,25 @@ static Image *ReadOnePNGImage(MngInfo *m - *r++=OpaqueOpacity; - } - } -- else if (ping_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ else if (ping_colortype == PNG_COLOR_TYPE_RGB_ALPHA) - for (x=(long) (4*image->columns); x > 0; x--) - { - *r++=*p++; - p++; - } -- else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ else if (ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA) - for (x=(long) (2*image->columns); x > 0; x--) - { - *r++=*p++; - p++; - } - } -- if (depth == 8 && ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (depth == 8 && ping_colortype == PNG_COLOR_TYPE_GRAY) - (void) ImportImagePixelArea(image,(QuantumType) GrayQuantum, - image->depth,png_pixels+ - row_offset,0,0); -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY || -- ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY || -+ ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA) - { - image->depth=8; - (void) ImportImagePixelArea(image, -@@ -2309,12 +2379,12 @@ static Image *ReadOnePNGImage(MngInfo *m - row_offset,0,0); - image->depth=depth; - } -- else if (depth == 8 && ping_info->color_type == PNG_COLOR_TYPE_RGB) -+ else if (depth == 8 && ping_colortype == PNG_COLOR_TYPE_RGB) - (void) ImportImagePixelArea(image,(QuantumType) RGBQuantum, - image->depth,png_pixels+ - row_offset,0,0); -- else if (ping_info->color_type == PNG_COLOR_TYPE_RGB || -- ping_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ else if (ping_colortype == PNG_COLOR_TYPE_RGB || -+ ping_colortype == PNG_COLOR_TYPE_RGB_ALPHA) - { - image->depth=8; - (void) ImportImagePixelArea(image,(QuantumType) RGBAQuantum, -@@ -2322,28 +2392,28 @@ static Image *ReadOnePNGImage(MngInfo *m - row_offset,0,0); - image->depth=depth; - } -- else if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ else if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - (void) ImportImagePixelArea(image,(QuantumType) IndexQuantum, -- ping_info->bit_depth,png_pixels+ -+ ping_bit_depth,png_pixels+ - row_offset,0,0); - /* FIXME, sample size ??? */ - #else /* (QuantumDepth != 8) */ - -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - (void) ImportImagePixelArea(image,(QuantumType) GrayQuantum, - image->depth,png_pixels+ - row_offset,0,0); -- else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ else if (ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA) - (void) ImportImagePixelArea(image,(QuantumType) GrayAlphaQuantum, - image->depth,png_pixels+ - row_offset,0,0); -- else if (ping_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ else if (ping_colortype == PNG_COLOR_TYPE_RGB_ALPHA) - (void) ImportImagePixelArea(image,(QuantumType) RGBAQuantum, - image->depth,png_pixels+ - row_offset,0,0); -- else if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ else if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - (void) ImportImagePixelArea(image,(QuantumType) IndexQuantum, -- ping_info->bit_depth,png_pixels+ -+ ping_bit_depth,png_pixels+ - row_offset,0,0); - /* FIXME, sample size ??? */ - else -@@ -2372,7 +2442,7 @@ static Image *ReadOnePNGImage(MngInfo *m - /* - Convert grayscale image to PseudoClass pixel packets. - */ -- image->matte=ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA; -+ image->matte=ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA; - quantum_scanline=MagickAllocateMemory(Quantum *, - (image->matte ? 2 : 1) * - image->columns*sizeof(Quantum)); -@@ -2385,7 +2455,7 @@ static Image *ReadOnePNGImage(MngInfo *m - *p; - - if (num_passes > 1) -- row_offset=ping_info->rowbytes*y; -+ row_offset=ping_rowbytes*y; - else - row_offset=0; - png_read_row(ping,png_pixels+row_offset,NULL); -@@ -2395,7 +2465,7 @@ static Image *ReadOnePNGImage(MngInfo *m - indexes=AccessMutableIndexes(image); - p=png_pixels+row_offset; - r=quantum_scanline; -- switch (ping_info->bit_depth) -+ switch (ping_bit_depth) - { - case 1: - { -@@ -2445,7 +2515,7 @@ static Image *ReadOnePNGImage(MngInfo *m - } - case 8: - { -- if (ping_info->color_type == 4) -+ if (ping_colortype == 4) - for (x=(long) image->columns; x > 0; x--) - { - *r++=*p++; -@@ -2473,7 +2543,7 @@ static Image *ReadOnePNGImage(MngInfo *m - *r=0; - *r|=(*p++); - r++; -- if (ping_info->color_type == 4) -+ if (ping_colortype == 4) - { - q->opacity=((*p++) << 8); - q->opacity|=(*p++); -@@ -2488,7 +2558,7 @@ static Image *ReadOnePNGImage(MngInfo *m - *r=0; - *r|=(*p++); - r++; -- if (ping_info->color_type == 4) -+ if (ping_colortype == 4) - { - q->opacity=((*p++) << 8); - q->opacity|=(*p++); -@@ -2499,7 +2569,7 @@ static Image *ReadOnePNGImage(MngInfo *m - #else /* QuantumDepth == 8 */ - *r++=(*p++); - p++; /* strip low byte */ -- if (ping_info->color_type == 4) -+ if (ping_colortype == 4) - { - q->opacity=(Quantum) (MaxRGB-(*p++)); - p++; -@@ -2549,7 +2619,7 @@ static Image *ReadOnePNGImage(MngInfo *m - " exit ReadOnePNGImage()."); - return (image); - } -- if (ping_info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - { - ClassType - storage_class; -@@ -2572,25 +2642,26 @@ static Image *ReadOnePNGImage(MngInfo *m - IndexPacket - index; - -- if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - for (x=0; x < (long) image->columns; x++) - { - index=indexes[x]; -- if (index < ping_info->num_trans) -+ if (index < ping_num_trans) - q->opacity= -- ScaleCharToQuantum(255-ping_info->trans_alpha[index]); -+ ScaleCharToQuantum(255-ping_trans_alpha[index]); - else - q->opacity=OpaqueOpacity; - q++; - } -- else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ else if (ping_colortype == PNG_COLOR_TYPE_GRAY) - for (x=0; x < (long) image->columns; x++) - { - index=indexes[x]; - q->red=image->colormap[index].red; - q->green=image->colormap[index].green; - q->blue=image->colormap[index].blue; -- if (q->red == transparent_color.opacity) -+ if (ScaleQuantumToShort(q->red) == -+ transparent_color.opacity) - q->opacity=TransparentOpacity; - else - q->opacity=OpaqueOpacity; -@@ -2600,9 +2671,9 @@ static Image *ReadOnePNGImage(MngInfo *m - else - for (x=(long) image->columns; x > 0; x--) - { -- if (q->red == transparent_color.red && -- q->green == transparent_color.green && -- q->blue == transparent_color.blue) -+ if (ScaleQuantumToShort(q->red) == transparent_color.red && -+ ScaleQuantumToShort(q->green) == transparent_color.green && -+ ScaleQuantumToShort(q->blue) == transparent_color.blue) - q->opacity=TransparentOpacity; - else - q->opacity=OpaqueOpacity; -@@ -2714,7 +2785,7 @@ static Image *ReadOnePNGImage(MngInfo *m - mng_info->ob[object_id]->interlace_method=interlace_method; - mng_info->ob[object_id]->compression_method=compression_method; - mng_info->ob[object_id]->filter_method=filter_method; -- if (ping_info->valid & PNG_INFO_PLTE) -+ if (png_get_valid(ping, ping_info, PNG_INFO_PLTE)) - { - int - number_colors; -@@ -5734,7 +5805,7 @@ static Image *ReadMNGImage(const ImageIn - (void) LogMagickEvent(CoderEvent,GetMagickModule(),"exit ReadMNGImage()"); - return(image); - } --#else /* PNG_LIBPNG_VER > 95 */ -+#else /* PNG_LIBPNG_VER > 10011 */ - static Image *ReadPNGImage(const ImageInfo *image_info, - ExceptionInfo *exception) - { -@@ -5749,7 +5820,7 @@ static Image *ReadMNGImage(const ImageIn - { - return (ReadPNGImage(image_info,exception)); - } --#endif /* PNG_LIBPNG_VER > 95 */ -+#endif /* PNG_LIBPNG_VER > 10011 */ - #endif - - /* -@@ -5960,7 +6031,7 @@ ModuleExport void UnregisterPNGImage(voi - } - - #if defined(HasPNG) --#if PNG_LIBPNG_VER > 95 -+#if PNG_LIBPNG_VER > 10011 - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % % -@@ -6043,20 +6114,6 @@ ModuleExport void UnregisterPNGImage(voi - */ - - --#if (PNG_LIBPNG_VER > 99 && PNG_LIBPNG_VER < 10007) --/* This function became available in libpng version 1.0.6g. */ --static void --png_set_compression_buffer_size(png_structp png_ptr, png_uint_32 size) --{ -- if (png_ptr->zbuf) -- png_free(png_ptr, png_ptr->zbuf); png_ptr->zbuf=NULL; -- png_ptr->zbuf_size=(png_size_t) size; -- png_ptr->zbuf=(png_bytep) png_malloc(png_ptr, size); -- if (!png_ptr->zbuf) -- png_error(png_ptr,"Unable to allocate zbuf"); --} --#endif -- - static void - png_write_raw_profile(const ImageInfo *image_info,png_struct *ping, - png_info *ping_info, const char *profile_type, -@@ -6064,7 +6121,6 @@ png_write_raw_profile(const ImageInfo *i - const unsigned char *profile_data, - png_uint_32 length) - { --#if (PNG_LIBPNG_VER > 10005) - png_textp - text; - -@@ -6083,25 +6139,12 @@ png_write_raw_profile(const ImageInfo *i - - unsigned char - hex[16]={'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; --#endif - --#if (PNG_LIBPNG_VER <= 10005) -- if (image_info->verbose) -- (void) printf("Not "); -- (void) image_info; -- (void) ping; -- (void) ping_info; -- (void) profile_type; -- (void) profile_description; -- (void) profile_data; -- (void) length; --#endif - if (image_info->verbose) - { - (void) printf("writing raw profile: type=%.1024s, length=%lu\n", - profile_type, (unsigned long)length); - } --#if (PNG_LIBPNG_VER > 10005) - text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text)); - description_length=strlen((const char *) profile_description); - allocated_length=(png_uint_32) (length*2 + (length >> 5) + 20 -@@ -6137,7 +6180,6 @@ png_write_raw_profile(const ImageInfo *i - png_free(ping,text[0].text); - png_free(ping,text[0].key); - png_free(ping,text); --#endif - } - - static MagickPassFail WriteOnePNGImage(MngInfo *mng_info, -@@ -6152,17 +6194,34 @@ static MagickPassFail WriteOnePNGImage(M - - int - num_passes, -- pass; -+ pass, -+ ping_bit_depth = 0, -+ ping_colortype = 0, -+ ping_interlace_method = 0, -+ ping_compression_method = 0, -+ ping_filter_method = 0, -+ ping_num_trans = 0; -+ -+ png_bytep -+ ping_trans_alpha = NULL; - - png_colorp - palette; - -+ png_color_16 -+ ping_background, -+ ping_trans_color; -+ - png_info - *ping_info; - - png_struct - *ping; - -+ png_uint_32 -+ ping_width, -+ ping_height; -+ - long - y; - -@@ -6181,8 +6240,7 @@ static MagickPassFail WriteOnePNGImage(M - image_depth, - image_matte, - logging, -- matte, -- not_valid; -+ matte; - - unsigned long - quantum_size, /* depth for ExportImage */ -@@ -6211,6 +6269,18 @@ static MagickPassFail WriteOnePNGImage(M - return MagickFail; - } - -+ /* Initialize some stuff */ -+ ping_background.red = 0; -+ ping_background.green = 0; -+ ping_background.blue = 0; -+ ping_background.gray = 0; -+ ping_background.index = 0; -+ -+ ping_trans_color.red=0; -+ ping_trans_color.green=0; -+ ping_trans_color.blue=0; -+ ping_trans_color.gray=0; -+ - image_colors=image->colors; - image_depth=image->depth; - image_matte=image->matte; -@@ -6259,7 +6329,7 @@ static MagickPassFail WriteOnePNGImage(M - LockSemaphoreInfo(png_semaphore); - #endif - -- if (setjmp(ping->jmpbuf)) -+ if (setjmp(png_jmpbuf(ping))) - { - /* - PNG write failed. -@@ -6288,16 +6358,16 @@ static MagickPassFail WriteOnePNGImage(M - # endif - #endif - x=0; -- ping_info->width=image->columns; -- ping_info->height=image->rows; -+ ping_width=image->columns; -+ ping_height=image->rows; - if (logging) - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " width=%lu", -- (unsigned long)ping_info->width); -+ (unsigned long)ping_width); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " height=%lu", -- (unsigned long)ping_info->height); -+ (unsigned long)ping_height); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image->depth=%u",image_depth); - } -@@ -6306,12 +6376,12 @@ static MagickPassFail WriteOnePNGImage(M - quantum_size=(image_depth > 8) ? 16:8; - - save_image_depth=image_depth; -- ping_info->bit_depth=(png_byte) save_image_depth; -+ ping_bit_depth=(png_byte) save_image_depth; - if (logging) - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " ping_info->bit_depth=%u", -- ping_info->bit_depth); -+ " ping_bit_depth=%u", -+ ping_bit_depth); - } - #if defined(PNG_pHYs_SUPPORTED) - if ((image->x_resolution != 0) && (image->y_resolution != 0) && -@@ -6398,8 +6468,8 @@ static MagickPassFail WriteOnePNGImage(M - matte=image_matte; - if (mng_info->write_png8) - { -- ping_info->color_type=PNG_COLOR_TYPE_PALETTE; -- ping_info->bit_depth=8; -+ ping_colortype=PNG_COLOR_TYPE_PALETTE; -+ ping_bit_depth=8; - { - /* TO DO: make this a function cause it's used twice, except - for reducing the sample depth from 8. */ -@@ -6424,13 +6494,13 @@ static MagickPassFail WriteOnePNGImage(M - " Colors quantized to %ld", - number_colors); - } -- if (matte) -- ping_info->valid|=PNG_INFO_tRNS; -+ - /* - Set image palette. - */ -- ping_info->color_type=PNG_COLOR_TYPE_PALETTE; -- ping_info->valid|=PNG_INFO_PLTE; -+ -+ ping_colortype=PNG_COLOR_TYPE_PALETTE; -+ - #if defined(PNG_SORT_PALETTE) - save_number_colors=image_colors; - if (CompressColormapTransFirst(image) == MagickFail) -@@ -6465,20 +6535,17 @@ static MagickPassFail WriteOnePNGImage(M - - } - png_set_PLTE(ping,ping_info,palette,(int) number_colors); --#if (PNG_LIBPNG_VER > 10008) - MagickFreeMemory(palette); --#endif - /* - Identify which colormap entry is transparent. - */ -- ping_info->trans_alpha=MagickAllocateMemory(unsigned char *, -- number_colors); -- if (ping_info->trans_alpha == (unsigned char *) NULL) -+ ping_trans_alpha=MagickAllocateMemory(unsigned char *, number_colors); -+ if (ping_trans_alpha == (unsigned char *) NULL) - ThrowWriterException(ResourceLimitError,MemoryAllocationFailed, - image); - assert(number_colors <= 256); - for (i=0; i < (long) number_colors; i++) -- ping_info->trans_alpha[i]=255; -+ ping_trans_alpha[i]=255; - for (y=0; y < (long) image->rows; y++) - { - register const PixelPacket -@@ -6498,29 +6565,29 @@ static MagickPassFail WriteOnePNGImage(M - - index=indexes[x]; - assert((unsigned long) index < number_colors); -- ping_info->trans_alpha[index]=(png_byte) (255- -+ ping_trans_alpha[index]=(png_byte) (255- - ScaleQuantumToChar(p->opacity)); - } - p++; - } - } -- ping_info->num_trans=0; -+ ping_num_trans=0; - for (i=0; i < (long) number_colors; i++) -- if (ping_info->trans_alpha[i] != 255) -- ping_info->num_trans=(unsigned short) (i+1); -- if (ping_info->num_trans == 0) -- ping_info->valid&=(~PNG_INFO_tRNS); -- if (!(ping_info->valid & PNG_INFO_tRNS)) -- ping_info->num_trans=0; -- if (ping_info->num_trans == 0) -- MagickFreeMemory(ping_info->trans_alpha); -+ if (ping_trans_alpha[i] != 255) -+ ping_num_trans=(unsigned short) (i+1); -+ if (ping_num_trans == 0) -+ png_set_invalid(ping,ping_info,PNG_INFO_tRNS); -+ if (!(png_get_valid(ping,ping_info,PNG_INFO_tRNS))) -+ ping_num_trans=0; -+ if (ping_num_trans == 0) -+ MagickFreeMemory(ping_trans_alpha); - /* - Identify which colormap entry is the background color. - */ - for (i=0; i < (long) Max(number_colors-1,1); i++) -- if (RGBColorMatchExact(ping_info->background,image->colormap[i])) -+ if (RGBColorMatchExact(ping_background,image->colormap[i])) - break; -- ping_info->background.index=(png_uint_16) i; -+ ping_background.index=(png_uint_16) i; - } - if (image_matte) - { -@@ -6530,79 +6597,79 @@ static MagickPassFail WriteOnePNGImage(M - else if (mng_info->write_png24) - { - image_matte=MagickFalse; -- ping_info->color_type=PNG_COLOR_TYPE_RGB; -+ ping_colortype=PNG_COLOR_TYPE_RGB; - } - else if (mng_info->write_png32) - { - image_matte=MagickTrue; -- ping_info->color_type=PNG_COLOR_TYPE_RGB_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_RGB_ALPHA; - } - else - { -- if (ping_info->bit_depth < 8) -- ping_info->bit_depth=8; -+ if (ping_bit_depth < 8) -+ ping_bit_depth=8; - -- ping_info->color_type=PNG_COLOR_TYPE_RGB; -+ ping_colortype=PNG_COLOR_TYPE_RGB; - if (characteristics.monochrome) - { - if (characteristics.opaque) - { -- ping_info->color_type=PNG_COLOR_TYPE_GRAY; -- ping_info->bit_depth=1; -+ ping_colortype=PNG_COLOR_TYPE_GRAY; -+ ping_bit_depth=1; - } - else - { -- ping_info->color_type=PNG_COLOR_TYPE_GRAY_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_GRAY_ALPHA; - } - } - else if (characteristics.grayscale) - { - if (characteristics.opaque) -- ping_info->color_type=PNG_COLOR_TYPE_GRAY; -+ ping_colortype=PNG_COLOR_TYPE_GRAY; - else -- ping_info->color_type=PNG_COLOR_TYPE_GRAY_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_GRAY_ALPHA; - } - else if (characteristics.palette && image_colors <= 256) - { -- ping_info->color_type=PNG_COLOR_TYPE_PALETTE; -- ping_info->bit_depth=8; -+ ping_colortype=PNG_COLOR_TYPE_PALETTE; -+ ping_bit_depth=8; - mng_info->IsPalette=MagickTrue; - } - else - { - if (characteristics.opaque) -- ping_info->color_type=PNG_COLOR_TYPE_RGB; -+ ping_colortype=PNG_COLOR_TYPE_RGB; - else -- ping_info->color_type=PNG_COLOR_TYPE_RGB_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_RGB_ALPHA; - } - if (image_info->type == BilevelType) - { - if (characteristics.monochrome) - { - if (!image_matte) -- ping_info->bit_depth=1; -+ ping_bit_depth=1; - } - } - if (image_info->type == GrayscaleType) -- ping_info->color_type=PNG_COLOR_TYPE_GRAY; -+ ping_colortype=PNG_COLOR_TYPE_GRAY; - if (image_info->type == GrayscaleMatteType) -- ping_info->color_type=PNG_COLOR_TYPE_GRAY_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_GRAY_ALPHA; - /* if (!mng_info->optimize && matte) */ -- /* ping_info->color_type=PNG_COLOR_TYPE_RGB_ALPHA; */ -+ /* ping_colortype=PNG_COLOR_TYPE_RGB_ALPHA; */ - - if (logging) - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Tentative PNG color type: %s (%d)", -- PngColorTypeToString(ping_info->color_type), -- ping_info->color_type); -+ PngColorTypeToString(ping_colortype), -+ ping_colortype); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image_info->type: %d",image_info->type); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image->depth: %u",image_depth); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " ping_info->bit_depth: %d", -- ping_info->bit_depth); -+ " ping_bit_depth: %d", -+ ping_bit_depth); - } - - if (matte && (mng_info->optimize || mng_info->IsPalette)) -@@ -6614,10 +6681,10 @@ static MagickPassFail WriteOnePNGImage(M - { - /* - No transparent pixels are present. Change 4 or 6 to 0 or 2, -- and do not set the PNG_INFO_tRNS flag in ping_info->valid. -+ and do not set the PNG_INFO_tRNS flag. - */ - image_matte=MagickFalse; -- ping_info->color_type&=0x03; -+ ping_colortype&=0x03; - } - else - { -@@ -6625,13 +6692,13 @@ static MagickPassFail WriteOnePNGImage(M - mask; - - mask=0xffff; -- if (ping_info->bit_depth == 8) -+ if (ping_bit_depth == 8) - mask=0x00ff; -- if (ping_info->bit_depth == 4) -+ if (ping_bit_depth == 4) - mask=0x000f; -- if (ping_info->bit_depth == 2) -+ if (ping_bit_depth == 2) - mask=0x0003; -- if (ping_info->bit_depth == 1) -+ if (ping_bit_depth == 1) - mask=0x0001; - - /* -@@ -6655,19 +6722,20 @@ static MagickPassFail WriteOnePNGImage(M - if ((p != (const PixelPacket *) NULL) && - (p->opacity != OpaqueOpacity)) - { -- ping_info->valid|=PNG_INFO_tRNS; -- ping_info->trans_color.red=ScaleQuantumToShort(p->red)&mask; -- ping_info->trans_color.green=ScaleQuantumToShort(p->green) -+ ping_trans_color.red=ScaleQuantumToShort(p->red)&mask; -+ ping_trans_color.green=ScaleQuantumToShort(p->green) - &mask; -- ping_info->trans_color.blue=ScaleQuantumToShort(p->blue) -+ ping_trans_color.blue=ScaleQuantumToShort(p->blue) - &mask; -- ping_info->trans_color.gray= -+ ping_trans_color.gray= - (png_uint_16) ScaleQuantumToShort(PixelIntensity(p))&mask; -- ping_info->trans_color.index=(unsigned char) -+ ping_trans_color.index=(unsigned char) - (ScaleQuantumToChar(MaxRGB-p->opacity)); -+ (void) png_set_tRNS(ping, ping_info, NULL, 0, -+ &ping_trans_color); - } - } -- if (ping_info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - { - /* - Determine if there is one and only one transparent color -@@ -6684,7 +6752,7 @@ static MagickPassFail WriteOnePNGImage(M - { - if (p->opacity != OpaqueOpacity) - { -- if (!RGBColorMatchExact(ping_info->trans_color,*p)) -+ if (!RGBColorMatchExact(ping_trans_color,*p)) - { - break; /* Can't use RGB + tRNS for multiple - transparent colors. */ -@@ -6697,7 +6765,7 @@ static MagickPassFail WriteOnePNGImage(M - } - else - { -- if (RGBColorMatchExact(ping_info->trans_color,*p)) -+ if (RGBColorMatchExact(ping_trans_color,*p)) - break; /* Can't use RGB + tRNS when another pixel - having the same RGB samples is - transparent. */ -@@ -6708,50 +6776,50 @@ static MagickPassFail WriteOnePNGImage(M - break; - } - if (x != 0) -- ping_info->valid&=(~PNG_INFO_tRNS); -+ png_set_invalid(ping, ping_info, PNG_INFO_tRNS); - } -- if (ping_info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - { -- ping_info->color_type &= 0x03; /* changes 4 or 6 to 0 or 2 */ -+ ping_colortype &= 0x03; /* changes 4 or 6 to 0 or 2 */ - if (image_depth == 8) - { -- ping_info->trans_color.red&=0xff; -- ping_info->trans_color.green&=0xff; -- ping_info->trans_color.blue&=0xff; -- ping_info->trans_color.gray&=0xff; -+ ping_trans_color.red&=0xff; -+ ping_trans_color.green&=0xff; -+ ping_trans_color.blue&=0xff; -+ ping_trans_color.gray&=0xff; - } - } - } - matte=image_matte; -- if (ping_info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - image_matte=MagickFalse; - if ((mng_info->optimize || mng_info->IsPalette) && - characteristics.grayscale && (!image_matte || image_depth >= 8)) - { - if (image_matte) -- ping_info->color_type=PNG_COLOR_TYPE_GRAY_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_GRAY_ALPHA; - else - { -- ping_info->color_type=PNG_COLOR_TYPE_GRAY; -+ ping_colortype=PNG_COLOR_TYPE_GRAY; - if (save_image_depth == 16 && image_depth == 8) -- ping_info->trans_color.gray*=0x0101; -+ ping_trans_color.gray*=0x0101; - } - if (image_depth > QuantumDepth) - image_depth=QuantumDepth; - if (image_colors == 0 || image_colors-1 > MaxRGB) - image_colors=1 << image_depth; - if (image_depth > 8) -- ping_info->bit_depth=16; -+ ping_bit_depth=16; - else - { -- if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - { -- ping_info->bit_depth=1; -- while ((int) (1 << ping_info->bit_depth) < -+ ping_bit_depth=1; -+ while ((int) (1 << ping_bit_depth) < - (long) image_colors) -- ping_info->bit_depth <<= 1; -+ ping_bit_depth <<= 1; - } -- else if (mng_info->optimize && ping_info->color_type == -+ else if (mng_info->optimize && ping_colortype == - PNG_COLOR_TYPE_GRAY && image_colors < 17 && - mng_info->IsPalette) - { -@@ -6779,11 +6847,11 @@ static MagickPassFail WriteOnePNGImage(M - depth_1_ok=MagickFalse; - } - if (depth_1_ok) -- ping_info->bit_depth=1; -+ ping_bit_depth=1; - else if (depth_2_ok) -- ping_info->bit_depth=2; -+ ping_bit_depth=2; - else if (depth_4_ok) -- ping_info->bit_depth=4; -+ ping_bit_depth=4; - } - } - } -@@ -6796,13 +6864,10 @@ static MagickPassFail WriteOnePNGImage(M - number_colors; - - number_colors=image_colors; -- if (matte) -- ping_info->valid|=PNG_INFO_tRNS; - /* - Set image palette. - */ -- ping_info->color_type=PNG_COLOR_TYPE_PALETTE; -- ping_info->valid|=PNG_INFO_PLTE; -+ ping_colortype=PNG_COLOR_TYPE_PALETTE; - if (mng_info->have_write_global_plte && !matte) - { - png_set_PLTE(ping,ping_info,NULL,0); -@@ -6847,14 +6912,12 @@ static MagickPassFail WriteOnePNGImage(M - " Setting up PLTE chunk with %d colors", - (int) number_colors); - png_set_PLTE(ping,ping_info,palette,(int) number_colors); --#if (PNG_LIBPNG_VER > 10008) - MagickFreeMemory(palette); --#endif - } -- ping_info->bit_depth=1; -- while ((1UL << ping_info->bit_depth) < number_colors) -- ping_info->bit_depth <<= 1; -- ping_info->num_trans=0; -+ ping_bit_depth=1; -+ while ((1UL << ping_bit_depth) < number_colors) -+ ping_bit_depth <<= 1; -+ ping_num_trans=0; - if (matte) - { - int -@@ -6890,7 +6953,7 @@ static MagickPassFail WriteOnePNGImage(M - if (trans_alpha[index] != (png_byte) (255- - ScaleQuantumToChar(p->opacity))) - { -- ping_info->color_type= -+ ping_colortype= - PNG_COLOR_TYPE_RGB_ALPHA; - break; - } -@@ -6900,11 +6963,11 @@ static MagickPassFail WriteOnePNGImage(M - } - p++; - } -- if (ping_info->color_type==PNG_COLOR_TYPE_RGB_ALPHA) -+ if (ping_colortype==PNG_COLOR_TYPE_RGB_ALPHA) - { -- ping_info->num_trans=0; -- ping_info->valid&=(~PNG_INFO_tRNS); -- ping_info->valid&=(~PNG_INFO_PLTE); -+ ping_num_trans=0; -+ png_set_invalid(ping, ping_info, PNG_INFO_tRNS); -+ png_set_invalid(ping, ping_info, PNG_INFO_PLTE); - mng_info->IsPalette=MagickFalse; - (void) SyncImage(image); - if (logging) -@@ -6916,40 +6979,41 @@ static MagickPassFail WriteOnePNGImage(M - break; - } - } -- if ((ping_info->valid & PNG_INFO_tRNS)) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - { - for (i=0; i < (long) number_colors; i++) - { - if (trans_alpha[i] == 256) - trans_alpha[i]=255; - if (trans_alpha[i] != 255) -- ping_info->num_trans=(unsigned short) (i+1); -+ ping_num_trans=(unsigned short) (i+1); - } - } -- if (ping_info->num_trans == 0) -- ping_info->valid&=(~PNG_INFO_tRNS); -- if (!(ping_info->valid & PNG_INFO_tRNS)) -- ping_info->num_trans=0; -- if (ping_info->num_trans != 0) -+ if (ping_num_trans == 0) -+ png_set_invalid(ping, ping_info, PNG_INFO_tRNS); -+ if (!png_get_valid(ping, ping_info, PNG_INFO_tRNS)) -+ ping_num_trans=0; -+ -+ if (ping_num_trans != 0) - { -- ping_info->trans_alpha=MagickAllocateMemory( -- unsigned char *, number_colors); -- if (ping_info->trans_alpha == (unsigned char *) NULL) -- ThrowWriterException(ResourceLimitError, -- MemoryAllocationFailed,image); -- for (i=0; i < (long) number_colors; i++) -- ping_info->trans_alpha[i]=(png_byte) trans_alpha[i]; -+ for (i=0; i<256; i++) -+ ping_trans_alpha[i]=(png_byte) trans_alpha[i]; - } -+ -+ (void) png_set_tRNS(ping, ping_info, -+ ping_trans_alpha, -+ ping_num_trans, -+ &ping_trans_color); - } - - /* - Identify which colormap entry is the background color. - */ - for (i=0; i < (long) Max(number_colors-1,1); i++) -- if (RGBColorMatchExact(ping_info->background, -+ if (RGBColorMatchExact(ping_background, - image->colormap[i])) - break; -- ping_info->background.index=(png_uint_16) i; -+ ping_background.index=(png_uint_16) i; - } - } - else -@@ -6958,10 +7022,10 @@ static MagickPassFail WriteOnePNGImage(M - image_depth=8; - if ((save_image_depth == 16) && (image_depth == 8)) - { -- ping_info->trans_color.red*=0x0101; -- ping_info->trans_color.green*=0x0101; -- ping_info->trans_color.blue*=0x0101; -- ping_info->trans_color.gray*=0x0101; -+ ping_trans_color.red*=0x0101; -+ ping_trans_color.green*=0x0101; -+ ping_trans_color.blue*=0x0101; -+ ping_trans_color.gray*=0x0101; - } - } - -@@ -6969,7 +7033,7 @@ static MagickPassFail WriteOnePNGImage(M - Adjust background and transparency samples in sub-8-bit - grayscale files. - */ -- if (ping_info->bit_depth < 8 && ping_info->color_type == -+ if (ping_bit_depth < 8 && ping_colortype == - PNG_COLOR_TYPE_GRAY) - { - png_uint_16 -@@ -6978,7 +7042,7 @@ static MagickPassFail WriteOnePNGImage(M - png_color_16 - background; - -- maxval=(1 << ping_info->bit_depth)-1; -+ maxval=(1 << ping_bit_depth)-1; - - - background.gray=(png_uint_16) -@@ -6989,28 +7053,26 @@ static MagickPassFail WriteOnePNGImage(M - " Setting up bKGD chunk"); - png_set_bKGD(ping,ping_info,&background); - -- ping_info->trans_color.gray=(png_uint_16)(maxval* -- ping_info->trans_color.gray/ -- MaxRGB); -+ ping_trans_color.gray=(png_uint_16)(maxval* -+ ping_trans_color.gray/ -+ MaxRGB); - } - } - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG color type: %s (%d)", -- PngColorTypeToString(ping_info->color_type), -- ping_info->color_type); -+ PngColorTypeToString(ping_colortype), -+ ping_colortype); - /* - Initialize compression level and filtering. - */ - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Setting up deflate compression"); --#if (PNG_LIBPNG_VER > 99) - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Compression buffer size: 32768"); - png_set_compression_buffer_size(ping,32768L); --#endif - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Compression mem level: 9"); -@@ -7044,7 +7106,7 @@ static MagickPassFail WriteOnePNGImage(M - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Filter_type: PNG_INTRAPIXEL_DIFFERENCING"); -- ping_info->filter_type=PNG_INTRAPIXEL_DIFFERENCING; -+ ping_filter_method=PNG_INTRAPIXEL_DIFFERENCING; - } - else - if (logging) -@@ -7061,8 +7123,8 @@ static MagickPassFail WriteOnePNGImage(M - if ((image_info->quality % 10) != 5) - base_filter=(int) image_info->quality % 10; - else -- if ((ping_info->color_type == PNG_COLOR_TYPE_GRAY) || -- (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) || -+ if ((ping_colortype == PNG_COLOR_TYPE_GRAY) || -+ (ping_colortype == PNG_COLOR_TYPE_PALETTE) || - (image_info->quality < 50)) - base_filter=PNG_NO_FILTERS; - else -@@ -7099,7 +7161,7 @@ static MagickPassFail WriteOnePNGImage(M - { - if (LocaleCompare(profile_name,"ICM") == 0) - { --#if (PNG_LIBPNG_VER > 10008) && defined(PNG_WRITE_iCCP_SUPPORTED) -+#if defined(PNG_WRITE_iCCP_SUPPORTED) - { - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -@@ -7170,8 +7232,8 @@ static MagickPassFail WriteOnePNGImage(M - (void) png_set_sRGB(ping,ping_info,PerceptualIntent); - png_set_gAMA(ping,ping_info,0.45455); - } -- not_valid=(!ping_info->valid); -- if ((!mng_info->write_mng) || not_valid & PNG_INFO_sRGB) -+ if ((!mng_info->write_mng) || -+ !png_get_valid(ping, ping_info, PNG_INFO_sRGB)) - #endif - { - if (!mng_info->have_write_global_gama && (image->gamma != 0.0)) -@@ -7210,7 +7272,7 @@ static MagickPassFail WriteOnePNGImage(M - bp.x,bp.y); - } - } -- ping_info->interlace_type=(image_info->interlace == LineInterlace); -+ ping_interlace_method=(image_info->interlace == LineInterlace); - - if (mng_info->write_mng) - png_set_sig_bytes(ping,8); -@@ -7219,6 +7281,15 @@ static MagickPassFail WriteOnePNGImage(M - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Writing PNG header chunks"); - -+ png_set_IHDR(ping,ping_info, -+ ping_width, -+ ping_height, -+ ping_bit_depth, -+ ping_colortype, -+ ping_interlace_method, -+ ping_compression_method, -+ ping_filter_method); -+ - png_write_info(ping,ping_info); - - #if (PNG_LIBPNG_VER == 10206) -@@ -7313,7 +7384,7 @@ static MagickPassFail WriteOnePNGImage(M - { - if ((!mng_info->write_png8 && !mng_info->write_png24 && - !mng_info->write_png32) && -- (!image_matte || (ping_info->bit_depth >= QuantumDepth)) && -+ (!image_matte || (ping_bit_depth >= QuantumDepth)) && - (mng_info->optimize || mng_info->IsPalette) && - IsGrayImage(image,&image->exception)) - { -@@ -7325,7 +7396,7 @@ static MagickPassFail WriteOnePNGImage(M - if (!AcquireImagePixels(image,0,y,image->columns,1, - &image->exception)) - break; -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - { - if (mng_info->IsPalette) - (void) ExportImagePixelArea(image, -@@ -7368,14 +7439,14 @@ static MagickPassFail WriteOnePNGImage(M - " pass %d, Image Is RGB," - " PNG colortype is %s (%d)",pass, - PngColorTypeToString( -- ping_info->color_type), -- ping_info->color_type); -+ ping_colortype), -+ ping_colortype); - for (y=0; y < (long) image->rows; y++) - { - if (!AcquireImagePixels(image,0,y,image->columns,1, - &image->exception)) - break; -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - { - if (image->storage_class == DirectClass) - (void) ExportImagePixelArea(image,(QuantumType) -@@ -7388,7 +7459,7 @@ static MagickPassFail WriteOnePNGImage(M - quantum_size, - png_pixels,0,0); - } -- else if (ping_info->color_type == -+ else if (ping_colortype == - PNG_COLOR_TYPE_GRAY_ALPHA) - (void) ExportImagePixelArea(image,(QuantumType) - GrayAlphaQuantum, -@@ -7433,12 +7504,12 @@ static MagickPassFail WriteOnePNGImage(M - if (!AcquireImagePixels(image,0,y,image->columns,1, - &image->exception)) - break; -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - (void) ExportImagePixelArea(image,(QuantumType) - GrayQuantum, - quantum_size, - png_pixels,0,0); -- else if (ping_info->color_type == -+ else if (ping_colortype == - PNG_COLOR_TYPE_GRAY_ALPHA) - (void) ExportImagePixelArea(image,(QuantumType) - GrayAlphaQuantum, -@@ -7471,38 +7542,32 @@ static MagickPassFail WriteOnePNGImage(M - " Writing PNG image data"); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Width: %lu", -- (unsigned long)ping_info->width); -+ (unsigned long)ping_width); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Height: %lu", -- (unsigned long)ping_info->height); -+ (unsigned long)ping_height); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " PNG sample depth: %d",ping_info->bit_depth); -+ " PNG sample depth: %d",ping_bit_depth); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG color type: %s (%d)", -- PngColorTypeToString(ping_info->color_type), -- ping_info->color_type); -+ PngColorTypeToString(ping_colortype), -+ ping_colortype); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG Interlace method: %d", -- ping_info->interlace_type); -+ ping_interlace_method); - } - /* - Generate text chunks. - */ --#if (PNG_LIBPNG_VER <= 10005) -- ping_info->num_text=0; --#endif - attribute=GetImageAttribute(image,(char *) NULL); - for ( ; attribute != (const ImageAttribute *) NULL; - attribute=attribute->next) - { --#if (PNG_LIBPNG_VER > 10005) - png_textp - text; --#endif - - if (*attribute->key == '[') - continue; --#if (PNG_LIBPNG_VER > 10005) - text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text)); - text[0].key=attribute->key; - text[0].text=attribute->value; -@@ -7519,40 +7584,6 @@ static MagickPassFail WriteOnePNGImage(M - } - png_set_text(ping,ping_info,text,1); - png_free(ping,text); --#else -- /* Work directly with ping_info struct; -- * png_set_text before libpng version -- * 1.0.5a is leaky */ -- if (ping_info->num_text == 0) -- { -- ping_info->text=MagickAllocateMemory(png_text *, -- 256*sizeof(png_text)); -- if (ping_info->text == (png_text *) NULL) -- (void) ThrowException(&image->exception,(ExceptionType) -- ResourceLimitError,MemoryAllocationFailed, -- image->filename); -- } -- i=ping_info->num_text++; -- if (i > 255) -- (void) ThrowException(&image->exception,(ExceptionType) -- ResourceLimitError, -- "Cannot write more than 256 PNG text chunks", -- image->filename); -- ping_info->text[i].key=attribute->key; -- ping_info->text[i].text=attribute->value; -- ping_info->text[i].text_length=strlen(attribute->value); -- ping_info->text[i].compression= -- image_info->compression == NoCompression || -- (image_info->compression == UndefinedCompression && -- ping_info->text[i].text_length < 128) ? -1 : 0; -- if (logging) -- { -- (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " Setting up text chunk"); -- (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " keyword: %s",ping_info->text[i].key); -- } --#endif - } - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -@@ -7560,9 +7591,9 @@ static MagickPassFail WriteOnePNGImage(M - png_write_end(ping,ping_info); - if (mng_info->need_fram && (int) image->dispose == BackgroundDispose) - { -- if (mng_info->page.x || mng_info->page.y || (ping_info->width != -+ if (mng_info->page.x || mng_info->page.y || (ping_width != - mng_info->page.width) || -- (ping_info->height != mng_info->page.height)) -+ (ping_height != mng_info->page.height)) - { - unsigned char - chunk[32]; -@@ -7583,10 +7614,10 @@ static MagickPassFail WriteOnePNGImage(M - chunk[14]=0; /* clipping boundaries delta type */ - PNGLong(chunk+15,(png_uint_32) (mng_info->page.x)); /* left cb */ - PNGLong(chunk+19,(png_uint_32) (mng_info->page.x + -- ping_info->width)); -+ ping_width)); - PNGLong(chunk+23,(png_uint_32) (mng_info->page.y)); /* top cb */ - PNGLong(chunk+27,(png_uint_32) (mng_info->page.y + -- ping_info->height)); -+ ping_height)); - (void) WriteBlob(image,31,(char *) chunk); - (void) WriteBlobMSBULong(image,crc32(0,chunk,31)); - mng_info->old_framing_mode=4; -@@ -7605,7 +7636,7 @@ static MagickPassFail WriteOnePNGImage(M - - /* Save depth actually written */ - -- s[0]=(char) ping_info->bit_depth; -+ s[0]=(char) ping_bit_depth; - s[1]='\0'; - - (void) SetImageAttribute(image,"[png:bit-depth-written]",s); -@@ -7613,18 +7644,6 @@ static MagickPassFail WriteOnePNGImage(M - /* - Free PNG resources. - */ --#if (PNG_LIBPNG_VER < 10007) -- if (ping_info->valid & PNG_INFO_PLTE) -- { -- MagickFreeMemory(ping_info->palette); -- ping_info->valid&=(~PNG_INFO_PLTE); -- } --#endif -- if (ping_info->valid & PNG_INFO_tRNS) -- { -- MagickFreeMemory(ping_info->trans_alpha); -- ping_info->valid&=(~PNG_INFO_tRNS); -- } - png_destroy_write_struct(&ping,&ping_info); - - MagickFreeMemory(png_pixels); -@@ -8365,23 +8384,12 @@ static unsigned int WriteMNGImage(const - final_delay=0, - initial_delay; - --#if (PNG_LIBPNG_VER < 10007) -+#if (PNG_LIBPNG_VER < 10200) - if (image_info->verbose) - printf("Your PNG library (libpng-%s) is rather old.\n", - PNG_LIBPNG_VER_STRING); - #endif - --#if (PNG_LIBPNG_VER >= 10400) --# ifndef PNG_TRANSFORM_GRAY_TO_RGB /* Added at libpng-1.4.0beta67 */ -- if (image_info->verbose) -- { -- printf("Your PNG library (libpng-%s) is an old beta version.\n", -- PNG_LIBPNG_VER_STRING); -- printf("Please update it.\n"); -- } --# endif --#endif -- - /* - Open image file. - */ -@@ -9196,7 +9204,7 @@ static unsigned int WriteMNGImage(const - (void) LogMagickEvent(CoderEvent,GetMagickModule(),"exit WriteMNGImage()"); - return(MagickPass); - } --#else /* PNG_LIBPNG_VER > 95 */ -+#else /* PNG_LIBPNG_VER > 10011 */ - static unsigned int WritePNGImage(const ImageInfo *image_info,Image *image) - { - image=image; -@@ -9208,5 +9216,5 @@ static unsigned int WriteMNGImage(const - { - return (WritePNGImage(image_info,image)); - } --#endif /* PNG_LIBPNG_VER > 95 */ -+#endif /* PNG_LIBPNG_VER > 10011 */ - #endif - \ No newline at end of file diff -r 97d5a5c48c12 -r 082cd6e86b6b src/graphicsmagick-test.cpp --- a/src/graphicsmagick-test.cpp Fri Mar 30 11:02:24 2012 +0200 +++ b/src/graphicsmagick-test.cpp Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/graphicsmagick.mk --- a/src/graphicsmagick.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/graphicsmagick.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GraphicsMagick PKG := graphicsmagick $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.12 -$(PKG)_CHECKSUM := 6b8a414af162ad8679f2f04b10f128edc8ee3233 +$(PKG)_CHECKSUM := 7ef5711a18da0a3b6b143548a2a7822597ea416d $(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION) $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.graphicsmagick.org/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc pthreads libtool zlib bzip2 jpeg jasper lcms1 libpng tiff freetype libxml2 @@ -45,7 +42,8 @@ --with-xml \ --with-zlib \ --without-x \ - ac_cv_prog_xml2_config='$(PREFIX)/$(TARGET)/bin/xml2-config' + ac_cv_prog_xml2_config='$(PREFIX)/$(TARGET)/bin/xml2-config' \ + ac_cv_path_xml2_config='$(PREFIX)/$(TARGET)/bin/xml2-config' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gsl-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gsl-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,20 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include +#include + +int main(int argc, char *argv[]) +{ + double x, y; + + (void)argc; + (void)argv; + + x = 5.0; + y = gsl_sf_bessel_J0 (x); + printf ("J0(%g) = %.18e\n", x, y); + return 0; +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gsl.mk --- a/src/gsl.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gsl.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GSL PKG := gsl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.14 $(PKG)_CHECKSUM := e1a600e4fe359692e6f0e28b7e12a96681efbe52 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.gnu.org/software/$(PKG)/ $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -22,9 +19,15 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --enable-static $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gsl.exe' \ + -lgsl endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gsoap-1-fixes.patch --- a/src/gsoap-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gsoap-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,76 +1,109 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From a4e9166bc8d78b2aee3c25757d479d4c2e53c7be Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Sun, 23 Oct 2011 21:36:53 +0200 +Subject: [PATCH 1/3] support static linking to ntlm + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) -Patches taken from -https://sourceforge.net/tracker/?func=detail&aid=3288762&group_id=52781&atid=468023 -https://sourceforge.net/tracker/?func=detail&aid=3288772&group_id=52781&atid=468023 - -From d49ac167169e2db531e1be5a48575186c8bc8799 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Mon, 18 Apr 2011 09:20:27 +0200 -Subject: [PATCH 1/2] use ws2spi instead of wspiapi +diff --git a/configure b/configure +index ad1830d..be95edf 100755 +--- a/configure ++++ b/configure +@@ -4822,7 +4822,7 @@ case "${host}" in + ;; + *-*-cygwin*) platform=CYGWIN ;; + *-*-mingw*) platform=MINGW +- SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32" ++ SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32" + ;; + *-*-freebsd*) platform=FREEBSD ;; + *-*-openbsd*) platform=OPENBSD ;; +-- +1.7.7 -diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h -index 238b7f1..ffccf80 100644 ---- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h -+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h -@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com - # endif - # include /* Visual Studio 2005 users: you must install the Platform SDK (R2) */ - # include --# include -+# include - # ifdef WITH_IPV6 - # define SOAP_GAI_STRERROR gai_strerrorA - # endif -diff --git a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h -index 238b7f1..ffccf80 100644 ---- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h -+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h -@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com - # endif - # include /* Visual Studio 2005 users: you must install the Platform SDK (R2) */ - # include --# include -+# include - # ifdef WITH_IPV6 - # define SOAP_GAI_STRERROR gai_strerrorA - # endif -diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h -index 238b7f1..ffccf80 100644 ---- a/gsoap/stdsoap2.h -+++ b/gsoap/stdsoap2.h -@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com - # endif - # include /* Visual Studio 2005 users: you must install the Platform SDK (R2) */ - # include --# include -+# include - # ifdef WITH_IPV6 - # define SOAP_GAI_STRERROR gai_strerrorA - # endif +From da0eb2fc386be0fd914ef8f9a7d6bf73004ea230 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Mon, 24 Oct 2011 11:17:13 +0200 +Subject: [PATCH 2/3] ntlm support in .pc files + +--- + gsoap++.pc.in | 2 +- + gsoap.pc.in | 2 +- + gsoapck++.pc.in | 2 +- + gsoapck.pc.in | 2 +- + gsoapssl++.pc.in | 2 +- + gsoapssl.pc.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/gsoap++.pc.in b/gsoap++.pc.in +index 035afd9..3411d55 100644 +--- a/gsoap++.pc.in ++++ b/gsoap++.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoap++ @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir} +diff --git a/gsoap.pc.in b/gsoap.pc.in +index e2607aa..96a54b9 100644 +--- a/gsoap.pc.in ++++ b/gsoap.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C Web Services + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoap @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir} +diff --git a/gsoapck++.pc.in b/gsoapck++.pc.in +index cb03e2f..b349049 100644 +--- a/gsoapck++.pc.in ++++ b/gsoapck++.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with Cookies Enabled + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoapck++ @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir} +diff --git a/gsoapck.pc.in b/gsoapck.pc.in +index 859a922..e5ce5eb 100644 +--- a/gsoapck.pc.in ++++ b/gsoapck.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C Web Services with Cookies Enabled + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoapck @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir} +diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in +index 391d820..791408a 100644 +--- a/gsoapssl++.pc.in ++++ b/gsoapssl++.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with SSL and ZLIB + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir} +diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in +index 79c940a..17c9ee3 100644 +--- a/gsoapssl.pc.in ++++ b/gsoapssl.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C Web Services with SSL and ZLIB + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoapssl @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir} -- -1.7.4.1 +1.7.7 -From 2ed5f1205a5517c4f1d919942fbebd58327ee3df Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Mon, 18 Apr 2011 10:14:06 +0200 -Subject: [PATCH 2/2] add missing libs to gsoapssl++.pc - - -diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in -index e8c8f4f..07515fe 100644 ---- a/gsoapssl++.pc.in -+++ b/gsoapssl++.pc.in -@@ -7,5 +7,5 @@ Name: GSoap - Description: SOAP C++ Web Services with SSL and ZLIB - Version: @VERSION@ - Requires: --Libs: -L${libdir} -lgsoapssl++ -+Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ - Cflags: -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} --- -1.7.4.1 - diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gsoap.mk --- a/src/gsoap.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gsoap.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,13 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# gSOAP PKG := gsoap $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.2 -$(PKG)_CHECKSUM := 199b7d4cf0b6a5bf81a2198e39f03c092ffc05a7 +$(PKG)_CHECKSUM := 011b507e667d7bb76e30fc8a31055e8cf323311d $(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG)) $(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip -$(PKG)_WEBSITE := http://gsoap2.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gsoap2/gSOAP/$($(PKG)_FILE) -$(PKG)_DEPS := gcc gnutls +$(PKG)_DEPS := gcc gnutls libgcrypt libntlm define $(PKG)_UPDATE wget -q -O- 'http://sourceforge.net/projects/gsoap2/files/gSOAP/' | \ @@ -22,8 +19,9 @@ # Native build to get tools wsdl2h and soapcpp2 cd '$(1)' && ./configure - # Parallel bulds can fail - $(MAKE) -C '$(1)'/gsoap -j 1 + # Work around parallel build problem + $(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h + $(MAKE) -C '$(1)'/gsoap -j '$(JOBS)' # Install the native tools manually $(INSTALL) -m755 '$(1)'/gsoap/wsdl/wsdl2h '$(PREFIX)/bin/$(TARGET)-wsdl2h' @@ -31,8 +29,8 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' clean - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' + # fix hard-coded gnutls dependencies + $(SED) -i "s/-lgnutls/`'$(TARGET)-pkg-config' --libs-only-l gnutls`/g;" '$(1)/configure' # Build for mingw. Static by default. # Prevent undefined reference to _rpl_malloc. @@ -40,17 +38,20 @@ cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --enable-gnutls + --build="`config.guess`" \ + --enable-gnutls \ + CPPFLAGS='-DWITH_NTLM' # Building for mingw requires native soapcpp2 - ln -s '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)'/gsoap/src/soapcpp2 + ln -sf '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2' - # Parallel bulds can fail - $(MAKE) -C '$(1)' -j 1 AR='$(TARGET)-ar' + # Work around parallel build problem + $(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h AR='$(TARGET)-ar' + $(MAKE) -C '$(1)' -j '$(JOBS)' AR='$(TARGET)-ar' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(1)' -j '$(JOBS)' install # Apparently there is a tradition of compiling gsoap source files into applications. # Since we linked dom.cpp and dom.c into the libraries, this should not be necessary. - # But we bend to tradition and install these sources into mingw-cross-env. + # But we bend to tradition and install these sources into MXE. $(INSTALL) -m644 '$(1)/gsoap/'*.c '$(1)/gsoap/'*.cpp '$(PREFIX)/$(TARGET)/share/gsoap' endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gst-plugins-base.mk --- a/src/gst-plugins-base.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gst-plugins-base.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# gst-plugins-base PKG := gst-plugins-base $(PKG)_IGNORE := -$(PKG)_VERSION := 0.10.34 -$(PKG)_CHECKSUM := 4db5f3112fe3a74ba46443e577647cff65b727e7 +$(PKG)_CHECKSUM := 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/ $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib libxml2 gstreamer liboil pango ogg vorbis theora diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gst-plugins-good.mk --- a/src/gst-plugins-good.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gst-plugins-good.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# gst-plugins-good PKG := gst-plugins-good $(PKG)_IGNORE := -$(PKG)_VERSION := 0.10.29 -$(PKG)_CHECKSUM := a0e55c20ae36c8de18990c56b4d97ed3997cc6e0 +$(PKG)_CHECKSUM := 9c78a751bb2f20ad50a1daf6860e0098e0495f5a $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/ $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib libxml2 gstreamer gst-plugins-base liboil libshout cairo flac gtk2 jpeg libpng speex taglib diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gstreamer.mk --- a/src/gstreamer.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gstreamer.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# gstreamer PKG := gstreamer $(PKG)_IGNORE := -$(PKG)_VERSION := 0.10.34 -$(PKG)_CHECKSUM := 3ebb64dceb45963e8be17c447a24a63958705164 +$(PKG)_CHECKSUM := ad03b8aca7b2415929b6ecc4c140b178acef39de $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/ $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib libxml2 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gta-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gta-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,22 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include + +int main(int argc, char *argv[]) +{ + gta_header_t *header; + gta_result_t r; + + (void)argc; + (void)argv; + + r = gta_create_header(&header); + if (r == GTA_OK) { + gta_destroy_header(header); + } + + return 0; +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gta.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gta.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,33 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := gta +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 9020944bcd40bd986a879d454d21920a1eb48db7 +$(PKG)_SUBDIR := libgta-$($(PKG)_VERSION) +$(PKG)_FILE := libgta-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://download.savannah.gnu.org/releases/gta/$($(PKG)_FILE) +$(PKG)_DEPS := gcc zlib bzip2 xz + +define $(PKG)_UPDATE + wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gta.git;a=tags' | \ + grep ']*>libgta-\([0-9.]*\)<.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --build="`config.guess`" \ + --disable-shared \ + --disable-reference \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install dist_doc_DATA= + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gta.exe' \ + `'$(TARGET)-pkg-config' gta --cflags --libs` +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtk2-1-fixes.patch --- a/src/gtk2-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtk2-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,16 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. Contains ad hoc patches for cross building. -From 1acd5465c0b9f2f612c5904ea7e652475fb3bee6 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 2e42ff35296c81959a8fab06aa8d3dacf19632d8 Mon Sep 17 00:00:00 2001 +From: MXE Date: Fri, 24 Sep 2010 14:43:43 +0200 -Subject: [PATCH 01/11] s,DllMain,static _disabled_DllMain, +Subject: [PATCH 01/10] s,DllMain,static _disabled_DllMain, diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c -index 94b7ac7..2c01be6 100644 +index dc139be..be2a7ee 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -65,7 +65,7 @@ const GOptionEntry _gdk_windowing_args[] = { @@ -23,10 +23,10 @@ LPVOID reserved) { diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c -index fdf4730..428fd96 100644 +index d081f70..aa2973d 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c -@@ -73,7 +73,7 @@ +@@ -74,7 +74,7 @@ static HMODULE gtk_dll; BOOL WINAPI @@ -36,13 +36,13 @@ LPVOID lpvReserved) { -- -1.7.1 +1.7.7.3 -From bc446ce0785954ccf28825554c3074a15b4f4071 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 86527a238545e47b4770531c79f5f2ead59aab85 Mon Sep 17 00:00:00 2001 +From: MXE Date: Fri, 24 Sep 2010 14:46:20 +0200 -Subject: [PATCH 02/11] s,__declspec(dllimport),, +Subject: [PATCH 02/10] s,__declspec(dllimport),, diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h @@ -72,7 +72,7 @@ #else # define GTKVAR extern diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h -index 21de92e..2c0f94c 100644 +index bbea9cd..059d7d0 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -69,7 +69,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget, @@ -98,13 +98,13 @@ #else #define VARIABLE extern -- -1.7.1 +1.7.7.3 -From 078f0c210e1706b4028907bf55cc55672d5dc7d3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 7277a7022eb4ffb498475d969057d3a57e687222 Mon Sep 17 00:00:00 2001 +From: MXE Date: Fri, 24 Sep 2010 15:03:28 +0200 -Subject: [PATCH 03/11] s,__declspec(dllexport),, +Subject: [PATCH 03/10] s,__declspec(dllexport),, diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h @@ -134,7 +134,7 @@ # define GTKVAR extern # endif diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h -index 2c0f94c..9c47b57 100644 +index 059d7d0..8c360d0 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -67,7 +67,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget, @@ -160,13 +160,13 @@ #define VARIABLE extern #endif -- -1.7.1 +1.7.7.3 -From 69568bc7c8627d117521548192730665a9623b80 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 604fcdb64972a82c6a430c36debc9f66c7f05d90 Mon Sep 17 00:00:00 2001 +From: MXE Date: Fri, 24 Sep 2010 14:17:22 +0200 -Subject: [PATCH 04/11] fix gtk+-2.0.pc.in +Subject: [PATCH 04/10] fix gtk+-2.0.pc.in diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in @@ -181,20 +181,20 @@ +Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32 Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@ -- -1.7.1 +1.7.7.3 -From 1f60f6943b5c67a199660618e546de5f0faafeef Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From a778e96b43b556389f1e3a6712072eaee9e2adb2 Mon Sep 17 00:00:00 2001 +From: MXE Date: Fri, 24 Sep 2010 14:48:31 +0200 -Subject: [PATCH 05/11] disable gtkbuiltincache +Subject: [PATCH 05/10] disable gtkbuiltincache diff --git a/gtk/Makefile.in b/gtk/Makefile.in -index 39a35c2..89bae23 100644 +index 76981d8..b6d170f 100644 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in -@@ -2872,7 +2872,7 @@ stamp-icons: $(STOCK_ICONS) +@@ -2888,7 +2888,7 @@ stamp-icons: $(STOCK_ICONS) ) done \ && touch stamp-icons @@ -204,20 +204,20 @@ $(gtk_update_icon_cache_program) --force --ignore-theme-index \ --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- -1.7.1 +1.7.7.3 -From e24f3fb7d18d0690dddd1fdb1a629a06d49b4c11 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 58310acc28f8e6994281eacac1989e8e6c51c150 Mon Sep 17 00:00:00 2001 +From: MXE Date: Fri, 24 Sep 2010 14:49:50 +0200 -Subject: [PATCH 06/11] disable test-inline-pixbufs.h +Subject: [PATCH 06/10] disable test-inline-pixbufs.h diff --git a/demos/Makefile.in b/demos/Makefile.in -index 6bffbb8..c866923 100644 +index 9f90d09..2e4f967 100644 --- a/demos/Makefile.in +++ b/demos/Makefile.in -@@ -433,7 +433,7 @@ LDADDS = \ +@@ -432,7 +432,7 @@ LDADDS = \ $(GTK_DEP_LIBS) \ $(MATH_LIB) @@ -227,20 +227,20 @@ testpixbuf_drawable_DEPENDENCIES = $(DEPS) testpixbuf_save_DEPENDENCIES = $(DEPS) -- -1.7.1 +1.7.7.3 -From b34df7c9461a798e9a8202eec886ac5e173da3ea Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 7532813f3bfe95fe088c06ce11d31c0d3d66c559 Mon Sep 17 00:00:00 2001 +From: MXE Date: Fri, 24 Sep 2010 14:51:04 +0200 -Subject: [PATCH 07/11] permit static building +Subject: [PATCH 07/10] permit static building diff --git a/configure b/configure -index f203b13..51e6619 100755 +index 5eedff6..6380da5 100755 --- a/configure +++ b/configure -@@ -4347,9 +4347,9 @@ if test "${enable_static+set}" = set; then : +@@ -4361,9 +4361,9 @@ if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -252,7 +252,7 @@ # Look at the argument we got. We use all the common list separators. lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do -@@ -4362,7 +4362,7 @@ if test "${enable_static+set}" = set; then : +@@ -4376,7 +4376,7 @@ if test "${enable_static+set}" = set; then : ;; esac else @@ -261,7 +261,7 @@ fi -@@ -4930,15 +4930,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -4944,15 +4944,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -283,7 +283,7 @@ fi enable_win32_dll=yes -@@ -8241,7 +8241,7 @@ done +@@ -8752,7 +8752,7 @@ func_stripname_cnf () if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in @@ -292,7 +292,7 @@ no) enable_shared=no ;; *) enable_shared=no -@@ -8250,14 +8250,14 @@ if test "${enable_shared+set}" = set; then : +@@ -8761,14 +8761,14 @@ if test "${enable_shared+set}" = set; then : for pkg in $enableval; do IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then @@ -309,7 +309,7 @@ fi -@@ -11970,7 +11970,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } +@@ -12632,7 +12632,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } # are all built from PIC. case $host_os in aix3*) @@ -318,7 +318,7 @@ if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' -@@ -11979,7 +11979,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } +@@ -12641,7 +12641,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } aix[4-9]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then @@ -328,20 +328,20 @@ ;; esac -- -1.7.1 +1.7.7.3 -From 831f94ccf7a26662bfc9e8d22b9ae9eaea740bbb Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 821882bb862fc86b7152eba82966163d054b488e Mon Sep 17 00:00:00 2001 +From: MXE Date: Fri, 24 Sep 2010 14:53:18 +0200 -Subject: [PATCH 08/11] no -Wl +Subject: [PATCH 08/10] no -Wl diff --git a/configure b/configure -index 51e6619..8c04264 100755 +index 6380da5..7283f17 100755 --- a/configure +++ b/configure -@@ -22951,7 +22951,7 @@ fi +@@ -23788,7 +23788,7 @@ fi fi if test "x$gdktarget" = "xwin32"; then @@ -351,20 +351,20 @@ USE_WIN32_TRUE= USE_WIN32_FALSE='#' -- -1.7.1 +1.7.7.3 -From 2ec5f9d9ea8d7d80758c5272ff2e94fd0e7856e8 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 80745459d75da07c53dbb83c6a79c3d9896e5fd3 Mon Sep 17 00:00:00 2001 +From: MXE Date: Fri, 24 Sep 2010 14:54:15 +0200 -Subject: [PATCH 09/11] gio not gio-unix +Subject: [PATCH 09/10] gio not gio-unix diff --git a/configure b/configure -index 8c04264..d3e5e21 100755 +index 7283f17..50e6a86 100755 --- a/configure +++ b/configure -@@ -23171,9 +23171,9 @@ fi +@@ -24008,9 +24008,9 @@ fi CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" @@ -377,45 +377,13 @@ GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend" fi -- -1.7.1 - - -From 3e9c211536912bf78c44172b7f6ecd8860887166 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Fri, 24 Sep 2010 14:55:33 +0200 -Subject: [PATCH 10/11] set cross_compiling explicitly to avoid Wine interference +1.7.7.3 -diff --git a/configure b/configure -index d3e5e21..7ae7a5d 100755 ---- a/configure -+++ b/configure -@@ -555,7 +555,7 @@ ac_default_prefix=/usr/local - ac_clean_files= - ac_config_libobj_dir=. - LIBOBJS= --cross_compiling=no -+cross_compiling=yes - subdirs= - MFLAGS= - MAKEFLAGS= -@@ -3872,7 +3872,7 @@ $as_echo "$ac_try_echo"; } >&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then -- cross_compiling=no -+ cross_compiling=yes - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes --- -1.7.1 - - -From 01cc2d128be8a19c1434b912e378deae3b1bfcf9 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 337e54ef8aa5a4d131e9d9007dedcc42b164e68c Mon Sep 17 00:00:00 2001 +From: MXE Date: Fri, 24 Sep 2010 15:30:49 +0200 -Subject: [PATCH 11/11] removed duplicate _gtk_marshal_OBJECT__VOID() +Subject: [PATCH 10/10] removed duplicate _gtk_marshal_OBJECT__VOID() diff --git a/perf/marshalers.c b/perf/marshalers.c @@ -467,5 +435,5 @@ void _gtk_marshal_VOID__ENUM_OBJECT_DOUBLE (GClosure *closure, -- -1.7.1 +1.7.7.3 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtk2-test.c --- a/src/gtk2-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtk2-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtk2.mk --- a/src/gtk2.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtk2.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GTK+ PKG := gtk2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.24.4 $(PKG)_CHECKSUM := c15a25ba49eb459b2c4cdc46baedf6cecf08cbcf $(PKG)_SUBDIR := gtk+-$($(PKG)_VERSION) $(PKG)_FILE := gtk+-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.gtk.org/ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc gettext libpng jpeg tiff jasper glib atk pango cairo gdk-pixbuf @@ -24,6 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-explicit-deps \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtkglext-1-fixes.patch --- a/src/gtkglext-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtkglext-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. Contains ad hoc patches for cross building. From c79e894db7f1a5cbd6ba57352f79d68595175666 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:43:15 +0200 Subject: [PATCH 1/4] remove pangox dependency @@ -35,7 +35,7 @@ From a6894898cad4238a3676cf6fbfe6c378217317ca Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:44:37 +0200 Subject: [PATCH 2/4] use correct glib mkenums patch @@ -91,7 +91,7 @@ From 9080ce06af85a0beee38f0d391ee8fab8dc07fdf Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:47:30 +0200 Subject: [PATCH 3/4] don't use deprecated functions @@ -181,7 +181,7 @@ From eb64eb053481321cb1b0d3ec9e2fcb46c55c0972 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:50:25 +0200 Subject: [PATCH 4/4] removed import declarations diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtkglext-test.c --- a/src/gtkglext-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtkglext-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtkglext.mk --- a/src/gtkglext.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtkglext.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GtkGLExt PKG := gtkglext $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.0 $(PKG)_CHECKSUM := db9ce38ee555fd14f55083ec7f4ae30e5338d5cc $(PKG)_SUBDIR := gtkglext-$($(PKG)_VERSION) $(PKG)_FILE := gtkglext-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://gtkglext.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gtkglext/gtkglext/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc gtk2 @@ -22,10 +19,9 @@ define $(PKG)_BUILD cd '$(1)' && autoconf - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --without-x \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtkglextmm-1-fixes.patch --- a/src/gtkglextmm-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtkglextmm-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. Contains ad hoc patches for cross building. -From c71783745127d3af9ab40f6a4cb95ac13ad2707b Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 865936e91293bdc59c2e9c47e5a4b54fb6f1629e Mon Sep 17 00:00:00 2001 +From: MXE Date: Wed, 29 Sep 2010 23:08:44 +0200 -Subject: [PATCH 1/2] allow deprecated GdkSpanFunc +Subject: [PATCH] allow deprecated GdkSpanFunc diff --git a/gtkglext/gtkmm/gl/Makefile.in b/gtkglext/gtkmm/gl/Makefile.in @@ -22,37 +22,5 @@ -DGTK_DISABLE_DEPRECATED -- -1.7.1 - - -From b3a26572b965ada869cc388b6bfce5c54b6ab704 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 29 Sep 2010 23:18:40 +0200 -Subject: [PATCH 2/2] wine workaround: s,cross_compiling=no,cross_compiling=yes, - +1.7.7.3 -diff --git a/configure b/configure -index 508d229..65f61fb 100755 ---- a/configure -+++ b/configure -@@ -409,7 +409,7 @@ exec 6>&1 - # - ac_default_prefix=/usr/local - ac_config_libobj_dir=. --cross_compiling=no -+cross_compiling=yes - subdirs= - MFLAGS= - MAKEFLAGS= -@@ -2486,7 +2486,7 @@ if test "$cross_compiling" != yes; then - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- cross_compiling=no -+ cross_compiling=yes - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes --- -1.7.1 - diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtkglextmm-test.cpp --- a/src/gtkglextmm-test.cpp Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtkglextmm-test.cpp Fri Mar 30 11:02:47 2012 +0200 @@ -1,13 +1,15 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ - -#include -#include - -int main(int argc, char *argv[]) -{ - Gtk::Main g(argc, argv); - Gtk::GL::init(argc, argv); - g.run(); - return 0; -} +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include +#include + +int main(int argc, char *argv[]) +{ + Gtk::Main g(argc, argv); + Gtk::GL::init(argc, argv); + g.run(); + return 0; +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtkglextmm.mk --- a/src/gtkglextmm.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtkglextmm.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GtkGLExtmm PKG := gtkglextmm $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.0 $(PKG)_CHECKSUM := 5cd489e07517a88262cd6050f723227664e82996 $(PKG)_SUBDIR := gtkglextmm-$($(PKG)_VERSION) $(PKG)_FILE := gtkglextmm-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://gtkglext.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gtkglext/gtkglextmm/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc gtkglext gtkmm2 @@ -23,6 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' install \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtkmm2-test.cpp --- a/src/gtkmm2-test.cpp Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtkmm2-test.cpp Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include @@ -9,7 +11,7 @@ Gtk::Main g(argc, argv); Gtk::Window window; - window.set_title("Test App mingw-cross-env"); + window.set_title("Test App MXE"); window.set_default_size(200, 200); window.show_all(); g.run(window); diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtkmm2.mk --- a/src/gtkmm2.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtkmm2.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GTKMM PKG := gtkmm2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.24.0 $(PKG)_CHECKSUM := 9b9e68360fb3f5faa7f221acba56f0d75a8198d2 $(PKG)_SUBDIR := gtkmm-$($(PKG)_VERSION) $(PKG)_FILE := gtkmm-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.gtkmm.org/ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc gtk2 libsigc++ pangomm cairomm atkmm @@ -22,10 +19,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE) diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtksourceview.mk --- a/src/gtksourceview.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtksourceview.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GTKSourceView PKG := gtksourceview $(PKG)_IGNORE := -$(PKG)_VERSION := 2.10.5 $(PKG)_CHECKSUM := 5081dc7a081954d0af73852c22e874a746bda30e $(PKG)_SUBDIR := gtksourceview-$($(PKG)_VERSION) $(PKG)_FILE := gtksourceview-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://projects.gnome.org/gtksourceview/ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtksourceview/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc gtk2 libxml2 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/gtksourceviewmm2.mk --- a/src/gtksourceviewmm2.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/gtksourceviewmm2.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GtkSourceViewmm PKG := gtksourceviewmm2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.10.1 $(PKG)_CHECKSUM := 7f6fb046427054d85c791a4b1fc0f742a3313c8a $(PKG)_SUBDIR := gtksourceviewmm-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz -$(PKG)_WEBSITE := http://projects.gnome.org/gtksourceviewmm/ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtksourceviewmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc gtkmm2 gtksourceview @@ -22,10 +19,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ MAKE=$(MAKE) diff -r 97d5a5c48c12 -r 082cd6e86b6b src/guile-1-win32.patch --- a/src/guile-1-win32.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/guile-1-win32.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. diff -ruN guile-1.8.7.orig/configure guile-1.8.7/configure --- guile-1.8.7.orig/configure 2009-07-05 22:25:00.000000000 +0200 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/guile-test.c --- a/src/guile-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/guile-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/guile.mk --- a/src/guile.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/guile.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GNU Guile PKG := guile -$(PKG)_IGNORE := 2.0.1 -$(PKG)_VERSION := 1.8.7 +$(PKG)_IGNORE := 2.0.5 $(PKG)_CHECKSUM := 24cd2f06439c76d41d982a7384fe8a0fe5313b54 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.gnu.org/software/$(PKG)/ $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc libtool gmp libiconv gettext libunistring gc libffi readline @@ -25,7 +22,7 @@ # which would fail because we tell Guile not to use Pthreads. cd '$(1)' && CC_FOR_BUILD=gcc ./configure \ --host='$(TARGET)' \ - --build="`sh ./config.guess`" \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --without-threads \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/id3lib-1-win32.patch --- a/src/id3lib-1-win32.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/id3lib-1-win32.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. diff -ru id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in --- id3lib-3.8.3-orig/configure.in 2003-03-02 01:23:00.000000000 +0100 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/id3lib.mk --- a/src/id3lib.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/id3lib.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# id3lib PKG := id3lib $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.3 $(PKG)_CHECKSUM := c92c880da41d1ec0b242745a901702ae87970838 $(PKG)_SUBDIR := id3lib-$($(PKG)_VERSION) $(PKG)_FILE := id3lib-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://id3lib.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/ilmbase-1-gcc45-include.patch --- a/src/ilmbase-1-gcc45-include.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/ilmbase-1-gcc45-include.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://cvs.savannah.gnu.org/viewvc/IlmBase/Imath/ImathMatrix.h?root=openexr&r1=1.7&r2=1.8&view=patch diff -r 97d5a5c48c12 -r 082cd6e86b6b src/ilmbase-2-osx-cxxflags.patch --- a/src/ilmbase-2-osx-cxxflags.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/ilmbase-2-osx-cxxflags.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from http://lists.nongnu.org/archive/html/openexr-devel/2010-08/msg00011.html diff -r 97d5a5c48c12 -r 082cd6e86b6b src/ilmbase.mk --- a/src/ilmbase.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/ilmbase.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# IlmBase PKG := ilmbase $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.2 $(PKG)_CHECKSUM := fe6a910a90cde80137153e25e175e2b211beda36 $(PKG)_SUBDIR := ilmbase-$($(PKG)_VERSION) $(PKG)_FILE := ilmbase-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.openexr.com/ $(PKG)_URL := http://download.savannah.nongnu.org/releases/openexr/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -20,8 +17,6 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' # build the win32 thread sources instead of the posix thread sources $(SED) -i 's,IlmThreadPosix\.,IlmThreadWin32.,' '$(1)/IlmThread/Makefile.in' $(SED) -i 's,IlmThreadSemaphorePosix\.,IlmThreadSemaphoreWin32.,' '$(1)/IlmThread/Makefile.in' @@ -31,6 +26,7 @@ # threading. It will just disable the unwanted check for pthread. cd '$(1)' && $(SHELL) ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-threading \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/imagemagick.mk --- a/src/imagemagick.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/imagemagick.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,13 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# ImageMagick PKG := imagemagick $(PKG)_IGNORE := -$(PKG)_VERSION := 6.6.9-9 -$(PKG)_CHECKSUM := 1d46f9d2b9294b11b9e9c03ee8da7e1df8d92fef +$(PKG)_CHECKSUM := 13198d502e95abb305c23c3d56378e9139fcb7c3 $(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION) -$(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.imagemagick.org/ +$(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.nluug.nl/ImageMagick/$($(PKG)_FILE) -$(PKG)_DEPS := gcc bzip2 ffmpeg fftw freetype jasper jpeg lcms libpng libtool openexr pthreads tiff zlib +$(PKG)_DEPS := gcc bzip2 ffmpeg fftw freetype jasper jpeg lcms libpng libtool openexr pthreads tiff define $(PKG)_UPDATE wget -q -O- 'http://www.imagemagick.org/' | \ @@ -19,14 +16,15 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --with-x=no \ + --without-zlib \ ac_cv_prog_freetype_config='$(PREFIX)/$(TARGET)/bin/freetype-config' + $(SED) -i 's/#define MAGICKCORE_ZLIB_DELEGATE 1//g' '$(1)/magick/magick-config.h' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/jasper.mk --- a/src/jasper.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/jasper.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# JasPer PKG := jasper $(PKG)_IGNORE := -$(PKG)_VERSION := 1.900.1 $(PKG)_CHECKSUM := 9c5735f773922e580bf98c7c7dfda9bbed4c5191 $(PKG)_SUBDIR := jasper-$($(PKG)_VERSION) $(PKG)_FILE := jasper-$($(PKG)_VERSION).zip -$(PKG)_WEBSITE := http://www.ece.uvic.ca/~mdadams/jasper/ $(PKG)_URL := http://www.ece.uvic.ca/~mdadams/jasper/software/$($(PKG)_FILE) $(PKG)_DEPS := gcc jpeg diff -r 97d5a5c48c12 -r 082cd6e86b6b src/jpeg-test.c --- a/src/jpeg-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/jpeg-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/jpeg.mk --- a/src/jpeg.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/jpeg.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# jpeg PKG := jpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 8c -$(PKG)_CHECKSUM := f0a3b88ac4db19667798bee971537eeed552bce9 +$(PKG)_CHECKSUM := f080b2fffc7581f7d19b968092ba9ebc234556ff $(PKG)_SUBDIR := jpeg-$($(PKG)_VERSION) $(PKG)_FILE := jpegsrc.v$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.ijg.org/ $(PKG)_URL := http://www.ijg.org/files/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/json-c.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/json-c.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := json-c +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := daaf5eb960fa98e137abc5012f569b83c79be90f +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://oss.metaparadigm.com/$(PKG)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + wget -q -O- 'http://oss.metaparadigm.com/json-c/?C=M;O=D' | \ + $(SED) -n 's,.*json-c-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --prefix='$(PREFIX)/$(TARGET)' \ + --build="`config.guess`"\ + CFLAGS=-Wno-error + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/lame.mk --- a/src/lame.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/lame.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# lame PKG := lame $(PKG)_IGNORE := -$(PKG)_VERSION := 3.98.4 -$(PKG)_CHECKSUM := eb29c7c937b9b7330ca979dfabc25ab2a31b9db2 +$(PKG)_CHECKSUM := 91dfd25bedc02759051a6b3af05e61337a575028 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://lame.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -19,10 +16,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 97d5a5c48c12 -r 082cd6e86b6b src/lapack.mk --- a/src/lapack.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/lapack.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# lapack PKG := lapack $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.1 -$(PKG)_CHECKSUM := 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac +$(PKG)_CHECKSUM := 910109a931524f8dcc2734ce23fe927b00ca199f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tgz -$(PKG)_WEBSITE := http://www.netlib.org/$(PKG)/ $(PKG)_URL := http://www.netlib.org/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.eq.uc.pt/pub/software/math/netlib/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -20,13 +17,9 @@ endef define $(PKG)_BUILD - cp $(1)/make.inc.example $(1)/make.inc - $(SED) -i 's,PLAT =.*,PLAT = _MINGW32,g' '$(1)/make.inc' - $(SED) -i 's,gfortran,$(TARGET)-gfortran,g' '$(1)/make.inc' - $(SED) -i 's, ar, $(TARGET)-ar,g' '$(1)/make.inc' - $(SED) -i 's, ranlib, $(TARGET)-ranlib,g' '$(1)/make.inc' - - $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/lapack_MINGW32.a' '$(PREFIX)/$(TARGET)/lib/liblapack.a' + cd '$(1)' && cmake \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ + . + $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' install endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/lcms-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/lcms-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,29 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 664fb3591893facfe280cb930e20b61355e32ac1 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 23 Dec 2011 00:01:31 +0100 +Subject: [PATCH] add missing static dependencies to .pc file + +--- + lcms2.pc.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/lcms2.pc.in b/lcms2.pc.in +index b715f59..4a8fdb3 100644 +--- a/lcms2.pc.in ++++ b/lcms2.pc.in +@@ -7,5 +7,6 @@ Name: @PACKAGE@ + Description: LCMS Color Management Library + Version: @VERSION@ + Libs: -L${libdir} -llcms2 +-Libs.private: @LIB_MATH@ ++Libs.private: -ljpeg @LIB_MATH@ + Cflags: -I${includedir} ++Requires.private: libtiff-4 +-- +1.7.8 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/lcms.mk --- a/src/lcms.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/lcms.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# lcms PKG := lcms $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1 -$(PKG)_CHECKSUM := 0ce856a004068ff6e22f9f2d7b94a11b9b469bf9 +$(PKG)_CHECKSUM := 67d5fabda2f5777ca8387766539b9c871d993133 $(PKG)_SUBDIR := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)) $(PKG)_FILE := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)).tar.gz -$(PKG)_WEBSITE := http://www.littlecms.com/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(subst a,,$($(PKG)_VERSION))/$($(PKG)_FILE) $(PKG)_DEPS := gcc jpeg tiff zlib @@ -19,11 +16,10 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --with-jpeg \ --with-tiff \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/lcms1-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/lcms1-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,25 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 6f4063fc97b3acc653605c077c94b862a9808fd4 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 23 Dec 2011 00:07:18 +0100 +Subject: [PATCH] add missing static dependencies to .pc file + + +diff --git a/lcms.pc.in b/lcms.pc.in +index b3897b0..c72ef2f 100755 +--- a/lcms.pc.in ++++ b/lcms.pc.in +@@ -7,4 +7,6 @@ Name: @PACKAGE@ + Description: LCMS Color Management Library + Version: @VERSION@ + Libs: -L${libdir} -llcms ++Libs.private: -ljpeg + Cflags: -I${includedir} ++Requires.private: libtiff-4 +-- +1.7.8 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/lcms1.mk --- a/src/lcms1.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/lcms1.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# lcms1 PKG := lcms1 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.19 $(PKG)_CHECKSUM := d5b075ccffc0068015f74f78e4bc39138bcfe2d4 $(PKG)_SUBDIR := lcms-$($(PKG)_VERSION) $(PKG)_FILE := lcms-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.littlecms.com/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/lcms/lcms/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc jpeg tiff zlib @@ -20,11 +17,10 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --with-jpeg \ --with-tiff \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libarchive-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libarchive-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,24 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 47b80beedcb3d8e6296e2d0b970bb0c82abb4424 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Tue, 14 Feb 2012 12:40:24 +0100 +Subject: [PATCH] fix pkg-config + + +diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in +index 95d7159..8288f31 100644 +--- a/build/pkgconfig/libarchive.pc.in ++++ b/build/pkgconfig/libarchive.pc.in +@@ -8,4 +8,4 @@ Description: library that can create and read several streaming archive formats + Version: @VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -larchive +-Libs.private: @LIBS@ ++Libs.private: @LIBS@ -liconv +-- +1.7.8.3 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libarchive-test.c --- a/src/libarchive-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libarchive-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libarchive.mk --- a/src/libarchive.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libarchive.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,13 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Libarchive PKG := libarchive $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.4 -$(PKG)_CHECKSUM := b9cc3bbd20bd71f996be9ec738f19fda8653f7af +$(PKG)_CHECKSUM := b774e2675e5c1abafbd4d667402e8c3e72313944 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://code.google.com/p/libarchive/ $(PKG)_URL := http://libarchive.googlecode.com/files/$($(PKG)_FILE) -$(PKG)_DEPS := gcc bzip2 libxml2 openssl xz zlib +$(PKG)_DEPS := gcc bzip2 libiconv libxml2 openssl xz zlib define $(PKG)_UPDATE wget -q -O- 'http://code.google.com/p/libarchive/downloads/list?sort=-uploaded' | \ @@ -34,5 +31,5 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libarchive.exe' \ - -larchive -lz + `'$(TARGET)-pkg-config' --libs-only-l libarchive` endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libass-test.c --- a/src/libass-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libass-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libass.mk --- a/src/libass.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libass.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,13 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libass PKG := libass $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.11 -$(PKG)_CHECKSUM := 6f69f6c4474c649de4fd7913b050bfd4cf8110cb +$(PKG)_CHECKSUM := 7a0ea048f687421f3e1314988ca02f04861fc5f0 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 -$(PKG)_WEBSITE := http://code.google.com/p/libass/ +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.xz $(PKG)_URL := http://libass.googlecode.com/files/$($(PKG)_FILE) -$(PKG)_DEPS := gcc freetype fontconfig +$(PKG)_DEPS := gcc freetype fontconfig fribidi define $(PKG)_UPDATE wget -q -O- 'http://code.google.com/p/libass/downloads/list?sort=-uploaded' | \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libcroco.mk --- a/src/libcroco.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libcroco.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Libcroco PKG := libcroco $(PKG)_IGNORE := -$(PKG)_VERSION := 0.6.2 $(PKG)_CHECKSUM := 4b0dd540a47f2492b1ac7cd7e3ec63c2ef4c9c2a $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.freespiders.org/projects/libcroco/ $(PKG)_URL := http://ftp.gnome.org/pub/GNOME/sources/libcroco/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib libxml2 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libdnet-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libdnet-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,27 @@ +This file is part of MXE. +See index.html for further information. + +Patch taken from http://sourceforge.net/mailarchive/message.php?msg_id=27995461 + +mingwrt 3.20 provides ssize_t and defines _SSIZE_T_. This patch +allows libdnet to use this ssize_t instead of defining its +own which causes build failure. Applies to libdnet 1.11. + +diff --git a/include/dnet/os.h b/include/dnet/os.h +index c12c7b2..9e8bdd2 100644 +--- a/include/dnet/os.h ++++ b/include/dnet/os.h +@@ -23,8 +23,10 @@ + typedef u_short uint16_t; + typedef u_int uint32_t; + # ifndef __CYGWIN__ ++# ifndef _SSIZE_T_ + typedef long ssize_t; + # endif ++# endif + #else + # include + # include +-- +1.7.6 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libdnet.mk --- a/src/libdnet.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libdnet.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libdnet PKG := libdnet $(PKG)_IGNORE := -$(PKG)_VERSION := 1.11 $(PKG)_CHECKSUM := e2ae8c7f0ca95655ae9f77fd4a0e2235dc4716bf $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://libdnet.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc winpcap diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libevent.mk --- a/src/libevent.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libevent.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,19 +1,16 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libevent PKG := libevent $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.11 -$(PKG)_CHECKSUM := 843b5d395054b9d4d5586220c004c29cdcc37fcf +$(PKG)_CHECKSUM := 2a2cc87ce1945f43dfa5a5f9575fef3d14a8f57a $(PKG)_SUBDIR := libevent-$($(PKG)_VERSION)-stable $(PKG)_FILE := libevent-$($(PKG)_VERSION)-stable.tar.gz -$(PKG)_WEBSITE := http://monkey.org/~provos/libevent/ -$(PKG)_URL := http://monkey.org/~provos/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/downloads/$(PKG)/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.monkey.org/~provos/libevent/' | \ + wget -q -O- 'http://libevent.org/' | \ grep 'libevent-' | \ $(SED) -n 's,.*libevent-\([0-9][^>]*\)-stable\.tar.*,\1,p' | \ head -1 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libffi-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libffi-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,33 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include +#include + +int main(int argc, char *argv[]) +{ + ffi_cif cif; + ffi_type *args[1]; + void *values[1]; + char *s; + int rc; + + (void)argc; + (void)argv; + + args[0] = &ffi_type_pointer; + values[0] = &s; + + if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, + &ffi_type_uint, args) == FFI_OK) + { + s = "Hello World!"; + ffi_call(&cif, FFI_FN(puts), &rc, values); + s = "Goodbye!"; + ffi_call(&cif, FFI_FN(puts), &rc, values); + } + + return 0; +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libffi.mk --- a/src/libffi.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libffi.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,19 +1,16 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libffi PKG := libffi $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.9 -$(PKG)_CHECKSUM := 56e41f87780e09d06d279690e53d4ea2c371ea88 +$(PKG)_CHECKSUM := 97abf70e6a6d315d9259d58ac463663051d471e1 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://sourceware.org/$(PKG)/ $(PKG)_URL := ftp://sourceware.org/pub/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q --no-check-certificate -O- 'http://github.com/atgreen/libffi/downloads' | \ + wget -q --no-check-certificate -O- 'https://github.com/atgreen/libffi/tags' | \ grep ']*\)\.tar.*,\1,p' | \ + grep -v '^1\.4\.' | \ tail -1 endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-gpg-error-prefix='$(PREFIX)/$(TARGET)' diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgee.mk --- a/src/libgee.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libgee.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libgee PKG := libgee $(PKG)_IGNORE := -$(PKG)_VERSION := 0.5.0 $(PKG)_CHECKSUM := 78d7fbd0668d01bc23e9772211b4885ae7e479cd $(PKG)_SUBDIR := libgee-$($(PKG)_VERSION) $(PKG)_FILE := libgee-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://live.gnome.org/Libgee $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/libgee/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgeotiff.mk --- a/src/libgeotiff.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libgeotiff.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GeoTiff PKG := libgeotiff $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.0 $(PKG)_CHECKSUM := b8cde5014cf82fe4683fa35fc81a5ea8d64b940f $(PKG)_SUBDIR := libgeotiff-$($(PKG)_VERSION) $(PKG)_FILE := libgeotiff-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://trac.osgeo.org/geotiff/ $(PKG)_URL := http://download.osgeo.org/geotiff/libgeotiff/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/geotiff/libgeotiff/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib jpeg tiff proj @@ -26,7 +23,7 @@ --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - LIBS='-ljpeg -lz' + LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz" $(MAKE) -C '$(1)' -j 1 all install EXEEXT=.remove-me MAKE='$(MAKE)' rm -fv '$(PREFIX)/$(TARGET)'/bin/*.remove-me endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgnurx-1-build-static-lib.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libgnurx-1-build-static-lib.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,18 @@ +This file is part of MXE. +See index.html for further information. + +diff -Nur mingw-libgnurx-2.5.1/Makefile.mxe mingw-libgnurx-2.5.1-mxe/Makefile.mxe +--- mingw-libgnurx-2.5.1/Makefile.mxe 1970-01-01 01:00:00.000000000 +0100 ++++ mingw-libgnurx-2.5.1-mxe/Makefile.mxe 2011-10-23 16:57:18.579312050 +0200 +@@ -0,0 +1,11 @@ ++include Makefile ++ ++libgnurx.a: $(OBJECTS) ++ rm -f $@ ++ $(TARGET)-ar rcu $@ $(OBJECTS) ++ $(TARGET)-ranlib $@ ++ ++install-static: libgnurx.a ++ mkdir -p ${includedir} ${libdir} ++ cp -p ${srcdir}/regex.h ${includedir} ++ cp -p ${srcdir}/libgnurx.a ${libdir} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgnurx.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libgnurx.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libgnurx +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := f1e4af2541645dac82362b618aaa849658cd4988 +$(PKG)_SUBDIR := mingw-libgnurx-$($(PKG)_VERSION) +$(PKG)_FILE := mingw-libgnurx-$($(PKG)_VERSION)-src.tar.gz +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/Other/UserContributed/regex/mingw-regex-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + wget -q -O- 'http://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/' | \ + grep 'mingw-regex-' | \ + $(SED) -n 's,.*mingw-regex-\([0-9\.]*\).*,\1,p' | \ + sort | \ + uniq | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= install-static +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgomp-test.c --- a/src/libgomp-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libgomp-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgomp.mk --- a/src/libgomp.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libgomp.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GCC-libgomp PKG := libgomp $(PKG)_IGNORE = $(gcc_IGNORE) -$(PKG)_VERSION = $(gcc_VERSION) $(PKG)_CHECKSUM = $(gcc_CHECKSUM) $(PKG)_SUBDIR = $(gcc_SUBDIR) $(PKG)_FILE = $(gcc_FILE) -$(PKG)_WEBSITE := http://gcc.gnu.org/projects/gomp/ $(PKG)_URL = $(gcc_URL) $(PKG)_URL_2 = $(gcc_URL_2) $(PKG)_DEPS := gcc pthreads @@ -18,12 +15,10 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/libgomp/configure' - mkdir -p '$(1)/build/$(TARGET)/libgomp' cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \ --host='$(TARGET)' \ + --build="`config.guess`" \ --target='$(TARGET)' \ --prefix='$(PREFIX)' \ --enable-version-specific-runtime-libs \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgpg_error.mk --- a/src/libgpg_error.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libgpg_error.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libgpg-error PKG := libgpg_error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10 $(PKG)_CHECKSUM := 95b324359627fbcb762487ab6091afbe59823b29 $(PKG)_SUBDIR := libgpg-error-$($(PKG)_VERSION) $(PKG)_FILE := libgpg-error-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := ftp://ftp.gnupg.org/gcrypt/libgpg-error/ $(PKG)_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -19,10 +16,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgsasl-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libgsasl-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,37 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 7 Nov 2011 18:01:56 +0100 +Subject: [PATCH] use memxor from nettle + + +diff --git a/gl/memxor.c b/gl/memxor.c +index 7fec454..d9b62cd 100644 +--- a/gl/memxor.c ++++ b/gl/memxor.c +@@ -23,7 +23,7 @@ + #include "memxor.h" + + void * +-memxor (void *restrict dest, const void *restrict src, size_t n) ++gsasl_memxor (void *restrict dest, const void *restrict src, size_t n) + { + char const *s = src; + char *d = dest; +diff --git a/libgsasl.pc.in b/libgsasl.pc.in +index b0c477d..d8d8ccc 100644 +--- a/libgsasl.pc.in ++++ b/libgsasl.pc.in +@@ -16,4 +16,5 @@ URL: http://www.gnu.org/software/gsasl/ + Version: @VERSION@ + Libs: -L${libdir} -lgsasl + Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@ ++Requires.private: nettle + Cflags: -I${includedir} +-- +1.7.7 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgsasl-test.c --- a/src/libgsasl-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libgsasl-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgsasl.mk --- a/src/libgsasl.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libgsasl.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,13 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Libgsasl PKG := libgsasl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.1 $(PKG)_CHECKSUM := 2942886514f14801193e505fc5367330d5c6b7de $(PKG)_SUBDIR := libgsasl-$($(PKG)_VERSION) $(PKG)_FILE := libgsasl-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.gnu.org/software/gsasl/ $(PKG)_URL := http://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libiconv libidn libntlm libgcrypt +$(PKG)_DEPS := gcc libiconv libidn libntlm libgcrypt nettle define $(PKG)_UPDATE wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gsasl.git;a=tags' | \ @@ -20,10 +17,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && touch src/libgsasl-7.def && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgsf-1-fixes.patch --- a/src/libgsf-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libgsf-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. Contains ad hoc patches for cross building. From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 23:34:26 +0200 -Subject: [PATCH 1/2] s,DllMain,static _disabled_DllMain, +Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain, diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c @@ -28,28 +28,3 @@ -- 1.7.1 - -From ab87b1b623f774244935bf9f1d82365a3203d8db Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 29 Sep 2010 20:15:48 +0200 -Subject: [PATCH 2/2] no gettext - - -diff --git a/configure.in b/configure.in -index af40c28..7ce5f7b 100644 ---- a/configure.in -+++ b/configure.in -@@ -53,10 +53,6 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - dnl Gettext/i18n stuff - --IT_PROG_INTLTOOL([0.35.0]) -- --AM_GLIB_GNU_GETTEXT -- - GETTEXT_PACKAGE=AC_PACKAGE_NAME - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) --- -1.7.1 - diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libgsf.mk --- a/src/libgsf.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libgsf.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libgsf PKG := libgsf $(PKG)_IGNORE := -$(PKG)_VERSION := 1.14.20 -$(PKG)_CHECKSUM := d172b454c1b98f9c111df11e000b1ced050bdac9 +$(PKG)_CHECKSUM := ca1c5aa92a840e322d7cafd9f2dede3d38a69660 $(PKG)_SUBDIR := libgsf-$($(PKG)_VERSION) -$(PKG)_FILE := libgsf-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://ftp.gnome.org/pub/gnome/sources/libgsf/ +$(PKG)_FILE := libgsf-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/libgsf/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib bzip2 glib libxml2 @@ -23,8 +20,6 @@ define $(PKG)_BUILD $(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in echo 'Libs.private: -lz -lbz2' >> '$(1)'/libgsf-1.pc.in - cd '$(1)' && aclocal -I m4 - cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libharu-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libharu-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,407 @@ +# This file is part of MXE. +# See index.html for further information. + +From 531d2a9af8c51ad8badc32bc9ba43bb3b87b0e9f Mon Sep 17 00:00:00 2001 +From: Antony Dovgal +Date: Mon, 10 Jan 2011 01:22:14 +0300 +Subject: [PATCH] fix build with libpng 1.5.0 (reported by Tamas Tevesz) + (cherry picked from commit + e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934) + +Conflicts: + + CHANGES +--- + src/hpdf_image_png.c | 109 +++++++++++++++++++++++++++----------------------- + 1 files changed, 59 insertions(+), 50 deletions(-) + +diff --git a/src/hpdf_image_png.c b/src/hpdf_image_png.c +index b8f831e..6057424 100644 +--- a/src/hpdf_image_png.c ++++ b/src/hpdf_image_png.c +@@ -109,14 +109,15 @@ ReadPngData_Interlaced (HPDF_Dict image, + png_infop info_ptr) + { + png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr); ++ png_uint_32 height = png_get_image_height(png_ptr, info_ptr); + png_bytep* row_pointers = HPDF_GetMem (image->mmgr, +- info_ptr->height * sizeof (png_bytep)); ++ height * sizeof (png_bytep)); + + if (row_pointers) { + HPDF_UINT i; + +- HPDF_MemSet (row_pointers, 0, info_ptr->height * sizeof (png_bytep)); +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ HPDF_MemSet (row_pointers, 0, height * sizeof (png_bytep)); ++ for (i = 0; i < (HPDF_UINT)height; i++) { + row_pointers[i] = HPDF_GetMem (image->mmgr, len); + + if (image->error->error_no != HPDF_OK) +@@ -126,7 +127,7 @@ ReadPngData_Interlaced (HPDF_Dict image, + if (image->error->error_no == HPDF_OK) { + png_read_image(png_ptr, row_pointers); + if (image->error->error_no == HPDF_OK) { /* add this line */ +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)height; i++) { + if (HPDF_Stream_Write (image->stream, row_pointers[i], len) != + HPDF_OK) + break; +@@ -135,7 +136,7 @@ ReadPngData_Interlaced (HPDF_Dict image, + } + + /* clean up */ +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)height; i++) { + HPDF_FreeMem (image->mmgr, row_pointers[i]); + } + +@@ -151,12 +152,13 @@ ReadPngData (HPDF_Dict image, + png_infop info_ptr) + { + png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr); ++ png_uint_32 height = png_get_image_height(png_ptr, info_ptr); + png_bytep buf_ptr = HPDF_GetMem (image->mmgr, len); + + if (buf_ptr) { + HPDF_UINT i; + +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)height; i++) { + png_read_rows(png_ptr, (png_byte**)&buf_ptr, NULL, 1); + if (image->error->error_no != HPDF_OK) + break; +@@ -182,14 +184,16 @@ ReadTransparentPaletteData (HPDF_Dict image, + HPDF_STATUS ret = HPDF_OK; + HPDF_UINT i, j; + png_bytep *row_ptr; ++ png_uint_32 height = png_get_image_height(png_ptr, info_ptr); ++ png_uint_32 width = png_get_image_width(png_ptr, info_ptr); + +- row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep)); ++ row_ptr = HPDF_GetMem (image->mmgr, height * sizeof(png_bytep)); + if (!row_ptr) { + return HPDF_FAILD_TO_ALLOC_MEM; + } else { + png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr); + +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)height; i++) { + row_ptr[i] = HPDF_GetMem(image->mmgr, len); + if (!row_ptr[i]) { + for (; i >= 0; i--) { +@@ -207,19 +211,19 @@ ReadTransparentPaletteData (HPDF_Dict image, + goto Error; + } + +- for (j = 0; j < info_ptr->height; j++) { +- for (i = 0; i < info_ptr->width; i++) { +- smask_data[info_ptr->width * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF; ++ for (j = 0; j < height; j++) { ++ for (i = 0; i < width; i++) { ++ smask_data[width * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF; + } + +- if (HPDF_Stream_Write (image->stream, row_ptr[j], info_ptr->width) != HPDF_OK) { ++ if (HPDF_Stream_Write (image->stream, row_ptr[j], width) != HPDF_OK) { + ret = HPDF_FILE_IO_ERROR; + goto Error; + } + } + + Error: +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)height; i++) { + HPDF_FreeMem (image->mmgr, row_ptr[i]); + } + +@@ -238,6 +242,8 @@ ReadTransparentPngData (HPDF_Dict image, + HPDF_UINT i, j; + png_bytep *row_ptr, row; + png_byte color_type; ++ png_uint_32 height = png_get_image_height(png_ptr, info_ptr); ++ png_uint_32 width = png_get_image_width(png_ptr, info_ptr); + + color_type = png_get_color_type(png_ptr, info_ptr); + +@@ -245,13 +251,13 @@ ReadTransparentPngData (HPDF_Dict image, + return HPDF_INVALID_PNG_IMAGE; + } + +- row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep)); ++ row_ptr = HPDF_GetMem (image->mmgr, height * sizeof(png_bytep)); + if (!row_ptr) { + return HPDF_FAILD_TO_ALLOC_MEM; + } else { + png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr); + +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)height; i++) { + row_ptr[i] = HPDF_GetMem(image->mmgr, len); + if (!row_ptr[i]) { + for (; i >= 0; i--) { +@@ -271,12 +277,12 @@ ReadTransparentPngData (HPDF_Dict image, + + switch (color_type) { + case PNG_COLOR_TYPE_RGB_ALPHA: +- row_len = 3 * info_ptr->width * sizeof(png_byte); +- for (j = 0; j < info_ptr->height; j++) { +- for (i = 0; i < info_ptr->width; i++) { ++ row_len = 3 * width * sizeof(png_byte); ++ for (j = 0; j < height; j++) { ++ for (i = 0; i < width; i++) { + row = row_ptr[j]; + memmove(row + (3 * i), row + (4*i), 3); +- smask_data[info_ptr->width * j + i] = row[4 * i + 3]; ++ smask_data[width * j + i] = row[4 * i + 3]; + } + + if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) { +@@ -286,12 +292,12 @@ ReadTransparentPngData (HPDF_Dict image, + } + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: +- row_len = info_ptr->width * sizeof(png_byte); +- for (j = 0; j < info_ptr->height; j++) { +- for (i = 0; i < info_ptr->width; i++) { ++ row_len = width * sizeof(png_byte); ++ for (j = 0; j < height; j++) { ++ for (i = 0; i < width; i++) { + row = row_ptr[j]; + row[i] = row[2 * i]; +- smask_data[info_ptr->width * j + i] = row[2 * i + 1]; ++ smask_data[width * j + i] = row[2 * i + 1]; + } + + if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) { +@@ -306,7 +312,7 @@ ReadTransparentPngData (HPDF_Dict image, + } + + Error: +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)height; i++) { + HPDF_FreeMem (image->mmgr, row_ptr[i]); + } + +@@ -415,7 +421,8 @@ LoadPngData (HPDF_Dict image, + + { + HPDF_STATUS ret = HPDF_OK; +- ++ png_uint_32 width, height; ++ int bit_depth, color_type; + png_structp png_ptr = NULL; + png_infop info_ptr = NULL; + +@@ -447,8 +454,10 @@ LoadPngData (HPDF_Dict image, + goto Exit; + } + ++ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL); ++ + /* 16bit images are not supported. */ +- if (info_ptr->bit_depth == 16) { ++ if (bit_depth == 16) { + png_set_strip_16(png_ptr); + } + +@@ -458,7 +467,7 @@ LoadPngData (HPDF_Dict image, + } + + /* check palette-based images for transparent areas and load them immediately if found */ +- if (xref && PNG_COLOR_TYPE_PALETTE & info_ptr->color_type) { ++ if (xref && PNG_COLOR_TYPE_PALETTE & color_type) { + png_bytep trans; + int num_trans; + HPDF_Dict smask; +@@ -478,10 +487,10 @@ LoadPngData (HPDF_Dict image, + smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT; + ret = HPDF_Dict_AddName (smask, "Type", "XObject"); + ret += HPDF_Dict_AddName (smask, "Subtype", "Image"); +- ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height); ++ ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)width); ++ ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)height); + ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray"); +- ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)bit_depth); + + if (ret != HPDF_OK) { + HPDF_Dict_Free(smask); +@@ -489,7 +498,7 @@ LoadPngData (HPDF_Dict image, + goto Exit; + } + +- smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height); ++ smask_data = HPDF_GetMem(image->mmgr, width * height); + if (!smask_data) { + HPDF_Dict_Free(smask); + ret = HPDF_FAILD_TO_ALLOC_MEM; +@@ -503,7 +512,7 @@ LoadPngData (HPDF_Dict image, + goto Exit; + } + +- if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) { ++ if (HPDF_Stream_Write(smask->stream, smask_data, width * height) != HPDF_OK) { + HPDF_FreeMem(image->mmgr, smask_data); + HPDF_Dict_Free(smask); + ret = HPDF_FILE_IO_ERROR; +@@ -513,9 +522,9 @@ LoadPngData (HPDF_Dict image, + + + ret += CreatePallet(image, png_ptr, info_ptr); +- ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height); +- ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)width); ++ ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)height); ++ ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)bit_depth); + ret += HPDF_Dict_Add (image, "SMask", smask); + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); +@@ -526,7 +535,7 @@ no_transparent_color_in_palette: + + /* read images with alpha channel right away + we have to do this because image transparent mask must be added to the Xref */ +- if (xref && PNG_COLOR_MASK_ALPHA & info_ptr->color_type) { ++ if (xref && PNG_COLOR_MASK_ALPHA & color_type) { + HPDF_Dict smask; + png_bytep smask_data; + +@@ -539,10 +548,10 @@ no_transparent_color_in_palette: + smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT; + ret = HPDF_Dict_AddName (smask, "Type", "XObject"); + ret += HPDF_Dict_AddName (smask, "Subtype", "Image"); +- ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height); ++ ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)width); ++ ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)height); + ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray"); +- ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)bit_depth); + + if (ret != HPDF_OK) { + HPDF_Dict_Free(smask); +@@ -550,7 +559,7 @@ no_transparent_color_in_palette: + goto Exit; + } + +- smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height); ++ smask_data = HPDF_GetMem(image->mmgr, width * height); + if (!smask_data) { + HPDF_Dict_Free(smask); + ret = HPDF_FAILD_TO_ALLOC_MEM; +@@ -564,7 +573,7 @@ no_transparent_color_in_palette: + goto Exit; + } + +- if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) { ++ if (HPDF_Stream_Write(smask->stream, smask_data, width * height) != HPDF_OK) { + HPDF_FreeMem(image->mmgr, smask_data); + HPDF_Dict_Free(smask); + ret = HPDF_FILE_IO_ERROR; +@@ -572,14 +581,14 @@ no_transparent_color_in_palette: + } + HPDF_FreeMem(image->mmgr, smask_data); + +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { ++ if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { + ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray"); + } else { + ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB"); + } +- ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height); +- ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)width); ++ ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)height); ++ ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)bit_depth); + ret += HPDF_Dict_Add (image, "SMask", smask); + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); +@@ -589,9 +598,9 @@ no_transparent_color_in_palette: + /* if the image has color palette, copy the pallet of the image to + * create color map. + */ +- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ++ if (color_type == PNG_COLOR_TYPE_PALETTE) + ret = CreatePallet(image, png_ptr, info_ptr); +- else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) ++ else if (color_type == PNG_COLOR_TYPE_GRAY) + ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray"); + else + ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB"); +@@ -617,16 +626,16 @@ no_transparent_color_in_palette: + } + + /* setting the info of the image. */ +- if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width) ++ if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)width) + != HPDF_OK) + goto Exit; + +- if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height) ++ if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)height) + != HPDF_OK) + goto Exit; + + if (HPDF_Dict_AddNumber (image, "BitsPerComponent", +- (HPDF_UINT)info_ptr->bit_depth) != HPDF_OK) ++ (HPDF_UINT)bit_depth) != HPDF_OK) + goto Exit; + + /* clean up */ +-- +1.7.8.3 + +Wt requires the following patch for libHaru to render arcs correctly. +This patch has been tested against libhar 2.1.0 and 2.2.0. +(see http://redmine.webtoolkit.eu/projects/wt/wiki/LibHaru) + +diff -ur a/src/hpdf_page_operator.c b/src/hpdf_page_operator.c +--- a/src/hpdf_page_operator.c 2010-02-01 07:26:13.000000000 -0300 ++++ b/src/hpdf_page_operator.c 2012-03-10 18:12:41.347028623 -0300 +@@ -2192,7 +2192,7 @@ + + HPDF_PTRACE ((" HPDF_Page_Arc\n")); + +- if (ang1 >= ang2 || (ang2 - ang1) >= 360) ++ if (fabs(ang2 - ang1) >= 360) + HPDF_RaiseError (page->error, HPDF_PAGE_OUT_OF_RANGE, 0); + + if (ret != HPDF_OK) +@@ -2205,10 +2205,10 @@ + + + for (;;) { +- if (ang2 - ang1 <= 90) ++ if (fabs(ang2 - ang1) <= 90) + return InternalArc (page, x, y, ray, ang1, ang2, cont_flg); + else { +- HPDF_REAL tmp_ang = ang1 + 90; ++ HPDF_REAL tmp_ang = (ang2 > ang1 ? ang1 + 90 : ang1 - 90); + + if ((ret = InternalArc (page, x, y, ray, ang1, tmp_ang, cont_flg)) + != HPDF_OK) +@@ -2217,7 +2217,7 @@ + ang1 = tmp_ang; + } + +- if (ang1 >= ang2) ++ if (fabs(ang1 - ang2) < 0.1) + break; + + cont_flg = HPDF_TRUE; +@@ -2280,7 +2280,11 @@ + pbuf = HPDF_FToA (pbuf, (HPDF_REAL)x0, eptr); + *pbuf++ = ' '; + pbuf = HPDF_FToA (pbuf, (HPDF_REAL)y0, eptr); +- pbuf = (char *)HPDF_StrCpy (pbuf, " m\012", eptr); ++ ++ if (attr->gmode == HPDF_GMODE_PATH_OBJECT) ++ pbuf = (char *)HPDF_StrCpy (pbuf, " l\012", eptr); ++ else ++ pbuf = (char *)HPDF_StrCpy (pbuf, " m\012", eptr); + } + + pbuf = HPDF_FToA (pbuf, (HPDF_REAL)x1, eptr); diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libharu.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libharu.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,27 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libharu +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := b75ec6052b8d72aa7f23d67adcdf9df4847b64ca +$(PKG)_SUBDIR := libharu-$($(PKG)_VERSION) +$(PKG)_FILE := libharu-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://libharu.org/files/$($(PKG)_FILE) +$(PKG)_DEPS := gcc zlib libpng + +define $(PKG)_UPDATE + wget -q -O- 'http://libharu.org/files/?C=M;O=D' | \ + $(SED) -n 's,.*libharu-\([0-9][^>]*\)\.tar.*,\1,p' | \ + grep -v 'rc' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --prefix='$(PREFIX)/$(TARGET)' \ + --disable-shared \ + --with-zlib='$(PREFIX)/$(TARGET)' \ + --with-png='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libiberty-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libiberty-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,26 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#define _GNU_SOURCE +#include +#include +#include + +int main(int argc, char *argv[]) +{ + char *s; + + (void)argc; + (void)argv; + + if (asprintf(&s, "Test%i", 123) >= 0) { + printf("asprintf output: %s\n", s); + free(s); + return 0; + } else { + printf("asprintf() failed!\n"); + return 1; + } +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libiberty.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libiberty.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,31 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libiberty +$(PKG)_IGNORE = $(binutils_IGNORE) +$(PKG)_CHECKSUM = $(binutils_CHECKSUM) +$(PKG)_SUBDIR = $(binutils_SUBDIR)/libiberty +$(PKG)_FILE = $(binutils_FILE) +$(PKG)_URL = $(binutils_URL) +$(PKG)_URL_2 = $(binutils_URL_2) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + echo $(binutils_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --enable-static \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' \ + --enable-install-libiberty + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install target_header_dir=libiberty + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libiberty.exe' \ + -I$(PREFIX)/$(TARGET)/include/libiberty -liberty +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libical-1-tml.patch --- a/src/libical-1-tml.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,197 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -https://build.opensuse.org/package/view_file?file=libical-0.44-tml.patch&package=mingw32-libical&project=windows%3Amingw%3Awin32 - ---- libical-0.44/autogen.sh 2009-01-08 17:50:28.000000000 +0100 -+++ libical-0.44/autogen.sh 2009-04-15 15:25:54.000000000 +0200 -@@ -37,11 +37,6 @@ - exit 1 - } - --if test -z "$*"; then -- echo "I am going to run ./configure with no arguments - if you wish " -- echo "to pass any to it, please specify them on the $0 command line." --fi -- - case $CC in - *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;; - esac -@@ -55,7 +50,3 @@ - autoconf - cd $ORIGDIR - --$srcdir/configure "$@" -- --echo --echo "Now type 'make' to compile $PROJECT." ---- libical-0.44/src/libical/icalrecur.c 2009-01-08 17:50:21.000000000 +0100 -+++ libical-0.44/src/libical/icalrecur.c 2009-04-15 15:12:35.000000000 +0200 -@@ -141,16 +141,6 @@ - - #include - --#ifndef HAVE_INTPTR_T --#if defined (WIN32) || defined (XP_BEOS) --typedef long intptr_t; --#endif --#endif -- --#ifdef WIN32 --#define strcasecmp stricmp --#endif -- - #include "icalrecur.h" - - #include "icalerror.h" ---- libical-0.44/src/libical/icaltz-util.c 2009-01-08 17:50:21.000000000 +0100 -+++ libical-0.44/src/libical/icaltz-util.c 2009-04-15 15:17:06.000000000 +0200 -@@ -20,67 +20,24 @@ - * Boston, MA 02110-1301, USA. - */ - --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif - #include -- - #if defined(sun) && defined(__SVR4) - #include -+#elif defined(_WIN32) -+#define BIG_ENDIAN 'B' -+#define LITTLE_ENDIAN 'l' -+#define BYTE_ORDER LITTLE_ENDIAN -+#define bswap32(val) ((((val) & 0x000000ffU) << 24) | (((val) & 0x0000ff00U) << 8) | (((val) & 0x00ff0000U) >> 8) | (((val) & 0xff000000U) >> 24)) -+#elif defined(__linux__) -+#include -+#include - #else --# ifdef HAVE_BYTESWAP_H --# include --# endif --# ifdef HAVE_SYS_ENDIAN_H --# include --# ifdef bswap32 --# define bswap_32 bswap32 --# else --# define bswap_32 swap32 --# endif --# endif --# ifdef HAVE_ENDIAN_H --# include --# endif --#endif -- --#ifdef WIN32 --#if !defined(HAVE_BYTESWAP_H) && !defined(HAVE_SYS_ENDIAN_H) && !defined(HAVE_ENDIAN_H) --#define bswap_16(x) (((x) << 8) & 0xff00) | (((x) >> 8 ) & 0xff) --#define bswap_32(x) (((x) << 24) & 0xff000000) \ -- | (((x) << 8) & 0xff0000) \ -- | (((x) >> 8) & 0xff00) \ -- | (((x) >> 24) & 0xff ) --#define bswap_64(x) ((((x) & 0xff00000000000000ull) >> 56) \ -- | (((x) & 0x00ff000000000000ull) >> 40) \ -- | (((x) & 0x0000ff0000000000ull) >> 24) \ -- | (((x) & 0x000000ff00000000ull) >> 8) \ -- | (((x) & 0x00000000ff000000ull) << 8) \ -- | (((x) & 0x0000000000ff0000ull) << 24) \ -- | (((x) & 0x000000000000ff00ull) << 40) \ -- | (((x) & 0x00000000000000ffull) << 56)) -+#include - #endif --#include --#endif -- --#ifndef PATH_MAX --#define PATH_MAX 512 --#endif -- --#ifndef F_OK --#define F_OK 0 --#endif -- --#ifndef R_OK --#define R_OK 4 --#endif -- - #include - #include - #include --#ifdef HAVE_UNISTD_H - #include --#endif - #include - #include - -@@ -139,7 +96,11 @@ - if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4) - return *(const int *) ptr; - else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4) -+#ifdef __linux__ - return bswap_32 (*(const int *) ptr); -+#else -+ return bswap32 (*(const unsigned *) ptr); -+#endif - #endif - else - { ---- libical-0.44/src/libical/Makefile.am 2009-01-08 17:50:22.000000000 +0100 -+++ libical-0.44/src/libical/Makefile.am 2009-04-15 15:27:20.000000000 +0200 -@@ -51,7 +51,7 @@ - -I$(top_builddir)/src/libical \ - -I$(srcdir) - --libical_la_LDFLAGS = -version-info 44:0:44 -+libical_la_LDFLAGS = -version-info 44:0:44 -no-undefined - - libical_la_LIBADD = $(PTHREAD_LIBS) - ---- libical-0.44/src/libical/vsnprintf.c 2009-01-08 17:50:22.000000000 +0100 -+++ libical-0.44/src/libical/vsnprintf.c 2009-04-15 15:23:35.000000000 +0200 -@@ -1,8 +1,7 @@ --#ifndef WIN32 - #include "config.h" --#endif -+ - #ifndef HAVE_SNPRINTF --#error DO NOT USE libical version of vsnprintf. -+ - /* - * Revision 12: http://theos.com/~deraadt/snprintf.c - * ---- libical-0.44/src/libicalcap/Makefile.am 2009-01-08 17:50:20.000000000 +0100 -+++ libical-0.44/src/libicalcap/Makefile.am 2009-04-15 15:32:11.000000000 +0200 -@@ -34,7 +34,7 @@ - -I$(srcdir) \ - -DWITH_RR $(RRCAP_CFLAGS) - --libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 44:0:44 -+libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 44:0:44 -no-undefined - - - libicalcap_evolution_la_SOURCES = \ ---- libical-0.44/src/libicalss/Makefile.am 2009-01-08 17:50:22.000000000 +0100 -+++ libical-0.44/src/libicalss/Makefile.am 2009-04-15 15:34:41.000000000 +0200 -@@ -63,8 +63,8 @@ - -I$(top_builddir)/src/libical \ - $(BDB_INCLUDE) - --libicalss_la_LDFLAGS = -version-info 44:0:44 --libicalss_la_LIBADD = $(BDB_LIBFILES) -+libicalss_la_LDFLAGS = -version-info 44:0:44 -no-undefined -+libicalss_la_LIBADD = $(BDB_LIBFILES) $(top_builddir)/src/libical/libical.la - - if DEV - libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y ---- libical-0.44/src/libicalvcal/Makefile.am 2009-01-08 17:50:23.000000000 +0100 -+++ libical-0.44/src/libicalvcal/Makefile.am 2009-04-15 15:31:48.000000000 +0200 -@@ -8,7 +8,7 @@ - -I$(top_builddir)/src/libical \ - -I$(top_srcdir)/src/libicalss - --libicalvcal_la_LDFLAGS = -version-info 44:0:44 -+libicalvcal_la_LDFLAGS = -version-info 44:0:44 -no-undefined - libicalvcal_la_LIBADD = ../libical/.libs/libical.la - - if DEV diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libical-2-windows.patch --- a/src/libical-2-windows.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,282 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -https://build.opensuse.org/package/view_file?file=libical-0.44-windows.patch&package=mingw32-libical&project=windows%3Amingw%3Awin32 - ---- libical-0.44/src/libical/icaltime.c 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/icaltime.c 2010-03-17 14:55:36.000000000 +0100 -@@ -45,14 +45,19 @@ - #include "icaltimezone.h" - #include "icalvalue.h" - --#ifdef WIN32 -+#ifdef _WIN32 - #include - - #define snprintf _snprintf - #define strcasecmp stricmp - #endif - --#ifdef WIN32 -+#ifdef HAVE_PTHREAD -+ #include -+ static pthread_mutex_t tzid_mutex = PTHREAD_MUTEX_INITIALIZER; -+#endif -+ -+#ifdef _WIN32 - /* Undef the similar macro from pthread.h, it doesn't check if - * gmtime() returns NULL. - */ -@@ -62,11 +67,6 @@ - #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) - #endif - --#ifdef HAVE_PTHREAD -- #include -- static pthread_mutex_t tzid_mutex = PTHREAD_MUTEX_INITIALIZER; --#endif -- - /* - * Function to convert a struct tm time specification - * to an ANSI time_t using the specified time zone. -@@ -192,18 +192,20 @@ - * - */ - struct icaltimetype --icaltime_from_timet_with_zone(const time_t tm, const int is_date, -+icaltime_from_timet_with_zone(time_t tm, const int is_date, - const icaltimezone *zone) - { - struct icaltimetype tt; - struct tm t; - icaltimezone *utc_zone; - -+ if (tm < 0) tm=0; -+ - utc_zone = icaltimezone_get_utc_timezone (); - - /* Convert the time_t to a struct tm in UTC time. We can trust gmtime - for this. */ --#ifdef HAVE_PTHREAD -+#if defined(HAVE_PTHREAD) || defined(_WIN32) - gmtime_r (&tm, &t); - #else - t = *(gmtime (&tm)); ---- libical-0.44/src/libical/icaltimezone.c 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/icaltimezone.c 2010-03-19 14:34:25.000000000 +0100 -@@ -59,6 +59,61 @@ - /** This is the toplevel directory where the timezone data is installed in. */ - #define ZONEINFO_DIRECTORY PACKAGE_DATA_DIR "/zoneinfo" - -+#ifdef _WIN32 -+/* search for data relative to where we are installed */ -+ -+static HMODULE hmodule; -+ -+BOOL WINAPI -+DllMain (HINSTANCE hinstDLL, -+ DWORD fdwReason, -+ LPVOID lpvReserved) -+{ -+ switch (fdwReason) -+ { -+ case DLL_PROCESS_ATTACH: -+ hmodule = hinstDLL; -+ break; -+ } -+ -+ return TRUE; -+} -+ -+char * -+get_zoneinfo_directory (void) -+{ -+ static char retval[1000]; -+ static int beenhere = 0; -+ -+ unsigned char *p; -+ -+ if (beenhere) -+ return retval; -+ -+ if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 10)) -+ return ZONEINFO_DIRECTORY; -+ -+ p = _mbsrchr ((const unsigned char *) retval, '\\'); -+ *p = '\0'; -+ p = _mbsrchr ((const unsigned char *) retval, '\\'); -+ if (p) { -+ if (stricmp ((const char *) (p+1), "bin") == 0) -+ *p = '\0'; -+ } -+ strcat (retval, "\\share\\libical\\zoneinfo"); -+ -+ beenhere = 1; -+ -+ return retval; -+} -+ -+#undef ZONEINFO_DIRECTORY -+#define ZONEINFO_DIRECTORY get_zoneinfo_directory () -+ -+#endif -+ -+ -+ - /** The prefix we use to uniquely identify TZIDs. - It must begin and end with forward slashes. - */ -@@ -1943,96 +1998,7 @@ - - static const char* get_zone_directory(void) - { --#ifndef WIN32 - return zone_files_directory == NULL ? ZONEINFO_DIRECTORY : zone_files_directory; --#else -- wchar_t wbuffer[1000]; -- char buffer[1000], zoneinfodir[1000], dirname[1000]; -- int used_default; -- static char *cache = NULL; -- char *dirslash, *zislash; -- struct stat st; -- -- if (zone_files_directory) -- return zone_files_directory; -- -- if (cache) -- return cache; -- -- /* Get the filename of the application */ -- if (!GetModuleFileNameW (NULL, wbuffer, sizeof (wbuffer) / sizeof (wbuffer[0]))) -- return ZONEINFO_DIRECTORY; -- -- /* Convert to system codepage */ -- if (!WideCharToMultiByte (CP_ACP, 0, wbuffer, -1, buffer, sizeof (buffer), -- NULL, &used_default) || -- used_default) { -- /* Failed, try 8.3 format */ -- if (!GetShortPathNameW (wbuffer, wbuffer, -- sizeof (wbuffer) / sizeof (wbuffer[0])) || -- !WideCharToMultiByte (CP_ACP, 0, wbuffer, -1, buffer, sizeof (buffer), -- NULL, &used_default) || -- used_default) -- return ZONEINFO_DIRECTORY; -- } -- /* Look for the zoneinfo directory somewhere in the path where -- * the app is installed. If the path to the app is -- * -- * C:\opt\evo-2.6\bin\evolution-2.6.exe -- * -- * and the compile-time ZONEINFO_DIRECTORY is -- * -- * C:/devel/target/evo/share/evolution-data-server-1.6/zoneinfo, -- * -- * we check the pathnames: -- * -- * C:\opt\evo-2.6/devel/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt\evo-2.6/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt\evo-2.6/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt\evo-2.6/share/evolution-data-server-1.6/zoneinfo <=== -- * C:\opt\evo-2.6/evolution-data-server-1.6/zoneinfo -- * C:\opt\evo-2.6/zoneinfo -- * C:\opt/devel/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt/share/evolution-data-server-1.6/zoneinfo -- * C:\opt/evolution-data-server-1.6/zoneinfo -- * C:\opt/zoneinfo -- * C:/devel/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:/evo/share/evolution-data-server-1.6/zoneinfo -- * C:/share/evolution-data-server-1.6/zoneinfo -- * C:/evolution-data-server-1.6/zoneinfo -- * C:/zoneinfo -- * -- * In Evolution's case, we would get a match already at the -- * fourth pathname check. -- */ -- -- /* Strip away basename of app .exe first */ -- dirslash = _mbsrchr (buffer, '\\'); -- if (dirslash) -- *dirslash = '\0'; -- -- while ((dirslash = _mbsrchr (buffer, '\\'))) { -- /* Strip one more directory from app .exe location */ -- *dirslash = '\0'; -- -- strcpy (zoneinfodir, ZONEINFO_DIRECTORY); -- while ((zislash = _mbschr (zoneinfodir, '/'))) { -- *zislash = '.'; -- strcpy (dirname, buffer); -- strcat (dirname, "/"); -- strcat (dirname, zislash + 1); -- if (stat (dirname, &st) == 0 && -- S_ISDIR (st.st_mode)) { -- cache = strdup (dirname); -- return cache; -- } -- } -- } -- return ZONEINFO_DIRECTORY; --#endif - } - - void set_zone_directory(char *path) ---- libical-0.44/src/libical/icaltz-util.c 2010-03-17 15:04:14.000000000 +0100 -+++ libical-0.44/src/libical/icaltz-util.c 2010-03-19 14:38:56.000000000 +0100 -@@ -41,6 +42,10 @@ - #include - #include - -+/** This is the filename of the file containing the city names and -+ coordinates of all the builtin timezones. */ -+#define ZONES_TAB_FILENAME "zones.tab" -+ - typedef struct - { - char ttisgmtcnt [4]; -@@ -53,7 +58,7 @@ - - static int r_pos [] = {1, 2, 3, -2, -1}; - --static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; -+static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo",PACKAGE_DATA_DIR "/zoneinfo"}; - static char *zdir = NULL; - - #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) -@@ -174,12 +179,24 @@ - return; - } - -+#ifdef _WIN32 -+char * get_zoneinfo_directory (void); -+#endif -+ - static void - set_zone_directory (void) - { - char file_path[PATH_MAX]; -- const char *fname = ZONES_TAB_SYSTEM_FILENAME; -+ -+#ifdef _WIN32 -+ const char *fname = ZONES_TAB_FILENAME; -+ -+ sprintf (file_path, "%s\\%s", get_zoneinfo_directory(), fname); -+ if (!access (file_path, F_OK|R_OK)) -+ zdir = strdup(get_zoneinfo_directory()); -+#else - int i; -+ const char *fname = ZONES_TAB_SYSTEM_FILENAME; - - for (i = 0;i < NUM_SEARCH_PATHS; i++) { - sprintf (file_path, "%s/%s", search_paths [i], fname); -@@ -188,6 +205,7 @@ - break; - } - } -+#endif - } - - diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libical-3-pthread.patch --- a/src/libical-3-pthread.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been made by: garethcoco@gmail.com - ---- libical-0.44/libical.pc.in 2011-02-02 15:33:11.363284126 -0500 -+++ libical-0.44/libical.pc.in 2011-02-02 15:32:44.202284263 -0500 -@@ -6,6 +6,6 @@ - Name: libical - Description: An implementation of basic iCAL protocols - Version: @VERSION@ --Libs: -L${libdir} -lical -licalss -licalvcal -+Libs: -L${libdir} -lical -licalss -licalvcal @PTHREAD_LIBS@ - Cflags: -I${includedir}/ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libical-test.c --- a/src/libical-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libical-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,18 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include int main(int argc, char *argv[]) { - icalvalue *v; + icalvalue *v; char *str; (void)argc; (void)argv; - + v = icalvalue_new_caladdress("cap://value/1"); str = icalvalue_as_ical_string_r(v); printf("String: %s\n", str); diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libical.mk --- a/src/libical.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libical.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,12 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# PDcurses PKG := libical -$(PKG)_IGNORE := 0.46 -$(PKG)_VERSION := 0.44 -$(PKG)_CHECKSUM := f781150e2d98806e91b7e0bee02abdc6baf9ac7d +$(PKG)_CHECKSUM := 4693cd0438be9f3727146ac1a46aa5b1b93b8c86 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://freeassociation.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeassociation/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc pthreads +$(PKG)_DEPS := gcc define $(PKG)_UPDATE wget -q -O- 'http://sourceforge.net/projects/freeassociation/files/$(PKG)/' | \ @@ -19,13 +15,16 @@ endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install - + cd '$(1)' && mkdir build + cd '$(1)/build' && cmake .. \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DSTATIC_LIBRARY=true \ + -DHAVE_PTHREAD_H=false \ + -DCMAKE_HAVE_PTHREAD_H=false + $(MAKE) -C '$(1)/build' -j '$(JOBS)' ical-header + $(MAKE) -C '$(1)/build' -j '$(JOBS)' + $(MAKE) -C '$(1)/build' -j 1 install + '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libical.exe' \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libiconv.mk --- a/src/libiconv.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libiconv.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libiconv PKG := libiconv $(PKG)_IGNORE := -$(PKG)_VERSION := 1.13.1 -$(PKG)_CHECKSUM := 5b0524131cf0d7abd50734077f13aaa5508f6bbe +$(PKG)_CHECKSUM := be7d67e50d72ff067b2c0291311bc283add36965 $(PKG)_SUBDIR := libiconv-$($(PKG)_VERSION) $(PKG)_FILE := libiconv-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.gnu.org/software/libiconv/ $(PKG)_URL := http://ftp.gnu.org/pub/gnu/libiconv/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libidn-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libidn-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,25 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 2d8680323de1e709bfec5194db0119a7395ab78a Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 25 Nov 2011 15:58:28 +0100 +Subject: [PATCH] fix Libs.private + + +diff --git a/libidn.pc.in b/libidn.pc.in +index a69d5d3..2d36472 100644 +--- a/libidn.pc.in ++++ b/libidn.pc.in +@@ -19,5 +19,5 @@ Description: IETF stringprep, nameprep, punycode, IDNA text processing. + URL: http://www.gnu.org/software/libidn/ + Version: @VERSION@ + Libs: -L${libdir} -lidn +-Libs.private: @LTLIBICONV@ ++Libs.private: -lintl -liconv + Cflags: -I${includedir} +-- +1.7.8 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libidn-test.c --- a/src/libidn-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libidn-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libidn.mk --- a/src/libidn.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libidn.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,13 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Libidn PKG := libidn $(PKG)_IGNORE := -$(PKG)_VERSION := 1.22 -$(PKG)_CHECKSUM := 8358e897c24d534438f6b5694c25e85889d860c3 +$(PKG)_CHECKSUM := 4251c108966375ede4df15d76a1bd9a4440f44ee $(PKG)_SUBDIR := libidn-$($(PKG)_VERSION) $(PKG)_FILE := libidn-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.gnu.org/software/libidn/ $(PKG)_URL := ftp://ftp.gnu.org/gnu/libidn/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libiconv +$(PKG)_DEPS := gcc gettext libiconv define $(PKG)_UPDATE wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=libidn.git;a=tags' | \ @@ -20,10 +17,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --disable-csharp \ --prefix='$(PREFIX)/$(TARGET)' \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libircclient-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libircclient-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,88 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 06b27e262de1d156ea31b52762ed372211b72de9 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 23 Jan 2012 08:26:14 +0100 +Subject: [PATCH 1/2] use the proper WIN32 define + + +diff --git a/examples/censor.cpp b/examples/censor.cpp +index 0c15f4c..c784040 100644 +--- a/examples/censor.cpp ++++ b/examples/censor.cpp +@@ -32,7 +32,7 @@ + #include + #include + +-#if !defined (WIN32) ++#if !defined (_WIN32) + #include + #endif + +diff --git a/examples/irctest.c b/examples/irctest.c +index bd6dbc3..08d2ba7 100644 +--- a/examples/irctest.c ++++ b/examples/irctest.c +@@ -51,7 +51,7 @@ void addlog (const char * fmt, ...) + va_list va_alist; + + va_start (va_alist, fmt); +-#if defined (WIN32) ++#if defined (_WIN32) + _vsnprintf (buf, sizeof(buf), fmt, va_alist); + #else + vsnprintf (buf, sizeof(buf), fmt, va_alist); +diff --git a/examples/spammer.c b/examples/spammer.c +index ae9c2c7..2a0861b 100644 +--- a/examples/spammer.c ++++ b/examples/spammer.c +@@ -17,7 +17,7 @@ + #include + #include + +-#if defined (WIN32) ++#if defined (_WIN32) + #include + + #define CREATE_THREAD(id,func,param) (CreateThread(0, 0, func, param, 0, id) == 0) +diff --git a/include/libircclient.h b/include/libircclient.h +index 2dcd44c..af7d769 100644 +--- a/include/libircclient.h ++++ b/include/libircclient.h +@@ -44,7 +44,7 @@ + #ifndef INCLUDE_LIBIRC_H + #define INCLUDE_LIBIRC_H + +-#if !defined (WIN32) ++#if !defined (_WIN32) + #include /* fd_set */ + #else + #include +-- +1.7.8.3 + + +From 1a54c4dda67b99c1c0c0c68b45a395b741cb7030 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Sun, 22 Jan 2012 22:39:23 +0100 +Subject: [PATCH 2/2] fix missing header + + +diff --git a/include/libircclient.h b/include/libircclient.h +index af7d769..57c8516 100644 +--- a/include/libircclient.h ++++ b/include/libircclient.h +@@ -131,6 +131,7 @@ typedef void (*irc_dcc_callback_t) (irc_session_t * session, irc_dcc_t id, int s + #include "libirc_errors.h" + #include "libirc_events.h" + #include "libirc_options.h" ++#include "libirc_rfcnumeric.h" + #undef IN_INCLUDE_LIBIRC_H + + +-- +1.7.8.3 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libircclient-test.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libircclient-test.cpp Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,18 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + irc_callbacks_t callbacks; + memset(&callbacks, 0, sizeof(callbacks)); + + irc_create_session(&callbacks); + return 0; +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libircclient.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libircclient.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,40 @@ +# This file is part of MXE. +# See index.html for further information. + +# Note that IPv6 support is partly broken and therefore disabled. +PKG := libircclient +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 10fb7a2478f6d668dce2d7fb5cd5a35ea8f53ed4 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + wget -q -O- 'http://sourceforge.net/projects/libircclient/files/libircclient/' | \ + $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --prefix='$(PREFIX)/$(TARGET)' \ + --host='$(TARGET)' \ + --disable-debug \ + --enable-threads \ + --disable-ipv6 + $(MAKE) -C '$(1)'/src -j '$(JOBS)' static + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/src/libircclient.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libircclient.h' '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_errors.h' '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_events.h' '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_rfcnumeric.h' '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_options.h' '$(PREFIX)/$(TARGET)/include/libircclient' + + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-libircclient.exe' \ + -lircclient -lws2_32 +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/liblo.mk --- a/src/liblo.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/liblo.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# liblo PKG := liblo $(PKG)_IGNORE := -$(PKG)_VERSION := 0.26 $(PKG)_CHECKSUM := 21942c8f19e9829b5842cb85352f98c49dfbc823 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://liblo.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc pthreads diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libmad.mk --- a/src/libmad.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libmad.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libmad PKG := libmad $(PKG)_IGNORE := -$(PKG)_VERSION := 0.15.1b $(PKG)_CHECKSUM := cac19cd00e1a907f3150cc040ccc077783496d76 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.underbit.com/products/mad/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mad/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libmikmod-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libmikmod-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,27 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From e740945ac2db92c3d1de0e805e0e8ea76f2e1373 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Sat, 24 Mar 2012 01:43:51 +0100 +Subject: [PATCH] libmikmod-config should include -pthread for static + + +diff --git a/libmikmod-config.in b/libmikmod-config.in +index 8698715..c788c8a 100644 +--- a/libmikmod-config.in ++++ b/libmikmod-config.in +@@ -50,7 +50,7 @@ while test $# -gt 0 ; do + ;; + --libs) + libdir=-L${exec_prefix}/lib +- echo $libdir -lmikmod @LIBRARY_LIB@ ++ echo $libdir -lmikmod @LIBRARY_LIB@ -pthread + ;; + *) + echo "${usage}" 1>&2 +-- +1.7.9.2 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libmikmod-test.c --- a/src/libmikmod-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libmikmod-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libmikmod.mk --- a/src/libmikmod.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libmikmod.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libMikMod PKG := libmikmod $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.0-beta2 $(PKG)_CHECKSUM := f16fc09ee643af295a8642f578bda97a81aaf744 $(PKG)_SUBDIR := libmikmod-$($(PKG)_VERSION) $(PKG)_FILE := libmikmod-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://mikmod.raphnet.net/ $(PKG)_URL := http://mikmod.raphnet.net/files/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -29,6 +26,7 @@ ./configure \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-esd $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libmng-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libmng-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,32 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 1a94342a8f86ab72b8d6c24b8ecd974d2821be04 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Thu, 3 Nov 2011 14:40:24 +0100 +Subject: [PATCH] add pkg-config file + + +diff --git a/libmng.pc.in b/libmng.pc.in +new file mode 100644 +index 0000000..1dfc9fa +--- /dev/null ++++ b/libmng.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: libmng ++Description: The MNG library. ++Version: @VERSION@ ++Libs: -L${libdir} -lmng ++Libs.private: @mng_libs_private@ ++Cflags: -I${includedir} ++Requires.private: @mng_requires_private@ +-- +1.7.7 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libmng.mk --- a/src/libmng.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libmng.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libmng PKG := libmng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.10 $(PKG)_CHECKSUM := c21c84b614500ae1a41c6595d5f81c596e406ca2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.libmng.com/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)-devel/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib jpeg lcms1 @@ -27,4 +24,10 @@ $(INSTALL) -m644 '$(1)/libmng.a' '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' $(INSTALL) -m644 '$(1)/libmng.h' '$(1)/libmng_conf.h' '$(1)/libmng_types.h' '$(PREFIX)/$(TARGET)/include/' + $(SED) -e 's^@prefix@^$(PREFIX)/$(TARGET)^;' \ + -e 's^@VERSION@^$(libmng_VERSION)^;' \ + -e 's^@mng_libs_private@^-ljpeg^;' \ + -e 's^@mng_requires_private@^lcms zlib^;' \ + < '$(1)/libmng.pc.in' > '$(1)/libmng.pc' + $(INSTALL) -m644 '$(1)/libmng.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libntlm.mk --- a/src/libntlm.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libntlm.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Libntlm PKG := libntlm $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2 -$(PKG)_CHECKSUM := 27538a3375690a37574fa991fbd327d150d8b505 +$(PKG)_CHECKSUM := 5dd798d5fb9a75656225052aa88ceb9befbbd4a0 $(PKG)_SUBDIR := libntlm-$($(PKG)_VERSION) $(PKG)_FILE := libntlm-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.nongnu.org/libntlm/ $(PKG)_URL := http://www.nongnu.org/libntlm/releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -20,10 +17,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 97d5a5c48c12 -r 082cd6e86b6b src/liboauth-test.c --- a/src/liboauth-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/liboauth-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/liboauth.mk --- a/src/liboauth.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/liboauth.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# liboauth PKG := liboauth $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.4 -$(PKG)_CHECKSUM := 9c48dcfe9bb2f7b0fa4825e645056bdf77640454 +$(PKG)_CHECKSUM := 9182ca5d7e127589d132377b807d0c8a8878b122 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://liboauth.sourceforge.net/ $(PKG)_URL := http://liboauth.sourceforge.net/pool/$($(PKG)_FILE) $(PKG)_DEPS := gcc curl openssl @@ -26,7 +23,7 @@ --disable-curl $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - + '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-liboauth.exe' \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libodbc++-1-win32.patch --- a/src/libodbc++-1-win32.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libodbc++-1-win32.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. --- libodbc++-0.2.5.orig/configure.ac 2009-08-20 23:39:08.000000000 +0200 +++ libodbc++-0.2.5/configure.ac 2010-02-04 22:40:32.000000000 +0100 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libodbc++.mk --- a/src/libodbc++.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libodbc++.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libodbc++ PKG := libodbc++ $(PKG)_IGNORE := -$(PKG)_VERSION := 0.2.5 $(PKG)_CHECKSUM := 8a77921b21c23926042c413f4a7a187a3656025b $(PKG)_SUBDIR := libodbc++-$($(PKG)_VERSION) $(PKG)_FILE := libodbc++-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://libodbcxx.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/libodbcxx/libodbc++/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/liboil.mk --- a/src/liboil.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/liboil.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# liboil PKG := liboil $(PKG)_IGNORE := -$(PKG)_VERSION := 0.3.17 $(PKG)_CHECKSUM := f9d7103a3a4a4089f56197f81871ae9129d229ed $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://$(PKG).freedesktop.org/ $(PKG)_URL := http://$(PKG).freedesktop.org/download/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libpano13.mk --- a/src/libpano13.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libpano13.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libpano13 PKG := libpano13 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.18_rc2 $(PKG)_CHECKSUM := 23849bdbdfc9176a2b53d157e58bd24aa0e7276e $(PKG)_SUBDIR := $(PKG)-$(word 1,$(subst _, ,$($(PKG)_VERSION))) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://panotools.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/panotools/$(PKG)/$($(PKG)_SUBDIR)/$($(PKG)_FILE) $(PKG)_DEPS := gcc jpeg tiff libpng zlib @@ -32,6 +29,7 @@ --with-jpeg='$(PREFIX)/$(TARGET)'/lib \ --with-tiff='$(PREFIX)/$(TARGET)'/lib \ --with-png='$(PREFIX)/$(TARGET)'/lib \ - --with-zlib='$(PREFIX)/$(TARGET)'/lib + --with-zlib='$(PREFIX)/$(TARGET)'/lib \ + LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libpaper.mk --- a/src/libpaper.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libpaper.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libpaper PKG := libpaper $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.24+nmu1 $(PKG)_CHECKSUM := 1f7a810a433a5a68b099aa92777cc2d0b3d03b42 $(PKG)_SUBDIR := libpaper-$($(PKG)_VERSION) $(PKG)_FILE := libpaper_$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://packages.debian.org/unstable/libpaper1 $(PKG)_URL := http://ftp.debian.org/debian/pool/main/libp/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libpng-test.c --- a/src/libpng-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libpng-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,36 +1,38 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ - -/* This is a slightly modified version of: */ -/* http://ironalbatross.net/wiki/index.php5?title=CPP_LIBPNG#Minimal_Example_of_writing_a_PNG_File */ +/* + * This file is part of MXE. + * See index.html for further information. + * + * This is a slightly modified version of: + * http://ironalbatross.net/wiki/index.php5?title=CPP_LIBPNG#Minimal_Example_of_writing_a_PNG_File + */ #include #include #include #include #include - + int main(int argc, char *argv[]) { (void)argc; (void)argv; - + /* PNG structs and types */ png_byte color_type; png_byte bit_depth; png_structp png_ptr; png_infop info_ptr; png_bytep *row_pointers; - + int height, width; FILE *fp; - + width = 640; height = 480; - + color_type = PNG_COLOR_TYPE_RGB; bit_depth = 8; /* Number of bits per color, not per pixel */ - + /* Dynamic 2D array in C */ row_pointers = (png_bytep *)malloc( sizeof(png_bytep) * height); int i; @@ -45,7 +47,7 @@ row_pointers[i][2+3*j] = (i * j) % 255; /* B */ } } - + /* Write the data out to the PNG file */ fp = fopen("test.png","wb"); png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,NULL,NULL,NULL); @@ -57,13 +59,13 @@ png_write_info(png_ptr, info_ptr); png_write_image(png_ptr, row_pointers); png_write_end(png_ptr, NULL); - + /* Free up memory after use */ for(i = 0; i < height; i++) { free(row_pointers[i]); } free(row_pointers); - + return 0; } diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libpng.mk --- a/src/libpng.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libpng.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libpng PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.2 -$(PKG)_CHECKSUM := 50243a46c4745b39e7fcda7a39f498f38e084ad6 +$(PKG)_CHECKSUM := bfa655f04965545a54dc974e50c2325968ca5a71 $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz -$(PKG)_WEBSITE := http://www.libpng.org/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/older-releases/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.simplesystems.org/pub/$(PKG)/png/src/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib @@ -20,7 +17,7 @@ grep -v alpha | \ grep -v beta | \ grep -v rc | \ - grep -v '^1\.4\.' | \ + grep -v '^1\.[0-4]\.' | \ head -1 endef @@ -30,7 +27,7 @@ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - + '$(TARGET)-gcc' \ -W -Wall -Werror -std=c99 -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libpng.exe' \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/librsvg-1-fixes.patch --- a/src/librsvg-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/librsvg-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. Contains an ad hoc patch for cross building. From 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 27 Sep 2010 12:00:52 +0200 Subject: [PATCH 1/2] fix .pc requirements diff -r 97d5a5c48c12 -r 082cd6e86b6b src/librsvg-test.c --- a/src/librsvg-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/librsvg-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/librsvg.mk --- a/src/librsvg.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/librsvg.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# librsvg PKG := librsvg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.34.0 -$(PKG)_CHECKSUM := 59e01568a6b201fc45828a76b942f790859cddeb +$(PKG)_CHECKSUM := 11a2dc00c813da13532d7f16a822b414201e8b1b $(PKG)_SUBDIR := librsvg-$($(PKG)_VERSION) -$(PKG)_FILE := librsvg-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://librsvg.sourceforge.net/ +$(PKG)_FILE := librsvg-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib libgsf cairo pango gtk2 libcroco @@ -21,15 +18,13 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-pixbuf-loader \ --disable-gtk-theme \ - --disable-mozilla-plugin \ --disable-gtk-doc \ - --with-svgz \ - --with-croco \ - --without-x + --enable-introspection=no $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libsamplerate.mk --- a/src/libsamplerate.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libsamplerate.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libsamplerate PKG := libsamplerate $(PKG)_IGNORE := -$(PKG)_VERSION := 0.1.7 -$(PKG)_CHECKSUM := f3f803ec5feae5a3fdb0fa3937277669e854386e +$(PKG)_CHECKSUM := e5fe82c4786be2fa33ca6bd4897db4868347fe70 $(PKG)_SUBDIR := libsamplerate-$($(PKG)_VERSION) $(PKG)_FILE := libsamplerate-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.mega-nerd.com/SRC/ $(PKG)_URL := http://www.mega-nerd.com/SRC/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -21,10 +18,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - #$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libshout-1-fixes.patch --- a/src/libshout-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libshout-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. Contains ad hoc patches for cross building. From 25255ff19813e122e6442518b29a55c15860d3a3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 17:20:29 +0200 Subject: [PATCH] mingw fixes diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libshout.mk --- a/src/libshout.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libshout.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libshout PKG := libshout $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.2 $(PKG)_CHECKSUM := cabc409e63f55383f4d85fac26d3056bf0365aac $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.icecast.org/ $(PKG)_URL := http://downloads.us.xiph.org/releases/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc vorbis ogg theora speex diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libsigc++.mk --- a/src/libsigc++.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libsigc++.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libsigc++ PKG := libsigc++ $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.9 -$(PKG)_CHECKSUM := ce3bc95c66feda3ed124197d325902f09ea5cdf9 +$(PKG)_CHECKSUM := 240d3e0a02e764a6362f6ce1b32de71401e50844 $(PKG)_SUBDIR := libsigc++-$($(PKG)_VERSION) $(PKG)_FILE := libsigc++-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://libsigc.sourceforge.net/ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/libsigc++/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -20,11 +17,9 @@ endef define $(PKG)_BUILD - # cross build - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ CXX='$(TARGET)-c++' \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libsndfile.mk --- a/src/libsndfile.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libsndfile.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libsndfile PKG := libsndfile $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.24 -$(PKG)_CHECKSUM := ade2dad272b52f61bb58aca3a4004b28549ee0f8 +$(PKG)_CHECKSUM := e95d9fca57f7ddace9f197071cbcfb92fa16748e $(PKG)_SUBDIR := libsndfile-$($(PKG)_VERSION) $(PKG)_FILE := libsndfile-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.mega-nerd.com/libsndfile/ $(PKG)_URL := http://www.mega-nerd.com/libsndfile/files/$($(PKG)_FILE) $(PKG)_DEPS := gcc sqlite flac ogg vorbis diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libssh2-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libssh2-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,32 @@ +This file is part of MXE. +See index.html for further information. + +From b3ade9a63e881e69b4c9cfe7b5dbad78dcc4a0e0 Mon Sep 17 00:00:00 2001 +From: Peter Stuge +Date: Wed, 1 Feb 2012 09:53:44 +0100 +Subject: [PATCH] Fix undefined reference to _libssh_error in libgcrypt + backend + +Commit 209de22299b4b58e582891dfba70f57e1e0492db introduced a function +call to a non-existing function, and since then the libgcrypt backend +has not been buildable. +--- + src/libgcrypt.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/libgcrypt.c b/src/libgcrypt.c +index 1bda5ee..5c2787b 100644 +--- a/src/libgcrypt.c ++++ b/src/libgcrypt.c +@@ -581,7 +581,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session, + const char *privatekey, + const char *passphrase) + { +- return _libssh_error(session, LIBSSH2_ERROR_FILE, ++ return _libssh2_error(session, LIBSSH2_ERROR_FILE, + "Unable to extract public key from private key file: " + "Method unimplemented in libgcrypt backend"); + } +-- +1.7.8.3 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libssh2-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libssh2-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,17 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include +#include + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + libssh2_init(0); + printf("libssh2 version: %s", libssh2_version(0) ); + libssh2_exit(); + return 0; +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libssh2.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libssh2.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,34 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libssh2 +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 53428b4935ab6eb843d45f1593dc434cb287b93e +$(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) +$(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://www.libssh2.org/download/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libgcrypt zlib + +define $(PKG)_UPDATE + wget -q -O- 'http://www.libssh2.org/download/?C=M;O=D' | \ + grep 'libssh2-' | \ + $(SED) -n 's,.*libssh2-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' \ + --without-openssl \ + --with-libgcrypt \ + PKG_CONFIG='$(TARGET)-pkg-config' \ + LIBS="-lgcrypt `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs`" + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libssh2.exe' \ + `'$(TARGET)-pkg-config' --cflags --libs libssh2` +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libtool.mk --- a/src/libtool.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libtool.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GNU Libtool PKG := libtool $(PKG)_IGNORE := -$(PKG)_VERSION := 2.4 -$(PKG)_CHECKSUM := 149e9d7a993b643d13149a94d07bbca1085e601c +$(PKG)_CHECKSUM := 22b71a8b5ce3ad86e1094e7285981cae10e6ff88 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.gnu.org/software/$(PKG)/ $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libunistring.mk --- a/src/libunistring.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libunistring.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# libunistring PKG := libunistring $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.3 $(PKG)_CHECKSUM := e1ea13c24a30bc93932d19eb5ad0704a618506dd $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.gnu.org/software/$(PKG)/ $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libusb.mk --- a/src/libusb.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libusb.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# LibUsb PKG := libusb $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.4.0 -$(PKG)_CHECKSUM := 9a0959a9a4fc537553786dd38207663e974ac6f1 +$(PKG)_CHECKSUM := 6b90d083e4aee2fa0edbf18dec79d40afe9ded7d $(PKG)_SUBDIR := $(PKG)-win32-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-win32-src-$($(PKG)_VERSION).zip -$(PKG)_WEBSITE := http://libusb-win32.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)-win32/$(PKG)-win32-releases/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -33,7 +30,7 @@ --output-lib libusb.a $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/src/usb.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m644 '$(1)/src/lusb0_usb.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' $(INSTALL) -m644 '$(1)/libusb.a' '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -m644 '$(1)/libusbd.a' '$(PREFIX)/$(TARGET)/lib/' diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libvpx-1-config.patch --- a/src/libvpx-1-config.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libvpx-1-config.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,10 +1,10 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -diff -Nru libvpx-0.9.1-orig/configure libvpx-0.9.1/configure ---- libvpx-0.9.1-orig/configure 2010-07-09 17:10:49.771062118 +0200 -+++ libvpx-0.9.1/configure 2010-07-09 17:16:28.583061657 +0200 -@@ -437,9 +437,6 @@ +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -465,9 +465,6 @@ process_detect() { } fi check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}" diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libvpx-2-fix-bin-bash.patch --- a/src/libvpx-2-fix-bin-bash.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libvpx-2-fix-bin-bash.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,75 +1,75 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://code.google.com/p/webm/issues/detail?id=54 -diff -urN libvpx-0.9.2.orig/build/make/armlink_adapter.sh libvpx-0.9.2.new/build/make/armlink_adapter.sh ---- libvpx-0.9.2.orig/build/make/armlink_adapter.sh 2010-09-03 04:56:47.000000000 +1000 -+++ libvpx-0.9.2.new/build/make/armlink_adapter.sh 2010-10-01 14:43:18.000000000 +1000 +diff --git a/build/make/armlink_adapter.sh b/build/make/armlink_adapter.sh +--- a/build/make/armlink_adapter.sh ++++ b/build/make/armlink_adapter.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## - ## Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. ## -diff -urN libvpx-0.9.2.orig/build/make/configure.sh libvpx-0.9.2.new/build/make/configure.sh ---- libvpx-0.9.2.orig/build/make/configure.sh 2010-09-03 04:56:47.000000000 +1000 -+++ libvpx-0.9.2.new/build/make/configure.sh 2010-10-01 14:43:18.000000000 +1000 +diff --git a/build/make/configure.sh b/build/make/configure.sh +--- a/build/make/configure.sh ++++ b/build/make/configure.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## ## configure.sh ## -diff -urN libvpx-0.9.2.orig/build/make/gen_asm_deps.sh libvpx-0.9.2.new/build/make/gen_asm_deps.sh ---- libvpx-0.9.2.orig/build/make/gen_asm_deps.sh 2010-09-03 04:56:47.000000000 +1000 -+++ libvpx-0.9.2.new/build/make/gen_asm_deps.sh 2010-10-01 14:43:18.000000000 +1000 +diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh +--- a/build/make/gen_asm_deps.sh ++++ b/build/make/gen_asm_deps.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## - ## Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. ## -diff -urN libvpx-0.9.2.orig/build/make/gen_msvs_def.sh libvpx-0.9.2.new/build/make/gen_msvs_def.sh ---- libvpx-0.9.2.orig/build/make/gen_msvs_def.sh 2010-09-03 04:56:47.000000000 +1000 -+++ libvpx-0.9.2.new/build/make/gen_msvs_def.sh 2010-10-01 14:43:18.000000000 +1000 +diff --git a/build/make/gen_msvs_def.sh b/build/make/gen_msvs_def.sh +--- a/build/make/gen_msvs_def.sh ++++ b/build/make/gen_msvs_def.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## - ## Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. ## -diff -urN libvpx-0.9.2.orig/build/make/gen_msvs_proj.sh libvpx-0.9.2.new/build/make/gen_msvs_proj.sh ---- libvpx-0.9.2.orig/build/make/gen_msvs_proj.sh 2010-09-03 04:56:47.000000000 +1000 -+++ libvpx-0.9.2.new/build/make/gen_msvs_proj.sh 2010-10-01 14:43:18.000000000 +1000 +diff --git a/build/make/gen_msvs_proj.sh b/build/make/gen_msvs_proj.sh +--- a/build/make/gen_msvs_proj.sh ++++ b/build/make/gen_msvs_proj.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## - ## Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. ## -diff -urN libvpx-0.9.2.orig/build/make/gen_msvs_sln.sh libvpx-0.9.2.new/build/make/gen_msvs_sln.sh ---- libvpx-0.9.2.orig/build/make/gen_msvs_sln.sh 2010-09-03 04:56:47.000000000 +1000 -+++ libvpx-0.9.2.new/build/make/gen_msvs_sln.sh 2010-10-01 14:43:18.000000000 +1000 +diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh +--- a/build/make/gen_msvs_sln.sh ++++ b/build/make/gen_msvs_sln.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## - ## Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. ## -diff -urN libvpx-0.9.2.orig/build/make/version.sh libvpx-0.9.2.new/build/make/version.sh ---- libvpx-0.9.2.orig/build/make/version.sh 2010-09-03 04:56:47.000000000 +1000 -+++ libvpx-0.9.2.new/build/make/version.sh 2010-10-01 14:43:18.000000000 +1000 +diff --git a/build/make/version.sh b/build/make/version.sh +--- a/build/make/version.sh ++++ b/build/make/version.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## - ## Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. ## -diff -urN libvpx-0.9.2.orig/configure libvpx-0.9.2.new/configure ---- libvpx-0.9.2.orig/configure 2010-09-03 04:56:47.000000000 +1000 -+++ libvpx-0.9.2.new/configure 2010-10-01 14:43:18.000000000 +1000 +diff --git a/configure b/configure +--- a/configure ++++ b/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libvpx.mk --- a/src/libvpx.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/libvpx.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# vpx PKG := libvpx $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.6 -$(PKG)_CHECKSUM := a3522bd2b73d52381ba767ded1cbf4760e9cc6f8 +$(PKG)_CHECKSUM := 2919e11074fef72fc61ef1a75160050ffaad6074 $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://code.google.com/p/webm/ $(PKG)_URL := http://webm.googlecode.com/files/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/libxml++.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libxml++.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,27 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libxml++ +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 112d6e26a8ce1426aa8931f26ea593484b2081f0 +$(PKG)_SUBDIR := libxml++-$($(PKG)_VERSION) +$(PKG)_FILE := libxml++-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libxml2 glibmm + +define $(PKG)_UPDATE + wget -q -O- 'http://git.gnome.org/browse/libxml++/refs/tags' | \ + grep ' #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/lua.mk --- a/src/lua.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/lua.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Lua PKG := lua $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.4 $(PKG)_CHECKSUM := 2b11c8e60306efb7f0734b747588f57995493db7 $(PKG)_SUBDIR := lua-$($(PKG)_VERSION) $(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.lua.org/ $(PKG)_URL := http://www.lua.org/ftp/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/lzo.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/lzo.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := lzo +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := a11768b8a168ec607750842bbef406f11547b904 +$(PKG)_SUBDIR := lzo-$($(PKG)_VERSION) +$(PKG)_FILE := lzo-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://www.oberhumer.com/opensource/lzo/download/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + wget -q -O- 'http://www.oberhumer.com/opensource/lzo/download/' | \ + grep 'lzo-' | \ + grep -v 'minilzo-' | \ + $(SED) -n 's,.*lzo-\([0-9][^>]*\)\.tar.*,\1,p' | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/matio.mk --- a/src/matio.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/matio.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# matio PKG := matio $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.4 $(PKG)_CHECKSUM := 721b9b57f2437850dd114acca1f422622e2c47e2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://sourceforge.net/projects/$(PKG)/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib diff -r 97d5a5c48c12 -r 082cd6e86b6b src/mingw-utils-1-portability-fix.patch --- a/src/mingw-utils-1-portability-fix.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/mingw-utils-1-portability-fix.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://sourceforge.net/tracker/?func=detail&aid=3119898&group_id=2435&atid=102435 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/mingw-utils.mk --- a/src/mingw-utils.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/mingw-utils.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,19 +1,16 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# MinGW Utilities PKG := mingw-utils $(PKG)_IGNORE := -$(PKG)_VERSION := 0.4-1 $(PKG)_CHECKSUM := 716f51d7622b36448fc1e92d2c69d8f41b1cc2df $(PKG)_SUBDIR := $(PKG)-$(word 1,$(subst -, ,$($(PKG)_VERSION))) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-mingw32-src.tar.lzma -$(PKG)_WEBSITE := http://www.mingw.org/ -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Utilities/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Extension/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Utilities/mingw-utils/' | \ + wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Extension/mingw-utils/' | \ $(SED) -n 's,.*mingw-utils-\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/mingwrt-1-float.patch --- a/src/mingwrt-1-float.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 -http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html - -diff -urN a/include/float.h b/include/float.h ---- a/include/float.h 2010-03-07 04:31:41.000000000 +0100 -+++ b/include/float.h 2010-06-05 12:29:08.899723741 +0200 -@@ -16,8 +16,6 @@ - * - */ - --#include_next -- - #ifndef _MINGW_FLOAT_H_ - #define _MINGW_FLOAT_H_ - diff -r 97d5a5c48c12 -r 082cd6e86b6b src/mingwrt.mk --- a/src/mingwrt.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/mingwrt.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,19 +1,16 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# MinGW Runtime PKG := mingwrt $(PKG)_IGNORE := -$(PKG)_VERSION := 3.18 -$(PKG)_CHECKSUM := 0c562f3b6a89f376b9edba48ccd7388c535f8c8d +$(PKG)_CHECKSUM := 7c63f3695968054b7236282f35562bb3a2c388d4 $(PKG)_SUBDIR := . $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-mingw32-dev.tar.gz -$(PKG)_WEBSITE := http://www.mingw.org/ -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Base/mingw-rt/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/' | \ + wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/' | \ $(SED) -n 's,.*mingwrt-\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/mpfr.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mpfr.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,31 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := mpfr +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 9ba6dfe62dad298f0570daf182db31660f7f016c +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) +$(PKG)_URL_2 := http://www.mpfr.org/mpfr-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc gmp + +define $(PKG)_UPDATE + wget -q -O- 'http://www.mpfr.org/mpfr-current/#download' | \ + grep 'mpfr-' | \ + $(SED) -n 's,.*mpfr-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --enable-static \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' \ + --enable-threads=win32 \ + --with-gmp-include='$(PREFIX)/$(TARGET)/include/' + --with-gmp-lib='$(PREFIX)/$(TARGET)/lib/' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/muparser.mk --- a/src/muparser.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/muparser.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# muParser PKG := muparser $(PKG)_IGNORE := -$(PKG)_VERSION := 1.34 $(PKG)_CHECKSUM := d6d834d3ba2bd3c316c9b3070369d32701703f78 $(PKG)_SUBDIR := $(PKG)_v$(subst .,,$($(PKG)_VERSION)) $(PKG)_FILE := $(PKG)_v$(subst .,,$($(PKG)_VERSION)).tar.gz -$(PKG)_WEBSITE := http://$(PKG).sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/Version $($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/mxml-test.c --- a/src/mxml-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/mxml-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/mxml.mk --- a/src/mxml.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/mxml.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Mini-XML PKG := mxml $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6 -$(PKG)_CHECKSUM := df180bd2e3890c97fa8a05dd131f9285468cffe1 +$(PKG)_CHECKSUM := a3bdcab48307794c297e790435bcce7becb9edae $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.minixml.org/ $(PKG)_URL := http://ftp.easysw.com/pub/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc pthreads diff -r 97d5a5c48c12 -r 082cd6e86b6b src/nettle.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/nettle.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := nettle +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 1df0cd013e83f73b78a5521411a67e331de3dfa6 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE) +$(PKG)_DEPS := gcc gmp + +define $(PKG)_UPDATE + wget -q -O- 'http://www.lysator.liu.se/~nisse/archive/' | \ + $(SED) -n 's,.*nettle-\([0-9][^>]*\)\.tar.*,\1,p' | \ + grep -v 'pre' | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --enable-static \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/nsis-1-explicit-mingw-cross-prefix.patch --- a/src/nsis-1-explicit-mingw-cross-prefix.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/nsis-1-explicit-mingw-cross-prefix.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/nsis.mk --- a/src/nsis.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/nsis.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# NSIS PKG := nsis $(PKG)_IGNORE := -$(PKG)_VERSION := 2.46 $(PKG)_CHECKSUM := 2cc9bff130031a0b1d76b01ec0a9136cdf5992ce $(PKG)_SUBDIR := nsis-$($(PKG)_VERSION)-src $(PKG)_FILE := nsis-$($(PKG)_VERSION)-src.tar.bz2 -$(PKG)_WEBSITE := http://nsis.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 2/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/ogg.mk --- a/src/ogg.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/ogg.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# OGG PKG := ogg $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.2 -$(PKG)_CHECKSUM := deeb1959f84de9277e74bca17ec66fa20ced9f08 +$(PKG)_CHECKSUM := a900af21b6d7db1c7aa74eb0c39589ed9db991b8 $(PKG)_SUBDIR := libogg-$($(PKG)_VERSION) $(PKG)_FILE := libogg-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.xiph.org/ogg/ $(PKG)_URL := http://downloads.xiph.org/releases/ogg/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -19,10 +16,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 97d5a5c48c12 -r 082cd6e86b6b src/old.mk --- a/src/old.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/old.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# old PKG := old $(PKG)_IGNORE := -$(PKG)_VERSION := 0.17 $(PKG)_CHECKSUM := d519a8282b0774c344ffeb1b4899f8be53d6d7b3 $(PKG)_SUBDIR := old-$($(PKG)_VERSION) $(PKG)_FILE := old-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://blitiri.com.ar/p/old/ $(PKG)_URL := http://blitiri.com.ar/p/old/files/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openal-1-luuid-pkg-config.patch --- a/src/openal-1-luuid-pkg-config.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/openal-1-luuid-pkg-config.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openal-2-guid-static-link.patch --- a/src/openal-2-guid-static-link.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/openal-2-guid-static-link.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openal-test.c --- a/src/openal-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/openal-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include @@ -18,4 +20,4 @@ alcCloseDevice(dev); return 0; -} \ No newline at end of file +} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openal.mk --- a/src/openal.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/openal.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# openal PKG := openal $(PKG)_IGNORE := -$(PKG)_VERSION := 1.13 $(PKG)_CHECKSUM := 0e2449375a12cee65a9cea354533dcaabf9d5068 $(PKG)_SUBDIR := openal-soft-$($(PKG)_VERSION) $(PKG)_FILE := openal-soft-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://kcat.strangesoft.net/openal.html $(PKG)_URL := http://kcat.strangesoft.net/openal-releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc portaudio diff -r 97d5a5c48c12 -r 082cd6e86b6b src/opencore-amr.mk --- a/src/opencore-amr.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/opencore-amr.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# opencore-amr PKG := opencore-amr $(PKG)_IGNORE := -$(PKG)_VERSION := 0.1.2 $(PKG)_CHECKSUM := 289478d49701213255e9d63a93aae9ad472125cc $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://$(PKG).sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/opencsg-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opencsg-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,46 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 71c4f0a34399fd74d4e39f9985a4c2c56f8b9a43 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Sat, 22 Oct 2011 01:29:03 +0200 +Subject: [PATCH] configure for MXE + + +diff --git a/example/example.pro b/example/example.pro +index 8891a28..02c1fe0 100644 +--- a/example/example.pro ++++ b/example/example.pro +@@ -1,10 +1,11 @@ + TEMPLATE = app + TARGET = opencsgexample + +-CONFIG += opengl warn_on release ++CONFIG += opengl warn_on release link_pkgconfig + INCLUDEPATH += ../glew/include ../include + +-LIBS += -L../lib -lopencsg -lglut -L../glew/lib -lGLEW ++LIBS += -L../lib -lopencsg ++PKGCONFIG += glew glut + + HEADERS = displaylistPrimitive.h + SOURCES = displaylistPrimitive.cpp main.cpp +diff --git a/src/src.pro b/src/src.pro +index db5e1fb..4c664ab 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -3,7 +3,8 @@ TARGET = opencsg + VERSION = 1.3.1 + DESTDIR = ../lib + +-CONFIG += opengl warn_on release ++CONFIG += opengl warn_on release staticlib link_pkgconfig ++PKGCONFIG += glew glut + INCLUDEPATH += ../include ../glew/include ../ + + HEADERS = ../include/opencsg.h \ +-- +1.7.7 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/opencsg.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opencsg.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,28 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := opencsg +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := e2b4abf169ae3e319eb5f6d9ae6136fa96710a05 +$(PKG)_SUBDIR := OpenCSG-$($(PKG)_VERSION) +$(PKG)_FILE := OpenCSG-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://www.opencsg.org/$($(PKG)_FILE) +$(PKG)_DEPS := gcc freeglut glew qt + +define $(PKG)_UPDATE + wget -q -O- 'http://www.opencsg.org/#download' | \ + grep 'OpenCSG-' | \ + $(SED) -n 's,.*OpenCSG-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)/src' && '$(TARGET)-qmake' src.pro + $(MAKE) -C '$(1)/src' -j '$(JOBS)' + $(INSTALL) -m644 '$(1)/include/opencsg.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m644 '$(1)/lib/libopencsg.a' '$(PREFIX)/$(TARGET)/lib/' + + cd '$(1)/example' && '$(TARGET)-qmake' example.pro + $(MAKE) -C '$(1)/example' -j '$(JOBS)' + $(INSTALL) -m755 '$(1)/example/release/opencsgexample.exe' '$(PREFIX)/$(TARGET)/bin/test-opencsg.exe' +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openexr-1-disable-zlib_winapi.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openexr-1-disable-zlib_winapi.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,25 @@ +This file is part of MXE. +See index.html for further information. + +diff -urN a/IlmImf/ImfPxr24Compressor.cpp b/IlmImf/ImfPxr24Compressor.cpp +--- a/IlmImf/ImfPxr24Compressor.cpp 2010-07-17 01:11:52.000000000 +0200 ++++ b/IlmImf/ImfPxr24Compressor.cpp 2011-09-21 23:41:28.130452657 +0200 +@@ -62,7 +62,6 @@ + // string of bytes is compressed with zlib. + // + //----------------------------------------------------------------------------- +-#define ZLIB_WINAPI + + #include + #include +diff -urN a/IlmImf/ImfZipCompressor.cpp b/IlmImf/ImfZipCompressor.cpp +--- a/IlmImf/ImfZipCompressor.cpp 2010-07-17 01:11:52.000000000 +0200 ++++ b/IlmImf/ImfZipCompressor.cpp 2011-09-21 23:42:01.154288691 +0200 +@@ -39,7 +39,6 @@ + // class ZipCompressor + // + //----------------------------------------------------------------------------- +-#define ZLIB_WINAPI + + #include + #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openexr.mk --- a/src/openexr.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/openexr.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,13 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# OpenEXR PKG := openexr $(PKG)_IGNORE := -$(PKG)_VERSION := 1.7.0 $(PKG)_CHECKSUM := 91d0d4e69f06de956ec7e0710fc58ec0d4c4dc2b $(PKG)_SUBDIR := openexr-$($(PKG)_VERSION) $(PKG)_FILE := openexr-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.openexr.com/ $(PKG)_URL := http://download.savannah.nongnu.org/releases/openexr/$($(PKG)_FILE) -$(PKG)_DEPS := gcc ilmbase zlib +$(PKG)_DEPS := gcc ilmbase pthreads zlib define $(PKG)_UPDATE wget -q -O- 'http://www.openexr.com/downloads.html' | \ @@ -24,7 +21,9 @@ cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,ilmbase) $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/ilmbase-*.patch)), (cd '$(1)/$(ilmbase_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) + echo 'echo $1' > '$(1)/$(ilmbase_SUBDIR)/config.sub' cd '$(1)/$(ilmbase_SUBDIR)' && $(SHELL) ./configure \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(1)/ilmbase' \ --enable-threading=no \ @@ -32,10 +31,9 @@ CONFIG_SHELL=$(SHELL) $(MAKE) -C '$(1)/$(ilmbase_SUBDIR)' -j '$(JOBS)' install \ bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-threading \ @@ -47,7 +45,7 @@ -I'$(1)/ilmbase/include/OpenEXR' \ -L'$(1)/ilmbase/lib' \ b44ExpLogTable.cpp \ - -lImath -lHalf -lIex -lIlmThread \ + -lImath -lHalf -lIex -lIlmThread -lpthread \ -o b44ExpLogTable '$(1)/IlmImf/b44ExpLogTable' > '$(1)/IlmImf/b44ExpLogTable.h' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openscenegraph-1-static.patch --- a/src/openscenegraph-1-static.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - ---- OpenSceneGraph-2.8.2.orig/src/osgPlugins/exr/ReaderWriterEXR.cpp 2008-11-27 10:36:18.000000000 +0100 -+++ OpenSceneGraph-2.8.2/src/osgPlugins/exr/ReaderWriterEXR.cpp 2010-01-26 21:36:31.000000000 +0100 -@@ -4,7 +4,7 @@ - #include - #include - --#ifdef _WIN32 -+#if defined _WIN32 && !defined OSG_LIBRARY_STATIC - //Make the half format work against openEXR libs - #define OPENEXR_DLL - #endif diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openscenegraph-2-no-asprintf.patch --- a/src/openscenegraph-2-no-asprintf.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -urN a/src/osgPlugins/xine/ReaderWriterXine.cpp b/src/osgPlugins/xine/ReaderWriterXine.cpp ---- a/src/osgPlugins/xine/ReaderWriterXine.cpp 2010-03-13 11:38:10.000000000 +0100 -+++ b/src/osgPlugins/xine/ReaderWriterXine.cpp 2010-04-28 22:54:29.203481468 +0200 -@@ -326,9 +326,8 @@ - const char* user_home = xine_get_homedir(); - if(user_home) - { -- char* cfgfile = NULL; -- int result = asprintf(&(cfgfile), "%s/.xine/config", user_home); -- if (result>0) xine_config_load(_xine, cfgfile); -+ std::string configFile(std::string(user_home)+"/.xine/config"); -+ xine_config_load(_xine, configFile.c_str()); - } - - xine_init(_xine); diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openscenegraph-3-pkg-config.patch --- a/src/openscenegraph-3-pkg-config.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,368 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -uNr OpenSceneGraph-2.8.3.orig/CMakeLists.txt OpenSceneGraph-2.8.3/CMakeLists.txt ---- OpenSceneGraph-2.8.3.orig/CMakeLists.txt 2010-04-01 11:02:54.000000000 +0200 -+++ OpenSceneGraph-2.8.3/CMakeLists.txt 2010-04-20 07:41:05.000000000 +0200 -@@ -802,12 +802,34 @@ - - # Generate pkg-config configuration file - --CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph.pc.in -- ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc -+SET(PKGCONFIG_FILES -+ openscenegraph -+ openscenegraph-osg -+ openscenegraph-osgDB -+ openscenegraph-osgFX -+ openscenegraph-osgGA -+ openscenegraph-osgParticle -+ openscenegraph-osgSim -+ openscenegraph-osgText -+ openscenegraph-osgUtil -+ openscenegraph-osgTerrain -+ openscenegraph-osgManipulator -+ openscenegraph-osgViewer -+ openscenegraph-osgWidget -+ openscenegraph-osgShadow -+ openscenegraph-osgAnimation -+ openscenegraph-osgVolume -+ openscenegraph-osgIntrospection -+ openscenegraph-osgPlugins -+) -+ -+FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES}) -+ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc.in -+ ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc - @ONLY - ) -- --INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) -+ INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) -+ENDFOREACH(PKGCONFIG_FILE) - - # Run this as late as possible so users can easier spot the message - IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local") -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgAnimation -+Description: Skinning and morphing library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osg openscenegraph-osgText openscenegraph-osgGA openscenegraph-osgViewer openthreads -+Conflicts: -+Libs: -L${libdir} -losgAnimation -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgDB.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgDB.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgDB.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgDB.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgDB -+Description: File format reading library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgDB -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgFX.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgFX.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgFX.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgFX.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgFX -+Description: Special effects library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgFX -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgGA.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgGA.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgGA.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgGA.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgGA -+Description: GUI event library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgGA -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgIntrospection -+Description: Introspection library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgIntrospection -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgManipulator -+Description: Manipulator library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgUtil openscenegraph-osgGA openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgManipulator -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgParticle.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgParticle.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgParticle.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgParticle.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgParticle -+Description: Particle system library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgParticle -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osg.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osg.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osg.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osg.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osg -+Description: 3D scenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openthreads -+Conflicts: -+Libs: -L${libdir} -losg -+Libs.private: -lglu32 -lopengl32 -+Cflags: -I${includedir} -DOSG_LIBRARY_STATIC -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in 2010-01-17 18:59:13.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgPlugins -+Description: Plugins for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgParticle openscenegraph-osgWidget openscenegraph-osgVolume openscenegraph-osgShadow openscenegraph-osgTerrain openscenegraph-osgFX openscenegraph-osgSim openscenegraph-osgText openscenegraph-osgAnimation openscenegraph-osgViewer openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads -+Conflicts: -+Libs: -+Libs.private: -L${libdir}/osgPlugins-@OPENSCENEGRAPH_VERSION@ -losgdb_3dc -losgdb_3ds -losgdb_ac -losgdb_bmp -losgdb_bsp -losgdb_bvh -losgdb_cfg -losgdb_curl -losgdb_dds -losgdb_dot -losgdb_dw -losgdb_dxf -losgdb_exr -losgdb_freetype -losgdb_gdal -losgdb_geo -losgdb_gif -losgdb_glsl -losgdb_gz -losgdb_hdr -losgdb_ive -losgdb_jp2 -losgdb_jpeg -losgdb_logo -losgdb_lwo -losgdb_lws -losgdb_md2 -losgdb_mdl -losgdb_normals -losgdb_obj -losgdb_ogr -losgdb_openflight -losgdb_osg -losgdb_osga -losgdb_osganimation -losgdb_osgfx -losgdb_osgparticle -losgdb_osgshadow -losgdb_osgsim -losgdb_osgterrain -losgdb_osgtext -losgdb_osgtgz -losgdb_osgviewer -losgdb_osgvolume -losgdb_osgwidget -losgdb_pic -losgdb_png -losgdb_pnm -losgdb_rgb -losgdb_rot -losgdb_scale -losgdb_shp -losgdb_stl -losgdb_tga -losgdb_tgz -losgdb_tiff -losgdb_trans -losgdb_txf -losgdb_txp -losgdb_vtf -losgdb_x -losgdb_zip -lcurl -lgnutls -lgcrypt -lgpg-error -lidn -lIlmImf -lHalf -lImath -lIlmThread -lIex -lfreetype -lgdal -ltiff -lgif -ljasper -ljpeg -lpng -liconv -lz -lws2_32 -lwinmm -lwldap32 -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgShadow.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgShadow.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgShadow.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgShadow.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgShadow -+Description: Shadow techniques library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgShadow -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgSim.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgSim.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgSim.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgSim.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgSim -+Description: Simulator utility library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgText openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgSim -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgTerrain -+Description: Terrain library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgTerrain -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgText.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgText.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgText.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgText.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgText -+Description: Text rendering library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgDB openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgText -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgUtil.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgUtil.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgUtil.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgUtil.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgUtil -+Description: Utility library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgUtil -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgViewer.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgViewer.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgViewer.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgViewer.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgViewer -+Description: Windowing system setup, thread scene manager library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgText openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osgGA openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgViewer -+Libs.private: -lgdi32 -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgVolume.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgVolume.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgVolume.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgVolume.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgVolume -+Description: Volume library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osgGA openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgVolume -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgWidget.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgWidget.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgWidget.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgWidget.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgWidget -+Description: Windowing toolkit library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgText openscenegraph-osgViewer openscenegraph-osgDB openscenegraph-osgGA openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgWidget -+Libs.private: -+Cflags: -I${includedir} diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openscenegraph.mk --- a/src/openscenegraph.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/openscenegraph.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,17 +1,14 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# OpenSceneGraph PKG := openscenegraph $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.4 -$(PKG)_CHECKSUM := 356ecd39f7e714dabb6776e23303fe3f1798a7cf +$(PKG)_CHECKSUM := 13c7e39f6d62047ad944d8d28a0f0eb60384ce33 $(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION) $(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip -$(PKG)_WEBSITE := http://www.openscenegraph.org/ $(PKG)_URL := http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$($(PKG)_VERSION)/source/$($(PKG)_FILE) $(PKG)_URL_2 := http://distfiles.macports.org/OpenSceneGraph/$($(PKG)_FILE) -$(PKG)_DEPS := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib +$(PKG)_DEPS := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib dcmtk qt define $(PKG)_UPDATE wget -q -O- 'http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/tags?order=date&desc=1' | \ @@ -30,5 +27,5 @@ -DDYNAMIC_OPENSCENEGRAPH=OFF \ -DBUILD_OSG_APPLICATIONS=OFF \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 - $(MAKE) -C '$(1)' -j '$(JOBS)' install + $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openssl-1-winsock2.patch --- a/src/openssl-1-winsock2.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/openssl-1-winsock2.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest @@ -7,7 +7,7 @@ diff -urN a/e_os.h b/e_os.h --- a/e_os.h 2010-05-31 15:18:08.000000000 +0200 +++ b/e_os.h 2010-06-04 17:43:44.370181869 +0200 -@@ -498,7 +498,7 @@ +@@ -492,7 +492,7 @@ # endif # if !defined(IPPROTO_IP) /* winsock[2].h was included already? */ @@ -31,7 +31,7 @@ diff -urN a/ssl/ssltest.c b/ssl/ssltest.c --- a/ssl/ssltest.c 2010-01-24 17:57:38.000000000 +0100 +++ b/ssl/ssltest.c 2010-06-04 17:44:26.134181765 +0200 -@@ -190,7 +190,7 @@ +@@ -193,7 +193,7 @@ */ #ifdef OPENSSL_SYS_WINDOWS diff -r 97d5a5c48c12 -r 082cd6e86b6b src/openssl.mk --- a/src/openssl.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/openssl.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# openssl PKG := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.0d -$(PKG)_CHECKSUM := 32ca934f380a547061ddab7221b1a34e4e07e8d5 +$(PKG)_CHECKSUM := a6476d33fd38c2e7dfb438d1e3be178cc242c907 $(PKG)_SUBDIR := openssl-$($(PKG)_VERSION) $(PKG)_FILE := openssl-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.openssl.org/ $(PKG)_URL := http://www.openssl.org/source/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.openssl.org/source/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib libgcrypt diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pango-1-fixes.patch --- a/src/pango-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pango-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,19 +1,19 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. Contains ad hoc patches for cross building. -From ed3371ed8a13f169cfd1920ecc794b30bb69cc0b Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 987d02305fd8187bd10bfd292db38f7da705a7f3 Mon Sep 17 00:00:00 2001 +From: MXE Date: Wed, 29 Sep 2010 00:52:59 +0200 -Subject: [PATCH 1/5] s,DllMain,static _disabled_DllMain, +Subject: [PATCH 1/4] s,DllMain,static _disabled_DllMain, diff --git a/pango/pango-utils.c b/pango/pango-utils.c -index 100dbc7..f60be42 100644 +index 44ec353..72e13f1 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c -@@ -657,12 +657,12 @@ pango_config_key_get (const char *key) +@@ -658,12 +658,12 @@ pango_config_key_get (const char *key) #ifdef G_OS_WIN32 @@ -29,20 +29,20 @@ LPVOID lpvReserved) { -- -1.7.1 +1.7.7.3 -From b33f70af495cdaddab9ddccd79aef777e005bb85 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From f0c5d358e54fd9d69133eeff972fdb05592789f3 Mon Sep 17 00:00:00 2001 +From: MXE Date: Wed, 29 Sep 2010 00:55:07 +0200 -Subject: [PATCH 2/5] static, not shared +Subject: [PATCH 2/4] static, not shared diff --git a/configure b/configure -index 352c9c4..a78ace5 100755 +index fb173ce..beb3290 100755 --- a/configure +++ b/configure -@@ -5942,9 +5942,9 @@ if test "${enable_static+set}" = set; then : +@@ -5832,9 +5832,9 @@ if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -54,7 +54,7 @@ # Look at the argument we got. We use all the common list separators. lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do -@@ -5957,7 +5957,7 @@ if test "${enable_static+set}" = set; then : +@@ -5847,7 +5847,7 @@ if test "${enable_static+set}" = set; then : ;; esac else @@ -63,7 +63,7 @@ fi -@@ -5971,15 +5971,15 @@ fi +@@ -5861,15 +5861,15 @@ fi if test "$pango_os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -85,7 +85,7 @@ fi case `pwd` in -@@ -8969,7 +8969,7 @@ fi +@@ -8968,7 +8968,7 @@ func_stripname_cnf () if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in @@ -94,7 +94,7 @@ no) enable_shared=no ;; *) enable_shared=no -@@ -8978,14 +8978,14 @@ if test "${enable_shared+set}" = set; then : +@@ -8977,14 +8977,14 @@ if test "${enable_shared+set}" = set; then : for pkg in $enableval; do IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then @@ -111,7 +111,7 @@ fi -@@ -12572,7 +12572,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } +@@ -12848,7 +12848,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } # are all built from PIC. case $host_os in aix3*) @@ -120,7 +120,7 @@ if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' -@@ -12581,7 +12581,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } +@@ -12857,7 +12857,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } aix[4-9]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then @@ -130,20 +130,20 @@ ;; esac -- -1.7.1 +1.7.7.3 -From 4601f723ef49c010656ef800ce705cd8677833d4 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From 08292532296e3a0f135f6bcd683851d2f41836c6 Mon Sep 17 00:00:00 2001 +From: MXE Date: Wed, 29 Sep 2010 00:57:12 +0200 -Subject: [PATCH 3/5] no pango-querymodules +Subject: [PATCH 3/4] no pango-querymodules diff --git a/modules/Makefile.in b/modules/Makefile.in -index 0d48e08..df71e02 100644 +index 49813f7..afc29c5 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in -@@ -643,7 +643,7 @@ uninstall-am: uninstall-local +@@ -647,7 +647,7 @@ uninstall-am: uninstall-local @CROSS_COMPILING_FALSE@all-local: pango.modules @@ -153,45 +153,13 @@ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ -- -1.7.1 - - -From 53bd7d3d3a83e40eb7d02568b560840ceadd7c0a Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 29 Sep 2010 00:58:13 +0200 -Subject: [PATCH 4/5] wine workaround s,^install-data-local:.*,install-data-local:, +1.7.7.3 -diff --git a/configure b/configure -index a78ace5..92b1334 100755 ---- a/configure -+++ b/configure -@@ -694,7 +694,7 @@ ac_default_prefix=/usr/local - ac_clean_files= - ac_config_libobj_dir=. - LIBOBJS= --cross_compiling=no -+cross_compiling=yes - subdirs= - MFLAGS= - MAKEFLAGS= -@@ -3873,7 +3873,7 @@ $as_echo "$ac_try_echo"; } >&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then -- cross_compiling=no -+ cross_compiling=yes - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes --- -1.7.1 - - -From ccd472e0aee0109932e261eb1f7d9d24bbf1870c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From c646ee7869c20a1e093f63ec8de8e83e7ca88b27 Mon Sep 17 00:00:00 2001 +From: MXE Date: Wed, 29 Sep 2010 00:50:08 +0200 -Subject: [PATCH 5/5] add missing lib to pango.pc for static linking +Subject: [PATCH 4/4] add missing lib to pango.pc for static linking diff --git a/pango.pc.in b/pango.pc.in @@ -206,5 +174,5 @@ +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10 Cflags: -I${includedir}/pango-1.0 -- -1.7.1 +1.7.7.3 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pango.mk --- a/src/pango.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pango.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Pango PKG := pango $(PKG)_IGNORE := -$(PKG)_VERSION := 1.28.4 -$(PKG)_CHECKSUM := e715954a5a3b358889d15b6235e1965303dbb622 +$(PKG)_CHECKSUM := 467a3dacc0f3173e6fd457524b9ccd9772039a62 $(PKG)_SUBDIR := pango-$($(PKG)_VERSION) $(PKG)_FILE := pango-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.pango.org/ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/pango/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc fontconfig freetype cairo glib @@ -22,6 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-gtk-doc \ diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pangomm.mk --- a/src/pangomm.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pangomm.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Pangomm PKG := pangomm $(PKG)_IGNORE := -$(PKG)_VERSION := 2.28.2 $(PKG)_CHECKSUM := 31bcbb0c8773fdde6f4ea9b4a79fdf7159f94520 $(PKG)_SUBDIR := pangomm-$($(PKG)_VERSION) $(PKG)_FILE := pangomm-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.pango.org/ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/pangomm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc cairomm glibmm pango @@ -20,10 +17,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE) diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pcre.mk --- a/src/pcre.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pcre.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,15 +1,13 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# PCRE PKG := pcre $(PKG)_IGNORE := -$(PKG)_VERSION := 8.12 -$(PKG)_CHECKSUM := 2219b372bff53ee29a7e44ecf5977ad15df01cea +$(PKG)_CHECKSUM := 68d28fb383325b8af9e3d481d30f586b46c56022 $(PKG)_SUBDIR := pcre-$($(PKG)_VERSION) $(PKG)_FILE := pcre-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.pcre.org/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/pcre/pcre/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE @@ -21,17 +19,18 @@ define $(PKG)_BUILD $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcre.h.in' $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h' - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --enable-utf8 \ + --enable-pcre16 \ + --enable-utf \ --enable-unicode-properties \ --disable-cpp \ --disable-pcregrep-libz \ --disable-pcregrep-libbz2 \ --disable-pcretest-libreadline + rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/pcre16*.3 $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pdcurses.mk --- a/src/pdcurses.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pdcurses.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# PDcurses PKG := pdcurses $(PKG)_IGNORE := -$(PKG)_VERSION := 3.4 $(PKG)_CHECKSUM := e36684442a6171cc3a5165c8c49c70f67db7288c $(PKG)_SUBDIR := PDCurses-$($(PKG)_VERSION) $(PKG)_FILE := PDCurses-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://pdcurses.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/pdcurses/pdcurses/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pdflib_lite-1-mingw.patch --- a/src/pdflib_lite-1-mingw.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pdflib_lite-1-mingw.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://tech.groups.yahoo.com/group/pdflib/message/20472 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pdflib_lite.mk --- a/src/pdflib_lite.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pdflib_lite.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# PDFlib Lite PKG := pdflib_lite $(PKG)_IGNORE := -$(PKG)_VERSION := 7.0.5 $(PKG)_CHECKSUM := 5b2bf5edc49dba3da0997ade0e191511a37fae01 $(PKG)_SUBDIR := PDFlib-Lite-$($(PKG)_VERSION) $(PKG)_FILE := PDFlib-Lite-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.pdflib.com/download/free-software/pdflib-lite-7/ $(PKG)_URL := http://www.pdflib.com/binaries/PDFlib/$(subst .,,$(word 1,$(subst p, ,$($(PKG)_VERSION))))/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pfstools.mk --- a/src/pfstools.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pfstools.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# pfstools PKG := pfstools $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.3 -$(PKG)_CHECKSUM := b13d1863944afc4a88eb6ec92954677995399ab7 +$(PKG)_CHECKSUM := dc595438f0fd8b40a05d9f9c498892363a1b3f05 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://$(PKG).sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/physfs-1-fix-gcc46-warnings.patch --- a/src/physfs-1-fix-gcc46-warnings.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/physfs-1-fix-gcc46-warnings.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://icculus.org/pipermail/physfs/2011-March/000990.html diff -r 97d5a5c48c12 -r 082cd6e86b6b src/physfs-test.c --- a/src/physfs-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/physfs-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,7 +1,10 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ - -/* modified from test/physfs_test.c */ +/* + * This file is part of MXE. + * See index.html for further information. + * + * This is a slightly modified version of: + * test/physfs_test.c + */ #include "physfs.h" #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/physfs.mk --- a/src/physfs.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/physfs.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# physfs PKG := physfs $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.2 $(PKG)_CHECKSUM := 2d3d3cc819ad26542d34451f44050b85635344d0 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz -$(PKG)_WEBSITE := http://icculus.org/physfs/ $(PKG)_URL := http://icculus.org/physfs/downloads/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pixman.mk --- a/src/pixman.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pixman.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# pixman PKG := pixman $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.8 -$(PKG)_CHECKSUM := fe0118cc00c266e364bf391b839ebaadd42d1692 +$(PKG)_CHECKSUM := 2785cedd25fb6ded0ceac8d427432f16b074dd52 $(PKG)_SUBDIR := pixman-$($(PKG)_VERSION) $(PKG)_FILE := pixman-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://cairographics.org/ $(PKG)_URL := http://cairographics.org/snapshots/$($(PKG)_FILE) $(PKG)_URL_2 := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -22,6 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 97d5a5c48c12 -r 082cd6e86b6b src/plotmm-1-fixes.patch --- a/src/plotmm-1-fixes.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/plotmm-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. Contains ad hoc patches for cross building. From cd2b1b4a0ae81dddd3fa70c06528a7024ada7a5f Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 12:54:06 +0200 Subject: [PATCH] SigC changed to sigc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/plotmm.mk --- a/src/plotmm.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/plotmm.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# PlotMM PKG := plotmm $(PKG)_IGNORE := -$(PKG)_VERSION := 0.1.2 $(PKG)_CHECKSUM := 64da0930b7c8994d59769597917cca05df989258 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://$(PKG).sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc gtkmm2 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/plotutils-2.6-libpng-1.5.patch --- a/src/plotutils-2.6-libpng-1.5.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/plotutils-2.6-libpng-1.5.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch fix building with libpng-1.5 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/plotutils.mk --- a/src/plotutils.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/plotutils.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# plotutils PKG := plotutils $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6 $(PKG)_CHECKSUM := 7921301d9dfe8991e3df2829bd733df6b2a70838 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.gnu.org/software/plotutils/ $(PKG)_URL := http://ftpmirror.gnu.org/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc libpng pthreads diff -r 97d5a5c48c12 -r 082cd6e86b6b src/poco-1-fix-mno-cygwin.patch --- a/src/poco-1-fix-mno-cygwin.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/poco-1-fix-mno-cygwin.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. --- a/build/config/MinGW-CrossEnv +++ b/build/config/MinGW-CrossEnv diff -r 97d5a5c48c12 -r 082cd6e86b6b src/poco-test.cpp --- a/src/poco-test.cpp Fri Mar 30 11:02:24 2012 +0200 +++ b/src/poco-test.cpp Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/poco.mk --- a/src/poco.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/poco.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# POCO C++ Libraries PKG := poco $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.1p1 -$(PKG)_CHECKSUM := e9810b8fc14c607626d7d3c74baf60726a61e83c +$(PKG)_CHECKSUM := 9e1ef31d369c67eef2d3ce1ca8f2b6ac5cc38ec4 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz -$(PKG)_WEBSITE := http://pocoproject.org/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/sources/$(PKG)-$(word 1,$(subst p, ,$($(PKG)_VERSION)))/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/popt-1-win32.patch --- a/src/popt-1-win32.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/popt-1-win32.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. diff -urN a/popt.c b/popt.c --- a/popt.c 2010-01-19 01:39:10.000000000 +0100 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/popt.mk --- a/src/popt.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/popt.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# popt PKG := popt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.16 $(PKG)_CHECKSUM := cfe94a15a2404db85858a81ff8de27c8ff3e235e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://freshmeat.net/projects/popt/ $(PKG)_URL := http://rpm5.org/files/popt/$($(PKG)_FILE) $(PKG)_URL_2 := http://ftp.debian.org/debian/pool/main/p/$(PKG)/$(PKG)_$($(PKG)_VERSION).orig.tar.gz $(PKG)_DEPS := gcc libiconv gettext diff -r 97d5a5c48c12 -r 082cd6e86b6b src/portaudio-1-win32.patch --- a/src/portaudio-1-win32.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/portaudio-1-win32.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. diff -ru portaudio-orig/configure.in portaudio/configure.in --- portaudio-orig/configure.in 2007-11-13 22:22:56.000000000 +0100 diff -r 97d5a5c48c12 -r 082cd6e86b6b src/portaudio-test.c --- a/src/portaudio-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/portaudio-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/portaudio.mk --- a/src/portaudio.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/portaudio.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# portaudio PKG := portaudio $(PKG)_IGNORE := -$(PKG)_VERSION := 19_20071207 $(PKG)_CHECKSUM := 3841453bb7be672a15b6b632ade6f225eb0a4efc $(PKG)_SUBDIR := portaudio $(PKG)_FILE := pa_stable_v$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://www.portaudio.com $(PKG)_URL := http://www.portaudio.com/archives/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/postgresql-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/postgresql-1-fixes.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,59 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 7985f049ed030c1f49927828a4b8e3d7552e52a4 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 24 Oct 2011 14:02:33 +0200 +Subject: [PATCH 1/2] use unix style names for openssl on MXE + + +diff --git a/configure.in b/configure.in +index 7c0e94e..2ee79c7 100644 +--- a/configure.in ++++ b/configure.in +@@ -943,13 +943,8 @@ fi + + if test "$with_openssl" = yes ; then + dnl Order matters! +- if test "$PORTNAME" != "win32"; then +- AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) +- AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) +- else +- AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) +- AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) +- fi ++ AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) ++ AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) + fi + + if test "$with_pam" = yes ; then +-- +1.7.9 + + +From 9471812a4e7021fea291469d636bdeca6078c1e5 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 24 Oct 2011 14:09:38 +0200 +Subject: [PATCH 2/2] do not check autoconf version + + +diff --git a/configure.in b/configure.in +index 2ee79c7..102b95b 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros + + AC_INIT([PostgreSQL], [9.1.3], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2011, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) +-- +1.7.9 + diff -r 97d5a5c48c12 -r 082cd6e86b6b src/postgresql.mk --- a/src/postgresql.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/postgresql.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,16 +1,12 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# PostgreSQL PKG := postgresql $(PKG)_IGNORE := -$(PKG)_VERSION := 9.0.4 -$(PKG)_CHECKSUM := 5c4ebc2abbbc63ce2973974a7d020e7d14a01e73 +$(PKG)_CHECKSUM := 1cf3044415df807c08bb8ad8e40e24e8d375cf34 $(PKG)_SUBDIR := postgresql-$($(PKG)_VERSION) $(PKG)_FILE := postgresql-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.postgresql.org/ -$(PKG)_URL := http://ftp2.nl.postgresql.org/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_URL_2 := http://ftp10.us.postgresql.org/postgresql/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib openssl define $(PKG)_UPDATE @@ -18,18 +14,13 @@ grep 'refs/tags/REL9[0-9_]*"' | \ $(SED) 's,.*refs/tags/REL\(.*\)".*,\1,g;' | \ $(SED) 's,_,.,g' | \ + grep -v '^9\.\0' | \ head -1 endef define $(PKG)_BUILD + cd '$(1)' && autoconf cp -Rp '$(1)' '$(1).native' - # The static OpenSSL libraries are in unix (not win32) naming style. - $(SED) -i 's,SSLEAY32,SSL,' '$(1)'/configure - $(SED) -i 's,ssleay32,ssl,' '$(1)'/configure - $(SED) -i 's,EAY32,CRYPTO,' '$(1)'/configure - $(SED) -i 's,eay32,crypto,' '$(1)'/configure - $(SED) -i 's,ssleay32,ssl,' '$(1)'/src/interfaces/libpq/Makefile - $(SED) -i 's,eay32,crypto,' '$(1)'/src/interfaces/libpq/Makefile # Since we build only client libary, use bogus tzdata to satisfy configure. cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -51,7 +42,7 @@ --without-libxslt \ --with-zlib \ --with-system-tzdata=/dev/null \ - LIBS='-lsecur32 -lws2_32 -lgdi32' + LIBS="-lsecur32 `'$(TARGET)-pkg-config' openssl --libs`" $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= shlib= $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' haslibarule= shlib= $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= shlib= @@ -79,6 +70,6 @@ --without-zlib \ --with-system-tzdata=/dev/null $(MAKE) -C '$(1).native'/src/port -j '$(JOBS)' - $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' - $(INSTALL) -m755 '$(1).native'/src/bin/pg_config/pg_config '$(PREFIX)/bin/$(TARGET)-pg_config' + $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install + ln -sf '$(PREFIX)/$(TARGET)/bin/pg_config' '$(PREFIX)/bin/$(TARGET)-pg_config' endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/proj-1-mutex-win32.patch --- a/src/proj-1-mutex-win32.patch Fri Mar 30 11:02:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://trac.osgeo.org/proj/ticket/56 -http://trac.osgeo.org/proj/changeset/1790 - ---- proj/src/pj_mutex.c (revision 1788) -+++ proj/src/pj_mutex.c (revision 1790) -@@ -38,6 +38,8 @@ - #endif - --#ifdef _WIN32 -+/* on win32 we always use win32 mutexes, even if pthreads are available */ -+#if defined(_WIN32) && !defined(MUTEX_stub) - # define MUTEX_win32 -+# undef MUTEX_pthread - #endif diff -r 97d5a5c48c12 -r 082cd6e86b6b src/proj.mk --- a/src/proj.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/proj.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# proj PKG := proj $(PKG)_IGNORE := -$(PKG)_VERSION := 4.7.0 -$(PKG)_CHECKSUM := bfe59b8dc1ea0c57e1426c37ff2b238fea66acd7 +$(PKG)_CHECKSUM := 5c8d6769a791c390c873fef92134bf20bb20e82a $(PKG)_SUBDIR := proj-$($(PKG)_VERSION) $(PKG)_FILE := proj-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://trac.osgeo.org/proj/ $(PKG)_URL := http://download.osgeo.org/proj/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/proj/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -26,5 +23,7 @@ --prefix='$(PREFIX)/$(TARGET)' \ --with-mutex $(MAKE) -C '$(1)' -j '$(JOBS)' + # remove header which is not installed since 4.8.0 + rm -f '$(PREFIX)/$(TARGET)'/include/projects.h $(MAKE) -C '$(1)' -j 1 install endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pthreads-1-autostatic.patch --- a/src/pthreads-1-autostatic.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pthreads-1-autostatic.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,5 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. +This file is part of MXE. +See index.html for further information. This patch has been taken from: http://sourceware.org/ml/pthreads-win32/2010/msg00006.html diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pthreads-test.c --- a/src/pthreads-test.c Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pthreads-test.c Fri Mar 30 11:02:47 2012 +0200 @@ -1,5 +1,7 @@ -/* This file is part of mingw-cross-env. */ -/* See doc/index.html for further information. */ +/* + * This file is part of MXE. + * See index.html for further information. + */ #include #include diff -r 97d5a5c48c12 -r 082cd6e86b6b src/pthreads.mk --- a/src/pthreads.mk Fri Mar 30 11:02:24 2012 +0200 +++ b/src/pthreads.mk Fri Mar 30 11:02:47 2012 +0200 @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# Pthreads-w32 PKG := pthreads $(PKG)_IGNORE := -$(PKG)_VERSION := 2-8-0 $(PKG)_CHECKSUM := da8371cb20e8e238f96a1d0651212f154d84a9ac $(PKG)_SUBDIR := pthreads-w32-$($(PKG)_VERSION)-release $(PKG)_FILE := pthreads-w32-$($(PKG)_VERSION)-release.tar.gz -$(PKG)_WEBSITE := http://sourceware.org/pthreads-win32/ $(PKG)_URL := ftp://sourceware.org/pub/pthreads-win32/$($(PKG)_FILE) $(PKG)_DEPS := gcc diff -r 97d5a5c48c12 -r 082cd6e86b6b src/qjson-1-static.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qjson-1-static.patch Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,84 @@ +This file is part of MXE. +See index.html for further information. + +This patch taken from: +http://sourceforge.net/mailarchive/forum.php?thread_name=4E1DBC0D.10000%40jrit.at&forum_name=qjson-devel + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4ed5478..9a378a1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,6 +30,13 @@ IF(QJSON_VERBOSE_DEBUG_OUTPUT) + ADD_DEFINITIONS("-DQJSON_VERBOSE_DEBUG_OUTPUT") + endif(QJSON_VERBOSE_DEBUG_OUTPUT) + ++# For Static builds ++IF(LIBTYPE STREQUAL "STATIC") ++ ADD_DEFINITIONS("-DQJSON_STATIC") ++ ADD_DEFINITIONS("-DQT_NODLL") ++ SET(PKG_CONFIG_CFLAGS -DQJSON_STATIC ${PKG_CONFIG_CFLAGS}) ++endif() ++ + # Find Qt4 + FIND_PACKAGE( Qt4 REQUIRED ) + +@@ -51,13 +58,13 @@ set(QJSON_LIB_VERSION_STRING "${QJSON_LIB_MAJOR_VERSION}.${QJSON_LIB_MINOR_VERSI + set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" ) + + # pkg-config +-IF (NOT WIN32) ++if (NOT WIN32 OR MINGW) + CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/QJson.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc + @ONLY) + INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc + DESTINATION lib${LIB_SUFFIX}/pkgconfig) +-ENDIF (NOT WIN32) ++endif() + + # Include the cmake file needed to use qt4 + INCLUDE( ${QT_USE_FILE} ) +diff --git a/QJson.pc.in b/QJson.pc.in +index e4704bd..bf5fd01 100644 +--- a/QJson.pc.in ++++ b/QJson.pc.in +@@ -8,4 +8,4 @@ Description: QJson is a qt-based library that maps JSON data to QVariant objects + Version: @QJSON_LIB_MAJOR_VERSION@.@QJSON_LIB_MINOR_VERSION@.@QJSON_LIB_PATCH_VERSION@ + Requires: QtCore + Libs: -L${libdir} -lqjson +-Cflags: -I${includedir} +\ No newline at end of file ++Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ced213d..d0d9c68 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -26,7 +26,12 @@ qt4_wrap_cpp(qjson_MOC_SRCS ${qjson_MOC_HDRS}) + + set (qjson_SRCS parser.cpp qobjecthelper.cpp json_scanner.cpp json_parser.cc parserrunnable.cpp serializer.cpp serializerrunnable.cpp) + +-add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS}) ++IF(LIBTYPE STREQUAL "STATIC") ++ add_library (qjson STATIC ${qjson_SRCS} ${qjson_MOC_SRCS}) ++else() ++ add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS}) ++endif() ++ + target_link_libraries( qjson ${QT_LIBRARIES}) + + set_target_properties(qjson PROPERTIES +diff --git a/src/qjson_export.h b/src/qjson_export.h +index c7f5325..d5871e2 100644 +--- a/src/qjson_export.h ++++ b/src/qjson_export.h +@@ -23,7 +23,9 @@ + #include + + #ifndef QJSON_EXPORT +-# if defined(QJSON_MAKEDLL) ++# ifdef QJSON_STATIC ++# define QJSON_EXPORT ++# elif defined(QJSON_MAKEDLL) + /* We are building this library */ + # define QJSON_EXPORT Q_DECL_EXPORT + # else diff -r 97d5a5c48c12 -r 082cd6e86b6b src/qjson.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qjson.mk Fri Mar 30 11:02:47 2012 +0200 @@ -0,0 +1,27 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qjson +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 19bbef24132b238e99744bb35194c6dadece98f9 +$(PKG)_SUBDIR := $(PKG) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qt + +define $(PKG)_UPDATE + wget -q -O- 'http://sourceforge.net/projects/qjson/files/qjson/' | \ + $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + echo '$(PREFIX)/bin/$(TARGET)-qmake' + mkdir '$(1)/build' + cd '$(1)/build' && cmake .. \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DCMAKE_BUILD_TYPE=Release \ + -DLIBTYPE=STATIC + + $(MAKE) -C '$(1)/build' -j '$(JOBS)' install +endef diff -r 97d5a5c48c12 -r 082cd6e86b6b src/qt-1-cherrypicks.patch --- a/src/qt-1-cherrypicks.patch Fri Mar 30 11:02:24 2012 +0200 +++ b/src/qt-1-cherrypicks.patch Fri Mar 30 11:02:47 2012 +0200 @@ -1,1311 +1,80701 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -Commits backported (cherry-picked) from Qt 4.7 branch. +This file is part of MXE. +See index.html for further information. + +Commits backported (cherry-picked) from upstream branch or merge requests. http://qt.gitorious.org/qt - -From bb75d02785da59c967dee09006700488af9f482e Mon Sep 17 00:00:00 2001 +Also contains MXE specific fixes. + +From 16a4f14e8e879a14ae5db47d0731c9199c01a816 Mon Sep 17 00:00:00 2001 From: Mark Brand -Date: Fri, 15 Oct 2010 14:56:03 +0200 -Subject: [PATCH 01/16] removed obsolete -qt-gif configure option - -Since "-system-gif" is not offered, offering "-qt-gif" is unnecessary -and perhaps misleading. By default the GIF handler is built from code -included with Qt, unless suppressed by "-no-gif". - -Merge-request: 859 -Reviewed-by: Oswald Buddenhagen -(cherry picked from commit dfe9084344d73d59f4569c8be6104ce83ae0df95) +Date: Fri, 13 Jan 2012 00:17:48 +0100 +Subject: [PATCH 01/16] remove trailing whitespace + +backported from qt5/qtbase +Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6 +Reviewed-by: Friedemann Kleint +(cherry picked from commit 0f7a413683ab4358c4ded8bdffb7381459d98068) --- - configure | 7 ++----- - tools/configure/configureapp.cpp | 5 +---- - 2 files changed, 3 insertions(+), 9 deletions(-) + src/corelib/codecs/codecs.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri +index 6bc2fa6..9b7967d 100644 +--- a/src/corelib/codecs/codecs.pri ++++ b/src/corelib/codecs/codecs.pri +@@ -42,7 +42,7 @@ unix { + ../plugins/codecs/cn/qgb18030codec.h \ + ../plugins/codecs/jp/qeucjpcodec.h \ + ../plugins/codecs/jp/qjiscodec.h \ +- ../plugins/codecs/jp/qsjiscodec.h \ ++ ../plugins/codecs/jp/qsjiscodec.h \ + ../plugins/codecs/kr/qeuckrcodec.h \ + ../plugins/codecs/tw/qbig5codec.h \ + ../plugins/codecs/jp/qfontjpcodec.h +-- +1.7.9.2 + + +From 162708efc51e40ed59d4e3397d399920c21d03a6 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 30 Jun 2011 10:22:33 +0200 +Subject: [PATCH 02/16] do not detect or configure iconv for Windows + +Qt doesn't use iconv on Windows, but configuring it will appear to +work and the build will complete. The result is that character +set conversions do not work. + +Configure.exe already disables iconv for Windows. + +backported from qt5/qtbase +Change-Id: I449a00860c2e77e6cdd8cdcf7108621c684207bf +Reviewed-by: Lars Knoll +Reviewed-by: Friedemann Kleint +(cherry picked from commit 9fa2b641ba6ff4f4b3f474b87ddb642cfa5c3d83) +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 7abe0eb..c159cd4 100755 +index a706908..0690822 100755 --- a/configure +++ b/configure -@@ -1570,8 +1570,7 @@ while [ "$#" -gt 0 ]; do - fi - ;; - gif) -- [ "$VAL" = "qt" ] && VAL=auto -- if [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then -+ if [ "$VAL" = "no" ]; then - CFG_GIF="$VAL" - else - UNKNOWN_OPT=yes -@@ -3544,7 +3543,7 @@ Usage: $relconf [-h] [-prefix ] [-prefix-install] [-bindir ] [-libdir - [-accessibility] [-no-stl] [-stl] [-no-sql-] [-sql-] - [-plugin-sql-] [-system-sqlite] [-no-qt3support] [-qt3support] - [-platform] [-D ] [-I ] [-L ] [-help] -- [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff] -+ [-qt-zlib] [-system-zlib] [-no-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff] - [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng] - [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make ] - [-nomake ] [-R ] [-l ] [-no-rpath] [-rpath] [-continue] -@@ -3773,8 +3772,6 @@ Third Party Libraries: - See http://www.gzip.org/zlib - - -no-gif ............ Do not compile GIF reading support. -- * -qt-gif ............ Compile GIF reading support. -- See also src/gui/image/qgifhandler_p.h - - -no-libtiff ........ Do not compile TIFF support. - -qt-libtiff ........ Use the libtiff bundled with Qt. -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 15c0ddb..dd5647b 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -590,8 +590,6 @@ void Configure::parseCmdLine() - // Image formats -------------------------------------------- - else if (configCmdLine.at(i) == "-no-gif") - dictionary[ "GIF" ] = "no"; -- else if (configCmdLine.at(i) == "-qt-gif") -- dictionary[ "GIF" ] = "plugin"; - - else if (configCmdLine.at(i) == "-no-libtiff") { - dictionary[ "TIFF"] = "no"; -@@ -1661,7 +1659,7 @@ bool Configure::displayHelp() - "[-no-qmake] [-qmake] [-dont-process] [-process]\n" - "[-no-style-