diff options
241 files changed, 1942 insertions, 914 deletions
@@ -1,3 +1,4 @@ +/settings.mk /usr/ /log/ /pkg @@ -13,6 +13,9 @@ 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 +WGET := wget --no-check-certificate \ + --user-agent=$(shell wget --version | \ + $(SED) -n 's,GNU \(Wget\) \([0-9.]*\).*,\1/\2,p') REQUIREMENTS := autoconf automake bash bison bzip2 cmake flex \ gcc intltoolize $(LIBTOOL) $(LIBTOOLIZE) \ @@ -61,13 +64,25 @@ CHECK_PKG_ARCHIVE = \ DOWNLOAD_PKG_ARCHIVE = \ mkdir -p '$(PKG_DIR)' && \ $(if $($(1)_URL_2), \ - ( wget -T 30 -t 3 --no-check-certificate -O- '$($(1)_URL)' || wget --no-check-certificate -O- '$($(1)_URL_2)' ), \ - wget --no-check-certificate -O- '$($(1)_URL)') \ + ( $(WGET) -T 30 -t 3 -O- '$($(1)_URL)' || $(WGET) -O- '$($(1)_URL_2)' ), \ + $(WGET) -O- '$($(1)_URL)') \ $(if $($(1)_FIX_GZIP), \ | gzip -d | gzip -9n, \ ) \ > '$(PKG_DIR)/$($(1)_FILE)' +ifeq ($(IGNORE_SETTINGS),yes) + $(info [ignore settings.mk]) +else ifeq ($(wildcard $(PWD)/settings.mk),$(PWD)/settings.mk) + include $(PWD)/settings.mk +else + $(info [create settings.mk]) + $(shell { \ + echo '#JOBS = $(JOBS)'; \ + echo '#PKGS ='; \ + } >'$(PWD)/settings.mk') +endif + .PHONY: all all: $(PKGS) @@ -914,6 +914,16 @@ USE_OSGPLUGIN(<plugin2>) <td id="agg-website"><a href="http://www.antigrain.com/">Anti-Grain Geometry</a></td> </tr> <tr> + <td id="apr-util-package">apr-util</td> + <td id="apr-util-version">1.3.10</td> + <td id="apr-util-website"><a href="http://apr.apache.org/">APR-util</a></td> + </tr> + <tr> + <td id="apr-package">apr</td> + <td id="apr-version">1.4.2</td> + <td id="apr-website"><a href="http://apr.apache.org/">APR</a></td> + </tr> + <tr> <td id="atk-package">atk</td> <td id="atk-version">2.2.0</td> <td id="atk-website"><a href="http://www.gtk.org/">ATK</a></td> @@ -974,6 +984,11 @@ USE_OSGPLUGIN(<plugin2>) <td id="cgal-website"><a href="http://www.cgal.org/">cgal</a></td> </tr> <tr> + <td id="cminpack-package">cminpack</td> + <td id="cminpack-version">1.2.0</td> + <td id="cminpack-website"><a href="http://devernay.free.fr/hacks/cminpack/cminpack.html">cminpack</a></td> + </tr> + <tr> <td id="cppunit-package">cppunit</td> <td id="cppunit-version">1.12.1</td> <td id="cppunit-website"><a href="http://apps.sourceforge.net/mediawiki/cppunit/">CppUnit</a></td> @@ -985,7 +1000,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="curl-package">curl</td> - <td id="curl-version">7.25.0</td> + <td id="curl-version">7.26.0</td> <td id="curl-website"><a href="http://curl.haxx.se/libcurl/">cURL</a></td> </tr> <tr> @@ -1010,7 +1025,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="exiv2-package">exiv2</td> - <td id="exiv2-version">0.22</td> + <td id="exiv2-version">0.23</td> <td id="exiv2-website"><a href="http://www.exiv2.org/">Exiv2</a></td> </tr> <tr> @@ -1025,12 +1040,12 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="ffmpeg-package">ffmpeg</td> - <td id="ffmpeg-version">0.10.2</td> + <td id="ffmpeg-version">0.10.3</td> <td id="ffmpeg-website"><a href="http://www.ffmpeg.org/">ffmpeg</a></td> </tr> <tr> <td id="fftw-package">fftw</td> - <td id="fftw-version">3.3.1</td> + <td id="fftw-version">3.3.2</td> <td id="fftw-website"><a href="http://www.fftw.org/">fftw</a></td> </tr> <tr> @@ -1085,7 +1100,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="gc-package">gc</td> - <td id="gc-version">7.1</td> + <td id="gc-version">7.2</td> <td id="gc-website"><a href="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">gc</a></td> </tr> <tr> @@ -1095,7 +1110,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="gcc-gmp-package">gcc-gmp</td> - <td id="gcc-gmp-version">5.0.4</td> + <td id="gcc-gmp-version">5.0.5</td> <td id="gcc-gmp-website"><a href="http://www.gmplib.org/">GMP for GCC</a></td> </tr> <tr> @@ -1115,12 +1130,12 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="gdal-package">gdal</td> - <td id="gdal-version">1.9.0</td> + <td id="gdal-version">1.9.1</td> <td id="gdal-website"><a href="http://www.gdal.org/">GDAL</a></td> </tr> <tr> <td id="gdb-package">gdb</td> - <td id="gdb-version">7.4</td> + <td id="gdb-version">7.4.1</td> <td id="gdb-website"><a href="http://www.gnu.org/software/gdb/">gdb</a></td> </tr> <tr> @@ -1130,7 +1145,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="geos-package">geos</td> - <td id="geos-version">3.3.2</td> + <td id="geos-version">3.3.3</td> <td id="geos-website"><a href="http://trac.osgeo.org/geos/">GEOS</a></td> </tr> <tr> @@ -1140,7 +1155,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="giflib-package">giflib</td> - <td id="giflib-version">4.1.6</td> + <td id="giflib-version">4.2.0</td> <td id="giflib-website"><a href="http://sourceforge.net/projects/libungif/">giflib</a></td> </tr> <tr> @@ -1160,17 +1175,17 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="gmp-package">gmp</td> - <td id="gmp-version">5.0.4</td> + <td id="gmp-version">5.0.5</td> <td id="gmp-website"><a href="http://www.gmplib.org/">GMP</a></td> </tr> <tr> <td id="gnutls-package">gnutls</td> - <td id="gnutls-version">3.0.17</td> + <td id="gnutls-version">3.0.19</td> <td id="gnutls-website"><a href="http://www.gnu.org/software/gnutls/">GnuTLS</a></td> </tr> <tr> <td id="graphicsmagick-package">graphicsmagick</td> - <td id="graphicsmagick-version">1.3.14</td> + <td id="graphicsmagick-version">1.3.15</td> <td id="graphicsmagick-website"><a href="http://www.graphicsmagick.org/">GraphicsMagick</a></td> </tr> <tr> @@ -1239,6 +1254,11 @@ USE_OSGPLUGIN(<plugin2>) <td id="guile-website"><a href="http://www.gnu.org/software/guile/">GNU Guile</a></td> </tr> <tr> + <td id="hunspell-package">hunspell</td> + <td id="hunspell-version">1.3.2</td> + <td id="hunspell-website"><a href="http://hunspell.sourceforge.net/">Hunspell</a></td> + </tr> + <tr> <td id="id3lib-package">id3lib</td> <td id="id3lib-version">3.8.3</td> <td id="id3lib-website"><a href="http://id3lib.sourceforge.net/">id3lib</a></td> @@ -1289,6 +1309,11 @@ USE_OSGPLUGIN(<plugin2>) <td id="lcms1-website"><a href="http://www.littlecms.com/">lcms1</a></td> </tr> <tr> + <td id="levmar-package">levmar</td> + <td id="levmar-version">2.6</td> + <td id="levmar-website"><a href="http://www.ics.forth.gr/~lourakis/levmar">levmar</a></td> + </tr> + <tr> <td id="libarchive-package">libarchive</td> <td id="libarchive-version">3.0.3</td> <td id="libarchive-website"><a href="http://code.google.com/p/libarchive/">Libarchive</a></td> @@ -1310,12 +1335,17 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="libevent-package">libevent</td> - <td id="libevent-version">2.0.18</td> + <td id="libevent-version">2.0.19</td> <td id="libevent-website"><a href="http://libevent.org/">libevent</a></td> </tr> <tr> + <td id="libf2c-package">libf2c</td> + <td id="libf2c-version">1</td> + <td id="libf2c-website"><a href="http://www.netlib.org/f2c/">libf2c</a></td> + </tr> + <tr> <td id="libffi-package">libffi</td> - <td id="libffi-version">3.0.10</td> + <td id="libffi-version">3.0.11</td> <td id="libffi-website"><a href="http://sourceware.org/libffi/">libffi</a></td> </tr> <tr> @@ -1324,13 +1354,23 @@ USE_OSGPLUGIN(<plugin2>) <td id="libgcrypt-website"><a href="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</a></td> </tr> <tr> + <td id="libgda-package">libgda</td> + <td id="libgda-version">4.2.13</td> + <td id="libgda-website"><a href="http://www.gnome-db.org/">libgda</a></td> + </tr> + <tr> + <td id="libgdamm-package">libgdamm</td> + <td id="libgdamm-version">4.1.3</td> + <td id="libgdamm-website"><a href="https://launchpad.net/libgdamm">libgdamm</a></td> + </tr> + <tr> <td id="libgee-package">libgee</td> <td id="libgee-version">0.5.0</td> <td id="libgee-website"><a href="http://live.gnome.org/Libgee">libgee</a></td> </tr> <tr> <td id="libgeotiff-package">libgeotiff</td> - <td id="libgeotiff-version">1.3.0</td> + <td id="libgeotiff-version">1.4.0</td> <td id="libgeotiff-website"><a href="http://trac.osgeo.org/geotiff/">GeoTiff</a></td> </tr> <tr> @@ -1380,7 +1420,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="libidn-package">libidn</td> - <td id="libidn-version">1.24</td> + <td id="libidn-version">1.25</td> <td id="libidn-website"><a href="http://www.gnu.org/software/libidn/">Libidn</a></td> </tr> <tr> @@ -1409,6 +1449,11 @@ USE_OSGPLUGIN(<plugin2>) <td id="libmng-website"><a href="http://www.libmng.com/">libmng</a></td> </tr> <tr> + <td id="libmodplug-package">libmodplug</td> + <td id="libmodplug-version">0.8.8.4</td> + <td id="libmodplug-website"><a href="http://modplug-xmms.sourceforge.net/">libmodplug</a></td> + </tr> + <tr> <td id="libntlm-package">libntlm</td> <td id="libntlm-version">1.3</td> <td id="libntlm-website"><a href="http://www.nongnu.org/libntlm/">Libntlm</a></td> @@ -1435,7 +1480,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="libpaper-package">libpaper</td> - <td id="libpaper-version">1.1.24+nmu1</td> + <td id="libpaper-version">1.1.24+nmu2</td> <td id="libpaper-website"><a href="http://packages.debian.org/unstable/libpaper1">libpaper</a></td> </tr> <tr> @@ -1445,7 +1490,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="librsvg-package">librsvg</td> - <td id="librsvg-version">2.36.0</td> + <td id="librsvg-version">2.36.1</td> <td id="librsvg-website"><a href="http://librsvg.sourceforge.net/">librsvg</a></td> </tr> <tr> @@ -1455,7 +1500,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="libshout-package">libshout</td> - <td id="libshout-version">2.2.2</td> + <td id="libshout-version">2.3.0</td> <td id="libshout-website"><a href="http://www.icecast.org/">libshout</a></td> </tr> <tr> @@ -1470,7 +1515,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="libssh2-package">libssh2</td> - <td id="libssh2-version">1.4.0</td> + <td id="libssh2-version">1.4.2</td> <td id="libssh2-website"><a href="http://www.libssh2.org">libssh2</a></td> </tr> <tr> @@ -1490,7 +1535,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="libvpx-package">libvpx</td> - <td id="libvpx-version">1.0.0</td> + <td id="libvpx-version">1.1.0</td> <td id="libvpx-website"><a href="http://code.google.com/p/webm/">vpx</a></td> </tr> <tr> @@ -1514,8 +1559,13 @@ USE_OSGPLUGIN(<plugin2>) <td id="llvm-website"><a href="http://llvm.org/">llvm</a></td> </tr> <tr> + <td id="log4cxx-package">log4cxx</td> + <td id="log4cxx-version">0.10.0</td> + <td id="log4cxx-website"><a href="http://logging.apache.org/log4cxx/">log4cxx</a></td> + </tr> + <tr> <td id="lua-package">lua</td> - <td id="lua-version">5.1.4</td> + <td id="lua-version">5.2.0</td> <td id="lua-website"><a href="http://www.lua.org/">Lua</a></td> </tr> <tr> @@ -1529,6 +1579,11 @@ USE_OSGPLUGIN(<plugin2>) <td id="matio-website"><a href="http://sourceforge.net/projects/matio/">matio</a></td> </tr> <tr> + <td id="mdbtools-package">mdbtools</td> + <td id="mdbtools-version">0.6pre1</td> + <td id="mdbtools-website"><a href="http://sourceforge.net/projects/mdbtools/">mdbtools</a></td> + </tr> + <tr> <td id="mingw-utils-package">mingw-utils</td> <td id="mingw-utils-version">0.4-1</td> <td id="mingw-utils-website"><a href="http://www.mingw.org/">MinGW Utilities</a></td> @@ -1545,7 +1600,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="muparser-package">muparser</td> - <td id="muparser-version">1.34</td> + <td id="muparser-version">2.2.2</td> <td id="muparser-website"><a href="http://muparser.sourceforge.net/">muParser</a></td> </tr> <tr> @@ -1554,6 +1609,11 @@ USE_OSGPLUGIN(<plugin2>) <td id="mxml-website"><a href="http://www.minixml.org/">Mini-XML</a></td> </tr> <tr> + <td id="ncurses-package">ncurses</td> + <td id="ncurses-version">5.9</td> + <td id="ncurses-website"><a href="http://www.gnu.org/software/ncurses/">Ncurses</a></td> + </tr> + <tr> <td id="nettle-package">nettle</td> <td id="nettle-version">2.4</td> <td id="nettle-website"><a href="http://www.lysator.liu.se/~nisse/nettle/">nettle</a></td> @@ -1575,7 +1635,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="openal-package">openal</td> - <td id="openal-version">1.13</td> + <td id="openal-version">1.14</td> <td id="openal-website"><a href="http://kcat.strangesoft.net/openal.html">openal</a></td> </tr> <tr> @@ -1600,7 +1660,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="openssl-package">openssl</td> - <td id="openssl-version">1.0.1</td> + <td id="openssl-version">1.0.1c</td> <td id="openssl-website"><a href="http://www.openssl.org/">openssl</a></td> </tr> <tr> @@ -1640,7 +1700,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="pixman-package">pixman</td> - <td id="pixman-version">0.25.2</td> + <td id="pixman-version">0.25.6</td> <td id="pixman-website"><a href="http://cairographics.org/">pixman</a></td> </tr> <tr> @@ -1659,6 +1719,11 @@ USE_OSGPLUGIN(<plugin2>) <td id="poco-website"><a href="http://pocoproject.org/">POCO C++ Libraries</a></td> </tr> <tr> + <td id="poppler-package">poppler</td> + <td id="poppler-version">0.18.4</td> + <td id="poppler-website"><a href="http://poppler.freedesktop.org/">poppler</a></td> + </tr> + <tr> <td id="popt-package">popt</td> <td id="popt-version">1.16</td> <td id="popt-website"><a href="http://freshmeat.net/projects/popt/">popt</a></td> @@ -1684,13 +1749,18 @@ USE_OSGPLUGIN(<plugin2>) <td id="pthreads-website"><a href="http://sourceware.org/pthreads-win32/">Pthreads-w32</a></td> </tr> <tr> + <td id="qdbm-package">qdbm</td> + <td id="qdbm-version">1.8.78</td> + <td id="qdbm-website"><a href="http://fallabs.com/qdbm/">QDBM</a></td> + </tr> + <tr> <td id="qjson-package">qjson</td> <td id="qjson-version">0.7.1</td> <td id="qjson-website"><a href="http://qjson.sourceforge.net/">QJson</a></td> </tr> <tr> <td id="qt-package">qt</td> - <td id="qt-version">4.8.1</td> + <td id="qt-version">4.8.2</td> <td id="qt-website"><a href="http://qt.nokia.com/">Qt</a></td> </tr> <tr> @@ -1744,18 +1814,23 @@ USE_OSGPLUGIN(<plugin2>) <td id="smpeg-website"><a href="http://icculus.org/smpeg/">smpeg</a></td> </tr> <tr> + <td id="sox-package">sox</td> + <td id="sox-version">14.4.0</td> + <td id="sox-website"><a href="http://sox.sourceforge.net/">SoX</a></td> + </tr> + <tr> <td id="speex-package">speex</td> <td id="speex-version">1.2rc1</td> <td id="speex-website"><a href="http://www.speex.org/">Speex</a></td> </tr> <tr> <td id="sqlite-package">sqlite</td> - <td id="sqlite-version">3071100</td> + <td id="sqlite-version">3071201</td> <td id="sqlite-website"><a href="http://www.sqlite.org/">SQLite</a></td> </tr> <tr> <td id="suitesparse-package">suitesparse</td> - <td id="suitesparse-version">3.7.0</td> + <td id="suitesparse-version">3.7.1</td> <td id="suitesparse-website"><a href="http://www.cise.ufl.edu/research/sparse/SuiteSparse/">SuiteSparse</a></td> </tr> <tr> @@ -1765,7 +1840,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="taglib-package">taglib</td> - <td id="taglib-version">1.7.1</td> + <td id="taglib-version">1.7.2</td> <td id="taglib-website"><a href="http://developer.kde.org/~wheeler/taglib.html">TagLib</a></td> </tr> <tr> @@ -1800,7 +1875,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="vorbis-package">vorbis</td> - <td id="vorbis-version">1.3.2</td> + <td id="vorbis-version">1.3.3</td> <td id="vorbis-website"><a href="http://www.vorbis.com/">Vorbis</a></td> </tr> <tr> @@ -1845,7 +1920,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="xmlwrapp-package">xmlwrapp</td> - <td id="xmlwrapp-version">0.6.2</td> + <td id="xmlwrapp-version">0.6.3</td> <td id="xmlwrapp-website"><a href="http://sourceforge.net/projects/xmlwrapp/">xmlwrapp</a></td> </tr> <tr> @@ -1860,7 +1935,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="zlib-package">zlib</td> - <td id="zlib-version">1.2.6</td> + <td id="zlib-version">1.2.7</td> <td id="zlib-website"><a href="http://zlib.net/">zlib</a></td> </tr> <tr> @@ -2058,6 +2133,7 @@ https://...</pre> <tr><td><code>make</code></td> <td>→</td><td><code>$(MAKE)</code></td></tr> <tr><td><code>patch</code></td> <td>→</td><td><code>$(PATCH)</code></td></tr> <tr><td><code>sed</code></td> <td>→</td><td><code>$(SED)</code></td></tr> + <tr><td><code>wget</code></td> <td>→</td><td><code>$(WGET)</code></td></tr> </table> </li> @@ -10,7 +10,7 @@ $(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' | \ + $(WGET) -q -O- 'http://www.antigrain.com/download/index.html' | \ $(SED) -n 's,.*<A href="http://www.antigrain.com/agg-\([0-9.]*\).tar.gz".*,\1,p' | \ head -1 endef diff --git a/src/apr-util.mk b/src/apr-util.mk new file mode 100644 index 0000000..9b21163 --- /dev/null +++ b/src/apr-util.mk @@ -0,0 +1,33 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := apr-util +$(PKG)_IGNORE := 1.4.1 +$(PKG)_CHECKSUM := f5aaf15542209fee479679299dc4cb1ac0924a59 +$(PKG)_SUBDIR := apr-util-$($(PKG)_VERSION) +$(PKG)_FILE := apr-util-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://mirror.apache-kr.org/apr/$($(PKG)_FILE) +$(PKG)_URL_2 := http://archive.apache.org/dist/apr/$($(PKG)_FILE) +$(PKG)_DEPS := gcc apr expat libiconv + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://apr.apache.org/download.cgi' | \ + grep 'aprutil1.*best' | + $(SED) -n 's,.*APR-util \([0-9.]*\).*,\1,p' +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --prefix='$(PREFIX)/$(TARGET)' \ + --host='$(TARGET)' \ + --build="`config.guess`" \ + --disable-shared \ + --enable-static \ + --without-pgsql \ + --without-sqlite2 \ + --without-sqlite3 \ + --with-apr='$(PREFIX)/$(TARGET)' \ + CFLAGS=-D_WIN32_WINNT=0x0500 + $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= + ln -sf '$(PREFIX)/$(TARGET)/bin/apu-1-config' '$(PREFIX)/bin/$(TARGET)-apu-1-config' +endef diff --git a/src/apr.mk b/src/apr.mk new file mode 100644 index 0000000..c706fec --- /dev/null +++ b/src/apr.mk @@ -0,0 +1,33 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := apr +$(PKG)_IGNORE := 1.4.6 +$(PKG)_CHECKSUM := d48324efb0280749a5d7ccbb053d68545c568b4b +$(PKG)_SUBDIR := apr-$($(PKG)_VERSION) +$(PKG)_FILE := apr-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://mirror.apache-kr.org/apr/$($(PKG)_FILE) +$(PKG)_URL_2 := http://archive.apache.org/dist/apr/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://apr.apache.org/download.cgi' | \ + grep 'apr1.*best' | + $(SED) -n 's,.*APR \([0-9.]*\).*,\1,p' +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --prefix='$(PREFIX)/$(TARGET)' \ + --host='$(TARGET)' \ + --build="`config.guess`" \ + --disable-shared \ + --enable-static \ + ac_cv_sizeof_off_t=4 \ + ac_cv_sizeof_pid_t=4 \ + ac_cv_sizeof_size_t=4 \ + ac_cv_sizeof_ssize_t=4 \ + CFLAGS=-D_WIN32_WINNT=0x0500 + $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= + ln -sf '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config' +endef diff --git a/src/atk-1-DllMain.patch b/src/atk-1-DllMain.patch new file mode 100644 index 0000000..f1c1f68 --- /dev/null +++ b/src/atk-1-DllMain.patch @@ -0,0 +1,12 @@ +diff -uNr atk-2.2.0-orig/atk/atkobject.c atk-2.2.0/atk/atkobject.c +--- atk-2.2.0-orig/atk/atkobject.c 2011-09-19 19:06:54.000000000 +0200 ++++ atk-2.2.0/atk/atkobject.c 2012-04-14 20:26:12.763814596 +0200 +@@ -366,7 +366,7 @@ + static HMODULE atk_dll; + + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++atk_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + { @@ -3,14 +3,14 @@ PKG := atk $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 3f4daf31f99b6e0c12ce9675400f2f02dbf1b820 +$(PKG)_CHECKSUM := b9808b77c7905eb46fc2b64587ef93beab37470a $(PKG)_SUBDIR := atk-$($(PKG)_VERSION) -$(PKG)_FILE := atk-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := atk-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/atk/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib gettext define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/atk/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/atk/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=ATK_\\([0-9]*_[0-9]*[02468]_[^<]*\\)'.*,\\1,p" | \ $(SED) 's,_,.,g' | \ @@ -18,7 +18,6 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/atk/atkobject.c' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/atkmm.mk b/src/atkmm.mk index e13cc37..4e3bc79 100644 --- a/src/atkmm.mk +++ b/src/atkmm.mk @@ -3,14 +3,14 @@ PKG := atkmm $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 9ca44756821f4d431c554e1cf8184989bb25ce12 +$(PKG)_CHECKSUM := 2af04a30dd1f6250d3d35f616bbc34c264b7b327 $(PKG)_SUBDIR := atkmm-$($(PKG)_VERSION) -$(PKG)_FILE := atkmm-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := atkmm-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/atkmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc atk glibmm define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/atkmm/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/atkmm/refs/tags' | \ grep '<a href=' | \ $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \ head -1 diff --git a/src/aubio.mk b/src/aubio.mk index 279c346..78f0cf3 100644 --- a/src/aubio.mk +++ b/src/aubio.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.aubio.org/pub/$($(PKG)_FILE) $(PKG)_DEPS := gcc fftw libsamplerate libsndfile define $(PKG)_UPDATE - wget -q -O- 'http://www.aubio.org/download' | \ + $(WGET) -q -O- 'http://www.aubio.org/download' | \ $(SED) -n 's,.*aubio-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/binutils.mk b/src/binutils.mk index 50e96b3..2791fcb 100644 --- a/src/binutils.mk +++ b/src/binutils.mk @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/binutils/$($(PKG)_FILE) $(PKG)_DEPS := define $(PKG)_UPDATE - wget -q -O- 'http://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \ + $(WGET) -q -O- 'http://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \ $(SED) -n 's,.*<a href="binutils-\([0-9][^"]*\)\.tar.*,\1,p' | \ grep -v '^2\.1' | \ head -1 diff --git a/src/boost.mk b/src/boost.mk index 09d11e0..13c36ef 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/boost/boost/$($(PKG)_VER $(PKG)_DEPS := gcc zlib bzip2 expat define $(PKG)_UPDATE - wget -q -O- 'http://www.boost.org/users/download/' | \ + $(WGET) -q -O- 'http://www.boost.org/users/download/' | \ $(SED) -n 's,.*/boost/\([0-9][^"/]*\)/".*,\1,p' | \ grep -v beta | \ head -1 diff --git a/src/bzip2.mk b/src/bzip2.mk index 69d56a4..fa2d073 100644 --- a/src/bzip2.mk +++ b/src/bzip2.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.bzip.org/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.bzip.org/downloads.html' | \ + $(WGET) -q -O- 'http://www.bzip.org/downloads.html' | \ grep 'bzip2-' | \ $(SED) -n 's,.*bzip2-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/cairo-1-DllMain.patch b/src/cairo-1-DllMain.patch new file mode 100644 index 0000000..cb87fde --- /dev/null +++ b/src/cairo-1-DllMain.patch @@ -0,0 +1,18 @@ +diff -uNr cairo-1.10.2-orig/src/cairo-system.c cairo-1.10.2/src/cairo-system.c +--- cairo-1.10.2-orig/src/cairo-system.c 2010-06-18 13:47:14.000000000 +0200 ++++ cairo-1.10.2/src/cairo-system.c 2012-04-14 22:01:27.848928137 +0200 +@@ -70,12 +70,12 @@ + + /* declare to avoid "no previous prototype for 'DllMain'" warning */ + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++cairo_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved); + + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++cairo_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + { diff --git a/src/cairo.mk b/src/cairo.mk index 3eeeb26..cf0a719 100644 --- a/src/cairo.mk +++ b/src/cairo.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib libpng fontconfig freetype pixman define $(PKG)_UPDATE - wget -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \ + $(WGET) -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \ $(SED) -n 's,.*"cairo-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/cairomm.mk b/src/cairomm.mk index 1bbcd8b..5461eaf 100644 --- a/src/cairomm.mk +++ b/src/cairomm.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc cairo libsigc++ define $(PKG)_UPDATE - wget -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \ + $(WGET) -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \ $(SED) -n 's,.*"cairomm-\([0-9][^"]*\)\.tar.*,\1,p' | \ grep -v '^1\.8\.' | \ head -1 diff --git a/src/cgal.mk b/src/cgal.mk index 6aa40bb..e08f166 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -10,7 +10,7 @@ $(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' | \ + $(WGET) -q -O- 'https://gforge.inria.fr/frs/?group_id=52' | \ grep 'CGAL-' | \ $(SED) -n 's,.*CGAL-\([0-9][^>a-z]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/cminpack.mk b/src/cminpack.mk new file mode 100644 index 0000000..79326e5 --- /dev/null +++ b/src/cminpack.mk @@ -0,0 +1,27 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := cminpack +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 7ac79d8623d0bc6c95c61e0c364ca9e38e8a13ca +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://devernay.free.fr/hacks/cminpack/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://devernay.free.fr/hacks/cminpack/cminpack.html' | \ + $(SED) -n 's,.*cminpack-\([0-9.]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && cmake \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + $(MAKE) -C '$(1)' -j $(JOBS) + + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/libcminpack.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m644 '$(1)/cminpack.h' '$(PREFIX)/$(TARGET)/include/' +endef diff --git a/src/cppunit.mk b/src/cppunit.mk index 7461282..2c02fda 100644 --- a/src/cppunit.mk +++ b/src/cppunit.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/cppunit/files/cppunit/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/cppunit/files/cppunit/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/cunit.mk b/src/cunit.mk index e510d74..bc0dc55 100644 --- a/src/cunit.mk +++ b/src/cunit.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/cunit/CUnit/$($(PKG)_VER $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/cunit/files/CUnit/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/cunit/files/CUnit/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/curl-1-fixes.patch b/src/curl-1-fixes.patch index 0b1ce01..8590bb1 100644 --- a/src/curl-1-fixes.patch +++ b/src/curl-1-fixes.patch @@ -5,29 +5,25 @@ 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 <vog@notjusthosting.com> -Date: Fri, 28 Oct 2011 13:48:04 +0200 -Subject: [PATCH] static linking for MXE +From ed729805781e366b68105f074f9e3c17fb81df27 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Thu, 24 May 2012 20:45:36 +0200 +Subject: [PATCH] define CURL_STATICLIB via pkg-config --- - include/curl/curlbuild.h.in | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + libcurl.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -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 +diff --git a/libcurl.pc.in b/libcurl.pc.in +index 2ba9c39..e0ddd8d 100644 +--- a/libcurl.pc.in ++++ b/libcurl.pc.in +@@ -36,4 +36,4 @@ Description: Library to transfer files with ftp, http, etc. + Version: @CURLVERSION@ + Libs: -L${libdir} -lcurl @LIBS@ + Libs.private: @LIBCURL_LIBS@ @LIBS@ +-Cflags: -I${includedir} ++Cflags: -DCURL_STATICLIB -I${includedir} -- -1.7.8.3 +1.7.9.2 diff --git a/src/curl.mk b/src/curl.mk index 088911a..ea50d3f 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -3,20 +3,19 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_CHECKSUM := f6016a24051d98806ca3ddf754592701cb66e00c +$(PKG)_CHECKSUM := c2e62eaace2407d377bf544d1f808aea6dddf64c $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) $(PKG)_DEPS := gcc gnutls libidn libssh2 define $(PKG)_UPDATE - wget -q -O- 'http://curl.haxx.se/download/?C=M;O=D' | \ + $(WGET) -q -O- 'http://curl.haxx.se/download/?C=M;O=D' | \ $(SED) -n 's,.*curl-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef define $(PKG)_BUILD - cd '$(1)' && ./buildconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ diff --git a/src/dbus.mk b/src/dbus.mk index 34d4bb1..510d676 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -10,7 +10,7 @@ $(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' | \ + $(WGET) -q -O- 'http://cgit.freedesktop.org/dbus/dbus/refs/tags' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \ grep -v '^1\.[01234]\.' | \ head -1 diff --git a/src/dcmtk.mk b/src/dcmtk.mk index 7f7c888..831116b 100644 --- a/src/dcmtk.mk +++ b/src/dcmtk.mk @@ -11,7 +11,7 @@ $(PKG)_URL_2 := http://ftp.debian.org/debian/pool/main/d/$(PKG)/$(PKG)_$($(PK $(PKG)_DEPS := gcc openssl tiff libpng libxml2 zlib define $(PKG)_UPDATE - wget -q -O- 'http://dicom.offis.de/dcmtk.php.en' | \ + $(WGET) -q -O- 'http://dicom.offis.de/dcmtk.php.en' | \ $(SED) -n 's,.*/dcmtk-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/devil.mk b/src/devil.mk index 4ef75c7..b88f8ce 100644 --- a/src/devil.mk +++ b/src/devil.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/openil/DevIL/$($(PKG)_VE $(PKG)_DEPS := gcc freeglut zlib openexr jpeg jasper lcms libmng libpng tiff sdl define $(PKG)_UPDATE - wget -q -O- 'http://openil.svn.sourceforge.net/viewvc/openil/tags/?sortby=date' | \ + $(WGET) -q -O- 'http://openil.svn.sourceforge.net/viewvc/openil/tags/?sortby=date' | \ grep '<a name="' | \ $(SED) -n 's,.*<a name="release-\([0-9][^"]*\)".*,\1,p' | \ head -1 diff --git a/src/eigen.mk b/src/eigen.mk index 9fb5a5f..3a6fc28 100644 --- a/src/eigen.mk +++ b/src/eigen.mk @@ -10,7 +10,7 @@ $(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' | \ + $(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 diff --git a/src/exiv2-r2619.patch b/src/exiv2-r2619.patch deleted file mode 100644 index 569e79c..0000000 --- a/src/exiv2-r2619.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 --git a/src/exiv2-r2646.patch b/src/exiv2-r2646.patch deleted file mode 100644 index 16b3f69..0000000 --- a/src/exiv2-r2646.patch +++ /dev/null @@ -1,175 +0,0 @@ -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;<BR> -+ 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<const byte*>(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<const byte*>(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<const byte*>(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 --git a/src/exiv2-r2650.patch b/src/exiv2-r2650.patch deleted file mode 100644 index 438605c..0000000 --- a/src/exiv2-r2650.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 --git a/src/exiv2.mk b/src/exiv2.mk index 751cf3a..5d91a56 100644 --- a/src/exiv2.mk +++ b/src/exiv2.mk @@ -3,14 +3,14 @@ PKG := exiv2 $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 35211d853a986fe1b008fca14db090726e8dcce3 +$(PKG)_CHECKSUM := 5f342bf642477526f41add11d6ee7787cdcd639f $(PKG)_SUBDIR := exiv2-$($(PKG)_VERSION) $(PKG)_FILE := exiv2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.exiv2.org/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv zlib expat define $(PKG)_UPDATE - wget -q -O- 'http://www.exiv2.org/download.html' | \ + $(WGET) -q -O- 'http://www.exiv2.org/download.html' | \ grep 'href="exiv2-' | \ $(SED) -n 's,.*exiv2-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/expat.mk b/src/expat.mk index c010f1d..c006013 100644 --- a/src/expat.mk +++ b/src/expat.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VER $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/expat/files/expat/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/expat/files/expat/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/faad2.mk b/src/faad2.mk index d019f93..28edbd1 100644 --- a/src/faad2.mk +++ b/src/faad2.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/faac/$(PKG)-src/$(PKG)-$ $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/faac/files/faad2-src/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/faac/files/faad2-src/' | \ $(SED) -n 's,.*faad2-\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index 6bb5857..b78e7e4 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -3,7 +3,7 @@ PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 743f44a71f93b14c9b26ca2424b0da8457cef4be +$(PKG)_CHECKSUM := 4fb6f682dbc1b4ea54178040d515fc3a4c05d415 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) @@ -11,7 +11,7 @@ $(PKG)_URL_2 := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/ $(PKG)_DEPS := gcc bzip2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib define $(PKG)_UPDATE - wget -q -O- 'http://www.ffmpeg.org/download.html' | \ + $(WGET) -q -O- 'http://www.ffmpeg.org/download.html' | \ $(SED) -n 's,.*ffmpeg-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/fftw.mk b/src/fftw.mk index 82d5189..95d2a5c 100644 --- a/src/fftw.mk +++ b/src/fftw.mk @@ -3,14 +3,14 @@ PKG := fftw $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 3fecc492f576503a6a509d2073bd82b3fe0aef13 +$(PKG)_CHECKSUM := 11a8c31186ff5a7d686a79a3f21b2530888e0dc2 $(PKG)_SUBDIR := fftw-$($(PKG)_VERSION) $(PKG)_FILE := fftw-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.fftw.org/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.fftw.org/download.html' | \ + $(WGET) -q -O- 'http://www.fftw.org/download.html' | \ $(SED) -n 's,.*fftw-\([0-9][^>]*\)\.tar.*,\1,p' | \ grep -v alpha | \ grep -v beta | \ @@ -20,6 +20,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \ @@ -29,6 +30,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \ @@ -38,6 +40,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \ diff --git a/src/file.mk b/src/file.mk index 14af0de..dc438ed 100644 --- a/src/file.mk +++ b/src/file.mk @@ -10,7 +10,7 @@ $(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/' | \ + $(WGET) -q -O- 'ftp://ftp.astron.com/pub/file/' | \ grep 'file-' | \ $(SED) -n 's,.*file-\([0-9][^>]*\)\.tar.*,\1,p' | \ tail -1 diff --git a/src/flac.mk b/src/flac.mk index 3c90ddb..8b47394 100644 --- a/src/flac.mk +++ b/src/flac.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/flac/flac-src/flac-$($(P $(PKG)_DEPS := gcc libiconv ogg define $(PKG)_UPDATE - wget -q -O- 'http://flac.cvs.sourceforge.net/viewvc/flac/flac/' | \ + $(WGET) -q -O- 'http://flac.cvs.sourceforge.net/viewvc/flac/flac/' | \ grep '<option>FLAC_RELEASE_' | \ $(SED) -n 's,.*FLAC_RELEASE_\([0-9][0-9_]*\)__.*,\1,p' | \ $(SED) 's,_,.,g' | \ diff --git a/src/fltk.mk b/src/fltk.mk index 5ae6f44..7121e58 100644 --- a/src/fltk.mk +++ b/src/fltk.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.easysw.com/pub/fltk/$($(PKG)_VERSION)/$($(PKG)_FIL $(PKG)_DEPS := gcc zlib jpeg libpng pthreads define $(PKG)_UPDATE - wget -q -O- 'http://www.fltk.org/' | \ + $(WGET) -q -O- 'http://www.fltk.org/' | \ $(SED) -n 's,.*>v\([0-9][^<]*\)<.*,\1,p' | \ grep -v '^1\.1\.' | \ head -1 diff --git a/src/fontconfig.mk b/src/fontconfig.mk index 2992c44..369aecc 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE) $(PKG)_DEPS := gcc freetype expat define $(PKG)_UPDATE - wget -q -O- 'http://fontconfig.org/release/' | \ + $(WGET) -q -O- 'http://fontconfig.org/release/' | \ $(SED) -n 's,.*fontconfig-\([0-9][^>]*\)\.tar.*,\1,p' | \ tail -1 endef diff --git a/src/freeglut.mk b/src/freeglut.mk index a4bb250..facfeeb 100644 --- a/src/freeglut.mk +++ b/src/freeglut.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PK $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/freeglut/files/freeglut/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/freeglut/files/freeglut/' | \ $(SED) -n 's,.*freeglut-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/freeimage.mk b/src/freeimage.mk index 77c8d10..b0e49af 100644 --- a/src/freeimage.mk +++ b/src/freeimage.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeimage/Source Distrib $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/freeimage/files/Source Distribution/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/freeimage/files/Source Distribution/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/freetds.mk b/src/freetds.mk index 7138694..0299c3d 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -14,7 +14,7 @@ define $(PKG)_UPDATE echo $(freetds_VERSION) endef define $(PKG)_UPDATE_orig - wget -q -O- 'http://freetds.cvs.sourceforge.net/viewvc/freetds/freetds/' | \ + $(WGET) -q -O- 'http://freetds.cvs.sourceforge.net/viewvc/freetds/freetds/' | \ grep '<option>R' | \ $(SED) -n 's,.*R\([0-9][0-9_]*\)<.*,\1,p' | \ $(SED) 's,_,.,g' | \ diff --git a/src/freetype.mk b/src/freetype.mk index 510439c..1076882 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$($(P $(PKG)_DEPS := gcc zlib define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/freetype/files/freetype2/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/freetype/files/freetype2/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/fribidi.mk b/src/fribidi.mk index d4ed282..1eb6eef 100644 --- a/src/fribidi.mk +++ b/src/fribidi.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://fribidi.org/download/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib define $(PKG)_UPDATE - wget -q -O- 'http://fribidi.org/download/?C=M;O=D' | \ + $(WGET) -q -O- 'http://fribidi.org/download/?C=M;O=D' | \ $(SED) -n 's,.*<a href="fribidi-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/ftgl.mk b/src/ftgl.mk index 502d465..07efcab 100644 --- a/src/ftgl.mk +++ b/src/ftgl.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/FTGL Source/$($(P $(PKG)_DEPS := gcc freetype define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/ftgl/files/FTGL Source/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/ftgl/files/FTGL Source/' | \ $(SED) -n 's,.*<tr title="\([0-9][^"]*\)".*,\1,p' | \ head -1 endef @@ -3,14 +3,14 @@ PKG := gc $(PKG)_IGNORE := -$(PKG)_CHECKSUM := e84cba5d18f4ea5ed4e5fd3f1dc6a46bc190ff6f +$(PKG)_CHECKSUM := 43c5f2704479dc8d8010fb2c73fa269bf3151d5b $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.hpl.hp.com/personal/Hans_Boehm/$(PKG)/$(PKG)_source/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/?C=M;O=D' | \ + $(WGET) -q -O- 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/?C=M;O=D' | \ grep '<a href="gc-' | \ $(SED) -n 's,.*<a href="gc-\([0-9][^"]*\)\.tar.*,\1,p' | \ grep -v 'alpha' | \ @@ -20,6 +20,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --enable-threads=win32 \ diff --git a/src/gcc-mpc.mk b/src/gcc-mpc.mk index 608f292..f134611 100644 --- a/src/gcc-mpc.mk +++ b/src/gcc-mpc.mk @@ -11,7 +11,7 @@ $(PKG)_URL_2 := http://ftp.debian.org/debian/pool/main/m/mpclib/mpclib_$($(PK $(PKG)_DEPS := define $(PKG)_UPDATE - wget -q --no-check-certificate -O- 'https://gforge.inria.fr/scm/viewvc.php/tags/?root=mpc&sortby=date' | \ + $(WGET) -q -O- 'https://gforge.inria.fr/scm/viewvc.php/tags/?root=mpc&sortby=date' | \ $(SED) -n 's,.*<a name="\([0-9][^"]*\)".*,\1,p' | \ head -1 endef @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$ $(PKG)_DEPS := mingwrt w32api binutils gcc-gmp gcc-mpc gcc-mpfr define $(PKG)_UPDATE - wget -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \ + $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \ $(SED) -n 's,.*<a href="gcc-\([0-9][^"]*\)/".*,\1,p' | \ grep -v '^4\.[543]\.' | \ head -1 @@ -15,7 +15,7 @@ define $(PKG)_UPDATE echo $(gd_VERSION) endef define $(PKG)_UPDATE_orig - wget -q -O- 'http://www.libgd.org/releases/' | \ + $(WGET) -q -O- 'http://www.libgd.org/releases/' | \ $(SED) -n 's,.*gd-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/gdal-1-fixes.patch b/src/gdal-1-fixes.patch new file mode 100644 index 0000000..b0cf98e --- /dev/null +++ b/src/gdal-1-fixes.patch @@ -0,0 +1,54 @@ +This file is part of MXE. +See index.html for further information. + +Taken from http://trac.osgeo.org/gdal/changeset/24491?format=diff&new=24491 + +Index: gdal/frmts/gif/gifdataset.cpp +=================================================================== +--- gdal/frmts/gif/gifdataset.cpp (revision 23621) ++++ gdal/frmts/gif/gifdataset.cpp (revision 24491) +@@ -471,4 +471,26 @@ + + /************************************************************************/ ++/* GDALPrintGifError() */ ++/************************************************************************/ ++ ++static void GDALPrintGifError(const char* pszMsg) ++{ ++/* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */ ++/* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */ ++#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ ++ ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) ++ /* Static string actually, hence the const char* cast */ ++ const char* pszGIFLIBError = (const char*) GifErrorString(); ++ if (pszGIFLIBError == NULL) ++ pszGIFLIBError = "Unknown error"; ++ CPLError( CE_Failure, CPLE_AppDefined, ++ "%s. GIFLib Error : %s", pszMsg, pszGIFLIBError ); ++#else ++ PrintGifError(); ++ CPLError( CE_Failure, CPLE_AppDefined, "%s", pszMsg ); ++#endif ++} ++ ++/************************************************************************/ + /* CreateCopy() */ + /************************************************************************/ +@@ -597,7 +619,5 @@ + { + FreeMapObject(psGifCT); +- PrintGifError(); +- CPLError( CE_Failure, CPLE_AppDefined, +- "Error writing gif file." ); ++ GDALPrintGifError("Error writing gif file."); + EGifCloseFile(hGifFile); + VSIFCloseL( fp ); +@@ -623,7 +643,5 @@ + if (EGifPutImageDesc(hGifFile, 0, 0, nXSize, nYSize, bInterlace, NULL) == GIF_ERROR ) + { +- PrintGifError(); +- CPLError( CE_Failure, CPLE_AppDefined, +- "Error writing gif file." ); ++ GDALPrintGifError("Error writing gif file."); + EGifCloseFile(hGifFile); + VSIFCloseL( fp ); diff --git a/src/gdal.mk b/src/gdal.mk index 6fe5897..9c1a56c 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -3,7 +3,7 @@ PKG := gdal $(PKG)_IGNORE := -$(PKG)_CHECKSUM := e2eaaf0fba39137b40c0d3069ac41dfb6f3c76db +$(PKG)_CHECKSUM := c1eae556398ff7b9332afe9d3022dcd931130808 $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_FILE) @@ -11,7 +11,7 @@ $(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 gta define $(PKG)_UPDATE - wget -q -O- 'http://trac.osgeo.org/gdal/wiki/DownloadSource' | \ + $(WGET) -q -O- 'http://trac.osgeo.org/gdal/wiki/DownloadSource' | \ $(SED) -n 's,.*gdal-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef @@ -20,6 +20,7 @@ define $(PKG)_BUILD # The option '--without-threads' means native win32 threading without pthread. cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-bsb \ @@ -65,7 +66,6 @@ define $(PKG)_BUILD --without-ingres \ --without-dods-root \ --without-dwgdirect \ - --without-dwg-plt \ --without-idb \ --without-sde \ --without-epsilon \ @@ -73,7 +73,6 @@ define $(PKG)_BUILD --without-php \ --without-ruby \ --without-python \ - --without-macosx-framework \ LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" $(MAKE) -C '$(1)' -j 1 lib-target $(MAKE) -C '$(1)' -j 1 install-lib diff --git a/src/gdb-2-fix-makeinfo.patch b/src/gdb-2-fix-makeinfo.patch deleted file mode 100644 index 3b5c0d9..0000000 --- a/src/gdb-2-fix-makeinfo.patch +++ /dev/null @@ -1,94 +0,0 @@ -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<include dir> if - you have headers in a nonstandard directory <include dir> - 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="" @@ -2,7 +2,7 @@ # See index.html for further information. PKG := gdb -$(PKG)_CHECKSUM := 43a3ee582eae4d69c2babea4f8700b7bec8e37fa +$(PKG)_CHECKSUM := 1b0f8c3778d4b10c8d2be6922ac01a9900e8116c $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) @@ -10,7 +10,7 @@ $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc expat libiconv zlib define $(PKG)_UPDATE - wget -q -O- 'http://ftp.gnu.org/gnu/gdb/?C=M;O=D' | \ + $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gdb/?C=M;O=D' | \ $(SED) -n 's,.*<a href="gdb-\([0-9][^"]*\)\.tar.*,\1,p' | \ grep -v '^7\.3a' | \ sort -r | \ diff --git a/src/gdk-pixbuf-1-fixes.patch b/src/gdk-pixbuf-1-fixes.patch index 6f18015..b186a04 100644 --- a/src/gdk-pixbuf-1-fixes.patch +++ b/src/gdk-pixbuf-1-fixes.patch @@ -27,7 +27,7 @@ index 6a5dbce..e5e1c2d 100644 BOOL WINAPI -DllMain (HINSTANCE hinstDLL, -+static _disabled_DllMain (HINSTANCE hinstDLL, ++gdkpixbuf_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/src/gdk-pixbuf.mk b/src/gdk-pixbuf.mk index 3405e71..05ad422 100644 --- a/src/gdk-pixbuf.mk +++ b/src/gdk-pixbuf.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(call SHOR $(PKG)_DEPS := gcc glib libpng jpeg tiff jasper libiconv define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/gdk-pixbuf/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/gdk-pixbuf/refs/tags' | \ grep '<a href=' | \ $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \ grep -v '^2\.9' | \ diff --git a/src/geos.mk b/src/geos.mk index e35e43a..496fa05 100644 --- a/src/geos.mk +++ b/src/geos.mk @@ -3,7 +3,7 @@ PKG := geos $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 942b0bbc61a059bd5269fddd4c0b44a508670cb3 +$(PKG)_CHECKSUM := 2ecd23c38d74e5f04757dc528ec30858006fb6a7 $(PKG)_SUBDIR := geos-$($(PKG)_VERSION) $(PKG)_FILE := geos-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://download.osgeo.org/geos/$($(PKG)_FILE) @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.remotesensing.org/geos/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://geos.refractions.net/' | \ + $(WGET) -q -O- 'http://geos.refractions.net/' | \ $(SED) -n 's,.*geos-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/gettext.mk b/src/gettext.mk index e618740..edccffe 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -10,7 +10,7 @@ $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv define $(PKG)_UPDATE - wget -q -O- 'http://www.gnu.org/software/gettext/' | \ + $(WGET) -q -O- 'http://www.gnu.org/software/gettext/' | \ grep 'gettext-' | \ $(SED) -n 's,.*gettext-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/giflib.mk b/src/giflib.mk index b8defb2..a943965 100644 --- a/src/giflib.mk +++ b/src/giflib.mk @@ -3,14 +3,14 @@ PKG := giflib $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 22680f604ec92065f04caf00b1c180ba74fb8562 +$(PKG)_CHECKSUM := bc942711f75de7d8539f79be34d69c0d53c381c1 $(PKG)_SUBDIR := giflib-$($(PKG)_VERSION) $(PKG)_FILE := giflib-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/giflib/giflib-4.x/giflib-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/giflib/giflib-4.x/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/giflib/files/giflib 4.x/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/giflib/files/giflib 4.x/' | \ $(SED) -n 's,.*/giflib-\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef @@ -18,8 +18,9 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ + --disable-shared \ --without-x \ CPPFLAGS='-D_OPEN_BINARY' $(MAKE) -C '$(1)/lib' -j '$(JOBS)' install diff --git a/src/glew.mk b/src/glew.mk index 4de9694..1b133f8 100644 --- a/src/glew.mk +++ b/src/glew.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/glew/glew/$($(PKG)_VERSI $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/glew/files/glew/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/glew/files/glew/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/glib-2-DllMain.patch b/src/glib-2-DllMain.patch new file mode 100644 index 0000000..4ed2ac5 --- /dev/null +++ b/src/glib-2-DllMain.patch @@ -0,0 +1,59 @@ +diff -uNr glib-2.28.8-orig/gio/giomodule.c glib/gio/giomodule.c +--- glib-2.28.8-orig/gio/giomodule.c 2011-01-05 22:44:06.000000000 +0100 ++++ glib/gio/giomodule.c 2011-11-23 21:04:43.867004895 +0100 +@@ -489,10 +489,8 @@ + + static HMODULE gio_dll = NULL; + +-#ifdef DLL_EXPORT +- + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++gio_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + { +@@ -502,8 +500,6 @@ + return TRUE; + } + +-#endif +- + #undef GIO_MODULE_DIR + + /* GIO_MODULE_DIR is used only in code called just once, +diff -uNr glib-2.28.8-orig/glib/gutils.c glib/glib/gutils.c +--- glib-2.28.8-orig/glib/gutils.c 2011-06-06 01:18:49.000000000 +0200 ++++ glib/glib/gutils.c 2011-11-23 21:05:07.822988144 +0100 +@@ -144,10 +144,8 @@ + + static HMODULE glib_dll = NULL; + +-#ifdef DLL_EXPORT +- + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++glib_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + { +@@ -157,8 +155,6 @@ + return TRUE; + } + +-#endif +- + gchar * + _glib_get_dll_directory (void) + { +@@ -166,10 +162,8 @@ + gchar *p; + wchar_t wc_fn[MAX_PATH]; + +-#ifdef DLL_EXPORT + if (glib_dll == NULL) + return NULL; +-#endif + + /* This code is different from that in + * g_win32_get_package_installation_directory_of_module() in that diff --git a/src/glib.mk b/src/glib.mk index e3aaabe..a0f427d 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -3,14 +3,14 @@ PKG := glib $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 20cd63705a8805260da0320c65b979233f2e3c18 +$(PKG)_CHECKSUM := 9b11968fedf4da45bcd10c4a8c50012d41b3af50 $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) -$(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := glib-$($(PKG)_VERSION).tar.xz $(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 define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/glib/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/glib/refs/tags' | \ $(SED) -n "s,.*tag/?id=\([0-9]\+\.[0-9]*[02468]\.[^']*\).*,\1,p" | \ head -1 endef diff --git a/src/glibmm.mk b/src/glibmm.mk index cd1c356..23ca3f9 100644 --- a/src/glibmm.mk +++ b/src/glibmm.mk @@ -3,14 +3,14 @@ PKG := glibmm $(PKG)_IGNORE := -$(PKG)_CHECKSUM := d15bc0fed7dea6fec73746370653687f74e02592 +$(PKG)_CHECKSUM := bd1962c7de710036875a8b6d7ab7b5e5e50fb7af $(PKG)_SUBDIR := glibmm-$($(PKG)_VERSION) -$(PKG)_FILE := glibmm-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := glibmm-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/glibmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib libsigc++ define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/glibmm/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/glibmm/refs/tags' | \ grep '<a href=' | \ $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \ head -1 @@ -3,7 +3,7 @@ PKG := gmp $(PKG)_IGNORE := -$(PKG)_CHECKSUM := ea4ea7c3f10436ef5ae7a75b3fad163a8b86edc0 +$(PKG)_CHECKSUM := 12a662456033e21aed3e318aef4177f4000afe3b $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gmplib.org/pub/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.gmplib.org/' | \ + $(WGET) -q -O- 'http://www.gmplib.org/' | \ grep '<a href="' | \ $(SED) -n 's,.*gmp-\([0-9][^>]*\)\.tar.*,\1,p' | \ grep -v '^4\.' | \ @@ -21,6 +21,7 @@ endef define $(PKG)_BUILD cd '$(1)' && CC_FOR_BUILD=gcc ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --enable-cxx \ diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index fee1cff..d6cebbc 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -3,11 +3,14 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 6e89465f1e792f5d527708544cce1ef92ae4669b Mon Sep 17 00:00:00 2001 -From: MXE +From ef8ca0b0c163a5fbca686a292890479c498607c8 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 28 Oct 2011 09:23:41 +0200 -Subject: [PATCH 1/2] add missing static library linking +Subject: [PATCH 1/3] add missing static library linking +--- + lib/gnutls.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in index c45f8f3..57d0dbb 100644 @@ -25,11 +28,14 @@ index c45f8f3..57d0dbb 100644 1.7.9.2 -From aa11a6f645ce93f80fbffd7e72c6964bdfd68542 Mon Sep 17 00:00:00 2001 -From: MXE +From e90e7ac3a472b0bef5475966ac06d7f2f12c712b Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 24 Nov 2011 15:06:06 +0100 -Subject: [PATCH 2/2] disable doc and test (MXE specific) +Subject: [PATCH 2/3] disable doc and test (MXE specific) +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0afe4bd..da7436a 100644 @@ -47,3 +53,31 @@ index 0afe4bd..da7436a 100644 -- 1.7.9.2 + +From 5f92acf7123fed0e7a2c617a8abea48f00d83c19 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Tue, 3 Apr 2012 13:58:42 +0200 +Subject: [PATCH 3/3] Revert "make dist will also make lzip compressed + tarball" + +This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ba60ce8..9af1253 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.18], [bug-gnutls@gnu.org]) + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override]) ++AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Werror -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AM_CONFIG_HEADER(config.h) + +-- +1.7.9.2 + diff --git a/src/gnutls.mk b/src/gnutls.mk index 902aaf9..e177d05 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,7 +2,7 @@ # See index.html for further information. PKG := gnutls -$(PKG)_CHECKSUM := 2e2adc41e0c75d8170fdca5955bd007ae93ceada +$(PKG)_CHECKSUM := df55f60a0426de1f0efb5c1a902e209b069b3d51 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE) @@ -10,7 +10,7 @@ $(PKG)_URL_2 := ftp://ftp.gnupg.org/gcrypt/gnutls/$($(PKG)_FILE) $(PKG)_DEPS := gcc nettle zlib define $(PKG)_UPDATE - wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=tags' | \ + $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=tags' | \ grep '<a class="list name"' | \ $(SED) -n 's,.*<a[^>]*>gnutls_\([0-9]*_[0-9]*[02468]_[^<]*\)<.*,\1,p' | \ $(SED) 's,_,.,g' | \ diff --git a/src/graphicsmagick.mk b/src/graphicsmagick.mk index 3f76616..c021797 100644 --- a/src/graphicsmagick.mk +++ b/src/graphicsmagick.mk @@ -3,14 +3,14 @@ PKG := graphicsmagick $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 7ef5711a18da0a3b6b143548a2a7822597ea416d +$(PKG)_CHECKSUM := 59ab01a1a8a12b26955c64bb2b660b6283855204 $(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION) $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.bz2 $(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 define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef @@ -20,6 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --without-modules \ @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=$(PKG).git;a=tags' | \ + $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=$(PKG).git;a=tags' | \ grep '<a class="list subject"' | \ $(SED) -n 's,.*<a[^>]*>[^0-9>]*\([0-9][^<]*\)<.*,\1,p' | \ head -1 diff --git a/src/gsoap.mk b/src/gsoap.mk index d12bc71..f494b97 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gsoap2/gSOAP/$($(PKG)_FI $(PKG)_DEPS := gcc gnutls libgcrypt libntlm define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/gsoap2/files/gSOAP/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/gsoap2/files/gSOAP/' | \ $(SED) -n 's,.*gsoap_\([0-9][^>]*\)\.zip.*,\1,p' | \ head -1 endef diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk index eb05bf7..07a4039 100644 --- a/src/gst-plugins-base.mk +++ b/src/gst-plugins-base.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib libxml2 gstreamer liboil pango ogg vorbis theora define $(PKG)_UPDATE - wget -q -O- 'http://cgit.freedesktop.org/gstreamer/gst-plugins-base/refs/tags' | \ + $(WGET) -q -O- 'http://cgit.freedesktop.org/gstreamer/gst-plugins-base/refs/tags' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \ head -1 endef diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk index 0b942f2..1390809 100644 --- a/src/gst-plugins-good.mk +++ b/src/gst-plugins-good.mk @@ -10,7 +10,7 @@ $(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 define $(PKG)_UPDATE - wget -q -O- 'http://cgit.freedesktop.org/gstreamer/gst-plugins-good/refs/tags' | \ + $(WGET) -q -O- 'http://cgit.freedesktop.org/gstreamer/gst-plugins-good/refs/tags' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \ head -1 endef diff --git a/src/gstreamer.mk b/src/gstreamer.mk index f87f7e4..eca1a11 100644 --- a/src/gstreamer.mk +++ b/src/gstreamer.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc glib libxml2 define $(PKG)_UPDATE - wget -q -O- 'http://cgit.freedesktop.org/gstreamer/gstreamer/refs/tags' | \ + $(WGET) -q -O- 'http://cgit.freedesktop.org/gstreamer/gstreamer/refs/tags' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \ head -1 endef @@ -10,7 +10,7 @@ $(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' | \ + $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gta.git;a=tags' | \ grep '<a class="list subject"' | \ $(SED) -n 's,.*<a[^>]*>libgta-\([0-9.]*\)<.*,\1,p' | \ head -1 diff --git a/src/gtk2-1-fixes.patch b/src/gtk2-1-fixes.patch index cd26a7b..a413637 100644 --- a/src/gtk2-1-fixes.patch +++ b/src/gtk2-1-fixes.patch @@ -18,7 +18,7 @@ index dc139be..be2a7ee 100644 int __stdcall -DllMain (HINSTANCE hinstDLL, -+static _disabled_DllMain (HINSTANCE hinstDLL, ++gdk_DllMain (HINSTANCE hinstDLL, DWORD dwReason, LPVOID reserved) { @@ -31,7 +31,7 @@ index d081f70..aa2973d 100644 BOOL WINAPI -DllMain (HINSTANCE hinstDLL, -+static _disabled_DllMain (HINSTANCE hinstDLL, ++gtk_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/src/gtk2.mk b/src/gtk2.mk index a5f063a..266dd4f 100644 --- a/src/gtk2.mk +++ b/src/gtk2.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(call SHORT_PKG_ $(PKG)_DEPS := gcc gettext libpng jpeg tiff jasper glib atk pango cairo gdk-pixbuf define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/gtk+/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/gtk+/refs/tags' | \ grep '<a href=' | \ $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \ grep -v '^2\.9' | \ diff --git a/src/gtkglext.mk b/src/gtkglext.mk index 339fb87..53e800b 100644 --- a/src/gtkglext.mk +++ b/src/gtkglext.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gtkglext/gtkglext/$($(PK $(PKG)_DEPS := gcc gtk2 define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/cgit/gtkglext/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/cgit/gtkglext/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=\\([0-9][^']*\\)'.*,\\1,p" | \ grep -v '1\.1\.' | \ diff --git a/src/gtkglextmm.mk b/src/gtkglextmm.mk index 18a2968..e76cca1 100644 --- a/src/gtkglextmm.mk +++ b/src/gtkglextmm.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gtkglext/gtkglextmm/$($( $(PKG)_DEPS := gcc gtkglext gtkmm2 define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/cgit/gtkglextmm/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/cgit/gtkglextmm/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=\\([0-9][^']*\\)'.*,\\1,p" | \ grep -v '1\.1\.' | \ diff --git a/src/gtkmm2.mk b/src/gtkmm2.mk index ccabfca..a8c7c2b 100644 --- a/src/gtkmm2.mk +++ b/src/gtkmm2.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(call SHORT_PKG $(PKG)_DEPS := gcc gtk2 libsigc++ pangomm cairomm atkmm define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/gtkmm/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/gtkmm/refs/tags' | \ grep '<a href=' | \ $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \ grep -v '^2\.9' | \ diff --git a/src/gtksourceview.mk b/src/gtksourceview.mk index 2d3c2da..1751296 100644 --- a/src/gtksourceview.mk +++ b/src/gtksourceview.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtksourceview/$(call S $(PKG)_DEPS := gcc gtk2 libxml2 define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/gtksourceview/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/gtksourceview/refs/tags' | \ $(SED) -n 's,.*>GTKSOURCEVIEW_\([0-9]\+_[0-9]*[02468]_[^<]*\)<.*,\1,p' | \ $(SED) 's,_,.,g' | \ grep -v '^2\.9[0-9]\.' | \ diff --git a/src/gtksourceviewmm2.mk b/src/gtksourceviewmm2.mk index 7d75077..1c0e846 100644 --- a/src/gtksourceviewmm2.mk +++ b/src/gtksourceviewmm2.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtksourceviewmm/$(call $(PKG)_DEPS := gcc gtkmm2 gtksourceview define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/cgit/gtksourceviewmm/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/cgit/gtksourceviewmm/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=gtksourceviewmm-\\([0-9][^']*\\)'.*,\\1,p" | \ grep -v '^2\.9[0-9]\.' | \ diff --git a/src/guile.mk b/src/guile.mk index 27c47a7..db08c98 100644 --- a/src/guile.mk +++ b/src/guile.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc libtool gmp libiconv gettext libunistring gc libffi readline define $(PKG)_UPDATE - wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=$(PKG).git;a=tags' | \ + $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=$(PKG).git;a=tags' | \ grep '<a class="list subject"' | \ $(SED) -n 's,.*<a[^>]*>[^0-9>]*\([0-9][^< ]*\)\.<.*,\1,p' | \ head -1 diff --git a/src/hunspell-test.cpp b/src/hunspell-test.cpp new file mode 100644 index 0000000..67393d5 --- /dev/null +++ b/src/hunspell-test.cpp @@ -0,0 +1,37 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include <iostream> +#include <fstream> +#include <hunspell.hxx> + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + std::ofstream dic ("hunspell-test.dic"); + dic << "2\nHello\nWorld"; + dic.close(); + std::ofstream aff ("hunspell-test.aff"); + aff << "SET UTF-8\nTRY loredWH\nMAXDIFF 1"; + aff.close(); + Hunspell h("hunspell-test.aff", "hunspell-test.dic"); + + if (h.spell("Hello") == 0) + { + std::cerr << "Error: hunspell marked correct word as wrong" << std::endl; + } + if (h.spell("wrld") != 0) + { + std::cerr << "Error: hunspell marked wrong word as correct" << std::endl; + } + + char ** result; + int n = h.suggest(&result, "ell"); + for (int i = 0; i < n; i++) std::cout << result[i]; + + return 0; +} diff --git a/src/hunspell.mk b/src/hunspell.mk new file mode 100644 index 0000000..9d21e1e --- /dev/null +++ b/src/hunspell.mk @@ -0,0 +1,36 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := hunspell +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 902c76d2b55a22610e2227abc4fd26cbe606a51c +$(PKG)_SUBDIR := hunspell-$($(PKG)_VERSION) +$(PKG)_FILE := hunspell-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/hunspell/Hunspell/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libiconv gettext readline pthreads + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://sourceforge.net/projects/hunspell/files/Hunspell/' | \ + $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + # Note: the configure file doesn't pick up pdcurses, so "ui" is disabled + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --enable-static \ + --disable-shared \ + --with-warnings \ + --without-ui \ + --with-readline \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + + + # Test + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-hunspell.exe' \ + `'$(TARGET)-pkg-config' hunspell --cflags --libs` +endef diff --git a/src/id3lib.mk b/src/id3lib.mk index 8674e8d..5712b6d 100644 --- a/src/id3lib.mk +++ b/src/id3lib.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/id3lib/files/id3lib/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/id3lib/files/id3lib/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/ilmbase.mk b/src/ilmbase.mk index 9a5b1f3..24c93e5 100644 --- a/src/ilmbase.mk +++ b/src/ilmbase.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://download.savannah.nongnu.org/releases/openexr/$($(PKG) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.openexr.com/downloads.html' | \ + $(WGET) -q -O- 'http://www.openexr.com/downloads.html' | \ grep 'ilmbase-' | \ $(SED) -n 's,.*ilmbase-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/imagemagick.mk b/src/imagemagick.mk index e565426..64102dd 100644 --- a/src/imagemagick.mk +++ b/src/imagemagick.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.nluug.nl/ImageMagick/$($(PKG)_FILE) $(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/' | \ + $(WGET) -q -O- 'http://www.imagemagick.org/' | \ $(SED) -n 's,.*<p>The current release is ImageMagick \([0-9][^<]*\).</p>.*,\1,p' | \ head -1 endef diff --git a/src/jasper.mk b/src/jasper.mk index a67bb8d..497eae7 100644 --- a/src/jasper.mk +++ b/src/jasper.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.ece.uvic.ca/~mdadams/jasper/software/$($(PKG)_FILE $(PKG)_DEPS := gcc jpeg define $(PKG)_UPDATE - wget -q -O- 'http://www.ece.uvic.ca/~mdadams/jasper/' | \ + $(WGET) -q -O- 'http://www.ece.uvic.ca/~mdadams/jasper/' | \ grep 'jasper-' | \ $(SED) -n 's,.*jasper-\([0-9][^>]*\)\.zip.*,\1,p' | \ head -1 diff --git a/src/jpeg.mk b/src/jpeg.mk index 922b020..b9c8aa8 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.ijg.org/files/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.ijg.org/' | \ + $(WGET) -q -O- 'http://www.ijg.org/' | \ $(SED) -n 's,.*jpegsrc\.v\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/json-c.mk b/src/json-c.mk index cc37b9d..bcbee54 100644 --- a/src/json-c.mk +++ b/src/json-c.mk @@ -10,7 +10,7 @@ $(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' | \ + $(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 diff --git a/src/lame.mk b/src/lame.mk index 3c5bba5..69d1ca9 100644 --- a/src/lame.mk +++ b/src/lame.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/lame/files/lame/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/lame/files/lame/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/lapack-test.f b/src/lapack-test.f new file mode 100644 index 0000000..9872d3b --- /dev/null +++ b/src/lapack-test.f @@ -0,0 +1,10 @@ +* +* This file is part of MXE. +* See index.html for further information. +* + INTEGER MAJOR, MINOR, PATCH +* + CALL ILAVER ( MAJOR,MINOR, PATCH ) + WRITE(*,*) "LAPACK ",MAJOR,".",MINOR,".",PATCH +* + END diff --git a/src/lapack.mk b/src/lapack.mk index cc782d0..c9c8959 100644 --- a/src/lapack.mk +++ b/src/lapack.mk @@ -2,7 +2,7 @@ # See index.html for further information. PKG := lapack -$(PKG)_IGNORE := +$(PKG)_IGNORE := 3.4.1 $(PKG)_CHECKSUM := 910109a931524f8dcc2734ce23fe927b00ca199f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tgz @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.eq.uc.pt/pub/software/math/netlib/$(PKG)/$($(PKG)_F $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.netlib.org/lapack/' | \ + $(WGET) -q -O- 'http://www.netlib.org/lapack/' | \ $(SED) -n 's_.*>LAPACK, version \([0-9]\.[0-9]\.[0-9]\).*_\1_ip' | \ head -1 endef @@ -20,6 +20,12 @@ define $(PKG)_BUILD cd '$(1)' && cmake \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ + -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \ . $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' install + + '$(TARGET)-gfortran' \ + -W -Wall -Werror -pedantic \ + '$(2).f' -o '$(PREFIX)/$(TARGET)/bin/test-lapack.exe' \ + -llapack endef diff --git a/src/lcms.mk b/src/lcms.mk index 2ec645a..961ba6b 100644 --- a/src/lcms.mk +++ b/src/lcms.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(subst a, $(PKG)_DEPS := gcc jpeg tiff zlib define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/lcms/files/lcms/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/lcms/files/lcms/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/lcms1.mk b/src/lcms1.mk index 5fc7e13..0ba84ed 100644 --- a/src/lcms1.mk +++ b/src/lcms1.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/lcms/lcms/$($(PKG)_VERSI $(PKG)_DEPS := gcc jpeg tiff zlib define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/lcms/files/lcms/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/lcms/files/lcms/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ grep '^1\.' | \ head -1 diff --git a/src/levmar.mk b/src/levmar.mk new file mode 100644 index 0000000..f328abb --- /dev/null +++ b/src/levmar.mk @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := levmar +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 118bd20b55ab828d875f1b752cb5e1238258950b +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tgz +$(PKG)_URL := http://www.ics.forth.gr/~lourakis/$(PKG)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc lapack blas libf2c + +define $(PKG)_UPDATE + $(WGET) -q -O- "http://www.ics.forth.gr/~lourakis/levmar/" | \ + $(SED) -n 's_.*Latest:.*levmar-\([0-9]\.[0-9]\).*_\1_ip' | \ + head -1; +endef + +define $(PKG)_BUILD + $(MAKE) -C '$(1)' -j '$(JOBS)' liblevmar.a \ + CC=$(TARGET)-gcc \ + AR=$(TARGET)-ar \ + RANLIB=$(TARGET)-ranlib + $(INSTALL) -m644 '$(1)/levmar.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m644 '$(1)/liblevmar.a' '$(PREFIX)/$(TARGET)/lib/' +endef diff --git a/src/libarchive.mk b/src/libarchive.mk index a46b2ab..22d0189 100644 --- a/src/libarchive.mk +++ b/src/libarchive.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://libarchive.googlecode.com/files/$($(PKG)_FILE) $(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' | \ + $(WGET) -q -O- 'http://code.google.com/p/libarchive/downloads/list?sort=-uploaded' | \ $(SED) -n 's,.*libarchive-\([0-9][^<]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/libass.mk b/src/libass.mk index 8541bd6..48f0ded 100644 --- a/src/libass.mk +++ b/src/libass.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://libass.googlecode.com/files/$($(PKG)_FILE) $(PKG)_DEPS := gcc freetype fontconfig fribidi define $(PKG)_UPDATE - wget -q -O- 'http://code.google.com/p/libass/downloads/list?sort=-uploaded' | \ + $(WGET) -q -O- 'http://code.google.com/p/libass/downloads/list?sort=-uploaded' | \ $(SED) -n 's,.*libass-\([0-9][^<]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/libcroco.mk b/src/libcroco.mk index 00e23b1..839a1ae 100644 --- a/src/libcroco.mk +++ b/src/libcroco.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnome.org/pub/GNOME/sources/libcroco/$(call SHORT_ $(PKG)_DEPS := gcc glib libxml2 define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/libcroco/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/libcroco/refs/tags' | \ $(SED) -n 's,.*<a[^>]*>LIBCROCO_\([0-9][0-9_]*\)<.*,\1,p' | \ $(SED) 's,_,.,g' | \ head -1 diff --git a/src/libdnet.mk b/src/libdnet.mk index d1f5d7b..8407d46 100644 --- a/src/libdnet.mk +++ b/src/libdnet.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-$($ $(PKG)_DEPS := gcc winpcap define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/libdnet/files/libdnet/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/libdnet/files/libdnet/' | \ $(SED) -n 's,.*/libdnet-\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/libevent.mk b/src/libevent.mk index 9365254..4866bea 100644 --- a/src/libevent.mk +++ b/src/libevent.mk @@ -3,14 +3,14 @@ PKG := libevent $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 2a2cc87ce1945f43dfa5a5f9575fef3d14a8f57a +$(PKG)_CHECKSUM := 28c109190345ce5469add8cf3f45c5dd57fe2a85 $(PKG)_SUBDIR := libevent-$($(PKG)_VERSION)-stable $(PKG)_FILE := libevent-$($(PKG)_VERSION)-stable.tar.gz $(PKG)_URL := https://github.com/downloads/$(PKG)/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://libevent.org/' | \ + $(WGET) -q -O- 'http://libevent.org/' | \ grep 'libevent-' | \ $(SED) -n 's,.*libevent-\([0-9][^>]*\)-stable\.tar.*,\1,p' | \ head -1 @@ -19,6 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA= diff --git a/src/libf2c-1.patch b/src/libf2c-1.patch new file mode 100644 index 0000000..2446e2a --- /dev/null +++ b/src/libf2c-1.patch @@ -0,0 +1,59 @@ +This file is part of MXE. +See index.html for further information. + +diff -ur libf2c.orig/makefile.u libf2c/makefile.u +--- libf2c.orig/makefile.u 2012-05-04 01:39:36.000000000 +1000 ++++ libf2c/makefile.u 2012-05-04 01:45:30.000000000 +1000 +@@ -20,7 +20,7 @@ + # compile, then strip unnecessary symbols + .c.o: + $(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c +- ld -r -x -o $*.xxx $*.o ++ $(LD) -r -x -o $*.xxx $*.o + mv $*.xxx $*.o + ## Under Solaris (and other systems that do not understand ld -x), + ## omit -x in the ld line above. +@@ -72,8 +72,8 @@ + all: f2c.h signal1.h sysdep1.h libf2c.a + + libf2c.a: $(OFILES) +- ar r libf2c.a $? +- -ranlib libf2c.a ++ $(AR) r libf2c.a $? ++ -$(RANLIB) libf2c.a + + ## Shared-library variant: the following rule works on Linux + ## systems. Details are system-dependent. Under Linux, -fPIC +@@ -123,7 +123,7 @@ + + install: libf2c.a + cp libf2c.a $(LIBDIR) +- -ranlib $(LIBDIR)/libf2c.a ++ -$(RANLIB) $(LIBDIR)/libf2c.a + + clean: + rm -f libf2c.a *.o arith.h signal1.h sysdep1.h +@@ -182,12 +182,6 @@ + xwsne.o: lio.h + xwsne.o: fmt.h + +-arith.h: arithchk.c +- $(CC) $(CFLAGS) -DNO_FPINIT arithchk.c -lm ||\ +- $(CC) -DNO_LONG_LONG $(CFLAGS) -DNO_FPINIT arithchk.c -lm +- ./a.out >arith.h +- rm -f a.out arithchk.o +- + check: + xsum Notice README abort_.c arithchk.c backspac.c c_abs.c c_cos.c \ + c_div.c c_exp.c c_log.c c_sin.c c_sqrt.c cabs.c close.c comptry.bat \ + +diff -urN tmp-libf2c.orig/arith.h tmp-libf2c/arith.h +--- tmp-libf2c.orig/arith.h 1970-01-01 10:00:00.000000000 +1000 ++++ tmp-libf2c/arith.h 2012-05-04 01:16:16.000000000 +1000 +@@ -0,0 +1,5 @@ ++#define IEEE_8087 ++#define Arith_Kind_ASL 1 ++#define Double_Align ++#define QNaN0 0x0 ++#define QNaN1 0xfff80000 ++ diff --git a/src/libf2c.mk b/src/libf2c.mk new file mode 100644 index 0000000..67b5565 --- /dev/null +++ b/src/libf2c.mk @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libf2c +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := f71066b41695738dec2261de71eaf02a1aaffe8b +$(PKG)_SUBDIR := +$(PKG)_FILE := $(PKG).zip +$(PKG)_URL := http://www.netlib.org/f2c/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + echo 1 +endef + +define $(PKG)_BUILD + $(MAKE) -C '$(1)' -j '$(JOBS)' -f makefile.u \ + CC=$(TARGET)-gcc \ + AR=$(TARGET)-ar \ + LD=$(TARGET)-ld \ + RANLIB=$(TARGET)-ranlib \ + CFLAGS='-O -DUSE_CLOCK' + $(INSTALL) -m644 '$(1)/libf2c.a' '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/f2c.h' '$(PREFIX)/$(TARGET)/include' +endef diff --git a/src/libffi.mk b/src/libffi.mk index 65415a2..0b20035 100644 --- a/src/libffi.mk +++ b/src/libffi.mk @@ -3,14 +3,14 @@ PKG := libffi $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 97abf70e6a6d315d9259d58ac463663051d471e1 +$(PKG)_CHECKSUM := bff6a6c886f90ad5e30dee0b46676e8e0297d81d $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://sourceware.org/pub/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q --no-check-certificate -O- 'https://github.com/atgreen/libffi/tags' | \ + $(WGET) -q -O- 'https://github.com/atgreen/libffi/tags' | \ grep '<a href="/atgreen/libffi/tarball/' | \ $(SED) -n 's,.*href="/atgreen/libffi/tarball/v\([0-9][^"]*\)".*,\1,p' | \ head -1 diff --git a/src/libgcrypt-test.c b/src/libgcrypt-test.c new file mode 100644 index 0000000..5b4ec31 --- /dev/null +++ b/src/libgcrypt-test.c @@ -0,0 +1,32 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include <stdio.h> +#include <gcrypt.h> + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + if (!gcry_check_version (GCRYPT_VERSION)) { + fputs ("libgcrypt version mismatch\n", stderr); + exit (2); + } + + gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN); + gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0); + gcry_control (GCRYCTL_RESUME_SECMEM_WARN); + gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); + + if (!gcry_control (GCRYCTL_INITIALIZATION_FINISHED_P)) { + fputs ("libgcrypt has not been initialized\n", stderr); + abort (); + } + + printf("gcrypt version: %s", GCRYPT_VERSION ); + + return 0; +} diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index e2bc452..7dbbde0 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -10,7 +10,7 @@ $(PKG)_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/$($(PKG)_FILE) $(PKG)_DEPS := gcc libgpg_error define $(PKG)_UPDATE - wget -q -O- 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/' | \ + $(WGET) -q -O- 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/' | \ $(SED) -n 's,.*libgcrypt-\([0-9][^>]*\)\.tar.*,\1,p' | \ grep -v '^1\.4\.' | \ tail -1 @@ -24,4 +24,10 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --with-gpg-error-prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + ln -sf '$(PREFIX)/$(TARGET)/bin/libgcrypt-config' '$(PREFIX)/bin/$(TARGET)-libgcrypt-config' + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgcrypt.exe' \ + `$(TARGET)-libgcrypt-config --cflags --libs` endef diff --git a/src/libgda.mk b/src/libgda.mk new file mode 100644 index 0000000..d13d24d --- /dev/null +++ b/src/libgda.mk @@ -0,0 +1,34 @@ +# This file is part of MXE. +# See index.html for further information. + +# LibGDA +PKG := libgda +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 61d0b498202b780750633cc2e957c40325d6c705 +$(PKG)_SUBDIR := libgda-$($(PKG)_VERSION) +$(PKG)_FILE := libgda-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/libgda/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) +$(PKG)_DEPS := gcc glib libxml2 mdbtools postgresql + +define $(PKG)_UPDATE + echo 'TODO: Updates for package libgda need to be fixed.' >&2; + echo $(libgda_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --prefix='$(PREFIX)/$(TARGET)' \ + --disable-shared \ + --disable-gtk-doc \ + --without-bdb \ + --with-mdb \ + --without-oracle \ + --without-mysql \ + --without-firebird \ + --without-java \ + --enable-binreloc \ + --disable-crypto + $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= +endef diff --git a/src/libgdamm.mk b/src/libgdamm.mk new file mode 100644 index 0000000..e2e3d30 --- /dev/null +++ b/src/libgdamm.mk @@ -0,0 +1,28 @@ +# This file is part of MXE. +# See index.html for further information. + +# libgdamm +PKG := libgdamm +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := f6126d7b46720e3ea4f3d49e03add2e52da233be +$(PKG)_SUBDIR := libgdamm-$($(PKG)_VERSION) +$(PKG)_FILE := libgdamm-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/libgdamm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libgda glibmm + +define $(PKG)_UPDATE + echo 'TODO: Updates for package libgdamm need to be fixed.' >&2; + echo $(libgdamm_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --build="`config.guess`" \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' \ + CXX='$(TARGET)-c++' \ + PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ + MAKE=$(MAKE) + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= +endef diff --git a/src/libgee.mk b/src/libgee.mk index 2629e03..a5996c6 100644 --- a/src/libgee.mk +++ b/src/libgee.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/libgee/$(call SHORT_PK $(PKG)_DEPS := gcc glib define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/libgee/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/libgee/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=LIBGEE_\\([0-9]*_[0-9]*_[^<]*\\)'.*,\\1,p" | \ $(SED) 's,_,.,g' | \ diff --git a/src/libgeotiff.mk b/src/libgeotiff.mk index 2f973f5..9d3ea9c 100644 --- a/src/libgeotiff.mk +++ b/src/libgeotiff.mk @@ -3,7 +3,7 @@ PKG := libgeotiff $(PKG)_IGNORE := -$(PKG)_CHECKSUM := b8cde5014cf82fe4683fa35fc81a5ea8d64b940f +$(PKG)_CHECKSUM := 4c6f405869826bb7d9f35f1d69167e3b44a57ef0 $(PKG)_SUBDIR := libgeotiff-$($(PKG)_VERSION) $(PKG)_FILE := libgeotiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/geotiff/libgeotiff/$($(PKG)_FILE) @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.remotesensing.org/geotiff/libgeotiff/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib jpeg tiff proj define $(PKG)_UPDATE - wget -q -O- 'http://trac.osgeo.org/geotiff/' | \ + $(WGET) -q -O- 'http://trac.osgeo.org/geotiff/' | \ $(SED) -n 's,.*libgeotiff-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/libgnurx.mk b/src/libgnurx.mk index 9df7255..dcc307b 100644 --- a/src/libgnurx.mk +++ b/src/libgnurx.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/Other/UserContribu $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/' | \ + $(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 | \ diff --git a/src/libgpg_error.mk b/src/libgpg_error.mk index d113e3c..4d45ca4 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -10,7 +10,7 @@ $(PKG)_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'ftp://ftp.gnupg.org/gcrypt/libgpg-error/' | \ + $(WGET) -q -O- 'ftp://ftp.gnupg.org/gcrypt/libgpg-error/' | \ $(SED) -n 's,.*libgpg-error-\([1-9]\.[1-9][0-9][^>]*\)\.tar.*,\1,p' | \ tail -1 endef diff --git a/src/libgsasl.mk b/src/libgsasl.mk index 864fedd..ac1ab69 100644 --- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE) $(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' | \ + $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gsasl.git;a=tags' | \ grep '<a class="list subject"' | \ $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \ head -1 diff --git a/src/libgsf.mk b/src/libgsf.mk index 7363e7c..689cc0d 100644 --- a/src/libgsf.mk +++ b/src/libgsf.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/libgsf/$(call SHORT_PK $(PKG)_DEPS := gcc zlib bzip2 glib libxml2 define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/libgsf/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/libgsf/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=LIBGSF_\\([0-9]*_[0-9]*[02468]_[^<]*\\)'.*,\\1,p" | \ $(SED) 's,_,.,g' | \ diff --git a/src/libharu.mk b/src/libharu.mk index c643015..f000186 100644 --- a/src/libharu.mk +++ b/src/libharu.mk @@ -10,7 +10,7 @@ $(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' | \ + $(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 diff --git a/src/libical.mk b/src/libical.mk index 1df4a0e..f5f7245 100644 --- a/src/libical.mk +++ b/src/libical.mk @@ -9,7 +9,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeassociation/$(PKG)/$ $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/freeassociation/files/$(PKG)/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/freeassociation/files/$(PKG)/' | \ $(SED) -n 's,.*/$(PKG)-\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/libiconv.mk b/src/libiconv.mk index 19e4697..b4393d0 100644 --- a/src/libiconv.mk +++ b/src/libiconv.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnu.org/pub/gnu/libiconv/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.gnu.org/software/libiconv/' | \ + $(WGET) -q -O- 'http://www.gnu.org/software/libiconv/' | \ grep 'libiconv-' | \ $(SED) -n 's,.*libiconv-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/libidn.mk b/src/libidn.mk index c9842b1..b9c696e 100644 --- a/src/libidn.mk +++ b/src/libidn.mk @@ -3,14 +3,14 @@ PKG := libidn $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 4251c108966375ede4df15d76a1bd9a4440f44ee +$(PKG)_CHECKSUM := 92e64fd5a6428bda6ade2c3cde475b76455cd7dd $(PKG)_SUBDIR := libidn-$($(PKG)_VERSION) $(PKG)_FILE := libidn-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/gnu/libidn/$($(PKG)_FILE) $(PKG)_DEPS := gcc gettext libiconv define $(PKG)_UPDATE - wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=libidn.git;a=tags' | \ + $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=libidn.git;a=tags' | \ grep '<a class="list subject"' | \ $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \ head -1 diff --git a/src/libircclient.mk b/src/libircclient.mk index 0e20bec..81857ab 100644 --- a/src/libircclient.mk +++ b/src/libircclient.mk @@ -11,7 +11,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/libircclient/files/libircclient/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/libircclient/files/libircclient/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/liblo.mk b/src/liblo.mk index b326c7f..1a2d107 100644 --- a/src/liblo.mk +++ b/src/liblo.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc pthreads define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/liblo/files/liblo/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/liblo/files/liblo/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/libmad.mk b/src/libmad.mk index 906e0f5..d723250 100644 --- a/src/libmad.mk +++ b/src/libmad.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mad/$(PKG)/$($(PKG)_VERS $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/mad/files/libmad/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/mad/files/libmad/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/libmikmod.mk b/src/libmikmod.mk index f8f87f1..9ebb29a 100644 --- a/src/libmikmod.mk +++ b/src/libmikmod.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://mikmod.raphnet.net/files/$($(PKG)_FILE) $(PKG)_DEPS := gcc pthreads define $(PKG)_UPDATE - wget -q -O- 'http://mikmod.raphnet.net/' | \ + $(WGET) -q -O- 'http://mikmod.raphnet.net/' | \ $(SED) -n 's,.*libmikmod-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/libmng.mk b/src/libmng.mk index 5fdbae8..6be4198 100644 --- a/src/libmng.mk +++ b/src/libmng.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)-devel/$($( $(PKG)_DEPS := gcc zlib jpeg lcms1 define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/libmng/files/libmng-devel/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/libmng/files/libmng-devel/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/libmodplug-test.c b/src/libmodplug-test.c new file mode 100644 index 0000000..5ce1585 --- /dev/null +++ b/src/libmodplug-test.c @@ -0,0 +1,17 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include <modplug.h> + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + ModPlug_Settings settings; + ModPlug_GetSettings(&settings); + ModPlug_SetSettings(&settings); + return 0; +} diff --git a/src/libmodplug.mk b/src/libmodplug.mk new file mode 100644 index 0000000..9e84e14 --- /dev/null +++ b/src/libmodplug.mk @@ -0,0 +1,31 @@ +# This file is part of MXE. +# See index.html for further information. + +# libmodplug +PKG := libmodplug +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := df4deffe542b501070ccb0aee37d875ebb0c9e22 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/modplug-xmms/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://sourceforge.net/projects/modplug-xmms/files/libmodplug/' | \ + $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --enable-static \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install + + '$(TARGET)-gcc' \ + -W -Wall -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libmodplug.exe' \ + `'$(TARGET)-pkg-config' libmodplug --cflags --libs` +endef diff --git a/src/libntlm.mk b/src/libntlm.mk index 54d10db..daa167a 100644 --- a/src/libntlm.mk +++ b/src/libntlm.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.nongnu.org/libntlm/releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=libntlm.git;a=tags' | \ + $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=libntlm.git;a=tags' | \ grep '<a class="list subject"' | \ $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \ head -1 diff --git a/src/liboauth.mk b/src/liboauth.mk index 62e69ea..6817c3e 100644 --- a/src/liboauth.mk +++ b/src/liboauth.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://liboauth.sourceforge.net/pool/$($(PKG)_FILE) $(PKG)_DEPS := gcc curl openssl define $(PKG)_UPDATE - wget -q -O- 'http://liboauth.sourceforge.net/' | \ + $(WGET) -q -O- 'http://liboauth.sourceforge.net/' | \ $(SED) -n 's,.*liboauth-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/libodbc++.mk b/src/libodbc++.mk index f77eb91..4fb729e 100644 --- a/src/libodbc++.mk +++ b/src/libodbc++.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/libodbcxx/libodbc++/$($( $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://libodbcxx.svn.sourceforge.net/viewvc/libodbcxx/tags/?sortby=date' | \ + $(WGET) -q -O- 'http://libodbcxx.svn.sourceforge.net/viewvc/libodbcxx/tags/?sortby=date' | \ grep '<a name="' | \ $(SED) -n 's,.*<a name="libodbc++-\([0-9][^"]*\)".*,\1,p' | \ head -1 diff --git a/src/liboil.mk b/src/liboil.mk index eb1b545..e31bedc 100644 --- a/src/liboil.mk +++ b/src/liboil.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(PKG).freedesktop.org/download/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://cgit.freedesktop.org/liboil/refs/tags' | \ + $(WGET) -q -O- 'http://cgit.freedesktop.org/liboil/refs/tags' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \ head -1 endef diff --git a/src/libpano13.mk b/src/libpano13.mk index 2bb2467..984422c 100644 --- a/src/libpano13.mk +++ b/src/libpano13.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/panotools/$(PKG)/$($(PKG $(PKG)_DEPS := gcc jpeg tiff libpng zlib define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/api/file/index/project-id/96188/rss?path=/libpano13' | \ + $(WGET) -q -O- 'http://sourceforge.net/api/file/index/project-id/96188/rss?path=/libpano13' | \ $(SED) -n 's,.*libpano13-\([0-9].*\)\.tar.*,\1,p' | \ tail -1 endef diff --git a/src/libpaper.mk b/src/libpaper.mk index 72ed114..fb2dc0a 100644 --- a/src/libpaper.mk +++ b/src/libpaper.mk @@ -3,14 +3,14 @@ PKG := libpaper $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 1f7a810a433a5a68b099aa92777cc2d0b3d03b42 +$(PKG)_CHECKSUM := 40f16453d7752bf5e3c9e74515650eb37edbb3fe $(PKG)_SUBDIR := libpaper-$($(PKG)_VERSION) $(PKG)_FILE := libpaper_$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.debian.org/debian/pool/main/libp/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://packages.debian.org/unstable/source/libpaper' | \ + $(WGET) -q -O- 'http://packages.debian.org/unstable/source/libpaper' | \ $(SED) -n 's,.*libpaper_\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef @@ -18,6 +18,7 @@ endef 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 --git a/src/libpng.mk b/src/libpng.mk index 3702432..0696898 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.simplesystems.org/pub/$(PKG)/png/src/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib define $(PKG)_UPDATE - wget -q -O- 'http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=tags' | \ + $(WGET) -q -O- 'http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=tags' | \ grep '<a class="list name"' | \ $(SED) -n 's,.*<a[^>]*>v\([0-9][^<]*\)<.*,\1,p' | \ grep -v alpha | \ diff --git a/src/librsvg.mk b/src/librsvg.mk index 7311ef8..1185285 100644 --- a/src/librsvg.mk +++ b/src/librsvg.mk @@ -3,14 +3,14 @@ PKG := librsvg $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 11a2dc00c813da13532d7f16a822b414201e8b1b +$(PKG)_CHECKSUM := 1084015373e90ff8fccbae4b27ee778bbdf14d40 $(PKG)_SUBDIR := librsvg-$($(PKG)_VERSION) $(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 define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/librsvg/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/librsvg/refs/tags' | \ $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\).*,\1,p' | \ head -1 endef diff --git a/src/libsamplerate.mk b/src/libsamplerate.mk index 9fedddf..ec7a7ef 100644 --- a/src/libsamplerate.mk +++ b/src/libsamplerate.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.mega-nerd.com/SRC/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.mega-nerd.com/SRC/download.html' | \ + $(WGET) -q -O- 'http://www.mega-nerd.com/SRC/download.html' | \ $(SED) -n 's,.*libsamplerate-\([0-9][^>]*\)\.tar.*,\1,p' | \ grep -v alpha | \ grep -v beta | \ diff --git a/src/libshout-1-fixes.patch b/src/libshout-1-fixes.patch index e6077fa..715ccb4 100644 --- a/src/libshout-1-fixes.patch +++ b/src/libshout-1-fixes.patch @@ -3,44 +3,17 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 25255ff19813e122e6442518b29a55c15860d3a3 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Fri, 1 Oct 2010 17:20:29 +0200 +From b05b2d82333e13f637dffb93f821907f775eb585 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sun, 20 May 2012 23:23:37 +0200 Subject: [PATCH] mingw fixes +--- + include/shout/shout.h.in | 2 ++ + 1 file changed, 2 insertions(+) -diff --git a/examples/nonblocking.c b/examples/nonblocking.c -index 0f4aa68..49a3d36 100644 ---- a/examples/nonblocking.c -+++ b/examples/nonblocking.c -@@ -68,7 +68,11 @@ int main() - - while (ret == SHOUTERR_BUSY) { - printf("Connection pending. Sleeping...\n"); -+#ifdef __MINGW32__ -+ Sleep(1000); -+#else - sleep(1); -+#endif - ret = shout_get_connected(shout); - } - -diff --git a/include/os.h b/include/os.h -index 7d065b3..d7ae425 100755 ---- a/include/os.h -+++ b/include/os.h -@@ -1,7 +1,9 @@ - #ifdef _WIN32 -+#ifndef __MINGW32__ - typedef __int64 int64_t; - typedef unsigned __int64 uint64_t; - typedef unsigned __int32 uint32_t; - typedef __int32 int32_t; - typedef int ssize_t; - #endif -+#endif diff --git a/include/shout/shout.h.in b/include/shout/shout.h.in -index 43b0e7a..b026c10 100644 +index 682ad49..f412cdc 100644 --- a/include/shout/shout.h.in +++ b/include/shout/shout.h.in @@ -23,8 +23,10 @@ @@ -55,5 +28,5 @@ index 43b0e7a..b026c10 100644 #define SHOUTERR_SUCCESS (0) #define SHOUTERR_INSANE (-1) -- -1.7.1 +1.7.9.2 diff --git a/src/libshout.mk b/src/libshout.mk index f6c9686..c98ba9a 100644 --- a/src/libshout.mk +++ b/src/libshout.mk @@ -3,14 +3,14 @@ PKG := libshout $(PKG)_IGNORE := -$(PKG)_CHECKSUM := cabc409e63f55383f4d85fac26d3056bf0365aac +$(PKG)_CHECKSUM := a6f26441ec27b6f9b55fba38b99bd1d7ca17fecf $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.us.xiph.org/releases/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc vorbis ogg theora speex define $(PKG)_UPDATE - wget -q -O- 'http://www.icecast.org/download.php' | \ + $(WGET) -q -O- 'http://www.icecast.org/download.php' | \ $(SED) -n 's,.*libshout-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef @@ -18,9 +18,9 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ - --disable-debug \ --disable-thread \ --infodir='$(1)/sink' \ --mandir='$(1)/sink' diff --git a/src/libsigc++.mk b/src/libsigc++.mk index c0ec010..eb0684b 100644 --- a/src/libsigc++.mk +++ b/src/libsigc++.mk @@ -3,14 +3,14 @@ PKG := libsigc++ $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 240d3e0a02e764a6362f6ce1b32de71401e50844 +$(PKG)_CHECKSUM := 493d6e60c08bd8ec3688478d176e04b5713ced2a $(PKG)_SUBDIR := libsigc++-$($(PKG)_VERSION) -$(PKG)_FILE := libsigc++-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := libsigc++-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/libsigc++/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/libsigc++2/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/libsigc++2/refs/tags' | \ grep '<a href=' | \ $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \ head -1 diff --git a/src/libsndfile.mk b/src/libsndfile.mk index 240bf82..6ef3b57 100644 --- a/src/libsndfile.mk +++ b/src/libsndfile.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.mega-nerd.com/libsndfile/files/$($(PKG)_FILE) $(PKG)_DEPS := gcc sqlite flac ogg vorbis define $(PKG)_UPDATE - wget -q -O- 'http://www.mega-nerd.com/libsndfile/' | \ + $(WGET) -q -O- 'http://www.mega-nerd.com/libsndfile/' | \ grep '<META NAME="Version"' | \ $(SED) -n 's,.*CONTENT="libsndfile-\([0-9][^"]*\)">.*,\1,p' | \ head -1 diff --git a/src/libssh2-1-fixes.patch b/src/libssh2-1-fixes.patch index 04e85c0..9fcee2b 100644 --- a/src/libssh2-1-fixes.patch +++ b/src/libssh2-1-fixes.patch @@ -1,32 +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 <peter@stuge.se> -Date: Wed, 1 Feb 2012 09:53:44 +0100 -Subject: [PATCH] Fix undefined reference to _libssh_error in libgcrypt - backend +From 6b8a3edae23dc93cc02e6c9572d0796e338ddc4f Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sat, 19 May 2012 10:40:36 +0200 +Subject: [PATCH] libgcrypt does not provide pkg-config support -Commit 209de22299b4b58e582891dfba70f57e1e0492db introduced a function -call to a non-existing function, and since then the libgcrypt backend -has not been buildable. +Commits 04692445d4a32430610ccf8c256e18245cbb3e06 +and e887a8bd0f043fd49e9119756858e75e82dee504 add +'libgcrypt' to Requires.private of libssh2.pc +file, but libgcrypt does not provide a .pc file, so +this does not work. --- - src/libgcrypt.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 1 - + 1 file changed, 1 deletion(-) -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"); - } +diff --git a/configure.ac b/configure.ac +index aa9d397..0d35a27 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -102,7 +102,6 @@ fi + # Look for libgcrypt + if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then + AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>]) +- LIBSREQUIRED=libgcrypt + fi + + AC_SUBST(LIBSREQUIRED) -- -1.7.8.3 +1.7.9.2 diff --git a/src/libssh2.mk b/src/libssh2.mk index a232177..765c685 100644 --- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -3,20 +3,21 @@ PKG := libssh2 $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 53428b4935ab6eb843d45f1593dc434cb287b93e +$(PKG)_CHECKSUM := 7fc084254dabe14a9bc90fa3d569faa7ee943e19 $(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' | \ + $(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)' && ./buildconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/libtool.mk b/src/libtool.mk index 1880f94..036dd02 100644 --- a/src/libtool.mk +++ b/src/libtool.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://ftp.gnu.org/gnu/libtool/?C=M;O=D' | \ + $(WGET) -q -O- 'http://ftp.gnu.org/gnu/libtool/?C=M;O=D' | \ $(SED) -n 's,.*<a href="libtool-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/libunistring.mk b/src/libunistring.mk index be6ab55..2d72b58 100644 --- a/src/libunistring.mk +++ b/src/libunistring.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv define $(PKG)_UPDATE - wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=$(PKG).git;a=tags' | \ + $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=$(PKG).git;a=tags' | \ grep '<a class="list name"' | \ $(SED) -n 's,.*<a[^>]*>v\([0-9][^<]*\)<.*,\1,p' | \ head -1 diff --git a/src/libusb.mk b/src/libusb.mk index 775612a..2061559 100644 --- a/src/libusb.mk +++ b/src/libusb.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)-win32/$(PKG)-win3 $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/libvpx-1-config.patch b/src/libvpx-1-config.patch index 7fde577..402398f 100644 --- a/src/libvpx-1-config.patch +++ b/src/libvpx-1-config.patch @@ -4,7 +4,7 @@ diff --git a/configure b/configure --- a/configure +++ b/configure -@@ -465,9 +465,6 @@ process_detect() { +@@ -481,9 +481,6 @@ process_detect() { } fi check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}" diff --git a/src/libvpx.mk b/src/libvpx.mk index 020b07e..e44d3a7 100644 --- a/src/libvpx.mk +++ b/src/libvpx.mk @@ -3,14 +3,14 @@ PKG := libvpx $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 2919e11074fef72fc61ef1a75160050ffaad6074 +$(PKG)_CHECKSUM := 356af5f770c50cd021c60863203d8f30164f6021 $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://webm.googlecode.com/files/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://code.google.com/p/webm/downloads/list?sort=-uploaded' | \ + $(WGET) -q -O- 'http://code.google.com/p/webm/downloads/list?sort=-uploaded' | \ $(SED) -n 's,.*libvpx-v\([0-9][^<]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/libxml++.mk b/src/libxml++.mk index c903da4..2bb5e40 100644 --- a/src/libxml++.mk +++ b/src/libxml++.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(call SHORT_ $(PKG)_DEPS := gcc libxml2 glibmm define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/libxml++/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/libxml++/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=\\([0-9][^']*\\)'.*,\\1,p" | \ head -1 diff --git a/src/libxml2.mk b/src/libxml2.mk index 30d9d58..45b341f 100644 --- a/src/libxml2.mk +++ b/src/libxml2.mk @@ -10,7 +10,7 @@ $(PKG)_URL := ftp://xmlsoft.org/libxml2/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/libxml2/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/libxml2/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=v\\([0-9][^']*\\)'.*,\\1,p" | \ head -1 diff --git a/src/libxslt.mk b/src/libxslt.mk index 4f10992..624639c 100644 --- a/src/libxslt.mk +++ b/src/libxslt.mk @@ -10,7 +10,7 @@ $(PKG)_URL := ftp://xmlsoft.org/libxslt/$($(PKG)_FILE) $(PKG)_DEPS := gcc libxml2 libgcrypt define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/libxslt/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/libxslt/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=v\\([0-9][^']*\\)'.*,\\1,p" | \ head -1 diff --git a/src/llvm.mk b/src/llvm.mk index bea4882..18c24d3 100644 --- a/src/llvm.mk +++ b/src/llvm.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://llvm.org/releases/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://llvm.org/releases/download.html' | \ + $(WGET) -q -O- 'http://llvm.org/releases/download.html' | \ grep 'Download LLVM' | \ $(SED) -n 's,.*\([0-9]\.[0-9]\).*,\1,p' | \ head -1 diff --git a/src/log4cxx-1-gcc.4.4.patch b/src/log4cxx-1-gcc.4.4.patch new file mode 100644 index 0000000..51e8598 --- /dev/null +++ b/src/log4cxx-1-gcc.4.4.patch @@ -0,0 +1,47 @@ +This file is part of MXE. +See index.html for further information. + +These changes have already been applied to log4cxx trunk to update inclusions +for recent gcc's. + +diff -NBaur vanilla/src/examples/cpp/console.cpp mingw_cross/src/examples/cpp/console.cpp +--- vanilla/src/examples/cpp/console.cpp 2008-04-01 07:34:52.000000000 +0900 ++++ mingw_cross/src/examples/cpp/console.cpp 2011-05-09 10:27:52.923808248 +0900 +@@ -15,6 +15,7 @@ + * limitations under the License. + */ + ++#include <cstdio> + #include <stdlib.h> + #include <log4cxx/logger.h> + #include <log4cxx/consoleappender.h> +@@ -22,6 +23,7 @@ + #include <log4cxx/logmanager.h> + #include <iostream> + #include <locale.h> ++#include <string.h> + + using namespace log4cxx; + using namespace log4cxx::helpers; +diff -NBaur vanilla/src/main/cpp/inputstreamreader.cpp mingw_cross/src/main/cpp/inputstreamreader.cpp +--- vanilla/src/main/cpp/inputstreamreader.cpp 2008-04-01 07:34:09.000000000 +0900 ++++ mingw_cross/src/main/cpp/inputstreamreader.cpp 2011-05-09 10:27:27.991842868 +0900 +@@ -20,6 +20,7 @@ + #include <log4cxx/helpers/exception.h> + #include <log4cxx/helpers/pool.h> + #include <log4cxx/helpers/bytebuffer.h> ++#include <string.h> + + using namespace log4cxx; + using namespace log4cxx::helpers; +diff -NBaur vanilla/src/main/cpp/socketoutputstream.cpp mingw_cross/src/main/cpp/socketoutputstream.cpp +--- vanilla/src/main/cpp/socketoutputstream.cpp 2008-04-01 07:34:09.000000000 +0900 ++++ mingw_cross/src/main/cpp/socketoutputstream.cpp 2011-05-09 10:27:27.999058156 +0900 +@@ -19,6 +19,7 @@ + #include <log4cxx/helpers/socketoutputstream.h> + #include <log4cxx/helpers/socket.h> + #include <log4cxx/helpers/bytebuffer.h> ++#include <string.h> + + using namespace log4cxx; + using namespace log4cxx::helpers; diff --git a/src/log4cxx-2-pkgconfig.patch b/src/log4cxx-2-pkgconfig.patch new file mode 100644 index 0000000..f86d360 --- /dev/null +++ b/src/log4cxx-2-pkgconfig.patch @@ -0,0 +1,19 @@ +This file is part of MXE. +See index.html for further information. + +This patch ensures that the correct dependencies can always be found for +static mingw builds. Submitted upstream: + + https://issues.apache.org/jira/browse/LOGCXX-381 + +diff -NBaur vanilla/liblog4cxx.pc.in mingw_cross/liblog4cxx.pc.in +--- vanilla/liblog4cxx.pc.in 2008-04-01 07:34:52.000000000 +0900 ++++ mingw_cross/liblog4cxx.pc.in 2011-05-09 10:31:00.175584637 +0900 +@@ -20,6 +20,7 @@ + Name: log4cxx + Description: log4cxx C++ logging framework + Version: @VERSION@ ++Requires: apr-util-1, apr-1 + Libs: -L${libdir} -llog4cxx + Cflags: -I${includedir} + diff --git a/src/log4cxx-3-warnings.patch b/src/log4cxx-3-warnings.patch new file mode 100644 index 0000000..9398354 --- /dev/null +++ b/src/log4cxx-3-warnings.patch @@ -0,0 +1,20 @@ +This file is part of MXE. +See index.html for further information. + +Already applied to log4cxx trunk. + +diff -NBaur vanilla/src/main/include/log4cxx/helpers/objectptr.h mingw_cross/src/main/include/log4cxx/helpers/objectptr.h +--- vanilla/src/main/include/log4cxx/helpers/objectptr.h 2008-04-01 07:34:26.000000000 +0900 ++++ mingw_cross/src/main/include/log4cxx/helpers/objectptr.h 2011-05-09 10:30:03.767560165 +0900 +@@ -28,9 +28,9 @@ + // switching between the initialization styles. + // + #if LOG4CXX_HELGRIND +-#define _LOG4CXX_OBJECTPTR_INIT(x) { exchange(x); ++#define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase() { exchange(x); + #else +-#define _LOG4CXX_OBJECTPTR_INIT(x) : p(x) { ++#define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase(), p(x) { + #endif + + namespace log4cxx diff --git a/src/log4cxx-4-mingw.definitions.patch b/src/log4cxx-4-mingw.definitions.patch new file mode 100644 index 0000000..3022926 --- /dev/null +++ b/src/log4cxx-4-mingw.definitions.patch @@ -0,0 +1,28 @@ +This file is part of MXE. +See index.html for further information. + +Fixes a problem with the mismatched calling conventions in apr and log4cxx. +See http://www.mail-archive.com/log4cxx-user@logging.apache.org/msg02671.html +Submitted upstream: + + https://issues.apache.org/jira/browse/LOGCXX-382 + +diff -NBaur vanilla/src/main/include/log4cxx/helpers/thread.h mingw_cross/src/main/include/log4cxx/helpers/thread.h +--- vanilla/src/main/include/log4cxx/helpers/thread.h 2008-04-01 07:34:26.000000000 +0900 ++++ mingw_cross/src/main/include/log4cxx/helpers/thread.h 2011-05-09 11:08:23.123558232 +0900 +@@ -23,9 +23,13 @@ + + #if !defined(LOG4CXX_THREAD_FUNC) + #if defined(_WIN32) +-#define LOG4CXX_THREAD_FUNC __stdcall ++ #if defined(__MINGW32__) ++ #define LOG4CXX_THREAD_FUNC ++ #else ++ #define LOG4CXX_THREAD_FUNC __stdcall ++ #endif + #else +-#define LOG4CXX_THREAD_FUNC ++ #define LOG4CXX_THREAD_FUNC + #endif + #endif + diff --git a/src/log4cxx-5-cmake.patch b/src/log4cxx-5-cmake.patch new file mode 100644 index 0000000..7628fb6 --- /dev/null +++ b/src/log4cxx-5-cmake.patch @@ -0,0 +1,17 @@ +This file is part of MXE. +See index.html for further information. + +diff -NBaur vanilla/log4cxx-config.cmake mingw_cross/log4cxx-config.cmake +--- vanilla/log4cxx-config.cmake 1970-01-01 09:00:00.000000000 +0900 ++++ mingw_cross/log4cxx-config.cmake 2012-03-14 15:29:54.706247316 +0900 +@@ -0,0 +1,10 @@ ++ ++set(LOG4CXX_VERSION 0.10.0) ++ ++get_filename_component(LOG4CXX_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) ++ ++set(LOG4CXX_INCLUDE_DIR "${LOG4CXX_CMAKE_DIR}/../../../include" CACHE FILEPATH "Log4cxx include directory") ++set(LOG4CXX_INCLUDE_DIRS "${LOG4CXX_INCLUDE_DIR}") ++set(LOG4CXX_LIBRARY_DIRS "${LOG4CXX_CMAKE_DIR}/../../../lib") ++set(LOG4CXX_LIBRARIES "log4cxx;aprutil-1;iconv;expat;apr-1;rpcrt4;shell32;ws2_32;advapi32;kernel32;msvcrt") ++ diff --git a/src/log4cxx-test.cpp b/src/log4cxx-test.cpp new file mode 100644 index 0000000..460ee33 --- /dev/null +++ b/src/log4cxx-test.cpp @@ -0,0 +1,33 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include <cstdlib> +#include "log4cxx/logger.h" +#include "log4cxx/basicconfigurator.h" +#include "log4cxx/helpers/exception.h" + +using namespace log4cxx; +using namespace log4cxx::helpers; + +LoggerPtr logger(Logger::getLogger("MXE")); + +int main(int argc, char **argv) +{ + (void)argc; + (void)argv; + + int result = EXIT_SUCCESS; + try + { + BasicConfigurator::configure(); + LOG4CXX_INFO(logger, "Hello World!"); + } + catch(Exception&) + { + result = EXIT_FAILURE; + } + + return result; +} diff --git a/src/log4cxx.mk b/src/log4cxx.mk new file mode 100644 index 0000000..07ad661 --- /dev/null +++ b/src/log4cxx.mk @@ -0,0 +1,37 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := log4cxx +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := d79c053e8ac90f66c5e873b712bb359fd42b648d +$(PKG)_SUBDIR := apache-log4cxx-$($(PKG)_VERSION) +$(PKG)_FILE := apache-log4cxx-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://apache.naggo.co.kr/logging/log4cxx/0.10.0/$($(PKG)_FILE) +$(PKG)_URL_2 := http://apache.mirror.cdnetworks.com//logging/log4cxx/0.10.0/$($(PKG)_FILE) +$(PKG)_DEPS := gcc apr-util + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://logging.apache.org/log4cxx/download.html' | \ + $(SED) -n 's,.*log4cxx-\([0-9.]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --prefix='$(PREFIX)/$(TARGET)' \ + --host='$(TARGET)' \ + --disable-shared \ + --enable-static \ + --with-apr='$(PREFIX)/$(TARGET)' \ + --with-apr-util='$(PREFIX)/$(TARGET)' \ + CFLAGS=-D_WIN32_WINNT=0x0500 \ + CXXFLAGS=-D_WIN32_WINNT=0x0500 + $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= + mkdir -p '$(PREFIX)/$(TARGET)/share/cmake/log4cxx' + cp '$(1)/log4cxx-config.cmake' '$(PREFIX)/$(TARGET)/share/cmake/log4cxx/log4cxx-config.cmake' + + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-log4cxx.exe' \ + `$(TARGET)-pkg-config liblog4cxx --libs` +endef diff --git a/src/lua-test.c b/src/lua-test.c index 8cd0e9f..68de286 100644 --- a/src/lua-test.c +++ b/src/lua-test.c @@ -14,7 +14,7 @@ int main(int argc, char *argv[]) (void)argc; (void)argv; - L = lua_open(); + L = luaL_newstate(); lua_close(L); return 0; } @@ -3,14 +3,14 @@ PKG := lua $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 2b11c8e60306efb7f0734b747588f57995493db7 +$(PKG)_CHECKSUM := 08f84c355cdd646f617f09cebea48bd832415829 $(PKG)_SUBDIR := lua-$($(PKG)_VERSION) $(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lua.org/ftp/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.lua.org/download.html' | \ + $(WGET) -q -O- 'http://www.lua.org/download.html' | \ $(SED) -n 's,.*lua-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef @@ -29,12 +29,9 @@ define $(PKG)_BUILD TO_BIN='lua.h' \ INSTALL='$(INSTALL)' \ install - $(SED) -i 's,^prefix=.*,prefix=$(PREFIX)/$(TARGET),' '$(1)/etc/lua.pc' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' - $(INSTALL) -m644 '$(1)/etc/lua.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/lua.pc' '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-lua.exe' \ - `'$(TARGET)-pkg-config' lua --cflags --libs` + -llua endef @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.oberhumer.com/opensource/lzo/download/$($(PKG)_FIL $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.oberhumer.com/opensource/lzo/download/' | \ + $(WGET) -q -O- 'http://www.oberhumer.com/opensource/lzo/download/' | \ grep 'lzo-' | \ grep -v 'minilzo-' | \ $(SED) -n 's,.*lzo-\([0-9][^>]*\)\.tar.*,\1,p' | \ diff --git a/src/matio.mk b/src/matio.mk index bf01cc4..68064e5 100644 --- a/src/matio.mk +++ b/src/matio.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc zlib define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/matio/files/matio/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/matio/files/matio/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/mdbtools-1-header.patch b/src/mdbtools-1-header.patch new file mode 100644 index 0000000..90874c5 --- /dev/null +++ b/src/mdbtools-1-header.patch @@ -0,0 +1,15 @@ +This file is part of MXE. +See index.html for further information. + +diff -ur mdbtools-0.6pre1-orig//include/mdbtools.h mdbtools-0.6pre1//include/mdbtools.h +--- mdbtools-0.6pre1-orig//include/mdbtools.h 2011-06-01 00:07:12.336088034 +0900 ++++ mdbtools-0.6pre1//include/mdbtools.h 2011-06-01 00:10:51.536088143 +0900 +@@ -147,7 +147,7 @@ + #define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3) + + /* hash to store registered backends */ +-extern GHashTable *mdb_backends; ++static GHashTable *mdb_backends; + + /* forward declarations */ + typedef struct mdbindex MdbIndex; diff --git a/src/mdbtools.mk b/src/mdbtools.mk new file mode 100644 index 0000000..42e887a --- /dev/null +++ b/src/mdbtools.mk @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +# mdbtools +PKG := mdbtools +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 37a50d623a444ec690d2677b12b59c2f11e497c0 +$(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 glib + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://sourceforge.net/projects/mdbtools/files/mdbtools/' | \ + $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' \ + PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= +endef diff --git a/src/mingw-utils.mk b/src/mingw-utils.mk index 0204d1f..eaa0300 100644 --- a/src/mingw-utils.mk +++ b/src/mingw-utils.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Extension/$( $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Extension/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 --git a/src/mingwrt.mk b/src/mingwrt.mk index 2fe31af..49bd0e9 100644 --- a/src/mingwrt.mk +++ b/src/mingwrt.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Base/mingw-r $(PKG)_DEPS := define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Base/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 --git a/src/mpfr.mk b/src/mpfr.mk index f2076d5..19d32ca 100644 --- a/src/mpfr.mk +++ b/src/mpfr.mk @@ -11,7 +11,7 @@ $(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' | \ + $(WGET) -q -O- 'http://www.mpfr.org/mpfr-current/#download' | \ grep 'mpfr-' | \ $(SED) -n 's,.*mpfr-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/muparser.mk b/src/muparser.mk index c0d58c3..3510b19 100644 --- a/src/muparser.mk +++ b/src/muparser.mk @@ -3,14 +3,14 @@ PKG := muparser $(PKG)_IGNORE := -$(PKG)_CHECKSUM := d6d834d3ba2bd3c316c9b3070369d32701703f78 -$(PKG)_SUBDIR := $(PKG)_v$(subst .,,$($(PKG)_VERSION)) -$(PKG)_FILE := $(PKG)_v$(subst .,,$($(PKG)_VERSION)).tar.gz +$(PKG)_CHECKSUM := 830383b1bcfa706be5a6ac8b7ba43f32f16a1497 +$(PKG)_SUBDIR := $(PKG)_v$(subst .,_,$($(PKG)_VERSION)) +$(PKG)_FILE := $(PKG)_v$(subst .,_,$($(PKG)_VERSION)).zip $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/Version $($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/muparser/files/muparser/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/muparser/files/muparser/' | \ $(SED) -n 's,.*Version%20\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/mxml.mk b/src/mxml.mk index f04a87e..311f103 100644 --- a/src/mxml.mk +++ b/src/mxml.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.easysw.com/pub/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_F $(PKG)_DEPS := gcc pthreads define $(PKG)_UPDATE - wget -q -O- 'http://ftp.easysw.com/pub/mxml/?C=M;O=D' | \ + $(WGET) -q -O- 'http://ftp.easysw.com/pub/mxml/?C=M;O=D' | \ $(SED) -n 's,.*<a href="\([0-9][^"]*\)/.*,\1,p' | \ head -1 endef diff --git a/src/ncurses.mk b/src/ncurses.mk new file mode 100644 index 0000000..4e174df --- /dev/null +++ b/src/ncurses.mk @@ -0,0 +1,34 @@ +# This file is part of MXE. +# See index.html for further information. + +# ncurses +PKG := ncurses +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 3e042e5f2c7223bffdaac9646a533b8c758b65b5 +$(PKG)_SUBDIR := ncurses-$($(PKG)_VERSION) +$(PKG)_FILE := ncurses-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://ftp.gnu.org/pub/gnu/ncurses/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://ftp.gnu.org/pub/gnu/ncurses/?C=M;O=D' | \ + $(SED) -n 's,.*<a href="ncurses-\([0-9][^"]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --prefix=$(PREFIX)/$(TARGET) \ + --disable-home-terminfo \ + --enable-sp-funcs \ + --enable-term-driver \ + --enable-interop \ + --without-debug \ + --without-ada \ + --without-manpages \ + --enable-pc-files \ + --with-normal \ + --without-shared + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef diff --git a/src/nettle.mk b/src/nettle.mk index 7f4f0d2..4c45cf8 100644 --- a/src/nettle.mk +++ b/src/nettle.mk @@ -10,7 +10,7 @@ $(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/' | \ + $(WGET) -q -O- 'http://www.lysator.liu.se/~nisse/archive/' | \ $(SED) -n 's,.*nettle-\([0-9][^>]*\)\.tar.*,\1,p' | \ grep -v 'pre' | \ tail -1 diff --git a/src/nsis.mk b/src/nsis.mk index c952e53..1d867c4 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 2/$($(PKG)_VER $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://nsis.svn.sourceforge.net/viewvc/nsis/NSIS/tags/?sortby=date' | \ + $(WGET) -q -O- 'http://nsis.svn.sourceforge.net/viewvc/nsis/NSIS/tags/?sortby=date' | \ grep '<a name="' | \ $(SED) -n 's,.*<a name="v\([0-9]\)\([^"]*\)".*,\1.\2,p' | \ head -1 @@ -10,7 +10,7 @@ $(PKG)_URL := http://downloads.xiph.org/releases/ogg/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.xiph.org/downloads/' | \ + $(WGET) -q -O- 'http://www.xiph.org/downloads/' | \ $(SED) -n 's,.*libogg-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef @@ -10,7 +10,7 @@ $(PKG)_URL := http://blitiri.com.ar/p/old/files/$($(PKG)_VERSION)/$($(PKG)_ $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://blitiri.com.ar/p/old/' | \ + $(WGET) -q -O- 'http://blitiri.com.ar/p/old/' | \ grep 'old-' | \ $(SED) -n 's,.*old-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/openal-1-fixes.patch b/src/openal-1-fixes.patch new file mode 100644 index 0000000..93b2ab8 --- /dev/null +++ b/src/openal-1-fixes.patch @@ -0,0 +1,29 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From b5c7c4853307964f0b8e11e2c9edb5bf0f8511f7 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Tue, 3 Apr 2012 14:36:58 +0200 +Subject: [PATCH] add static private dependencies to pkg-config for cmake + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ef3d08d..88de1e5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -543,6 +543,7 @@ IF(DSOUND) + SET(BACKENDS "${BACKENDS} DirectSound \(linked\),") + SET(EXTRA_LIBS dsound ${EXTRA_LIBS}) + ENDIF() ++ SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -luuid -lole32") + ENDIF() + ENDIF() + ENDIF() +-- +1.7.9.2 + diff --git a/src/openal-1-luuid-pkg-config.patch b/src/openal-1-luuid-pkg-config.patch deleted file mode 100644 index e444abc..0000000 --- a/src/openal-1-luuid-pkg-config.patch +++ /dev/null @@ -1,17 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: - - -diff -ur openal-soft-1.13.orig/CMakeLists.txt openal-soft-1.13/CMakeLists.txt ---- openal-soft-1.13.orig/CMakeLists.txt 2011-02-16 07:05:40.000000000 +1100 -+++ openal-soft-1.13/CMakeLists.txt 2011-03-02 15:40:02.000000000 +1100 -@@ -393,6 +393,7 @@ - SET(BACKENDS "${BACKENDS} DirectSound \(linked\),") - SET(EXTRA_LIBS dsound ${EXTRA_LIBS}) - ENDIF() -+ SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -luuid") - ENDIF() - ENDIF() - ENDIF() diff --git a/src/openal-2-guid-static-link.patch b/src/openal-2-guid-static-link.patch deleted file mode 100644 index daf4470..0000000 --- a/src/openal-2-guid-static-link.patch +++ /dev/null @@ -1,27 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: - - ---- openal-soft-1.13.orig/Alc/dsound.c 2011-02-08 01:44:06.000000000 -0500 -+++ openal-soft-1.13/Alc/dsound.c 2011-03-02 22:57:58.000000000 -0500 -@@ -21,7 +21,6 @@ - #include "config.h" - - #define _WIN32_WINNT 0x0500 --#define INITGUID - #include <stdlib.h> - #include <stdio.h> - #include <memory.h> -@@ -45,8 +44,8 @@ - #define DSSPEAKER_7POINT1 7 - #endif - --DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); --DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); -+const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010,{0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -+const GUID KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; - - static void *ds_handle; - static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID pcGuidDevice, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter); diff --git a/src/openal.mk b/src/openal.mk index ea7e90e..0cc9c6c 100644 --- a/src/openal.mk +++ b/src/openal.mk @@ -3,14 +3,14 @@ PKG := openal $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 0e2449375a12cee65a9cea354533dcaabf9d5068 +$(PKG)_CHECKSUM := e6d69db13ec15465b83a45ef89978e8a0f55beca $(PKG)_SUBDIR := openal-soft-$($(PKG)_VERSION) $(PKG)_FILE := openal-soft-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://kcat.strangesoft.net/openal-releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc portaudio define $(PKG)_UPDATE - wget -q -O- 'http://kcat.strangesoft.net/openal-releases/?C=M;O=D' | \ + $(WGET) -q -O- 'http://kcat.strangesoft.net/openal-releases/?C=M;O=D' | \ $(SED) -n 's,.*"openal-soft-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/opencore-amr.mk b/src/opencore-amr.mk index 3c1ca2a..1c1f4d5 100644 --- a/src/opencore-amr.mk +++ b/src/opencore-amr.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/opencore-amr/files/opencore-amr/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/opencore-amr/files/opencore-amr/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/opencsg.mk b/src/opencsg.mk index 7863b90..f29401c 100644 --- a/src/opencsg.mk +++ b/src/opencsg.mk @@ -10,7 +10,7 @@ $(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' | \ + $(WGET) -q -O- 'http://www.opencsg.org/#download' | \ grep 'OpenCSG-' | \ $(SED) -n 's,.*OpenCSG-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/openexr.mk b/src/openexr.mk index c8db548..c3e79ce 100644 --- a/src/openexr.mk +++ b/src/openexr.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://download.savannah.nongnu.org/releases/openexr/$($(PKG) $(PKG)_DEPS := gcc ilmbase pthreads zlib define $(PKG)_UPDATE - wget -q -O- 'http://www.openexr.com/downloads.html' | \ + $(WGET) -q -O- 'http://www.openexr.com/downloads.html' | \ grep 'openexr-' | \ $(SED) -n 's,.*openexr-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index acb1220..2eab8f0 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -11,7 +11,7 @@ $(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 dcmtk qt define $(PKG)_UPDATE - wget -q -O- 'http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/tags?order=date&desc=1' | \ + $(WGET) -q -O- 'http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/tags?order=date&desc=1' | \ grep '<a ' | \ $(SED) -n 's,.*>OpenSceneGraph-\([0-9][^<]*\)<.*,\1,p' | \ grep -v '^2\.9\.' | \ diff --git a/src/openssl.mk b/src/openssl.mk index 870f527..0bd1b50 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -3,7 +3,7 @@ PKG := openssl $(PKG)_IGNORE := -$(PKG)_CHECKSUM := a6476d33fd38c2e7dfb438d1e3be178cc242c907 +$(PKG)_CHECKSUM := 91b684de947cb021ac61b8c51027cc4b63d894ce $(PKG)_SUBDIR := openssl-$($(PKG)_VERSION) $(PKG)_FILE := openssl-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.openssl.org/source/$($(PKG)_FILE) @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.openssl.org/source/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib libgcrypt define $(PKG)_UPDATE - wget -q -O- 'http://www.openssl.org/source/' | \ + $(WGET) -q -O- 'http://www.openssl.org/source/' | \ $(SED) -n 's,.*openssl-\([0-9][0-9a-z.]*\)\.tar.*,\1,p' | \ grep -v '^0\.9\.' | \ head -1 diff --git a/src/pango-1-fixes.patch b/src/pango-1-fixes.patch index da4e9a0..7090070 100644 --- a/src/pango-1-fixes.patch +++ b/src/pango-1-fixes.patch @@ -24,7 +24,7 @@ index 44ec353..72e13f1 100644 BOOL WINAPI -DllMain (HINSTANCE hinstDLL, -+static _disabled_DllMain (HINSTANCE hinstDLL, ++pango_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/src/pango.mk b/src/pango.mk index 76a0190..f3ed7c1 100644 --- a/src/pango.mk +++ b/src/pango.mk @@ -3,14 +3,14 @@ PKG := pango $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 467a3dacc0f3173e6fd457524b9ccd9772039a62 +$(PKG)_CHECKSUM := f0bf7974ef3e8826fbbb55c0974466ede1e67dd3 $(PKG)_SUBDIR := pango-$($(PKG)_VERSION) -$(PKG)_FILE := pango-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := pango-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/pango/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := gcc fontconfig freetype cairo glib define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/pango/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/pango/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=\\([0-9][^']*\\)'.*,\\1,p" | \ head -1 diff --git a/src/pangomm.mk b/src/pangomm.mk index bbc3eb3..67806da 100644 --- a/src/pangomm.mk +++ b/src/pangomm.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/pangomm/$(call SHORT_P $(PKG)_DEPS := gcc cairomm glibmm pango define $(PKG)_UPDATE - wget -q -O- 'http://git.gnome.org/browse/pangomm/refs/tags' | \ + $(WGET) -q -O- 'http://git.gnome.org/browse/pangomm/refs/tags' | \ grep '<a href=' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=\\([0-9][^']*\\)'.*,\\1,p" | \ head -1 diff --git a/src/pcre.mk b/src/pcre.mk index 0f7a8e3..e34128f 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$($(PKG $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/pcre/files/pcre/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/pcre/files/pcre/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/pdcurses.mk b/src/pdcurses.mk index daef48d..1fef244 100644 --- a/src/pdcurses.mk +++ b/src/pdcurses.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/pdcurses/pdcurses/$($(PK $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/pdcurses/files/pdcurses/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/pdcurses/files/pdcurses/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/pdflib_lite.mk b/src/pdflib_lite.mk index f9ed5e4..19ed4cd 100644 --- a/src/pdflib_lite.mk +++ b/src/pdflib_lite.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.pdflib.com/binaries/PDFlib/$(subst .,,$(word 1,$(s $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.pdflib.com/download/free-software/pdflib-lite-7/' | \ + $(WGET) -q -O- 'http://www.pdflib.com/download/free-software/pdflib-lite-7/' | \ $(SED) -n 's,.*PDFlib-Lite-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/pfstools.mk b/src/pfstools.mk index bb14aca..b4cabd3 100644 --- a/src/pfstools.mk +++ b/src/pfstools.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/pfstools/files/pfstools/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/pfstools/files/pfstools/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/physfs.mk b/src/physfs.mk index 2a11b7d..414a272 100644 --- a/src/physfs.mk +++ b/src/physfs.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://icculus.org/physfs/downloads/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib define $(PKG)_UPDATE - wget -q -O- 'http://icculus.org/physfs/downloads/?M=D' | \ + $(WGET) -q -O- 'http://icculus.org/physfs/downloads/?M=D' | \ $(SED) -n 's,.*<a href="physfs-\([0-9][^"]*\)\.tar.*,\1,pI' | \ head -1 endef diff --git a/src/pixman.mk b/src/pixman.mk index 47f0135..a3c5295 100644 --- a/src/pixman.mk +++ b/src/pixman.mk @@ -3,7 +3,7 @@ PKG := pixman $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 2785cedd25fb6ded0ceac8d427432f16b074dd52 +$(PKG)_CHECKSUM := ebd1b438a28aca0099777b1e383c60d4fcb88196 $(PKG)_SUBDIR := pixman-$($(PKG)_VERSION) $(PKG)_FILE := pixman-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://cairographics.org/snapshots/$($(PKG)_FILE) @@ -11,7 +11,7 @@ $(PKG)_URL_2 := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_F $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://cairographics.org/snapshots/?C=M;O=D' | \ + $(WGET) -q -O- 'http://cairographics.org/snapshots/?C=M;O=D' | \ $(SED) -n 's,.*"pixman-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/plotmm.mk b/src/plotmm.mk index 35b86b8..436e858 100644 --- a/src/plotmm.mk +++ b/src/plotmm.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc gtkmm2 define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/plotmm/files/plotmm/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/plotmm/files/plotmm/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/plotutils.mk b/src/plotutils.mk index c2d602c..8aee398 100644 --- a/src/plotutils.mk +++ b/src/plotutils.mk @@ -11,7 +11,7 @@ $(PKG)_URL_2 := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc libpng pthreads define $(PKG)_UPDATE - wget -q -O- 'http://ftp.gnu.org/gnu/plotutils/?C=M;O=D' | \ + $(WGET) -q -O- 'http://ftp.gnu.org/gnu/plotutils/?C=M;O=D' | \ grep '<a href="plotutils-' | \ $(SED) -n 's,.*plotutils-\([0-9][^<]*\)\.tar.*,\1,p' | \ head -1 diff --git a/src/poco.mk b/src/poco.mk index 46c117f..0904ce0 100644 --- a/src/poco.mk +++ b/src/poco.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/sources/$(PKG)-$( $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://pocoproject.org/download/' | \ + $(WGET) -q -O- 'http://pocoproject.org/download/' | \ $(SED) -n 's,.*poco-\([0-9][^>/]*\)\.tar.*,\1,p' | \ head -1 endef @@ -20,7 +20,7 @@ define $(PKG)_BUILD --config=MinGW-CrossEnv \ --static \ --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -j '$(JOBS)' install + $(MAKE) -C '$(1)' -j '$(JOBS)' install CROSSENV=$(TARGET) '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ diff --git a/src/poppler-1-win32.patch b/src/poppler-1-win32.patch new file mode 100644 index 0000000..11add51 --- /dev/null +++ b/src/poppler-1-win32.patch @@ -0,0 +1,243 @@ +This file is part of MXE. +See index.html for further information. + +From 991d23243522e1ae2bd8efd279032792681f3789 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> +Date: Sat, 21 Apr 2012 09:29:25 +0200 +Subject: [PATCH 1/4] Fix Standard-14 fallback fonts + +wingding.ttf is totally different from ZapfDingbats. symbol.ttf is only a lousy fallback for Symbol. +Based on patch provided by Jonathan Kew. +Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037 +--- + poppler/GlobalParamsWin.cc | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc +index f989fb8..b15773f 100644 +--- a/poppler/GlobalParamsWin.cc ++++ b/poppler/GlobalParamsWin.cc +@@ -73,13 +73,17 @@ static struct { + {"Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf"}, + {"Helvetica-Oblique", "n019023l.pfb", "ariali.ttf"}, + // TODO: not sure if "symbol.ttf" is right ++ // "symbol.ttf" can be used as a fallback, but some symbols are differently ++ // encoded (e.g., the glyphs for 'f', 'j', 'v'), while most other glyphs ++ // have a fairly different appearance + {"Symbol", "s050000l.pfb", "symbol.ttf"}, + {"Times-Bold", "n021004l.pfb", "timesbd.ttf"}, + {"Times-BoldItalic", "n021024l.pfb", "timesbi.ttf"}, + {"Times-Italic", "n021023l.pfb", "timesi.ttf"}, + {"Times-Roman", "n021003l.pfb", "times.ttf"}, + // TODO: not sure if "wingding.ttf" is right +- {"ZapfDingbats", "d050000l.pfb", "wingding.ttf"}, ++ // No, the symbol sets are totally different ++ {"ZapfDingbats", "d050000l.pfb", NULL}, + + // those seem to be frequently accessed by PDF files and I kind of guess + // which font file do the refer to +-- +1.7.5.4 + + +From 482782fa1951c8c75636918fb45c90f3f329bf86 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> +Date: Sat, 21 Apr 2012 09:34:46 +0200 +Subject: [PATCH 2/4] Only check for Type1 fonts in custom directory if path + is non-NULL + +Otherwise, programs using poppler may crash +Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037 +--- + poppler/GlobalParamsWin.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc +index b15773f..f68577f 100644 +--- a/poppler/GlobalParamsWin.cc ++++ b/poppler/GlobalParamsWin.cc +@@ -243,7 +243,7 @@ void GlobalParams::setupBaseFonts(char * dir) + if (displayFonts->lookup(fontName)) + continue; + +- if (dir) { ++ if (dir && displayFontTab[i].t1FileName) { + GooString *fontPath = appendToPath(new GooString(dir), displayFontTab[i].t1FileName); + if (FileExists(fontPath->getCString())) { + AddFont(displayFonts, fontName, fontPath, displayFontT1); +-- +1.7.5.4 + + +From 7f01e803b134d01a72f6912d088d7887eba0df08 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> +Date: Sat, 21 Apr 2012 11:57:02 +0200 +Subject: [PATCH 3/4] Allow custom substitution fonts on Windows + +Standard-compliant PDF viewers must be able to handle 14 standard fonts even if they are not embedded. For the Symbol and ZapfDingbats fonts, there is no suitable alternative available on Windows by default, so they must be provided separately (and poppler must find them). + +The search path is share/fonts/type1/gsfonts (relative to poppler) similar to *nix systems and the search path for poppler-data. +Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037 +--- + poppler/GlobalParams.cc | 31 +++++++++++++++++++++++++++++++ + poppler/GlobalParamsWin.cc | 2 +- + 2 files changed, 32 insertions(+), 1 deletions(-) + +diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc +index 687fd25..eea60be 100644 +--- a/poppler/GlobalParams.cc ++++ b/poppler/GlobalParams.cc +@@ -214,6 +214,37 @@ get_poppler_datadir (void) + + #ifdef _WIN32 + ++static char * ++get_poppler_fontdir (void) ++{ ++#if !ENABLE_RELOCATABLE ++ static HMODULE hmodule = 0; ++#endif ++ static char retval[MAX_PATH]; ++ static int beenhere = 0; ++ ++ unsigned char *p; ++ ++ if (beenhere) ++ return retval; ++ ++ if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 32)) ++ return NULL; ++ ++ p = _mbsrchr ((unsigned char *) retval, '\\'); ++ *p = '\0'; ++ p = _mbsrchr ((unsigned char *) retval, '\\'); ++ if (p) { ++ if (stricmp ((const char *) (p+1), "bin") == 0) ++ *p = '\0'; ++ } ++ strcat (retval, "\\share\\fonts\\type1\\gsfonts"); ++ ++ beenhere = 1; ++ ++ return retval; ++} ++ + //------------------------------------------------------------------------ + // WinFontInfo + //------------------------------------------------------------------------ +diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc +index f68577f..3ee75e4 100644 +--- a/poppler/GlobalParamsWin.cc ++++ b/poppler/GlobalParamsWin.cc +@@ -281,7 +281,7 @@ DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) { + + if (!fontName) return NULL; + lockGlobalParams; +- setupBaseFonts(NULL); ++ setupBaseFonts(get_poppler_fontdir()); + dfp = (DisplayFontParam *)displayFonts->lookup(fontName); + if (!dfp) { + substFontName = findSubstituteName(fontName->getCString()); +-- +1.7.5.4 + + +From e000aafa7dec5441d072158814fa35631c5a9c52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> +Date: Sat, 21 Apr 2012 13:19:54 +0200 +Subject: [PATCH 4/4] Don't use dllimport/dllexport + +Otherwise static linking fails +MXE workaround for https://bugs.freedesktop.org/show_bug.cgi?id=49038 (presumably would break shared linking!) +--- + cpp/poppler-global.h | 5 ----- + poppler/XpdfPluginAPI.h | 18 ------------------ + qt4/src/poppler-export.h | 5 ----- + 3 files changed, 0 insertions(+), 28 deletions(-) + +diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h +index 5650182..6c3e01b 100644 +--- a/cpp/poppler-global.h ++++ b/cpp/poppler-global.h +@@ -20,13 +20,8 @@ + #ifndef POPPLER_GLOBAL_H + #define POPPLER_GLOBAL_H + +-#if defined(_WIN32) +-# define LIB_EXPORT __declspec(dllexport) +-# define LIB_IMPORT __declspec(dllimport) +-#else + # define LIB_EXPORT + # define LIB_IMPORT +-#endif + + #if defined(poppler_cpp_EXPORTS) + # define POPPLER_CPP_EXPORT LIB_EXPORT +diff --git a/poppler/XpdfPluginAPI.h b/poppler/XpdfPluginAPI.h +index 22540f7..290aa63 100644 +--- a/poppler/XpdfPluginAPI.h ++++ b/poppler/XpdfPluginAPI.h +@@ -28,19 +28,11 @@ extern "C" { + */ + #define xpdfPluginAPIVersion 1 + +-#ifdef _WIN32 +-# ifdef __cplusplus +-# define PLUGINFUNC(retType) extern "C" __declspec(dllexport) retType +-# else +-# define PLUGINFUNC(retType) extern __declspec(dllexport) retType +-# endif +-#else + # ifdef __cplusplus + # define PLUGINFUNC(retType) extern "C" retType + # else + # define PLUGINFUNC(retType) extern retType + # endif +-#endif + + /*------------------------------------------------------------------------ + * Plugin setup/cleanup +@@ -285,22 +277,12 @@ void (*_xpdfRegisterSecurityHandler)(XpdfSecurityHandler *handler); + + } XpdfPluginVecTable; + +-#ifdef _WIN32 +- +-extern __declspec(dllexport) XpdfPluginVecTable xpdfPluginVecTable; +- +-#define xpdfPluginSetup \ +- extern __declspec(dllexport) \ +- XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion}; +- +-#else + + extern XpdfPluginVecTable xpdfPluginVecTable; + + #define xpdfPluginSetup \ + XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion}; + +-#endif + + #define xpdfGetInfoDict (*xpdfPluginVecTable._xpdfGetInfoDict) + #define xpdfGetCatalog (*xpdfPluginVecTable._xpdfGetCatalog) +diff --git a/qt4/src/poppler-export.h b/qt4/src/poppler-export.h +index 7661fe9..ebb1e18 100644 +--- a/qt4/src/poppler-export.h ++++ b/qt4/src/poppler-export.h +@@ -2,13 +2,8 @@ + * This file is used to set the poppler_qt4_EXPORT macros right. + * This is needed for setting the visibility on windows, it will have no effect on other platforms. + */ +-#if defined(_WIN32) +-# define LIB_EXPORT __declspec(dllexport) +-# define LIB_IMPORT __declspec(dllimport) +-#else + # define LIB_EXPORT + # define LIB_IMPORT +-#endif + + #ifdef poppler_qt4_EXPORTS + # define POPPLER_QT4_EXPORT LIB_EXPORT +-- +1.7.5.4 + diff --git a/src/poppler-test.cxx b/src/poppler-test.cxx new file mode 100644 index 0000000..e59b48a --- /dev/null +++ b/src/poppler-test.cxx @@ -0,0 +1,12 @@ +#include <iostream> +#include <cpp/poppler-version.h> + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + std::cout << "Poppler version: " << poppler::version_string() << std::endl; + + return 0; +} diff --git a/src/poppler.mk b/src/poppler.mk new file mode 100644 index 0000000..4c94e8c --- /dev/null +++ b/src/poppler.mk @@ -0,0 +1,58 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := poppler +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 3753caecba71afaf29f097e0b9c52e0f83a10a59 +$(PKG)_SUBDIR := poppler-$($(PKG)_VERSION) +$(PKG)_FILE := poppler-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://poppler.freedesktop.org/$($(PKG)_FILE) +$(PKG)_DEPS := gcc glib cairo libpng lcms jpeg tiff freetype zlib curl qt + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://poppler.freedesktop.org/' | \ + $(SED) -n 's,.*"poppler-\([0-9.]\+\)\.tar\.gz".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + # Note: Specifying LIBS explicitly is necessary for configure to properly + # pick up libtiff (otherwise linking a minimal test program fails not + # because libtiff is not found, but because some references are + # undefined) + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --prefix='$(PREFIX)/$(TARGET)' \ + --disable-silent-rules \ + --disable-shared \ + --enable-static \ + --enable-xpdf-headers \ + --enable-poppler-qt4 \ + --enable-zlib \ + --enable-libcurl \ + --enable-libtiff \ + --enable-libjpeg \ + --enable-libpng \ + --enable-poppler-glib \ + --enable-poppler-cpp \ + --enable-cairo-output \ + --enable-splash-output \ + --enable-compile-warnings=yes \ + --enable-introspection=auto \ + --disable-libopenjpeg \ + --disable-gtk-test \ + --disable-utils \ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --with-font-configuration=win32 \ + LIBS="`'$(TARGET)-pkg-config' zlib liblzma --libs` -ljpeg" + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + + # Test program + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \ + `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs` +endef + diff --git a/src/popt.mk b/src/popt.mk index 8fdadd0..bae41c9 100644 --- a/src/popt.mk +++ b/src/popt.mk @@ -11,7 +11,7 @@ $(PKG)_URL_2 := http://ftp.debian.org/debian/pool/main/p/$(PKG)/$(PKG)_$($(PK $(PKG)_DEPS := gcc libiconv gettext define $(PKG)_UPDATE - wget -q -O- 'http://rpm5.org/files/popt/' | \ + $(WGET) -q -O- 'http://rpm5.org/files/popt/' | \ grep 'popt-' | \ $(SED) -n 's,.*popt-\([0-9][^>]*\)\.tar.*,\1,p' | \ tail -1 diff --git a/src/portaudio.mk b/src/portaudio.mk index ac5157c..e8cb712 100644 --- a/src/portaudio.mk +++ b/src/portaudio.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.portaudio.com/archives/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.portaudio.com/download.html' | \ + $(WGET) -q -O- 'http://www.portaudio.com/download.html' | \ $(SED) -n 's,.*pa_stable_v\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/postgresql.mk b/src/postgresql.mk index 925c3f7..3cce196 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(P $(PKG)_DEPS := gcc zlib openssl define $(PKG)_UPDATE - wget -q -O- 'http://git.postgresql.org/gitweb?p=postgresql.git;a=tags' | \ + $(WGET) -q -O- 'http://git.postgresql.org/gitweb?p=postgresql.git;a=tags' | \ grep 'refs/tags/REL9[0-9_]*"' | \ $(SED) 's,.*refs/tags/REL\(.*\)".*,\1,g;' | \ $(SED) 's,_,.,g' | \ diff --git a/src/proj.mk b/src/proj.mk index 25f8b34..6536671 100644 --- a/src/proj.mk +++ b/src/proj.mk @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.remotesensing.org/proj/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://trac.osgeo.org/proj/' | \ + $(WGET) -q -O- 'http://trac.osgeo.org/proj/' | \ $(SED) -n 's,.*proj-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/pthreads.mk b/src/pthreads.mk index 71c46c2..aa17ec0 100644 --- a/src/pthreads.mk +++ b/src/pthreads.mk @@ -10,7 +10,7 @@ $(PKG)_URL := ftp://sourceware.org/pub/pthreads-win32/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'ftp://sourceware.org/pub/pthreads-win32/Release_notes' | \ + $(WGET) -q -O- 'ftp://sourceware.org/pub/pthreads-win32/Release_notes' | \ $(SED) -n 's,^RELEASE \([0-9][^[:space:]]*\).*,\1,p' | \ tr '.' '-' | \ head -1 diff --git a/src/qdbm-test.c b/src/qdbm-test.c new file mode 100644 index 0000000..50b5b92 --- /dev/null +++ b/src/qdbm-test.c @@ -0,0 +1,51 @@ +/* + * This file is part of MXE. + * See index.html for further information. + * + * Taken from examples at http://fallabs.com/qdbm/spex.html + */ + +#include <depot.h> +#include <stdlib.h> +#include <stdio.h> + +#define NAME "mikio" +#define NUMBER "000-1234-5678" +#define DBNAME "book" + +int main(int argc, char **argv){ + DEPOT *depot; + char *val; + + (void)argc; + (void)argv; + + /* open the database */ + if(!(depot = dpopen(DBNAME, DP_OWRITER | DP_OCREAT, -1))){ + fprintf(stderr, "dpopen: %s\n", dperrmsg(dpecode)); + return 1; + } + + /* store the record */ + if(!dpput(depot, NAME, -1, NUMBER, -1, DP_DOVER)){ + fprintf(stderr, "dpput: %s\n", dperrmsg(dpecode)); + } + + /* retrieve the record */ + if(!(val = dpget(depot, NAME, -1, 0, -1, NULL))){ + fprintf(stderr, "dpget: %s\n", dperrmsg(dpecode)); + } + else { + printf("Name: %s\n", NAME); + printf("Number: %s\n", val); + free(val); + } + + /* close the database */ + if(!dpclose(depot)){ + fprintf(stderr, "dpclose: %s\n", dperrmsg(dpecode)); + return 1; + } + + return 0; +} diff --git a/src/qdbm.mk b/src/qdbm.mk new file mode 100644 index 0000000..e6be155 --- /dev/null +++ b/src/qdbm.mk @@ -0,0 +1,44 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qdbm +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 8c2ab938c2dad8067c29b0aa93efc6389f0e7076 +$(PKG)_SUBDIR := qdbm-$($(PKG)_VERSION) +$(PKG)_FILE := qdbm-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz +$(PKG)_DEPS := gcc bzip2 libiconv lzo zlib + +define $(PKG)_UPDATE + wget -q -O- 'http://fallabs.com/qdbm/' | \ + grep 'qdbm-' | \ + $(SED) -n 's,.*qdbm-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --prefix='$(PREFIX)/$(TARGET)' \ + --enable-lzo \ + --enable-bzip \ + --enable-zlib \ + --enable-iconv + $(MAKE) -C '$(1)' -j '$(JOBS)' \ + static \ + MYBINS= \ + MYLIBS=libqdbm.a \ + AR=i686-pc-mingw32-ar \ + RANLIB=i686-pc-mingw32-ranlib + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' + $(INSTALL) -m644 '$(1)/libqdbm.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -m644 '$(1)/qdbm.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + cd '$(1)' && $(INSTALL) -m644 depot.h curia.h relic.h hovel.h \ + cabin.h villa.h vista.h odeum.h '$(PREFIX)/$(TARGET)/include/' + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-qdbm.exe' \ + `'$(TARGET)-pkg-config' qdbm --cflags --libs` +endef diff --git a/src/qjson.mk b/src/qjson.mk index e094e85..7bb8422 100644 --- a/src/qjson.mk +++ b/src/qjson.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc qt define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/qjson/files/qjson/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/qjson/files/qjson/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch index 5d23e24..337d681 100644 --- a/src/qt-1-cherrypicks.patch +++ b/src/qt-1-cherrypicks.patch @@ -5,10 +5,10 @@ Commits backported (cherry-picked) from upstream branch or merge requests. http://qt.gitorious.org/qt Also contains MXE specific fixes. -From 16a4f14e8e879a14ae5db47d0731c9199c01a816 Mon Sep 17 00:00:00 2001 +From c9337a775daa3a53426403fdc6984656c0e08c29 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 13 Jan 2012 00:17:48 +0100 -Subject: [PATCH 01/17] remove trailing whitespace +Subject: [PATCH 01/15] remove trailing whitespace backported from qt5/qtbase Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6 @@ -19,7 +19,7 @@ Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> 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 +index 9090773..859ec8d 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -42,7 +42,7 @@ unix { @@ -35,10 +35,10 @@ index 6bc2fa6..9b7967d 100644 1.7.9.2 -From 162708efc51e40ed59d4e3397d399920c21d03a6 Mon Sep 17 00:00:00 2001 +From 2afee6408f010376ede9f58aaee1fe4e23aa116d Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 30 Jun 2011 10:22:33 +0200 -Subject: [PATCH 02/17] do not detect or configure iconv for Windows +Subject: [PATCH 02/15] 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 @@ -56,10 +56,10 @@ Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index a706908..0690822 100755 +index c1667b6..862aad5 100755 --- a/configure +++ b/configure -@@ -5600,7 +5600,7 @@ fi +@@ -5627,7 +5627,7 @@ fi # auto-detect iconv(3) support if [ "$CFG_ICONV" != "no" ]; then @@ -72,10 +72,10 @@ index a706908..0690822 100755 1.7.9.2 -From dd34e052a555203b2bfb415bd0ce348ef232aa7e Mon Sep 17 00:00:00 2001 +From f66200e240a3664dd62beb9eb8aa38efdecfddb1 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 18 Jan 2012 11:43:10 +0100 -Subject: [PATCH 03/17] fix whitespace +Subject: [PATCH 03/15] fix whitespace backported from qt5/qtbase Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f @@ -86,7 +86,7 @@ Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri -index 9b7967d..836cc34 100644 +index 859ec8d..70cd890 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -1,23 +1,23 @@ @@ -149,10 +149,10 @@ index 9b7967d..836cc34 100644 1.7.9.2 -From 7f2e5f5e4bc740446f0160ae3246907fa4f6dc2f Mon Sep 17 00:00:00 2001 +From a82277bac5c8ac6fa43577bcc9642534714c91fb Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 4 Jul 2011 00:42:24 +0200 -Subject: [PATCH 04/17] build and load text codecs regardless of iconv and +Subject: [PATCH 04/15] build and load text codecs regardless of iconv and platform Otherwise applications linking to static Qt may have to import @@ -174,7 +174,7 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri -index 836cc34..8ff9070 100644 +index 70cd890..c847264 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -10,6 +10,15 @@ HEADERS += \ @@ -237,10 +237,10 @@ index 836cc34..8ff9070 100644 } symbian:LIBS += -lcharconv diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp -index 74e5e90..2b3100a 100644 +index ea8a5fd..7966df2 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp -@@ -65,15 +65,14 @@ +@@ -66,15 +66,14 @@ # include "qtsciicodec_p.h" # include "qisciicodec_p.h" #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) @@ -258,7 +258,7 @@ index 74e5e90..2b3100a 100644 # if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED) # include "qfontlaocodec_p.h" # include "../../plugins/codecs/jp/qfontjpcodec.h" -@@ -759,8 +758,6 @@ static void setup() +@@ -751,8 +750,6 @@ static void setup() # if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED) // no font codecs when bootstrapping (void)new QFontLaoCodec; @@ -267,7 +267,7 @@ index 74e5e90..2b3100a 100644 (void)new QFontGb2312Codec; (void)new QFontGbkCodec; (void)new QFontGb18030_0Codec; -@@ -769,12 +766,11 @@ static void setup() +@@ -761,12 +758,11 @@ static void setup() (void)new QFontKsc5601Codec; (void)new QFontBig5hkscsCodec; (void)new QFontBig5Codec; @@ -282,7 +282,7 @@ index 74e5e90..2b3100a 100644 // no asian codecs when bootstrapping, sorry (void)new QGb18030Codec; (void)new QGbkCodec; -@@ -786,7 +782,7 @@ static void setup() +@@ -778,7 +774,7 @@ static void setup() (void)new QCP949Codec; (void)new QBig5Codec; (void)new QBig5hkscsCodec; @@ -295,10 +295,10 @@ index 74e5e90..2b3100a 100644 1.7.9.2 -From 00db0d7b9b99b18fd08463f86102f1b63eb3a527 Mon Sep 17 00:00:00 2001 +From 1ec39e28f1790723df212eb158a6695c355a304a Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 13 Jan 2012 00:24:13 +0100 -Subject: [PATCH 05/17] move plugin text codecs to QtCore +Subject: [PATCH 05/15] move plugin text codecs to QtCore Having plugin text codecs adds considerable complexity to configuring Qt. The plugin interface is designed for optional @@ -416,7 +416,7 @@ Conflicts: delete mode 100644 src/plugins/codecs/tw/tw.pro diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri -index 8ff9070..02f30f5 100644 +index c847264..a1271b9 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -11,13 +11,14 @@ HEADERS += \ @@ -39528,10 +39528,10 @@ index 0000000..c56a103 + +#endif // QSJISCODEC_H diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp -index 2b3100a..3399034 100644 +index 7966df2..3a2a60e 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp -@@ -66,16 +66,16 @@ +@@ -67,16 +67,16 @@ # include "qisciicodec_p.h" #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) # if !defined(QT_BOOTSTRAPPED) @@ -79337,10 +79337,10 @@ index 94ce675..c4af49b 100644 1.7.9.2 -From 0332650cdfb4c5847a4678a1aebfbe146c850b87 Mon Sep 17 00:00:00 2001 +From 71aff51d79b2b92edbf40d642903b5114548cc42 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 18 Jan 2012 21:01:26 +0100 -Subject: [PATCH 06/17] update private header references +Subject: [PATCH 06/15] update private header references backported from qt5/qtbase Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6 @@ -79513,10 +79513,10 @@ index c56a103..df1449b 100644 1.7.9.2 -From e76298384079852d9cc1e0138a10b0637f34687f Mon Sep 17 00:00:00 2001 +From 4cc7d919207633377a3afc52f750d551bc7a90bd Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 3 Jul 2011 21:53:27 +0200 -Subject: [PATCH 07/17] cosmetic adjustments for files moved to core/codecs +Subject: [PATCH 07/15] cosmetic adjustments for files moved to core/codecs -update old reference to 'plugin' -rename multiple inclusion guards @@ -80024,10 +80024,10 @@ index df1449b..f8efcae 100644 1.7.9.2 -From 16ea320980842c9c16d380f3bdd84c5a413dbd21 Mon Sep 17 00:00:00 2001 +From e57ad0b10f420f62db94ba3ed3367d34ad2825ca Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 12 Jan 2012 10:43:29 +0100 -Subject: [PATCH 08/17] remove obsolete codec plugin loading code +Subject: [PATCH 08/15] remove obsolete codec plugin loading code backported from qt5/qtbase Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d @@ -80053,7 +80053,7 @@ Conflicts: delete mode 100644 src/corelib/codecs/qtextcodecplugin.h diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri -index 02f30f5..76e8d5e 100644 +index a1271b9..9274eda 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -7,11 +7,9 @@ HEADERS += \ @@ -80083,13 +80083,13 @@ index 02f30f5..76e8d5e 100644 codecs/qjpunicode.cpp \ codecs/qeucjpcodec.cpp \ diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp -index 3399034..552a195 100644 +index 3a2a60e..3cd5a5e 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp -@@ -47,11 +47,6 @@ - +@@ -48,11 +48,6 @@ #include "qlist.h" #include "qfile.h" + #include "qvarlengtharray.h" -#ifndef QT_NO_LIBRARY -# include "qcoreapplication.h" -# include "qtextcodecplugin.h" @@ -80098,7 +80098,7 @@ index 3399034..552a195 100644 #include "qstringlist.h" #ifdef Q_OS_UNIX -@@ -104,11 +99,6 @@ +@@ -105,11 +100,6 @@ QT_BEGIN_NAMESPACE @@ -80110,7 +80110,7 @@ index 3399034..552a195 100644 //Cache for QTextCodec::codecForName and codecForMib. typedef QHash<QByteArray, QTextCodec *> QTextCodecCache; Q_GLOBAL_STATIC(QTextCodecCache, qTextCodecCache) -@@ -150,39 +140,6 @@ static bool nameMatch(const QByteArray &name, const QByteArray &test) +@@ -151,39 +141,6 @@ static bool nameMatch(const QByteArray &name, const QByteArray &test) } @@ -80150,7 +80150,7 @@ index 3399034..552a195 100644 static QList<QTextCodec*> *all = 0; #ifdef Q_DEBUG_TEXTCODEC static bool destroying_is_ok = false; -@@ -967,10 +924,6 @@ QTextCodec::ConverterState::~ConverterState() +@@ -959,10 +916,6 @@ QTextCodec::ConverterState::~ConverterState() \o Converts a Unicode string to an 8-bit character string. \endtable @@ -80161,7 +80161,7 @@ index 3399034..552a195 100644 \sa QTextStream, QTextDecoder, QTextEncoder, {Codecs Example} */ -@@ -1063,10 +1016,7 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name) +@@ -1055,10 +1008,7 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name) } } @@ -80173,7 +80173,7 @@ index 3399034..552a195 100644 } -@@ -1103,16 +1053,7 @@ QTextCodec* QTextCodec::codecForMib(int mib) +@@ -1095,16 +1045,7 @@ QTextCodec* QTextCodec::codecForMib(int mib) } } @@ -80191,7 +80191,7 @@ index 3399034..552a195 100644 } /*! -@@ -1145,18 +1086,6 @@ QList<QByteArray> QTextCodec::availableCodecs() +@@ -1137,18 +1078,6 @@ QList<QByteArray> QTextCodec::availableCodecs() locker.unlock(); #endif @@ -80210,7 +80210,7 @@ index 3399034..552a195 100644 return codecs; } -@@ -1185,18 +1114,6 @@ QList<int> QTextCodec::availableMibs() +@@ -1177,18 +1106,6 @@ QList<int> QTextCodec::availableMibs() locker.unlock(); #endif @@ -80574,10 +80574,10 @@ index 844101a..4ea4227 100644 1.7.9.2 -From 5a5ae1066dbcf8a663e7f292d8679aae2ccd7b73 Mon Sep 17 00:00:00 2001 +From ea246a109c1ebc2cfaad6e92ac87c4a1cc18ec7e Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 23 Jan 2012 23:12:46 +0100 -Subject: [PATCH 09/17] remove vestiges of text codec plugins +Subject: [PATCH 09/15] remove vestiges of text codec plugins follow-up to 3a3356a85079d734dfa57205a00e1996afc033df @@ -80611,10 +80611,10 @@ index dea05e0..12cd8ea 100644 1.7.9.2 -From 90daa3f753c91a3efde3dfdc9151f9a639c653d0 Mon Sep 17 00:00:00 2001 +From 6fa42258f48a5e03ad9faa708202a1c53e1e5e20 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 15:10:26 +0100 -Subject: [PATCH 10/17] use pkg-config for libmng (MXE specific) +Subject: [PATCH 10/15] use pkg-config for libmng (MXE specific) Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4 --- @@ -80640,10 +80640,10 @@ index ffb98de..6aab68f 100644 1.7.9.2 -From 1d4c3643de6eea011e74ed73dc2290c58f41d865 Mon Sep 17 00:00:00 2001 +From 94cbc5be38cb1386ec6acd6045615abb9b370874 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 14:11:02 +0100 -Subject: [PATCH 11/17] use pkg-config for libtiff-4 (MXE specific) +Subject: [PATCH 11/15] use pkg-config for libtiff-4 (MXE specific) Change-Id: I5e89e66fc1606d425553e781c9e62db703136957 --- @@ -80669,10 +80669,10 @@ index e1cc3ee..71cbab1 100644 1.7.9.2 -From a3c87e93fd4aa06163eb157b060e155c44fbbe14 Mon Sep 17 00:00:00 2001 +From 2faf7d28bd1aa3b8b889ad68268700403ccba4d0 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 5 Jun 2010 23:41:04 +0200 -Subject: [PATCH 12/17] restore support for static linking of QtWebKit (MXE +Subject: [PATCH 12/15] restore support for static linking of QtWebKit (MXE specific) Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113. @@ -80693,10 +80693,10 @@ Change-Id: Ia969b8e3f2b656a5057c7ebf748f272d74f014da 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index 0690822..2837eec 100755 +index 862aad5..f679fa4 100755 --- a/configure +++ b/configure -@@ -7599,12 +7599,6 @@ if [ "$CFG_GUI" = "no" ]; then +@@ -7626,12 +7626,6 @@ if [ "$CFG_GUI" = "no" ]; then canBuildWebKit="no" fi @@ -80779,10 +80779,10 @@ index 9be0f4a..6744f58 100644 1.7.9.2 -From 0f6cab5fff9eb2e0cfc173eaf71e068f9b82e9d3 Mon Sep 17 00:00:00 2001 +From e2187b030e2d7bd0fc9f51190737d5d45d693197 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 1 Sep 2011 13:47:10 +0200 -Subject: [PATCH 13/17] fix building on GNU/kFreeBSD (MXE specific) +Subject: [PATCH 13/15] fix building on GNU/kFreeBSD (MXE specific) This patch has been taken from: @@ -80797,7 +80797,7 @@ Last-Update: 2010-10-06 1 file changed, 2 insertions(+) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h -index ed8f9eb..e571c4e 100644 +index 15b6afb..55f7df3 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -226,6 +226,8 @@ namespace QT_NAMESPACE {} @@ -80813,10 +80813,10 @@ index ed8f9eb..e571c4e 100644 1.7.9.2 -From 3b9839cc26fc7997b043a74c7d30fc3b0b81ad83 Mon Sep 17 00:00:00 2001 +From edc8e5747312fb0dbc61ae4a1c432440cb70ad94 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 1 Sep 2011 13:49:47 +0200 -Subject: [PATCH 14/17] fix missing platform when building on GNU/kFreeBSD +Subject: [PATCH 14/15] fix missing platform when building on GNU/kFreeBSD (MXE specific) This patch is inspired by: @@ -80830,10 +80830,10 @@ Change-Id: I1bebe2e6eef878318142ca5ed3525afc167b0a95 1 file changed, 3 insertions(+) diff --git a/configure b/configure -index 2837eec..8b4e5e8 100755 +index f679fa4..bb563fe 100755 --- a/configure +++ b/configure -@@ -2749,6 +2749,9 @@ if [ -z "$PLATFORM" ]; then +@@ -2809,6 +2809,9 @@ if [ -z "$PLATFORM" ]; then GNU:*) PLATFORM=hurd-g++ ;; @@ -80847,10 +80847,10 @@ index 2837eec..8b4e5e8 100755 1.7.9.2 -From e15286869c4e9b5714209ec38686f63c8b2ff44c Mon Sep 17 00:00:00 2001 +From 9e5f8124bdb183e115d742d45acb00fd7a8250c3 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 1 Sep 2011 13:51:50 +0200 -Subject: [PATCH 15/17] fix building on dragonfly (MXE specific) +Subject: [PATCH 15/15] fix building on dragonfly (MXE specific) This patch is inspired by: http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup @@ -80861,10 +80861,10 @@ Change-Id: I9743a39ac35950cb15af915c3ae527433bc6b56d 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 8b4e5e8..99948d1 100755 +index bb563fe..79ca8d3 100755 --- a/configure +++ b/configure -@@ -2761,7 +2761,7 @@ if [ -z "$PLATFORM" ]; then +@@ -2821,7 +2821,7 @@ if [ -z "$PLATFORM" ]; then ULTRIX:*) PLATFORM=ultrix-g++ ;; @@ -80876,82 +80876,3 @@ index 8b4e5e8..99948d1 100755 -- 1.7.9.2 - -From 87952077f0d192d2ce15ea111be3f320bc03be40 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Fri, 23 Mar 2012 16:29:57 +0100 -Subject: [PATCH 16/17] gcc 4.7.0 compatibility fix for javascript - -taken from http://qt-project.org/forums/viewthread/15071 - -Change-Id: I701fb5a8d754afe9fcd6b327d779365673e07b5d ---- - .../JavaScriptCore/runtime/JSGlobalObject.h | 2 +- - .../JavaScriptCore/runtime/JSStaticScopeObject.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h -index 7c20272..9eb86e7 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h -@@ -59,7 +59,7 @@ namespace JSC { - protected: - using JSVariableObject::JSVariableObjectData; - -- struct JSGlobalObjectData : public JSVariableObjectData { -+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { - // We use an explicit destructor function pointer instead of a - // virtual destructor because we want to avoid adding a vtable - // pointer to this struct. Adding a vtable pointer would force the -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h -index 2542878..3cb66a0 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h -@@ -33,7 +33,7 @@ namespace JSC{ - class JSStaticScopeObject : public JSVariableObject { - protected: - using JSVariableObject::JSVariableObjectData; -- struct JSStaticScopeObjectData : public JSVariableObjectData { -+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { - JSStaticScopeObjectData() - : JSVariableObjectData(&symbolTable, ®isterStore + 1) - { --- -1.7.9.2 - - -From 4de5298ed5b06dea106f054ef110146a45f06b6f Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Thu, 19 Apr 2012 14:48:34 +0200 -Subject: [PATCH 17/17] fix static library names when generating .pc files for - pkgconfig - -c354d16cc64cf516a0b5149cdc9ef74de096a998 added the version extension -which only occurs on the DLL import library. - -cherry-picked from qt5/qtbase 8e053a5dfc9b4c8f100b1e77335439774f52fc61 -Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe -Reviewed-by: Mark Brand <mabrand@mabrand.nl> -Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> -(cherry picked from commit 51a2b0fde9bf635482fd2463b901139c82ed0dc4) ---- - qmake/generators/makefile.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 66c6d49..447943a 100644 ---- a/qmake/generators/makefile.cpp -+++ b/qmake/generators/makefile.cpp -@@ -3258,7 +3258,8 @@ MakefileGenerator::writePkgConfigFile() - } else { - pkgConfiglibDir = "-L${libdir}"; - pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length()); -- pkgConfiglibName += project->first("TARGET_VERSION_EXT"); -+ if (project->isActiveConfig("shared")) -+ pkgConfiglibName += project->first("TARGET_VERSION_EXT"); - } - t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl; - --- -1.7.9.2 - @@ -3,14 +3,14 @@ PKG := qt $(PKG)_IGNORE := -$(PKG)_CHECKSUM := a074d0f605f009e23c63e0a4cb9b71c978146ffc +$(PKG)_CHECKSUM := e1e2edef1d63ed677d6534d32800c2e1f7ad0e73 $(PKG)_SUBDIR := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://get.qt.nokia.com/qt/source/$($(PKG)_FILE) +$(PKG)_URL := http://releases.qt-project.org/qt4/source/$($(PKG)_FILE) $(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus define $(PKG)_UPDATE - wget -q -O- 'http://qt.gitorious.org/qt/qt/commits' | \ + $(WGET) -q -O- 'http://qt.gitorious.org/qt/qt/commits' | \ grep '<li><a href="/qt/qt/commit/' | \ $(SED) -n 's,.*<a[^>]*>v\([0-9][^<-]*\)<.*,\1,p' | \ tail -1 @@ -37,7 +37,7 @@ define $(PKG)_BUILD -script \ -no-iconv \ -opengl desktop \ - -webkit \ + -no-webkit \ -no-glib \ -no-gstreamer \ -no-phonon \ @@ -71,6 +71,12 @@ define $(PKG)_BUILD $(INSTALL) -m755 '$(1)/bin/uic' '$(PREFIX)/bin/$(TARGET)-uic' $(INSTALL) -m755 '$(1)/bin/qmake' '$(PREFIX)/bin/$(TARGET)-qmake' + cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro + $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install + + cd '$(1)/tools/designer' && '$(1)/bin/qmake' designer.pro + $(MAKE) -C '$(1)/tools/designer' -j '$(JOBS)' install + # at least some of the qdbus tools are useful on target cd '$(1)/tools/qdbus' && '$(1)/bin/qmake' qdbus.pro $(MAKE) -C '$(1)/tools/qdbus' -j '$(JOBS)' install diff --git a/src/qwtplot3d.mk b/src/qwtplot3d.mk index f3c2ba0..1305659 100644 --- a/src/qwtplot3d.mk +++ b/src/qwtplot3d.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc qt zlib define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/$(PKG)/files/$(PKG)/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/$(PKG)/files/$(PKG)/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/readline.mk b/src/readline.mk index 6da762e..27433a6 100644 --- a/src/readline.mk +++ b/src/readline.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.gnu.org/gnu/readline/$($(PKG)_FILE) $(PKG)_DEPS := gcc pdcurses define $(PKG)_UPDATE - wget -q -O- 'http://tiswww.case.edu/php/chet/readline/rltop.html' | \ + $(WGET) -q -O- 'http://tiswww.case.edu/php/chet/readline/rltop.html' | \ grep 'readline-' | \ $(SED) -n 's,.*readline-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.libsdl.org/release/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv define $(PKG)_UPDATE - wget -q -O- 'http://hg.libsdl.org/SDL/tags' | \ + $(WGET) -q -O- 'http://hg.libsdl.org/SDL/tags' | \ $(SED) -n 's,.*release-\([0-9][^<]*\).*,\1,p' | \ head -1 endef diff --git a/src/sdl_image.mk b/src/sdl_image.mk index fb4186d..45d54c8 100644 --- a/src/sdl_image.mk +++ b/src/sdl_image.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.libsdl.org/projects/SDL_image/release/$($(PKG)_FIL $(PKG)_DEPS := gcc sdl jpeg libpng tiff define $(PKG)_UPDATE - wget -q -O- 'http://hg.libsdl.org/SDL_image/tags' | \ + $(WGET) -q -O- 'http://hg.libsdl.org/SDL_image/tags' | \ $(SED) -n 's,.*release-\([0-9][^<]*\).*,\1,p' | \ head -1 endef diff --git a/src/sdl_mixer.mk b/src/sdl_mixer.mk index 07d39eb..0f230f1 100644 --- a/src/sdl_mixer.mk +++ b/src/sdl_mixer.mk @@ -7,10 +7,10 @@ $(PKG)_CHECKSUM := a20fa96470ad9e1052f1957b77ffa68fb090b384 $(PKG)_SUBDIR := SDL_mixer-$($(PKG)_VERSION) $(PKG)_FILE := SDL_mixer-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libsdl.org/projects/SDL_mixer/release/$($(PKG)_FILE) -$(PKG)_DEPS := gcc sdl libmikmod ogg vorbis smpeg +$(PKG)_DEPS := gcc sdl libmodplug ogg vorbis smpeg define $(PKG)_UPDATE - wget -q -O- 'http://hg.libsdl.org/SDL_mixer/tags' | \ + $(WGET) -q -O- 'http://hg.libsdl.org/SDL_mixer/tags' | \ $(SED) -n 's,.*release-\([0-9][^<]*\).*,\1,p' | \ head -1 endef @@ -19,7 +19,7 @@ define $(PKG)_BUILD $(SED) -i 's,^\(Requires:.*\),\1 vorbisfile,' '$(1)/SDL_mixer.pc.in' echo \ 'Libs.private:' \ - "`$(PREFIX)/$(TARGET)/bin/libmikmod-config --libs`" \ + "`$(TARGET)-pkg-config libmodplug --libs`" \ "`$(PREFIX)/$(TARGET)/bin/smpeg-config --libs`" \ >> '$(1)/SDL_mixer.pc.in' $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure' @@ -29,7 +29,8 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ --disable-sdltest \ - --enable-music-mod \ + --disable-music-mod \ + --enable-music-mod-modplug \ --enable-music-ogg \ --disable-music-flac \ --enable-music-mp3 \ @@ -39,7 +40,6 @@ define $(PKG)_BUILD --disable-music-mp3-shared \ --disable-smpegtest \ --with-smpeg-prefix='$(PREFIX)/$(TARGET)' \ - LIBMIKMOD_CONFIG='$(PREFIX)/$(TARGET)/bin/libmikmod-config' \ LIBS='-lvorbis -logg' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/sdl_net.mk b/src/sdl_net.mk index 9eaa7e7..345fb96 100644 --- a/src/sdl_net.mk +++ b/src/sdl_net.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.libsdl.org/projects/SDL_net/release/$($(PKG)_FILE) $(PKG)_DEPS := gcc sdl define $(PKG)_UPDATE - wget -q -O- 'http://www.libsdl.org/projects/SDL_net/release/?C=M;O=D' | \ + $(WGET) -q -O- 'http://www.libsdl.org/projects/SDL_net/release/?C=M;O=D' | \ $(SED) -n 's,.*SDL_net-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/sdl_pango.mk b/src/sdl_pango.mk index f9a530d..0d2887e 100644 --- a/src/sdl_pango.mk +++ b/src/sdl_pango.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/sdlpango/SDL_Pango/$($(P $(PKG)_DEPS := gcc sdl pango define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/sdlpango/files/SDL_Pango/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/sdlpango/files/SDL_Pango/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/sdl_sound.mk b/src/sdl_sound.mk index 7a1b71d..6874bb0 100644 --- a/src/sdl_sound.mk +++ b/src/sdl_sound.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://icculus.org/SDL_sound/downloads/$($(PKG)_FILE) $(PKG)_DEPS := gcc sdl libmikmod ogg vorbis flac speex define $(PKG)_UPDATE - wget -q -O- 'http://hg.icculus.org/icculus/SDL_sound/tags' | \ + $(WGET) -q -O- 'http://hg.icculus.org/icculus/SDL_sound/tags' | \ $(SED) -n 's,.*release-\([0-9][^<]*\).*,\1,p' | \ head -1 endef diff --git a/src/sdl_ttf.mk b/src/sdl_ttf.mk index b6aceea..bd78f6e 100644 --- a/src/sdl_ttf.mk +++ b/src/sdl_ttf.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.libsdl.org/projects/SDL_ttf/release/$($(PKG)_FILE) $(PKG)_DEPS := gcc sdl freetype define $(PKG)_UPDATE - wget -q -O- 'http://hg.libsdl.org/SDL_ttf/tags' | \ + $(WGET) -q -O- 'http://hg.libsdl.org/SDL_ttf/tags' | \ $(SED) -n 's,.*release-\([0-9][^<]*\).*,\1,p' | \ head -1 endef diff --git a/src/smpeg.mk b/src/smpeg.mk index 8aa775b..23cf144 100644 --- a/src/smpeg.mk +++ b/src/smpeg.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://ftp.debian.org/debian/pool/main/s/$(PKG)/$($(PKG)_FILE $(PKG)_DEPS := gcc sdl define $(PKG)_UPDATE - wget -q -O- 'http://packages.debian.org/unstable/source/smpeg' | \ + $(WGET) -q -O- 'http://packages.debian.org/unstable/source/smpeg' | \ $(SED) -n 's,.*smpeg_\([0-9][^>]*\)\.orig\.tar.*,\1,p' | \ head -1 endef diff --git a/src/sox-test.c b/src/sox-test.c new file mode 100644 index 0000000..4911ef0 --- /dev/null +++ b/src/sox-test.c @@ -0,0 +1,15 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include <sox.h> + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + sox_format_init(); + return(0); +} diff --git a/src/sox.mk b/src/sox.mk new file mode 100644 index 0000000..f5d2d5b --- /dev/null +++ b/src/sox.mk @@ -0,0 +1,39 @@ +# This file is part of MXE. +# See index.html for further information. + +# sox +PKG := sox +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := d809cab382c7a9d015491c69051a9d1c1a1a44f1 +$(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 ffmpeg flac lame libgomp libmad libsndfile vorbis + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://sourceforge.net/projects/sox/files/sox/' | \ + $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + # set pkg-config cflags and libs + $(SED) -i 's,^\(Cflags:.*\),\1 -fopenmp,' '$(1)/sox.pc.in' + $(SED) -i '/Libs.private/d' '$(1)/sox.pc.in' + echo Libs.private: `grep sox_LDADD '$(1)/src/optional-fmts.am' | \ + $(SED) 's, sox_LDADD += ,,g' | tr -d '\n'` >>'$(1)/sox.pc.in' + + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --prefix='$(PREFIX)/$(TARGET)' \ + --build="`config.guess`" \ + --disable-shared + + $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= EXTRA_PROGRAMS= + $(MAKE) -C '$(1)' -j 1 install + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sox.exe' \ + `'$(TARGET)-pkg-config' sox --cflags --libs` +endef diff --git a/src/speex.mk b/src/speex.mk index 06e28db..98061a4 100644 --- a/src/speex.mk +++ b/src/speex.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://downloads.xiph.org/releases/speex/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://git.xiph.org/?p=speex.git;a=tags' | \ + $(WGET) -q -O- 'http://git.xiph.org/?p=speex.git;a=tags' | \ grep '<a class="list name"' | \ $(SED) -n 's,.*<a[^>]*>Speex-\([0-9][^<]*\)<.*,\1,p' | \ head -1 diff --git a/src/sqlite.mk b/src/sqlite.mk index 6468d10..3e13623 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,14 +3,14 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_CHECKSUM := a768f76b10df84d6a2c66178544d42725a8fdaf0 +$(PKG)_CHECKSUM := 295b9acdf9c0452017ca1af392c0e5db019e6874 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.sqlite.org/download.html' | \ + $(WGET) -q -O- 'http://www.sqlite.org/download.html' | \ $(SED) -n 's,.*sqlite-autoconf-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef @@ -18,6 +18,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-readline \ diff --git a/src/suitesparse-1.patch b/src/suitesparse-1.patch new file mode 100644 index 0000000..33df8b2 --- /dev/null +++ b/src/suitesparse-1.patch @@ -0,0 +1,42 @@ +This file is part of MXE. +See index.html for further information. + +From 60ff05e30eaa435a7776b178f5f240f0c11e8f38 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sun, 20 May 2012 23:41:27 +0200 +Subject: [PATCH] build lib not demo + +--- + CHOLMOD/Makefile | 2 +- + UMFPACK/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CHOLMOD/Makefile b/CHOLMOD/Makefile +index d27ae54..878f9d8 100644 +--- a/CHOLMOD/Makefile ++++ b/CHOLMOD/Makefile +@@ -13,7 +13,7 @@ include ../UFconfig/UFconfig.mk + + # Compile the C-callable libraries and the Demo programs. + all: +- ( cd Demo ; $(MAKE) ) ++ ( cd Lib ; $(MAKE) ) + + # Compile the C-callable libraries only. + library: +diff --git a/UMFPACK/Makefile b/UMFPACK/Makefile +index 6163045..4973e55 100644 +--- a/UMFPACK/Makefile ++++ b/UMFPACK/Makefile +@@ -13,7 +13,7 @@ include ../UFconfig/UFconfig.mk + # compile all C code (except hb, fortran, and fortran64), including AMD and the + # demos, but not the MATLAB mexFunctions + all: +- ( cd Demo ; $(MAKE) ) ++ ( cd Lib ; $(MAKE) ) + + # compile just the C-callable UMFPACK library + library: +-- +1.7.9.2 + diff --git a/src/suitesparse.mk b/src/suitesparse.mk index 32eb0d1..528c910 100644 --- a/src/suitesparse.mk +++ b/src/suitesparse.mk @@ -2,14 +2,14 @@ # See index.html for further information. PKG := suitesparse -$(PKG)_CHECKSUM := d0eb24b43ee2f7def032e80eaa7a589f94f546fc +$(PKG)_CHECKSUM := a453b08877980848f3a5cde242f9865a7b08faad $(PKG)_SUBDIR := SuiteSparse $(PKG)_FILE := SuiteSparse-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cise.ufl.edu/research/sparse/SuiteSparse/$($(PKG)_FILE) $(PKG)_DEPS := gcc blas lapack define $(PKG)_UPDATE - wget -q -O- 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' | \ + $(WGET) -q -O- 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' | \ $(SED) -n 's,.*SuiteSparse-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef @@ -24,7 +24,7 @@ define $(PKG)_BUILD CC='$(TARGET)-gcc' \ CPLUSPLUS='$(TARGET)-g++' \ F77='$(TARGET)-gfortran' \ - AR='$(TARGET)-ar cr' \ + AR='$(TARGET)-ar' \ RANLIB='$(TARGET)-ranlib' \ BLAS='-lblas -lgfortran -lgfortranbegin' \ CHOLMOD_CONFIG='-DNPARTITION' diff --git a/src/t4k_common.mk b/src/t4k_common.mk index eab5ce6..193d863 100644 --- a/src/t4k_common.mk +++ b/src/t4k_common.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/tuxmath/$(PKG)/$($(PKG)_ $(PKG)_DEPS := gcc sdl sdl_mixer sdl_image sdl_net sdl_pango sdl_ttf libpng librsvg libxml2 pthreads define $(PKG)_UPDATE - wget -q -O- 'http://alioth.debian.org/frs/?group_id=31080' | \ + $(WGET) -q -O- 'http://alioth.debian.org/frs/?group_id=31080' | \ $(SED) -n 's,.*t4k_common-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/taglib.mk b/src/taglib.mk index 4d4fe45..9f8aeda 100644 --- a/src/taglib.mk +++ b/src/taglib.mk @@ -3,14 +3,14 @@ PKG := taglib $(PKG)_IGNORE := -$(PKG)_CHECKSUM := bafe0958eb884981cade83d45c18ee34165479b8 +$(PKG)_CHECKSUM := e657384ccf3284db2daba32dccece74534286012 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://developer.kde.org/~wheeler/files/src/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib define $(PKG)_UPDATE - wget -q -O- 'http://developer.kde.org/~wheeler/files/src/?C=M;O=D' | \ + $(WGET) -q -O- 'http://developer.kde.org/~wheeler/files/src/?C=M;O=D' | \ $(SED) -n 's,.*"taglib-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/theora.mk b/src/theora.mk index fbb5bf0..9925316 100644 --- a/src/theora.mk +++ b/src/theora.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://downloads.xiph.org/releases/theora/$($(PKG)_FILE) $(PKG)_DEPS := gcc ogg vorbis define $(PKG)_UPDATE - wget -q -O- 'http://www.xiph.org/downloads/' | \ + $(WGET) -q -O- 'http://www.xiph.org/downloads/' | \ $(SED) -n 's,.*libtheora-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/tiff.mk b/src/tiff.mk index 9fe1ef2..637c94d 100644 --- a/src/tiff.mk +++ b/src/tiff.mk @@ -11,7 +11,7 @@ $(PKG)_URL_2 := ftp://ftp.remotesensing.org/libtiff/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib jpeg xz define $(PKG)_UPDATE - wget -q -O- 'http://www.remotesensing.org/libtiff/' | \ + $(WGET) -q -O- 'http://www.remotesensing.org/libtiff/' | \ $(SED) -n 's,.*>v\([0-9][^<]*\)<.*,\1,p' | \ head -1 endef diff --git a/src/tinyxml.mk b/src/tinyxml.mk index b93b21c..e8e912e 100644 --- a/src/tinyxml.mk +++ b/src/tinyxml.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/tinyxml/files/tinyxml/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/tinyxml/files/tinyxml/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef @@ -11,7 +11,7 @@ $(PKG)_URL_2 := http://ftp.debian.org/debian/pool/main/t/$(PKG)/$(PKG)_$($(PK $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://laurikari.net/tre/download.html' | \ + $(WGET) -q -O- 'http://laurikari.net/tre/download.html' | \ $(SED) -n 's,.*tre-\([a-z0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/vigra.mk b/src/vigra.mk index 3f92d6d..ca9207e 100644 --- a/src/vigra.mk +++ b/src/vigra.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://hci.iwr.uni-heidelberg.de/vigra/$($(PKG)_FILE) $(PKG)_DEPS := gcc jpeg tiff libpng openexr define $(PKG)_UPDATE - wget -q -O- 'http://hci.iwr.uni-heidelberg.de/vigra/' | \ + $(WGET) -q -O- 'http://hci.iwr.uni-heidelberg.de/vigra/' | \ grep 'Sources' | \ grep '<a href="vigra' | \ $(SED) -n 's,.*"vigra-\([0-9][^"]*\)-src.*,\1,p' | \ diff --git a/src/vmime.mk b/src/vmime.mk index 570de15..90e4f4e 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(call SHO $(PKG)_DEPS := gcc libiconv gnutls libgsasl pthreads zlib define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/vmime/files/vmime/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/vmime/files/vmime/' | \ $(SED) -n 's,.*libvmime-\([0-9][^>]*\)\.tar.*,\1,p' | \ tail -1 endef diff --git a/src/vorbis.mk b/src/vorbis.mk index 6d8466f..f35839b 100644 --- a/src/vorbis.mk +++ b/src/vorbis.mk @@ -3,14 +3,14 @@ PKG := vorbis $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 4b089ace4c8420c479b2fde9c5b01588cf86c959 +$(PKG)_CHECKSUM := 8dae60349292ed76db0e490dc5ee51088a84518b $(PKG)_SUBDIR := libvorbis-$($(PKG)_VERSION) $(PKG)_FILE := libvorbis-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.xiph.org/releases/vorbis/$($(PKG)_FILE) $(PKG)_DEPS := gcc ogg define $(PKG)_UPDATE - wget -q -O- 'http://www.xiph.org/downloads/' | \ + $(WGET) -q -O- 'http://www.xiph.org/downloads/' | \ $(SED) -n 's,.*libvorbis-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef @@ -18,6 +18,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ PKG_CONFIG='$(TARGET)-pkg-config' @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.vtk.org/files/release/5.8/$($(PKG)_FILE) $(PKG)_DEPS := qt expat freetype jpeg libxml2 libpng tiff zlib libodbc++ postgresql define $(PKG)_UPDATE - wget -q -O- 'http://vtk.org/gitweb?p=VTK.git;a=tags' | \ + $(WGET) -q -O- 'http://vtk.org/gitweb?p=VTK.git;a=tags' | \ grep 'refs/tags/v[0-9.]*"' | \ $(SED) 's,.*refs/tags/v\(.*\)".*,\1,g;' | \ head -1 diff --git a/src/w32api.mk b/src/w32api.mk index 82fe762..12adc71 100644 --- a/src/w32api.mk +++ b/src/w32api.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Base/$(PKG)/ $(PKG)_DEPS := define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/' | \ $(SED) -n 's,.*w32api-\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/winpcap.mk b/src/winpcap.mk index 7f71fe1..e583758 100644 --- a/src/winpcap.mk +++ b/src/winpcap.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://www.winpcap.org/install/bin/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://www.winpcap.org/devel.htm' | \ + $(WGET) -q -O- 'http://www.winpcap.org/devel.htm' | \ $(SED) -n 's,.*WpcapSrc_\([0-9][^>]*\)\.zip.*,\1,p' | \ head -1 endef @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/witty/$(PKG)/$($(PKG)_VE $(PKG)_DEPS := gcc boost openssl libharu graphicsmagick pango postgresql sqlite define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/witty/files/witty/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/witty/files/witty/' | \ $(SED) -n 's,.*wt-\([0-9][^>]*\)\.tar.*,\1,p' | \ tail -1 endef @@ -31,6 +31,7 @@ define $(PKG)_BUILD -DGM_PREFIX='$(PREFIX)/$(TARGET)' \ -DGM_LIBS="`'$(TARGET)-pkg-config' --libs-only-l GraphicsMagick++`" \ -DPANGO_FT2_LIBS="`'$(TARGET)-pkg-config' --libs-only-l pangoft2`" \ + -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_BUILD_TYPE:STRING="Release" \ '$(1)' diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index 28fb3de..f591692 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/wxwindows/$($(PKG)_VERSI $(PKG)_DEPS := gcc libiconv libpng jpeg tiff sdl zlib expat define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/wxwindows/files/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/wxwindows/files/' | \ $(SED) -n 's,.*/\([0-9][^"9]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/xerces.mk b/src/xerces.mk index e0e0f2d..ecc0dca 100644 --- a/src/xerces.mk +++ b/src/xerces.mk @@ -11,7 +11,7 @@ $(PKG)_URL_2 := http://www.apache.org/dist/xerces/c/$(word 1,$(subst ., ,$($( $(PKG)_DEPS := gcc libiconv curl define $(PKG)_UPDATE - wget -q -O- 'http://www.apache.org/dist/xerces/c/3/sources/?C=M;O=D' | \ + $(WGET) -q -O- 'http://www.apache.org/dist/xerces/c/3/sources/?C=M;O=D' | \ $(SED) -n 's,.*<a href="xerces-c-\([0-9][^"]*\)\.tar.*,\1,p' | \ grep -v rc | \ head -1 diff --git a/src/xine-lib.mk b/src/xine-lib.mk index 8acdb54..37b8467 100644 --- a/src/xine-lib.mk +++ b/src/xine-lib.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/xine/$(PKG)/$($(PKG)_VER $(PKG)_DEPS := gcc faad2 ffmpeg flac fontconfig freetype graphicsmagick libiconv libmng pthreads sdl speex theora vorbis zlib define $(PKG)_UPDATE - wget -q -O- 'http://hg.debian.org/hg/xine-lib/xine-lib/tags' | \ + $(WGET) -q -O- 'http://hg.debian.org/hg/xine-lib/xine-lib/tags' | \ $(SED) -n 's,>,\n,gp' | \ $(SED) -n 's,^\([0-9][^< ]*\)<.*,\1,p' | \ head -1 diff --git a/src/xmlwrapp.mk b/src/xmlwrapp.mk index 7c913d1..86e8a91 100644 --- a/src/xmlwrapp.mk +++ b/src/xmlwrapp.mk @@ -3,14 +3,14 @@ PKG := xmlwrapp $(PKG)_IGNORE := -$(PKG)_CHECKSUM := b3ef8bff215bbacd988790615b76379672105928 +$(PKG)_CHECKSUM := 7bd66ecc1204b296580a499fd929d77b79e6e85a $(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 libxml2 libxslt +$(PKG)_DEPS := gcc boost libxml2 libxslt define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/xmlwrapp/files/xmlwrapp/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/xmlwrapp/files/xmlwrapp/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff --git a/src/xvidcore.mk b/src/xvidcore.mk index 8574de2..cd57dc2 100644 --- a/src/xvidcore.mk +++ b/src/xvidcore.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://downloads.xvid.org/downloads/$($(PKG)_FILE) $(PKG)_DEPS := gcc pthreads define $(PKG)_UPDATE - wget -q -O- 'http://www.xvid.org/' | \ + $(WGET) -q -O- 'http://www.xvid.org/' | \ $(SED) -n 's,.*Xvid \([0-9][^ ]*\) .*,\1,p' | \ head -1 endef @@ -10,7 +10,7 @@ $(PKG)_URL := http://tukaani.org/xz/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://tukaani.org/xz/' | \ + $(WGET) -q -O- 'http://tukaani.org/xz/' | \ $(SED) -n 's,.*xz-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/zlib-1-win32-static.patch b/src/zlib-1-win32-static.patch index 7ba2dd7..74c1087 100644 --- a/src/zlib-1-win32-static.patch +++ b/src/zlib-1-win32-static.patch @@ -13,7 +13,7 @@ diff --git a/Makefile.in b/Makefile.in index ea430bf..f2573e7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -188,11 +188,11 @@ install-libs: $(LIBS) +@@ -190,11 +190,11 @@ install-libs: $(LIBS) -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi @@ -31,7 +31,7 @@ diff --git a/configure b/configure index 780317c..6e6a033 100755 --- a/configure +++ b/configure -@@ -180,10 +180,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then +@@ -205,10 +205,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then CYGWIN* | Cygwin* | cygwin* | OS/2*) EXE='.exe' ;; MINGW* | mingw*) diff --git a/src/zlib.mk b/src/zlib.mk index 6b12038..bb75acc 100644 --- a/src/zlib.mk +++ b/src/zlib.mk @@ -3,7 +3,7 @@ PKG := zlib $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 3d445731e4bfea1cd00f36567d77d6e5f5a19be9 +$(PKG)_CHECKSUM := 858818fe6d358ec682d54ac5e106a2dd62628e7f $(PKG)_SUBDIR := zlib-$($(PKG)_VERSION) $(PKG)_FILE := zlib-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://zlib.net/$($(PKG)_FILE) @@ -11,7 +11,7 @@ $(PKG)_URL_2 := http://$(SOURCEFORGE_MIRROR)/project/libpng/$(PKG)/$($(PKG)_V $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://zlib.net/' | \ + $(WGET) -q -O- 'http://zlib.net/' | \ $(SED) -n 's,.*zlib-\([0-9][^>]*\)\.tar.*,\1,ip' | \ head -1 endef diff --git a/src/zziplib.mk b/src/zziplib.mk index 6404d0c..c57ac09 100644 --- a/src/zziplib.mk +++ b/src/zziplib.mk @@ -10,7 +10,7 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(word 2,$( $(PKG)_DEPS := gcc zlib define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/zziplib/files/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/zziplib/files/' | \ $(SED) -n 's,.*zziplib-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef |