d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

This commit is contained in:
Volker Grabsch 2012-01-02 11:18:06 +01:00
parent 5e735ec3e9 7cfca695cf
commit ad0e7e1e0f
182 changed files with 84941 additions and 5332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -2,3 +2,4 @@
^log($|/)
^pkg($|/)
^dist($|/)
^wip($|/)

1
Makefile
View File

@ -154,6 +154,7 @@ build-only-$(1):
$(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(1)-*.patch)),
(cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
$$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test)
(du -k -d 0 '$(2)' 2>/dev/null || du -k --max-depth 0 '$(2)') | $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p'
rm -rfv '$(2)'
,)
[ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed'

67
doc/index.html
View File

@ -450,28 +450,15 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
<dl>
<dt>2011-06-07 &ndash; Release <span id="latest-version">2.21</span></dt>
<dt>2011-xx-xx &ndash; Release <span id="latest-version">2.22</span></dt>
<dd>
<p>
<a href="https://bitbucket.org/vog/mingw-cross-env/downloads/mingw-cross-env-2.21.tar.gz">Download</a> |
<a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.21">Changelog</a>
<a href="https://bitbucket.org/vog/mingw-cross-env/downloads/mingw-cross-env-2.22.tar.gz">Download</a> |
<a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.22">Changelog</a>
</p>
<p>
Minor bugfixes in several packages.
</p>
<p>
Almost all packages are updated to their latest version.
</p>
<p>
Packages gtkmm and gtksourceviewmm have been renamed to gtkmm2 and gtksourceviewmm2.
</p>
<p>
New packages are supported:
libass, poco, and t4k_common.
Almost all packages were updated to their latest version.
</p>
</dd>
@ -621,6 +608,10 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
<td><a href="http://gcc.gnu.org/">GCC</a> (gcc, g++)</td>
<td></td>
</tr>
<tr>
<td><a href="http://www.gnu.org/s/gettext/">GNU Gettext</a></td>
<td></td>
</tr>
<tr>
<td><a href="http://www.gnu.org/software/make/">GNU Make</a></td>
<td>≥ 3.81</td>
@ -683,11 +674,11 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
</tr>
</table>
<h3 id="requirements-debian">Debian</h3>
<h3 id="requirements-debian">Debian (GNU/kFreeBSD &amp; GNU/Linux)</h3>
<!-- http://www.debian.org/distrib/packages#search_packages -->
<pre>aptitude install -R autoconf automake bash bison bzip2 \
cmake flex g++ intltool make sed \
cmake flex gettext g++ intltool make sed \
libtool libltdl-dev openssl libssl-dev \
libxml-parser-perl patch perl \
pkg-config scons unzip wget \
@ -702,7 +693,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
<!-- https://admin.fedoraproject.org/pkgdb/ -->
<pre>yum install autoconf automake bash bison bzip2 cmake \
flex gcc-c++ intltool make sed libtool \
flex gcc-c++ gettext intltool make sed libtool \
openssl-devel patch perl pkgconfig scons \
yasm unzip wget xz</pre>
@ -715,7 +706,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
<!-- http://www.freebsd.org/ports/ -->
<pre>pkg_add -r automake111 autoconf268 bash bison cmake \
flex gmake gsed intltool libtool openssl \
flex gettext gmake gsed intltool libtool openssl \
patch perl p5-XML-Parser pkg-config scons \
unzip wget yasm</pre>
@ -739,7 +730,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
<!-- http://www.frugalware.org/packages -->
<pre>pacman-g2 -S autoconf automake bash bzip2 bison cmake \
flex gcc intltool make sed libtool openssl \
flex gcc gettext intltool make sed libtool openssl \
patch perl perl-xml-parser pkgconfig scons \
unzip wget xz xz-lzma yasm</pre>
@ -754,6 +745,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
<pre>emerge sys-devel/autoconf sys-devel/automake \
app-shells/bash sys-devel/bison app-arch/bzip2 \
dev-util/cmake sys-devel/flex sys-devel/gcc \
sys-devel/gettext \
dev-util/intltool sys-devel/make sys-apps/sed \
sys-devel/libtool dev-libs/openssl sys-devel/patch \
dev-lang/perl dev-perl/XML-Parser \
@ -771,7 +763,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
</p>
<!-- http://www.macports.org/ports.php -->
<pre>sudo port install autoconf automake bison cmake flex \
gsed intltool libtool openssl \
gettext gsed intltool libtool openssl \
p5-xml-parser pkgconfig scons \
wget xz yasm</pre>
<p>
@ -797,8 +789,8 @@ sudo gcc_select gcc42</pre>
On 64-bit openSUSE, install also:
</p>
<pre>zypper install -R gcc-32bit glibc-devel-32bit \
libgcc45-32bit libgomp45-32bit \
libstdc++45-devel-32bit</pre>
libgcc46-32bit libgomp46-32bit \
libstdc++46-devel-32bit</pre>
<h3 id="open-issue-nsis">Open Issues with NSIS</h3>
@ -1192,6 +1184,31 @@ https://...</pre>
<dl>
<dt>2011-06-07 &ndash; Release 2.21</dt>
<dd>
<p>
<a href="https://bitbucket.org/vog/mingw-cross-env/downloads/mingw-cross-env-2.21.tar.gz">Download</a> |
<a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.21">Changelog</a>
</p>
<p>
Minor bugfixes in several packages.
</p>
<p>
Almost all packages are updated to their latest version.
</p>
<p>
Packages gtkmm and gtksourceviewmm have been renamed to gtkmm2 and gtksourceviewmm2.
</p>
<p>
New packages are supported:
libass, poco, and t4k_common.
</p>
</dd>
<dt>2011-04-05 &ndash; Release 2.20</dt>
<dd>
<p>

30
src/agg.mk Normal file
View File

@ -0,0 +1,30 @@
# This file is part of mingw-cross-env.
# See doc/index.html for further information.
PKG := agg
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.5
$(PKG)_CHECKSUM := 08f23da64da40b90184a0414369f450115cdb328
$(PKG)_SUBDIR := agg-$($(PKG)_VERSION)
$(PKG)_FILE := agg-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.antigrain.com
$(PKG)_URL := http://www.antigrain.com/$($(PKG)_FILE)
$(PKG)_DEPS := gcc freetype sdl
define $(PKG)_UPDATE
wget -q -O- 'http://www.antigrain.com/download/index.html' | \
$(SED) -n 's,.*<A href="http://www.antigrain.com/agg-\([0-9.]*\).tar.gz".*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
$(SED) -i 's,aclocal,aclocal -I $(PREFIX)/$(TARGET)/share/aclocal,' '$(1)/autogen.sh'
$(SED) -i 's,libtoolize,$(LIBTOOLIZE),' '$(1)/autogen.sh'
cd '$(1)' && $(SHELL) ./autogen.sh \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--without-x
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
endef

4
src/atk.mk
View File

@ -4,8 +4,8 @@
# ATK
PKG := atk
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.0.0
$(PKG)_CHECKSUM := a11205c094ce68cbe3ee7dd92163e08e00c34cce
$(PKG)_VERSION := 2.0.1
$(PKG)_CHECKSUM := f830ff27590e4dd486ebe6538e2b03484faee10a
$(PKG)_SUBDIR := atk-$($(PKG)_VERSION)
$(PKG)_FILE := atk-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://www.gtk.org/

15
src/binutils.mk
View File

@ -4,9 +4,9 @@
# GNU Binutils
PKG := binutils
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.21.1a
$(PKG)_CHECKSUM := 525255ca6874b872540c9967a1d26acfbc7c8230
$(PKG)_SUBDIR := binutils-2.21.1
$(PKG)_VERSION := 2.22
$(PKG)_CHECKSUM := 65b304a0b9a53a686ce50a01173d1f40f8efe404
$(PKG)_SUBDIR := binutils-$($(PKG)_VERSION)
$(PKG)_FILE := binutils-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://www.gnu.org/software/binutils/
$(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE)
@ -21,8 +21,17 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# install config.guess for general use
$(INSTALL) -d '$(PREFIX)/bin'
$(INSTALL) -m755 '$(1)/config.guess' '$(PREFIX)/bin/'
# install target-specific autotools config file
$(INSTALL) -d '$(PREFIX)/$(TARGET)/share'
echo "ac_cv_build=`$(1)/config.guess`" > '$(PREFIX)/$(TARGET)/share/config.site'
cd '$(1)' && ./configure \
--target='$(TARGET)' \
--build="`config.guess`" \
--prefix='$(PREFIX)' \
--with-gcc \
--with-gnu-ld \

8
src/boost.mk
View File

@ -4,8 +4,8 @@
# Boost C++ Library
PKG := boost
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.46.1
$(PKG)_CHECKSUM := 3ca6e173ec805e5126868d8a03618e587aa26aef
$(PKG)_VERSION := 1.48.0
$(PKG)_CHECKSUM := 27aced5086e96c6f7b2b684bda2bd515e115da35
$(PKG)_SUBDIR := boost_$(subst .,_,$($(PKG)_VERSION))
$(PKG)_FILE := boost_$(subst .,_,$($(PKG)_VERSION)).tar.bz2
$(PKG)_WEBSITE := http://www.boost.org/
@ -24,8 +24,8 @@ define $(PKG)_BUILD
# make the build script generate .a library files instead of .lib
$(SED) -i 's,<target-os>windows : lib ;,<target-os>windows : a ;,' '$(1)/tools/build/v2/tools/types/lib.jam'
# compile boost jam
cd '$(1)/tools/build/v2/engine/src' && ./build.sh
cd '$(1)' && tools/build/v2/engine/src/bin.*/bjam \
cd '$(1)/tools/build/v2/engine' && ./build.sh
cd '$(1)' && tools/build/v2/engine/bin.*/bjam \
-j '$(JOBS)' \
--ignore-site-config \
--user-config=user-config.jam \

2
src/cblas.mk
View File

@ -23,7 +23,7 @@ define $(PKG)_BUILD
$(SED) -i 's,FC =.*,FC = $(TARGET)-gfortran,g' '$(1)/Makefile.MINGW32'
$(SED) -i 's, make , $(MAKE) ,g' '$(1)/Makefile'
rm '$(1)/Makefile.in'
ln -s '$(1)/Makefile.MINGW32' '$(1)/Makefile.in'
ln -sf '$(1)/Makefile.MINGW32' '$(1)/Makefile.in'
mkdir '$(1)/MINGW32'
$(MAKE) -C '$(1)' -j '$(JOBS)' alllib
cd '$(1)' && $(TARGET)-ar cr libcblas.a src/*.o

324
src/cgal-1-fixes.patch Normal file
View File

@ -0,0 +1,324 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 89e55b180994db937e019678a2abccd0c6f73f7e Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 21 Oct 2011 23:08:52 +0200
Subject: [PATCH 1/2] adjustments for mingw-cross-env
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5af443..7d77f9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -326,6 +326,8 @@
#
#--------------------------------------------------------------------------------------------------
+uniquely_add_flags( CXXFLAGS "-DBOOST_THREAD_USE_LIB;-DBoost_USE_STATIC_LIBS" )
+SET(CMAKE_CXX_FLAGS_RELEASE "-DBOOST_THREAD_USE_LIB -DBoost_USE_STATIC_LIBS -O3 -DNDEBUG" CACHE STRING blah FORCE)
if( MSVC )
uniquely_add_flags ( CGAL_CXX_FLAGS "-D_CRT_SECURE_NO_DEPRECATE;-D_SCL_SECURE_NO_DEPRECATE;-D_CRT_SECURE_NO_WARNINGS;-D_SCL_SECURE_NO_WARNINGS" )
diff --git a/TryRunResults.cgal.cmake b/TryRunResults.cgal.cmake
new file mode 100644
index 0000000..cba9b44
--- /dev/null
+++ b/TryRunResults.cgal.cmake
@@ -0,0 +1,192 @@
+SET( GCC_RUN_RES
+ 0
+ CACHE STRING "version=4.6.2" FORCE)
+SET( GCC_RUN_RES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "version=4.6.2" FORCE)
+SET( GMP_RUN_RES
+ 0
+ CACHE STRING "version=5.0.2" FORCE)
+SET( GMP_RUN_RES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "version=5.0.2" FORCE)
+SET( MPFR_RUN_RES
+ 0
+ CACHE STRING "version=3.1.0" FORCE)
+SET( MPFR_RUN_RES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "version=3.1.0" FORCE)
+SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_DENORMALS_COMPILE_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_DENORMALS_COMPILE_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_IEEE_754_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_IEEE_754_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_ISTREAM_INT_BUG
+ 0
+ CACHE STRING "7812" FORCE)
+SET( CGAL_CFG_ISTREAM_INT_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "7812" FORCE)
+SET( CGAL_CFG_LONGNAME_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_LONGNAME_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_MATCHING_BUG_5
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_MATCHING_BUG_5__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_MATCHING_BUG_6
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_MATCHING_BUG_6__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG
+ 0
+ CACHE STRING "A's do_something\nC's do_something\nB's do_something\nC's do_something" FORCE)
+SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "A's do_something\nC's do_something\nB's do_something\nC's do_something" FORCE)
+SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_ISFINITE
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_ISFINITE__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_LONG_LONG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_LONG_LONG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_LIMITS
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_LIMITS__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_NEXTAFTER
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_NEXTAFTER__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_STL
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_STL__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TR1_ARRAY
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TR1_ARRAY__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TR1_TUPLE
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TR1_TUPLE__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NUMERIC_LIMITS_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NUMERIC_LIMITS_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( ZLIB_RUN_RES
+ 0
+ CACHE STRING "version=1.2.5" FORCE)
+SET( ZLIB_RUN_RES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "version=1.2.5" FORCE)
+SET( QT4_RUN_RES
+ 0
+ CACHE STRING "version=4.8.0" FORCE)
+SET( QT4_RUN_RES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "version=4.8.0" FORCE)
diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
index fbdde88..5d8a0a9 100644
--- a/cmake/modules/FindBoost.cmake
+++ b/cmake/modules/FindBoost.cmake
@@ -167,6 +167,7 @@
#
include( CGAL_VersionUtils )
+set(Boost_USE_STATIC_LIBS ON)
#-------------------------------------------------------------------------------
@@ -706,7 +707,9 @@ ELSE (_boost_IN_CACHE)
ENDIF( Boost_USE_STATIC_LIBS )
# Find libraries (search in user defined directories first)
+ SET ( _boost_COMPILER "_win32")
SET ( _boost_${UPPERCOMPONENT}_LIBRARY_RELEASE_NAMES
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
diff --git a/include/CGAL/Constrained_Delaunay_triangulation_2.h b/include/CGAL/Constrained_Delaunay_triangulation_2.h
index f1a7201..23a53c9 100644
--- a/include/CGAL/Constrained_Delaunay_triangulation_2.h
+++ b/include/CGAL/Constrained_Delaunay_triangulation_2.h
@@ -389,7 +389,7 @@ is_flipable(Face_handle f, int i, bool perturb) const
Face_handle ni = f->neighbor(i);
if (is_infinite(f) || is_infinite(ni)) return false;
if (f->is_constrained(i)) return false;
- return (side_of_oriented_circle(ni, f->vertex(i)->point(), perturb)
+ return (this->side_of_oriented_circle(ni, f->vertex(i)->point(), perturb)
== ON_POSITIVE_SIDE);
}
@@ -493,7 +493,7 @@ test_conflict(const Point& p, Face_handle fh) const
// return true if P is inside the circumcircle of fh
// if fh is infinite, return true when p is in the positive
// halfspace or on the boundary and in the finite edge of fh
- Oriented_side os = side_of_oriented_circle(fh,p,true);
+ Oriented_side os = this->side_of_oriented_circle(fh,p,true);
if (os == ON_POSITIVE_SIDE) return true;
if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) {
--
1.7.7.3
From aae0b2e8745754a1d90e080d6afb15f177b0705b Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 18 Nov 2011 00:08:25 +0100
Subject: [PATCH 2/2] prevent Qt's moc from choking on BOOST_JOIN
Taken from:
https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
diff --git a/include/CGAL/Qt/GraphicsItem.h b/include/CGAL/Qt/GraphicsItem.h
index 7348d02..807e200 100644
--- a/include/CGAL/Qt/GraphicsItem.h
+++ b/include/CGAL/Qt/GraphicsItem.h
@@ -24,7 +24,9 @@
#include <CGAL/auto_link/Qt4.h>
#include <QObject>
#include <QGraphicsItem>
+#ifndef Q_MOC_RUN
#include <CGAL/Object.h>
+#endif
diff --git a/include/CGAL/Qt/GraphicsViewInput.h b/include/CGAL/Qt/GraphicsViewInput.h
index 6c912cc..a5c5da8 100644
--- a/include/CGAL/Qt/GraphicsViewInput.h
+++ b/include/CGAL/Qt/GraphicsViewInput.h
@@ -22,7 +22,9 @@
#define CGAL_QT_GRAPHICS_VIEW_INPUT_H
#include <CGAL/auto_link/Qt4.h>
+#ifndef Q_MOC_RUN
#include <CGAL/Object.h>
+#endif
#include <QObject>
namespace CGAL {
--
1.7.7.3
diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake
--- a/cmake/modules/CGAL_Macros.cmake 2011-12-28 15:19:49.885888900 -0300
+++ b/cmake/modules/CGAL_Macros.cmake 2011-12-28 15:20:20.435888915 -0300
@@ -164,9 +164,9 @@
if ( ${LIB}_RUN_RES EQUAL "0" )
string( REGEX MATCH "version=.*\$" ${LIB}_VERSION_LINE ${${LIB}_OUTPUT} )
- string( REPLACE "\n" "" ${LIB}_VERSION_LINE2 ${${LIB}_VERSION_LINE} )
- string( REPLACE "\r" "" ${LIB}_VERSION_LINE3 ${${LIB}_VERSION_LINE2} )
- string( REPLACE "version=" "" ${LIB}_VERSION ${${LIB}_VERSION_LINE3} )
+ string( REPLACE "\n" "" "${LIB}_VERSION_LINE2" "${${LIB}_VERSION_LINE}" )
+ string( REPLACE "\r" "" "${LIB}_VERSION_LINE3" "${${LIB}_VERSION_LINE2}" )
+ string( REPLACE "version=" "" "${LIB}_VERSION" "${${LIB}_VERSION_LINE3}" )
else()

48
src/cgal.mk Normal file
View File

@ -0,0 +1,48 @@
# This file is part of mingw-cross-env.
# See doc/index.html for further information.
# cgal
PKG := cgal
$(PKG)_IGNORE :=
$(PKG)_VERSION := 3.9
$(PKG)_CHECKSUM := cc99fad7116f221b6301326834f71ff65cebf2eb
$(PKG)_SUBDIR := CGAL-$($(PKG)_VERSION)
$(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.cgal.org/
$(PKG)_URL := https://gforge.inria.fr/frs/download.php/29125/$($(PKG)_FILE)
$(PKG)_DEPS := gcc boost gmp mpfr qt
define $(PKG)_UPDATE
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
endef
define $(PKG)_BUILD
cd '$(1)' && cmake \
-DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" \
-DCMAKE_BUILD_TYPE:STRING="Release" \
-DCGAL_INSTALL_INC_DIR:STRING="include" \
-DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-3.9" \
-DCGAL_INSTALL_BIN_DIR:STRING="bin" \
-DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
-DWITH_CGAL_Qt3:BOOL="0" \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DBOOST_COMPILER=_win32 \
-DBOOST_THREAD_USE_LIB=1 \
-DBOOST_USE_STATIC_LIBS=1 \
-C TryRunResults.cgal.cmake .
$(MAKE) -C '$(1)' -j $(JOBS)
cd '$(1)/examples/AABB_tree' && cmake \
-DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
-DWITH_CGAL_Qt3:BOOL="0" \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DBOOST_COMPILER=_win32 \
-DBOOST_THREAD_USE_LIB=1 \
-DBOOST_USE_STATIC_LIBS=1 \
-DCGAL_DIR:STRING="../.." .
$(MAKE) -C '$(1)/examples/AABB_tree' -j $(JOBS)
$(MAKE) -C '$(1)' -j $(JOBS) install
$(INSTALL) '$(1)/examples/AABB_tree/AABB_polyhedron_edge_example.exe' '$(PREFIX)/$(TARGET)/bin/test-cgal.exe'
endef

19
src/curl-1-fix-static.patch
View File

@ -1,19 +0,0 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
This patch has been taken from:
http://sourceforge.net/tracker/?func=detail&aid=3016471&group_id=976&atid=100976
diff -r f9016ca5bace include/curl/curlbuild.h.in
--- a/include/curl/curlbuild.h.in Tue Jun 15 13:55:53 2010 +0200
+++ b/include/curl/curlbuild.h.in Tue Jun 15 14:00:13 2010 +0200
@@ -111,6 +111,9 @@
/* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */
/* ================================================================ */
+/* Configure process defines this to 1 when static linking is requested. */
+#undef CURL_STATICLIB
+
/* Configure process defines this to 1 when it finds out that system */
/* header file ws2tcpip.h must be included by the external interface. */
#undef CURL_PULL_WS2TCPIP_H

728
src/curl-1-fixes.patch Normal file
View File

@ -0,0 +1,728 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Commits backported (cherry-picked) from upstream.
http://github.com/bagder/curl
Also contains mingw-cross-env specific fixes.
From 017b42a86ec4cac8a4cd71cc607d0a4d201ff4fd Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Fri, 28 Oct 2011 13:48:04 +0200
Subject: [PATCH 1/7] static linking for mingw-cross-env
---
include/curl/curlbuild.h.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/include/curl/curlbuild.h.in b/include/curl/curlbuild.h.in
index fe348f4..c428273 100644
--- a/include/curl/curlbuild.h.in
+++ b/include/curl/curlbuild.h.in
@@ -111,6 +111,9 @@
/* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */
/* ================================================================ */
+/* Configure process defines this to 1 when static linking is requested. */
+#undef CURL_STATICLIB
+
/* Configure process defines this to 1 when it finds out that system */
/* header file ws2tcpip.h must be included by the external interface. */
#undef CURL_PULL_WS2TCPIP_H
--
1.7.7.3
From 1ce66d38f2696a25aeac411beaf9e291c8775fe5 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Tue, 15 Nov 2011 11:52:32 +0200
Subject: [PATCH 2/7] Add support for using nettle instead of gcrypt as gnutls
backend (cherry picked from commit
64f328c787ab763cc994eadd6b82f32490d37ebb)
---
configure.ac | 29 +++++++++++++++++++++--------
lib/curl_ntlm_core.c | 36 +++++++++++++++++++++++++++++++++++-
lib/curl_ntlm_msgs.c | 14 ++++++++++++++
lib/gtls.c | 4 ++++
lib/md5.c | 26 ++++++++++++++++++++++++++
5 files changed, 100 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 64ee1b7..2ba6625 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1799,17 +1799,30 @@ if test "$OPENSSL_ENABLED" != "1"; then
fi dnl OPENSSL != 1
dnl ---
-dnl If GnuTLS is enabled, we MUST verify that it uses libgcrypt since
-dnl curl code relies on that but recent GnuTLS versions can in fact build
-dnl with different crypto libraries which curl right now cannot handle
+dnl Check which crypto backend GnuTLS uses
dnl ---
if test "$GNUTLS_ENABLED" = "1"; then
- AC_CHECK_LIB(gcrypt,
- gcry_control, ,
- [
- AC_MSG_ERROR([need GnuTLS built with gcrypt to function with GnuTLS])
- ])
+ USE_GNUTLS_NETTLE=
+ # First check if we can detect either crypto library via transitive linking
+ AC_CHECK_LIB(gnutls, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
+ if test "$USE_GNUTLS_NETTLE" = ""; then
+ AC_CHECK_LIB(gnutls, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
+ fi
+ # If not, try linking directly to both of them to see if they are available
+ if test "$USE_GNUTLS_NETTLE" = ""; then
+ AC_CHECK_LIB(nettle, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
+ fi
+ if test "$USE_GNUTLS_NETTLE" = ""; then
+ AC_CHECK_LIB(gcrypt, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
+ fi
+ if test "$USE_GNUTLS_NETTLE" = ""; then
+ AC_MSG_ERROR([GnuTLS found, but neither gcrypt nor nettle found])
+ fi
+ if test "$USE_GNUTLS_NETTLE" = "1"; then
+ AC_DEFINE(USE_GNUTLS_NETTLE, 1, [if GnuTLS uses nettle as crypto backend])
+ AC_SUBST(USE_GNUTLS_NETTLE, [1])
+ fi
fi
dnl ---
diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
index 0be16b4..39952d2 100644
--- a/lib/curl_ntlm_core.c
+++ b/lib/curl_ntlm_core.c
@@ -63,6 +63,11 @@
# define DESKEY(x) &x
# endif
+#elif defined(USE_GNUTLS_NETTLE)
+
+# include <nettle/des.h>
+# include <nettle/md4.h>
+
#elif defined(USE_GNUTLS)
# include <gcrypt.h>
@@ -133,7 +138,17 @@ static void extend_key_56_to_64(const unsigned char *key_56, char *key)
key[7] = (unsigned char) ((key_56[6] << 1) & 0xFF);
}
-#if defined(USE_GNUTLS)
+#if defined(USE_GNUTLS_NETTLE)
+
+static void setup_des_key(const unsigned char *key_56,
+ struct des_ctx *des)
+{
+ char key[8];
+ extend_key_56_to_64(key_56, key);
+ des_set_key(des, key);
+}
+
+#elif defined(USE_GNUTLS)
/*
* Turns a 56 bit key into the 64 bit, odd parity key and sets the key.
@@ -233,6 +248,14 @@ void Curl_ntlm_core_lm_resp(const unsigned char *keys,
setup_des_key(keys + 14, DESKEY(ks));
DES_ecb_encrypt((DES_cblock*) plaintext, (DES_cblock*) (results + 16),
DESKEY(ks), DES_ENCRYPT);
+#elif defined(USE_GNUTLS_NETTLE)
+ struct des_ctx des;
+ setup_des_key(keys, &des);
+ des_encrypt(&des, 8, results, plaintext);
+ setup_des_key(keys + 7, &des);
+ des_encrypt(&des, 8, results + 8, plaintext);
+ setup_des_key(keys + 14, &des);
+ des_encrypt(&des, 8, results + 16, plaintext);
#elif defined(USE_GNUTLS)
gcry_cipher_hd_t des;
@@ -295,6 +318,12 @@ void Curl_ntlm_core_mk_lm_hash(struct SessionHandle *data,
setup_des_key(pw + 7, DESKEY(ks));
DES_ecb_encrypt((DES_cblock *)magic, (DES_cblock *)(lmbuffer + 8),
DESKEY(ks), DES_ENCRYPT);
+#elif defined(USE_GNUTLS_NETTLE)
+ struct des_ctx des;
+ setup_des_key(pw, &des);
+ des_encrypt(&des, 8, lmbuffer, magic);
+ setup_des_key(pw + 7, &des);
+ des_encrypt(&des, 8, lmbuffer + 8, magic);
#elif defined(USE_GNUTLS)
gcry_cipher_hd_t des;
@@ -357,6 +386,11 @@ CURLcode Curl_ntlm_core_mk_nt_hash(struct SessionHandle *data,
MD4_Init(&MD4pw);
MD4_Update(&MD4pw, pw, 2 * len);
MD4_Final(ntbuffer, &MD4pw);
+#elif defined(USE_GNUTLS_NETTLE)
+ struct md4_ctx MD4pw;
+ md4_init(&MD4pw);
+ md4_update(&MD4pw, 2 * len, pw);
+ md4_digest(&MD4pw, MD4_DIGEST_SIZE, ntbuffer);
#elif defined(USE_GNUTLS)
gcry_md_hd_t MD4pw;
gcry_md_open(&MD4pw, GCRY_MD_MD4, 0);
diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c
index bfd3e28..712c4b4 100644
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -54,6 +54,13 @@
# endif
# include "ssluse.h"
+#elif defined(USE_GNUTLS_NETTLE)
+
+# include <nettle/md5.h>
+# include <gnutls/gnutls.h>
+# include <gnutls/crypto.h>
+# define MD5_DIGEST_LENGTH 16
+
#elif defined(USE_GNUTLS)
# include <gcrypt.h>
@@ -714,6 +721,9 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data,
MD5_CTX MD5pw;
Curl_ossl_seed(data); /* Initiate the seed if not already done */
RAND_bytes(entropy, 8);
+#elif defined(USE_GNUTLS_NETTLE)
+ struct md5_ctx MD5pw;
+ gnutls_rnd(GNUTLS_RND_RANDOM, entropy, 8);
#elif defined(USE_GNUTLS)
gcry_md_hd_t MD5pw;
Curl_gtls_seed(data); /* Initiate the seed if not already done */
@@ -739,6 +749,10 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data,
MD5_Init(&MD5pw);
MD5_Update(&MD5pw, tmp, 16);
MD5_Final(md5sum, &MD5pw);
+#elif defined(USE_GNUTLS_NETTLE)
+ md5_init(&MD5pw);
+ md5_update(&MD5pw, 16, tmp);
+ md5_digest(&MD5pw, 16, md5sum);
#elif defined(USE_GNUTLS)
gcry_md_open(&MD5pw, GCRY_MD_MD5, 0);
gcry_md_write(MD5pw, tmp, MD5_DIGEST_LENGTH);
diff --git a/lib/gtls.c b/lib/gtls.c
index ed79313..a98a7e8 100644
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -34,7 +34,9 @@
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
+#ifndef USE_GNUTLS_NETTLE
#include <gcrypt.h>
+#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
@@ -1032,7 +1034,9 @@ int Curl_gtls_seed(struct SessionHandle *data)
static bool ssl_seeded = FALSE;
/* Quickly add a bit of entropy */
+#ifndef USE_GNUTLS_NETTLE
gcry_fast_random_poll();
+#endif
if(!ssl_seeded || data->set.str[STRING_SSL_RANDOM_FILE] ||
data->set.str[STRING_SSL_EGDSOCKET]) {
diff --git a/lib/md5.c b/lib/md5.c
index f26e027..cf8e053 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -27,6 +27,30 @@
#include "curl_md5.h"
#include "curl_hmac.h"
+#ifdef USE_GNUTLS_NETTLE
+
+#include <nettle/md5.h>
+
+typedef struct md5_ctx MD5_CTX;
+
+static void MD5_Init(MD5_CTX * ctx)
+{
+ md5_init(ctx);
+}
+
+static void MD5_Update(MD5_CTX * ctx,
+ const unsigned char * input,
+ unsigned int inputLen)
+{
+ md5_update(ctx, inputLen, input);
+}
+
+static void MD5_Final(unsigned char digest[16], MD5_CTX * ctx)
+{
+ md5_digest(ctx, 16, digest);
+}
+#else
+
#ifdef USE_GNUTLS
#include <gcrypt.h>
@@ -369,6 +393,8 @@ static void Decode (UINT4 *output,
#endif /* USE_GNUTLS */
+#endif /* USE_GNUTLS_NETTLE */
+
const HMAC_params Curl_HMAC_MD5[] = {
{
(HMAC_hinit_func) MD5_Init, /* Hash initialization function. */
--
1.7.7.3
From 380fb5054be1ccd85a80220fafbfcb33e1010f05 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 22 Nov 2011 22:48:15 +0100
Subject: [PATCH 3/7] gnutls: only translate winsock errors for old versions
Bugfix: https handshake fails using gnutls 3 on windows
http://sourceforge.net/tracker/index.php?func=detail&aid=3441084&group_id=976&atid=100976
New gnutls versions have an error handler that knows about Winsock
errors, which is why gnutls_transport_set_global_errno() was deprecated
and then removed.
This is a correction of commit f5bb370 (blame me) which meant to
reimplement gnutls_transport_set_global_errno(), which is not necessary.
(cherry picked from commit 28bac99674f199898f3e803fcfc4167a56a4c058)
---
lib/gtls.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/gtls.c b/lib/gtls.c
index a98a7e8..c64c8c4 100644
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -80,15 +80,17 @@ static void tls_log_func(int level, const char *str)
#endif
static bool gtls_inited = FALSE;
+#undef MAP_WINSOCK_ERRORS
#if defined(GNUTLS_VERSION_NUMBER)
# if (GNUTLS_VERSION_NUMBER >= 0x020c00)
# undef gnutls_transport_set_lowat
# define gnutls_transport_set_lowat(A,B) Curl_nop_stmt
# define USE_GNUTLS_PRIORITY_SET_DIRECT 1
# endif
-# if (GNUTLS_VERSION_NUMBER >= 0x020c03)
-# undef gnutls_transport_set_global_errno
-# define gnutls_transport_set_global_errno(A) SET_ERRNO((A))
+# if (GNUTLS_VERSION_NUMBER < 0x020c03)
+# ifdef USE_WINSOCK
+# define MAP_WINSOCK_ERRORS
+# endif
# endif
#endif
@@ -100,6 +102,7 @@ static bool gtls_inited = FALSE;
* us to get specific about the fourth "flags" argument, and to use arbitrary
* private data with gnutls_transport_set_ptr if we wish.
*
+ * For old gnutls versions, curl must translate Winsock errors:
* When these custom push and pull callbacks fail, GNU TLS checks its own
* session-specific error variable, and when not set also its own global
* errno variable, in order to take appropriate action. GNU TLS does not
@@ -111,7 +114,7 @@ static bool gtls_inited = FALSE;
* error translation must take place in these callbacks.
*/
-#ifdef USE_WINSOCK
+#ifdef MAP_WINSOCK_ERRORS
# define gtls_EINTR 4
# define gtls_EIO 5
# define gtls_EAGAIN 11
@@ -132,7 +135,7 @@ static int gtls_mapped_sockerrno(void)
static ssize_t Curl_gtls_push(void *s, const void *buf, size_t len)
{
ssize_t ret = swrite(GNUTLS_POINTER_TO_INT_CAST(s), buf, len);
-#ifdef USE_WINSOCK
+#ifdef MAP_WINSOCK_ERRORS
if(ret < 0)
gnutls_transport_set_global_errno(gtls_mapped_sockerrno());
#endif
@@ -142,7 +145,7 @@ static ssize_t Curl_gtls_push(void *s, const void *buf, size_t len)
static ssize_t Curl_gtls_pull(void *s, void *buf, size_t len)
{
ssize_t ret = sread(GNUTLS_POINTER_TO_INT_CAST(s), buf, len);
-#ifdef USE_WINSOCK
+#ifdef MAP_WINSOCK_ERRORS
if(ret < 0)
gnutls_transport_set_global_errno(gtls_mapped_sockerrno());
#endif
--
1.7.7.3
From 53b8a80e2e1d3a9a51ed461210a5244abdb0edfb Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Thu, 24 Nov 2011 12:11:52 +0100
Subject: [PATCH 4/7] Fix unreleased regression when using windows gnutls
versions older than 2.8 (cherry picked from commit
78feaff9d800efb5d1f97f8653721718a6cf00c8)
---
lib/gtls.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/gtls.c b/lib/gtls.c
index c64c8c4..a2e8d99 100644
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -80,17 +80,14 @@ static void tls_log_func(int level, const char *str)
#endif
static bool gtls_inited = FALSE;
-#undef MAP_WINSOCK_ERRORS
#if defined(GNUTLS_VERSION_NUMBER)
# if (GNUTLS_VERSION_NUMBER >= 0x020c00)
# undef gnutls_transport_set_lowat
# define gnutls_transport_set_lowat(A,B) Curl_nop_stmt
# define USE_GNUTLS_PRIORITY_SET_DIRECT 1
# endif
-# if (GNUTLS_VERSION_NUMBER < 0x020c03)
-# ifdef USE_WINSOCK
-# define MAP_WINSOCK_ERRORS
-# endif
+# if (GNUTLS_VERSION_NUMBER >= 0x020c03)
+# define GNUTLS_MAPS_WINSOCK_ERRORS 1
# endif
#endif
@@ -102,7 +99,6 @@ static bool gtls_inited = FALSE;
* us to get specific about the fourth "flags" argument, and to use arbitrary
* private data with gnutls_transport_set_ptr if we wish.
*
- * For old gnutls versions, curl must translate Winsock errors:
* When these custom push and pull callbacks fail, GNU TLS checks its own
* session-specific error variable, and when not set also its own global
* errno variable, in order to take appropriate action. GNU TLS does not
@@ -112,9 +108,13 @@ static bool gtls_inited = FALSE;
* resort global errno variable using gnutls_transport_set_global_errno,
* with a transport agnostic error value. This implies that some winsock
* error translation must take place in these callbacks.
+ *
+ * Paragraph above applies to GNU TLS versions older than 2.12.3, since
+ * this version GNU TLS does its own internal winsock error translation
+ * using system_errno() function.
*/
-#ifdef MAP_WINSOCK_ERRORS
+#if defined(USE_WINSOCK) && !defined(GNUTLS_MAPS_WINSOCK_ERRORS)
# define gtls_EINTR 4
# define gtls_EIO 5
# define gtls_EAGAIN 11
@@ -135,7 +135,7 @@ static int gtls_mapped_sockerrno(void)
static ssize_t Curl_gtls_push(void *s, const void *buf, size_t len)
{
ssize_t ret = swrite(GNUTLS_POINTER_TO_INT_CAST(s), buf, len);
-#ifdef MAP_WINSOCK_ERRORS
+#if defined(USE_WINSOCK) && !defined(GNUTLS_MAPS_WINSOCK_ERRORS)
if(ret < 0)
gnutls_transport_set_global_errno(gtls_mapped_sockerrno());
#endif
@@ -145,7 +145,7 @@ static ssize_t Curl_gtls_push(void *s, const void *buf, size_t len)
static ssize_t Curl_gtls_pull(void *s, void *buf, size_t len)
{
ssize_t ret = sread(GNUTLS_POINTER_TO_INT_CAST(s), buf, len);
-#ifdef MAP_WINSOCK_ERRORS
+#if defined(USE_WINSOCK) && !defined(GNUTLS_MAPS_WINSOCK_ERRORS)
if(ret < 0)
gnutls_transport_set_global_errno(gtls_mapped_sockerrno());
#endif
--
1.7.7.3
From 8cd4aa2718f67e50a72bb34c9d8ede803c86b287 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 25 Nov 2011 23:00:16 +0100
Subject: [PATCH 5/7] configure: add support for pkg-config detection of
libidn (cherry picked from commit
874855b743bd7e9bbbaebe2834dd281d2b2cea80)
---
configure.ac | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2ba6625..52158f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2377,6 +2377,15 @@ case "$LIBIDN" in
fi
if test "x$idn" != "xyes"; then
+ dnl check with pkg-config
+ PKG_CHECK_MODULES(LIBIDN_PC, libidn >= 0.0.0, [idn=yes], [idn=no])
+ if test "x$idn" = "xyes"; then
+ LIBS="$LIBS $LIBIDN_PC_LIBS"
+ CPPFLAGS="$CPPFLAGS $LIBIDN_PC_CFLAGS"
+ fi
+ fi
+
+ if test "x$idn" != "xyes"; then
dnl check with default paths
idn="yes"
AC_CHECK_LIB(idn, idna_to_ascii_lz, ,
--
1.7.7.3
From e5d7e688946a01c4c24568981fa7252aadf818b4 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 27 Nov 2011 20:00:30 +0100
Subject: [PATCH 6/7] configure: fix to make older pkg-config play well
configure.ac:1349: error: possibly undefined macro: PKG_CONFIG_LIBDIR
Obviously this is not a problem with pkg-config 0.26 but older versions
seem to show this.
Fix suggested by: Kamil Dudka
Reported by: Guenter
Bug: http://curl.haxx.se/mail/lib-2011-11/0298.html
(cherry picked from commit 11e52ef0a157acd6a6711b7635cda50467e606ae)
---
configure.ac | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 52158f1..7d2c7e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2377,6 +2377,10 @@ case "$LIBIDN" in
fi
if test "x$idn" != "xyes"; then
+
+ dnl to prevent errors with pkg-config < 0.26
+ m4_pattern_allow(PKG_CONFIG_LIBDIR)
+
dnl check with pkg-config
PKG_CHECK_MODULES(LIBIDN_PC, libidn >= 0.0.0, [idn=yes], [idn=no])
if test "x$idn" = "xyes"; then
--
1.7.7.3
From 69772182aa9e08e39f42d17abb5af553b493a90c Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Tue, 29 Nov 2011 19:11:34 +0100
Subject: [PATCH 7/7] configure: avoid usage of macro PKG_CHECK_MODULES
libidn option adjusted in order to use pkg-config info when available
in a similar way as we already do for other libraries.
(cherry picked from commit f80a508297e7ece911bbb833436985070e17e6a8)
---
configure.ac | 183 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 131 insertions(+), 52 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7d2c7e4..94cdd83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2349,64 +2349,143 @@ dnl Check for the presence of IDN libraries and headers
dnl **********************************************************************
AC_MSG_CHECKING([whether to build with libidn])
+OPT_IDN="default"
AC_ARG_WITH(libidn,
AC_HELP_STRING([--with-libidn=PATH],[Enable libidn usage])
AC_HELP_STRING([--without-libidn],[Disable libidn usage]),
- [LIBIDN="$withval"])
-
-case "$LIBIDN" in
+ [OPT_IDN=$withval])
+case "$OPT_IDN" in
no)
- AC_MSG_RESULT(no)
- ;;
- *) AC_MSG_RESULT(yes)
-
- idn=""
- dnl if there is a given path, check that FIRST
- if test -n "$LIBIDN"; then
- if test "x$LIBIDN" != "xyes"; then
- oldLDFLAGS=$LDFLAGS
- oldCPPFLAGS=$CPPFLAGS
- LDFLAGS="$LDFLAGS -L$LIBIDN/lib"
- CPPFLAGS="$CPPFLAGS -I$LIBIDN/include"
- idn="yes"
- AC_CHECK_LIB(idn, idna_to_ascii_4i, ,
- idn=""
- LDFLAGS=$oldLDFLAGS
- CPPFLAGS=$oldCPPFLAGS)
- fi
- fi
-
- if test "x$idn" != "xyes"; then
-
- dnl to prevent errors with pkg-config < 0.26
- m4_pattern_allow(PKG_CONFIG_LIBDIR)
-
- dnl check with pkg-config
- PKG_CHECK_MODULES(LIBIDN_PC, libidn >= 0.0.0, [idn=yes], [idn=no])
- if test "x$idn" = "xyes"; then
- LIBS="$LIBS $LIBIDN_PC_LIBS"
- CPPFLAGS="$CPPFLAGS $LIBIDN_PC_CFLAGS"
- fi
- fi
-
- if test "x$idn" != "xyes"; then
- dnl check with default paths
- idn="yes"
- AC_CHECK_LIB(idn, idna_to_ascii_lz, ,
- idn="")
- fi
-
- if test "x$idn" = "xyes"; then
- curl_idn_msg="enabled"
- AC_SUBST(IDN_ENABLED, [1])
- dnl different versions of libidn have different setups of these:
- AC_CHECK_FUNCS( idn_free idna_strerror tld_strerror)
- AC_CHECK_HEADERS( idn-free.h tld.h )
- fi
-
- ;;
+ dnl --without-libidn option used
+ want_idn="no"
+ AC_MSG_RESULT([no])
+ ;;
+ default)
+ dnl configure option not specified
+ want_idn="yes"
+ want_idn_path="default"
+ AC_MSG_RESULT([(assumed) yes])
+ ;;
+ yes)
+ dnl --with-libidn option used without path
+ want_idn="yes"
+ want_idn_path="default"
+ AC_MSG_RESULT([yes])
+ ;;
+ *)
+ dnl --with-libidn option used with path
+ want_idn="yes"
+ want_idn_path="$withval"
+ AC_MSG_RESULT([yes ($withval)])
+ ;;
esac
+if test "$want_idn" = "yes"; then
+ dnl idn library support has been requested
+ clean_CPPFLAGS="$CPPFLAGS"
+ clean_LDFLAGS="$LDFLAGS"
+ clean_LIBS="$LIBS"
+ PKGCONFIG="no"
+ #
+ if test "$want_idn_path" != "default"; then
+ dnl path has been specified
+ IDN_PCDIR="$want_idn_path/lib$libsuff/pkgconfig"
+ CURL_CHECK_PKGCONFIG(libidn, [$IDN_PCDIR])
+ if test "$PKGCONFIG" != "no"; then
+ IDN_LIBS=`CURL_EXPORT_PCDIR([$IDN_PCDIR]) dnl
+ $PKGCONFIG --libs-only-l libidn 2>/dev/null`
+ IDN_LDFLAGS=`CURL_EXPORT_PCDIR([$IDN_PCDIR]) dnl
+ $PKGCONFIG --libs-only-L libidn 2>/dev/null`
+ IDN_CPPFLAGS=`CURL_EXPORT_PCDIR([$IDN_PCDIR]) dnl
+ $PKGCONFIG --cflags-only-I libidn 2>/dev/null`
+ IDN_DIR=`echo $IDN_LDFLAGS | $SED -e 's/-L//'`
+ else
+ dnl pkg-config not available or provides no info
+ IDN_LIBS="-lidn"
+ IDN_LDFLAGS="-L$want_idn_path/lib$libsuff"
+ IDN_CPPFLAGS="-I$want_idn_path/include"
+ IDN_DIR="$want_idn_path/lib$libsuff"
+ fi
+ else
+ dnl path not specified
+ CURL_CHECK_PKGCONFIG(libidn)
+ if test "$PKGCONFIG" != "no"; then
+ IDN_LIBS=`$PKGCONFIG --libs-only-l libidn 2>/dev/null`
+ IDN_LDFLAGS=`$PKGCONFIG --libs-only-L libidn 2>/dev/null`
+ IDN_CPPFLAGS=`$PKGCONFIG --cflags-only-I libidn 2>/dev/null`
+ IDN_DIR=`echo $IDN_LDFLAGS | $SED -e 's/-L//'`
+ else
+ dnl pkg-config not available or provides no info
+ IDN_LIBS="-lidn"
+ fi
+ fi
+ #
+ if test "$PKGCONFIG" != "no"; then
+ AC_MSG_NOTICE([pkg-config: IDN_LIBS: "$IDN_LIBS"])
+ AC_MSG_NOTICE([pkg-config: IDN_LDFLAGS: "$IDN_LDFLAGS"])
+ AC_MSG_NOTICE([pkg-config: IDN_CPPFLAGS: "$IDN_CPPFLAGS"])
+ AC_MSG_NOTICE([pkg-config: IDN_DIR: "$IDN_DIR"])
+ else
+ AC_MSG_NOTICE([IDN_LIBS: "$IDN_LIBS"])
+ AC_MSG_NOTICE([IDN_LDFLAGS: "$IDN_LDFLAGS"])
+ AC_MSG_NOTICE([IDN_CPPFLAGS: "$IDN_CPPFLAGS"])
+ AC_MSG_NOTICE([IDN_DIR: "$IDN_DIR"])
+ fi
+ #
+ CPPFLAGS="$IDN_CPPFLAGS $CPPFLAGS"
+ LDFLAGS="$IDN_LDFLAGS $LDFLAGS"
+ LIBS="$IDN_LIBS $LIBS"
+ #
+ AC_MSG_CHECKING([if idna_to_ascii_4i can be linked])
+ AC_LINK_IFELSE([
+ AC_LANG_FUNC_LINK_TRY([idna_to_ascii_4i])
+ ],[
+ AC_MSG_RESULT([yes])
+ tst_links_libidn="yes"
+ ],[
+ AC_MSG_RESULT([no])
+ tst_links_libidn="no"
+ ])
+ if test "$tst_links_libidn" = "no"; then
+ AC_MSG_CHECKING([if idna_to_ascii_lz can be linked])
+ AC_LINK_IFELSE([
+ AC_LANG_FUNC_LINK_TRY([idna_to_ascii_lz])
+ ],[
+ AC_MSG_RESULT([yes])
+ tst_links_libidn="yes"
+ ],[
+ AC_MSG_RESULT([no])
+ tst_links_libidn="no"
+ ])
+ fi
+ #
+ if test "$tst_links_libidn" = "yes"; then
+ AC_DEFINE(HAVE_LIBIDN, 1, [Define to 1 if you have the `idn' library (-lidn).])
+ dnl different versions of libidn have different setups of these:
+ AC_CHECK_FUNCS( idn_free idna_strerror tld_strerror )
+ AC_CHECK_HEADERS( idn-free.h tld.h )
+ if test "x$ac_cv_header_tld_h" = "xyes"; then
+ AC_SUBST([IDN_ENABLED], [1])
+ curl_idn_msg="enabled"
+ if test -n "$IDN_DIR"; then
+ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$IDN_DIR"
+ export LD_LIBRARY_PATH
+ AC_MSG_NOTICE([Added $IDN_DIR to LD_LIBRARY_PATH])
+ fi
+ else
+ AC_MSG_WARN([Libraries for IDN support too old: IDN disabled])
+ CPPFLAGS="$clean_CPPFLAGS"
+ LDFLAGS="$clean_LDFLAGS"
+ LIBS="$clean_LIBS"
+ fi
+ else
+ AC_MSG_WARN([Cannot find libraries for IDN support: IDN disabled])
+ CPPFLAGS="$clean_CPPFLAGS"
+ LDFLAGS="$clean_LDFLAGS"
+ LIBS="$clean_LIBS"
+ fi
+fi
+
dnl Let's hope this split URL remains working:
dnl http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/aixprggd/ \
--
1.7.7.3

15
src/curl.mk
View File

@ -4,13 +4,13 @@
# cURL
PKG := curl
$(PKG)_IGNORE :=
$(PKG)_VERSION := 7.21.6
$(PKG)_CHECKSUM := 049a3aff13d283f6e4ea1f9aa3aa6abc067fd42e
$(PKG)_VERSION := 7.23.1
$(PKG)_CHECKSUM := 9bac69696446ead85e59d8488098ee84cf897b7e
$(PKG)_SUBDIR := curl-$($(PKG)_VERSION)
$(PKG)_FILE := curl-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://curl.haxx.se/libcurl/
$(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE)
$(PKG)_DEPS := gcc gnutls libidn
$(PKG)_DEPS := gcc gnutls libidn libssh2
define $(PKG)_UPDATE
wget -q -O- 'http://curl.haxx.se/download/?C=M;O=D' | \
@ -19,16 +19,17 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./buildconf
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--with-gnutls \
--with-libidn \
LIBS="-lgcrypt -liconv `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs`"
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--enable-sspi \
--with-libssh2
$(MAKE) -C '$(1)' -j '$(JOBS)' install
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \

44
src/dbus-1-fixes.patch
View File

@ -1,17 +1,19 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
From 7241e09abbfc2021f2a7e5cbded70222023fa7e6 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Contains ad hoc patches for cross building.
From 9c99802fc9d0e3b2c90b00ba877ae8be9bab615f Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Tue, 4 Jan 2011 00:47:49 +0100
Subject: [PATCH 1/1] always static in mingw-cross-env
Subject: [PATCH 1/2] always static in mingw-cross-env
diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
index d1e40ec..3a32355 100644
index dcd3eeb..8324278 100644
--- a/dbus/dbus-macros.h
+++ b/dbus/dbus-macros.h
@@ -158,6 +158,7 @@
@@ -172,6 +172,7 @@
*/
#if defined(_WIN32)
@ -20,5 +22,35 @@ index d1e40ec..3a32355 100644
# define DBUS_EXPORT
# elif defined(dbus_1_EXPORTS)
--
1.7.1
1.7.6.3
From d7bc1aff67132c09d154999c282e1b391bbe7a39 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 23 Sep 2011 16:24:46 +0200
Subject: [PATCH 2/2] add missing MemoryBarrier (mingw-cross-env specific)
Windows API has this, but it's not in MinGW.
See http://lists-archives.org/mingw-users/15935-missing-definition-of-memorybarrier.html
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index b492b09..082225f 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -55,6 +55,13 @@
#include <ws2tcpip.h>
#include <wincrypt.h>
+__CRT_INLINE VOID MemoryBarrier(VOID)
+{
+ LONG Barrier = 0;
+ __asm__ __volatile__("xchgl %%eax,%0 "
+ :"=r" (Barrier));
+}
+
/* Declarations missing in mingw's headers */
extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR StringSid, PSID *Sid);
extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
--
1.7.6.3

10
src/dbus.mk
View File

@ -4,8 +4,8 @@
# dbus
PKG := dbus
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.5.0
$(PKG)_CHECKSUM := 4f0c82af6de628d7359dcdbc0da402f8e369e367
$(PKG)_VERSION := 1.5.8
$(PKG)_CHECKSUM := c5e9e286b5757f892cc21f894145e7f05c8fc813
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://$(PKG).freedesktop.org/
@ -15,12 +15,12 @@ $(PKG)_DEPS := gcc expat
define $(PKG)_UPDATE
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\.[0123]\.' | \
grep -v '^1\.[01234]\.' | \
head -1
endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
cd '$(1)' && automake && ./configure \
--host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \
--with-xml=expat \
@ -29,8 +29,6 @@ define $(PKG)_BUILD
--disable-asserts \
--disable-shared \
--enable-static \
--disable-tests \
--disable-standalone-tests \
--disable-silent-rules
$(MAKE) -C '$(1)' -j '$(JOBS)' install
endef

3
src/devil.mk
View File

@ -21,10 +21,9 @@ endef
define $(PKG)_BUILD
$(SED) -i 's,__declspec(dllimport),,' '$(1)/include/IL/il.h'
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--enable-ILU \

26
src/eigen.mk Normal file
View File

@ -0,0 +1,26 @@
# This file is part of mingw-cross-env.
# See doc/index.html for further information.
# eigen
PKG := eigen
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.0.17
$(PKG)_CHECKSUM := 7e1674420a8eef7e90e1875ef5b9e828fb9db381
$(PKG)_SUBDIR := $(PKG)-$(PKG)-b23437e61a07
$(PKG)_FILE := $($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://eigen.tuxfamily.org/
$(PKG)_URL := https://bitbucket.org/$(PKG)/$(PKG)/get/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
wget -q -O- 'http://eigen.tuxfamily.org/index.php?title=Main_Page#Download' | \
grep 'eigen/get/' | \
$(SED) -n 's,.*eigen/get/\(2[^>]*\)\.tar.*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
cd '$(1)' && \
cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'
$(MAKE) -C '$(1)' -j '$(JOBS)' install
endef

79
src/exiv2-r2469.patch
View File

@ -1,79 +0,0 @@
# This file is part of mingw-cross-env.
# See doc/index.html for further information.
This patch has been taken from:
http://dev.exiv2.org/issues/764
Index: trunk/src/psdimage.cpp
===================================================================
--- trunk/src/psdimage.cpp (revision 2468)
+++ trunk/src/psdimage.cpp (revision 2469)
@@ -400,7 +400,7 @@
uint32_t resourceType = getULong(buf, bigEndian);
if (resourceType != kPhotoshopResourceType) {
- break; // bad resource type
+ throw Error(3, "Photoshop"); // bad resource type
}
uint16_t resourceId = getUShort(buf + 4, bigEndian);
uint32_t resourceNameLength = buf[6];
@@ -416,13 +416,13 @@
if (io_->read(buf, 4) != 4) throw Error(3, "Photoshop");
uint32_t resourceSize = getULong(buf, bigEndian);
+ uint32_t pResourceSize = (resourceSize + 1) & ~1; // padded resource size
uint32_t curOffset = io_->tell();
// Write IPTC_NAA resource block
if ((resourceId == kPhotoshopResourceID_IPTC_NAA ||
resourceId > kPhotoshopResourceID_IPTC_NAA) && iptcDone == false) {
newResLength += writeIptcData(iptcData_, outIo);
- resourceSize = (resourceSize + 1) & ~1; // adjust for padding
iptcDone = true;
}
@@ -430,7 +430,6 @@
else if ((resourceId == kPhotoshopResourceID_ExifInfo ||
resourceId > kPhotoshopResourceID_ExifInfo) && exifDone == false) {
newResLength += writeExifData(exifData_, outIo);
- resourceSize = (resourceSize + 1) & ~1; // adjust for padding
exifDone = true;
}
@@ -438,7 +437,6 @@
else if ((resourceId == kPhotoshopResourceID_XMPPacket ||
resourceId > kPhotoshopResourceID_XMPPacket) && xmpDone == false) {
newResLength += writeXmpData(xmpData_, outIo);
- resourceSize = (resourceSize + 1) & ~1; // adjust for padding
xmpDone = true;
}
@@ -467,10 +465,9 @@
readTotal = 0;
toRead = 0;
- resourceSize = (resourceSize + 1) & ~1; // pad to even
- while (readTotal < resourceSize) {
- toRead = static_cast<long>(resourceSize - readTotal) < lbuf.size_
- ? static_cast<long>(resourceSize - readTotal) : lbuf.size_;
+ while (readTotal < pResourceSize) {
+ toRead = static_cast<long>(pResourceSize - readTotal) < lbuf.size_
+ ? static_cast<long>(pResourceSize - readTotal) : lbuf.size_;
if (io_->read(lbuf.pData_, toRead) != toRead) {
throw Error(3, "Photoshop");
}
@@ -478,11 +475,11 @@
if (outIo.write(lbuf.pData_, toRead) != toRead) throw Error(21);
}
if (outIo.error()) throw Error(21);
- newResLength += resourceSize + adjResourceNameLen + 12;
+ newResLength += pResourceSize + adjResourceNameLen + 12;
}
- io_->seek(curOffset + resourceSize, BasicIo::beg);
- oldResLength -= (12 + adjResourceNameLen + resourceSize);
+ io_->seek(curOffset + pResourceSize, BasicIo::beg);
+ oldResLength -= (12 + adjResourceNameLen + pResourceSize);
}
// Append IPTC_NAA resource block, if not yet written

41
src/exiv2-r2472.patch
View File

@ -1,41 +0,0 @@
# This file is part of mingw-cross-env.
# See doc/index.html for further information.
This patch has been taken from:
http://dev.exiv2.org/issues/767
Index: trunk/config/configure.ac
===================================================================
--- trunk/config/configure.ac (revision 2471)
+++ trunk/config/configure.ac (revision 2472)
@@ -31,12 +31,6 @@
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_CANONICAL_HOST
-# Add flag for DLL on Windows
-case "$host_os" in
-*mingw* | *cygwin*)
- LDFLAGS="$LDFLAGS -no-undefined"
- ;;
-esac
# ---------------------------------------------------------------------------
# i18n support
@@ -204,6 +198,17 @@
fi
AC_SUBST(EXV_LIB_STATIC)
+# Add flag for DLL on Windows
+#
+# This must happen after all other configure checks, because
+# the "-no-undefined" flag is only for libtool and may not be
+# passed to GCC by accident.
+case "$host_os" in
+*mingw* | *cygwin*)
+ LDFLAGS="$LDFLAGS -no-undefined"
+ ;;
+esac
+
# ---------------------------------------------------------------------------
# Create output files.
# ---------------------------------------------------------------------------

49
src/exiv2-r2619.patch Normal file
View File

@ -0,0 +1,49 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
This patch has been taken from:
http://dev.exiv2.org/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);

11
src/exiv2.mk
View File

@ -4,8 +4,8 @@
# Exiv2
PKG := exiv2
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.21.1
$(PKG)_CHECKSUM := d33e0efbad5d6a7af7f2e6d1d0beb6e7c941cfca
$(PKG)_VERSION := 0.22
$(PKG)_CHECKSUM := 35211d853a986fe1b008fca14db090726e8dcce3
$(PKG)_SUBDIR := exiv2-$($(PKG)_VERSION)
$(PKG)_FILE := exiv2-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.exiv2.org/
@ -20,19 +20,14 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# rebuild configure script as one of the patches modifies configure.ac
$(MAKE) -C '$(1)/config' -f config.make
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-visibility \
--disable-nls \
--with-expat
# fix pkg-config linker flags
$(SED) -i 's,-no-undefined,,' '$(1)/config/exiv2.pc'
$(MAKE) -C '$(1)/xmpsdk/src' -j '$(JOBS)'
$(MAKE) -C '$(1)/src' -j '$(JOBS)' install-lib
endef

4
src/ffmpeg.mk
View File

@ -4,8 +4,8 @@
# ffmpeg
PKG := ffmpeg
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.7-rc1
$(PKG)_CHECKSUM := d15c005f46483fbfc3b678cb1c89123762b56b82
$(PKG)_VERSION := 0.9
$(PKG)_CHECKSUM := 5f4118496ebe8fc37e8f11cf0303f6f7c85756f9
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://www.ffmpeg.org/

4
src/fftw.mk
View File

@ -4,8 +4,8 @@
# fftw
PKG := fftw
$(PKG)_IGNORE :=
$(PKG)_VERSION := 3.2.2
$(PKG)_CHECKSUM := d43b799eedfb9408f62f9f056f5e8a645618467b
$(PKG)_VERSION := 3.3
$(PKG)_CHECKSUM := e44493ba4babeacba184568e727876d9aed44205
$(PKG)_SUBDIR := fftw-$($(PKG)_VERSION)
$(PKG)_FILE := fftw-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.fftw.org/

21
src/file-1-fix-cross-compilation-detection.patch Normal file
View File

@ -0,0 +1,21 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
diff -Nur file-5.09/magic/Makefile.am file-5.09-mingw-cross-env/magic/Makefile.am
--- file-5.09/magic/Makefile.am 2011-09-08 23:58:42.000000000 +0200
+++ file-5.09-mingw-cross-env/magic/Makefile.am 2011-10-23 17:31:31.456765605 +0200
@@ -246,13 +246,8 @@
# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file; for now we bail if the local version does not match
-if IS_CROSS_COMPILE
-FILE_COMPILE = file
+FILE_COMPILE = $(top_builddir)/src/file.local
FILE_COMPILE_DEP =
-else
-FILE_COMPILE = $(top_builddir)/src/file
-FILE_COMPILE_DEP = $(FILE_COMPILE)
-endif
${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
@rm -fr magic

38
src/file.mk Normal file
View File

@ -0,0 +1,38 @@
# This file is part of mingw-cross-env.
# See doc/index.html for further information.
# file
PKG := file
$(PKG)_IGNORE :=
$(PKG)_VERSION := 5.09
$(PKG)_CHECKSUM := 9d905f9e50033c3f5be3728473cbb709a41550fb
$(PKG)_SUBDIR := file-$($(PKG)_VERSION)
$(PKG)_FILE := file-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.darwinsys.com/file/
$(PKG)_URL := ftp://ftp.astron.com/pub/file/$($(PKG)_FILE)
$(PKG)_DEPS := gcc libgnurx
define $(PKG)_UPDATE
wget -q -O- 'ftp://ftp.astron.com/pub/file/' | \
grep 'file-' | \
$(SED) -n 's,.*file-\([0-9][^>]*\)\.tar.*,\1,p' | \
tail -1
endef
define $(PKG)_BUILD
# "file" needs a runnable version of the "file" utility
# itself. This must match the source code regarding its
# version. Therefore we build a native one ourselves first.
cd '$(1)' && ./configure \
--disable-shared
$(MAKE) -C '$(1)/src' -j '$(JOBS)' file
cp '$(1)/src/file' '$(1)/src/file.local'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)'
$(MAKE) -C '$(1)' clean
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
endef

13
src/fltk.mk
View File

@ -4,12 +4,12 @@
# FLTK
PKG := fltk
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.3.x-r8659
$(PKG)_CHECKSUM := 97d5002f1f3a32bf78634954e63c491483e727ac
$(PKG)_VERSION := 1.3.0
$(PKG)_CHECKSUM := 720f2804be6132ebae9909d4e74dedcc00b39d25
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2
$(PKG)_FILE := $($(PKG)_SUBDIR)-source.tar.gz
$(PKG)_WEBSITE := http://www.fltk.org/
$(PKG)_URL := http://ftp.easysw.com/pub/fltk/snapshots/$($(PKG)_FILE)
$(PKG)_URL := http://ftp.easysw.com/pub/fltk/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc zlib jpeg libpng pthreads
define $(PKG)_UPDATE
@ -22,10 +22,9 @@ endef
define $(PKG)_BUILD
cd '$(1)' && autoconf
$(SED) -i 's,\$$uname,MINGW,g' '$(1)/configure'
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--enable-threads \
@ -33,7 +32,7 @@ define $(PKG)_BUILD
# enable exceptions, because disabling them doesn't make any sense on PCs
$(SED) -i 's,-fno-exceptions,,' '$(1)/makeinclude'
$(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src LIBCOMMAND='$(TARGET)-ar cr'
ln -sf $(PREFIX)/$(TARGET)/bin/fltk-config $(PREFIX)/bin/$(TARGET)-fltk-config
ln -sf '$(PREFIX)/$(TARGET)/bin/fltk-config' '$(PREFIX)/bin/$(TARGET)-fltk-config'
'$(TARGET)-g++' \
-W -Wall -Werror -pedantic -ansi \

3
src/fontconfig.mk
View File

@ -22,11 +22,10 @@ define $(PKG)_BUILD
# ensure there is no (buggy) attempt to install the *.dll.a file
# (remove this line of you want to link dynamically)
$(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(1)/src/Makefile.in'
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
$(SED) -i 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' '$(1)/fontconfig.pc.in'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--with-arch='$(TARGET)' \

56
src/freeglut-1-fixes.patch Normal file
View File

@ -0,0 +1,56 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 80e19ec2e4f84fb9d0959993b53ade4bd6cb9195 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Mon, 24 Oct 2011 09:40:10 +0200
Subject: [PATCH] add pkg-config support
based on
http://old.nabble.com/-PATCH--Add-pkgconfig-file-td23312302.html
diff --git a/Makefile.am b/Makefile.am
index 39c5628..b504bc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,3 +68,6 @@ dist-hook:
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = glut.pc
diff --git a/configure.ac b/configure.ac
index 2f81174..5f069f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,5 +95,5 @@ if test "x$enable_debug" = xyes; then
fi
# Generate output.
-AC_CONFIG_FILES([Makefile doc/Makefile include/GL/Makefile include/Makefile progs/Makefile progs/demos/CallbackMaker/Makefile progs/demos/Fractals/Makefile progs/demos/Fractals_random/Makefile progs/demos/Lorenz/Makefile progs/demos/Makefile progs/demos/One/Makefile progs/demos/shapes/Makefile progs/demos/smooth_opengl3/Makefile progs/demos/spaceball/Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile doc/Makefile include/GL/Makefile include/Makefile progs/Makefile progs/demos/CallbackMaker/Makefile progs/demos/Fractals/Makefile progs/demos/Fractals_random/Makefile progs/demos/Lorenz/Makefile progs/demos/Makefile progs/demos/One/Makefile progs/demos/shapes/Makefile progs/demos/smooth_opengl3/Makefile progs/demos/spaceball/Makefile src/Makefile glut.pc])
AC_OUTPUT
diff --git a/glut.pc.in b/glut.pc.in
new file mode 100644
index 0000000..ea57c4a
--- /dev/null
+++ b/glut.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/@PACKAGE@
+
+Name: glut
+Description: A freely licensed alternative to the GLUT library
+Version: @VERSION@
+Libs: -L${libdir} -lglut
+Libs.private: -lglu32 -lopengl32 -lwinmm -lgdi32 -mwindows
+Cflags: -DFREEGLUT_STATIC -I${includedir}
+
--
1.7.7

20
src/freeglut-test.c Normal file
View File

@ -0,0 +1,20 @@
/* This file is part of mingw-cross-env. */
/* See doc/index.html for further information. */
#include <GL/glut.h>
#include <stdio.h>
int main(int argc, char *argv[])
{
glutInit(&argc, argv);
glutInitWindowSize(640,480);
glutInitWindowPosition(10,10);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
glutCreateWindow("FreeGLUT Shapes");
glutMainLoop();
return(0);
}

8
src/freeglut.mk
View File

@ -19,6 +19,7 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)' && ./autogen.sh
$(SED) -i 's,Windows\.h,windows.h,' '$(1)/src/freeglut_internal.h'
$(SED) -i 's,WindowsX\.h,windowsx.h,' '$(1)/src/freeglut_internal.h'
$(SED) -i 's,MMSystem\.h,mmsystem.h,' '$(1)/src/freeglut_internal.h'
@ -31,5 +32,10 @@ define $(PKG)_BUILD
--disable-debug \
--without-progs \
--without-x
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= EXPORT_FLAGS='-DFREEGLUT_STATIC'
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-freeglut.exe' \
`'$(TARGET)-pkg-config' glut --cflags --libs`
endef

4
src/freeimage.mk
View File

@ -4,8 +4,8 @@
# FreeImage
PKG := freeimage
$(PKG)_IGNORE :=
$(PKG)_VERSION := 3.15.0
$(PKG)_CHECKSUM := ec2faa01d1b312aab68d77afe62861759c790100
$(PKG)_VERSION := 3.15.1
$(PKG)_CHECKSUM := 02ae98007fc64d72a8f15ec3ff24c36ac745fbc8
$(PKG)_SUBDIR := FreeImage
$(PKG)_FILE := FreeImage$(subst .,,$($(PKG)_VERSION)).zip
$(PKG)_WEBSITE := http://freeimage.sourceforge.net/

10
src/freetds.mk
View File

@ -4,12 +4,12 @@
# FreeTDS
PKG := freetds
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.91.dev.20110523RC2
$(PKG)_CHECKSUM := c5848c9bf940782730dddf24a3bff141c9c9c369
$(PKG)_VERSION := 0.91
$(PKG)_CHECKSUM := 3ab06c8e208e82197dc25d09ae353d9f3be7db52
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.freetds.org/
$(PKG)_URL := https://bitbucket.org/mabrand/mingw-cross-env/downloads/$($(PKG)_FILE)
$(PKG)_URL := http://ibiblio.org/pub/Linux/ALPHA/$(PKG)/stable/$($(PKG)_FILE)
$(PKG)_DEPS := gcc libiconv gnutls
define $(PKG)_UPDATE
@ -25,12 +25,10 @@ define $(PKG)_UPDATE_orig
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--prefix='$(PREFIX)/$(TARGET)' \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-rpath \
--disable-dependency-tracking \
--disable-shared \

4
src/freetype.mk
View File

@ -4,8 +4,8 @@
# freetype
PKG := freetype
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.4.4
$(PKG)_CHECKSUM := 1d136cbc51c67b212c91ba04dc5db797f35e64e6
$(PKG)_VERSION := 2.4.8
$(PKG)_CHECKSUM := 1634cef894460ab98dd37eadfcdd055ffda9a27c
$(PKG)_SUBDIR := freetype-$($(PKG)_VERSION)
$(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://freetype.sourceforge.net/

2
src/gcc-1-mingw-float.patch
View File

@ -8,7 +8,7 @@ http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=243
diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h
--- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200
+++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200
@@ -236,3 +236,7 @@
@@ -275,3 +275,7 @@
#endif /* __STDC_WANT_DEC_FP__ */
#endif /* _FLOAT_H___ */

28
src/gcc-2-darwin-no-pie.patch Normal file
View File

@ -0,0 +1,28 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
mingw-cross-env specific workaround for OSX Lion's new ASLR
causing problems with pre-compiled headers.
1. more recent native compilers don't solve the problem
2. there isn't an equivalent sysctl for "kernel.randomize_va_space"
3. there isn't an equivalent command for "setarch -R"
4. Apple's version of gcc (based on 4.2) uses custom Makefiles that set "-fno-pic"
Patch below achieves a similar result to 4, without drifting
too far from standard gcc.
--- a/configure
+++ b/configure
@@ -30,6 +30,11 @@ else
esac
fi
+case `uname -sr` in
+ Darwin*11*)
+ LDFLAGS="$LDFLAGS -Wl,-no_pie"
+ ;;
+esac
as_nl='
'

20
src/gcc-mpfr.mk
View File

@ -3,18 +3,16 @@
# MPFR for GCC
PKG := gcc-mpfr
$(PKG)_IGNORE :=
$(PKG)_VERSION := 3.0.1
$(PKG)_CHECKSUM := fbf402fc196724ae60ef01eb6ca8490b1ea4db69
$(PKG)_SUBDIR := mpfr-$($(PKG)_VERSION)
$(PKG)_FILE := mpfr-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://www.mpfr.org/
$(PKG)_URL := http://www.mpfr.org/mpfr-$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_URL_2 := http://ftp.gnu.org/gnu/mpfr/$($(PKG)_FILE)
$(PKG)_IGNORE = $(mpfr_IGNORE)
$(PKG)_VERSION = $(mpfr_VERSION)
$(PKG)_CHECKSUM = $(mpfr_CHECKSUM)
$(PKG)_SUBDIR = $(mpfr_SUBDIR)
$(PKG)_FILE = $(mpfr_FILE)
$(PKG)_WEBSITE = $(mpfr_WEBSITE)
$(PKG)_URL = $(mpfr_URL)
$(PKG)_URL_2 = $(mpfr_URL_2)
$(PKG)_DEPS :=
define $(PKG)_UPDATE
wget -q --no-check-certificate -O- 'https://gforge.inria.fr/scm/viewvc.php/tags/?root=mpfr&sortby=date' | \
$(SED) -n 's,.*<a name="\([0-9][^"]*\)".*,\1,p' | \
head -1
echo $(mpfr_VERSION)
endef

13
src/gcc.mk
View File

@ -4,8 +4,8 @@
# GCC
PKG := gcc
$(PKG)_IGNORE :=
$(PKG)_VERSION := 4.6.0
$(PKG)_CHECKSUM := dcbb5ce724c4bf87b9ec93473d16b71e9ebac483
$(PKG)_VERSION := 4.6.2
$(PKG)_CHECKSUM := 691974613b1c1f15ed0182ec539fa54a12dd6f93
$(PKG)_SUBDIR := gcc-$($(PKG)_VERSION)
$(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://gcc.gnu.org/
@ -33,7 +33,9 @@ define $(PKG)_BUILD
mkdir '$(1).build'
cd '$(1).build' && '$(1)/configure' \
--target='$(TARGET)' \
--build="`config.guess`" \
--prefix='$(PREFIX)' \
--libdir='$(PREFIX)/lib' \
--enable-languages='c,c++,objc,fortran' \
--enable-version-specific-runtime-libs \
--with-gcc \
@ -46,7 +48,9 @@ define $(PKG)_BUILD
--disable-win32-registry \
--enable-threads=win32 \
--disable-libgomp \
--disable-libmudflap
--disable-libmudflap \
--with-mpfr-include='$(1)/mpfr/src' \
--with-mpfr-lib='$(1).build/mpfr/src/.libs'
$(MAKE) -C '$(1).build' -j '$(JOBS)'
$(MAKE) -C '$(1).build' -j 1 install
@ -60,14 +64,17 @@ define $(PKG)_BUILD
[ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))'
(echo 'set(BUILD_SHARED_LIBS OFF)'; \
echo 'set(CMAKE_SYSTEM_NAME Windows)'; \
echo 'set(MSYS 1)'; \
echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \
echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \
echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \
echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \
echo 'set(CMAKE_C_COMPILER $(PREFIX)/bin/$(TARGET)-gcc)'; \
echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \
echo 'set(CMAKE_Fortran_COMPILER $(PREFIX)/bin/$(TARGET)-gfortran)'; \
echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \
echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \
echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/bin/$(TARGET)-qmake)'; \
echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \
echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \
> '$(CMAKE_TOOLCHAIN_FILE)'

36
src/gdal-1-png.patch
View File

@ -1,36 +0,0 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
http://trac.osgeo.org/gdal/changeset/21526
Index: /branches/1.8/gdal/frmts/png/pngdataset.cpp
===================================================================
--- a/frmts/png/pngdataset.cpp (revision 21032)
+++ b/frmts/png/pngdataset.cpp (revision 21526)
@@ -1316,5 +1316,5 @@
*/
check = (png_size_t)VSIFReadL(data, (png_size_t)1, length,
- (VSILFILE*)png_ptr->io_ptr);
+ (VSILFILE*)png_get_io_ptr(png_ptr));
if (check != length)
@@ -1331,5 +1331,5 @@
png_uint_32 check;
- check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_ptr->io_ptr));
+ check = VSIFWriteL(data, 1, length, (VSILFILE*)png_get_io_ptr(png_ptr));
if (check != length)
@@ -1342,5 +1342,5 @@
static void png_vsi_flush(png_structp png_ptr)
{
- VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) );
+ VSIFFlushL( (VSILFILE*)png_get_io_ptr(png_ptr) );
}
@@ -1358,5 +1358,5 @@
// semantics. Ugg.
- jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr;
+ jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr);
if (psSetJmpContext)
{

8
src/gdal.mk
View File

@ -4,8 +4,8 @@
# GDAL
PKG := gdal
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.8.0
$(PKG)_CHECKSUM := e5a2802933054050c6fb0b0a0e1f46b5dd195b0a
$(PKG)_VERSION := 1.8.1
$(PKG)_CHECKSUM := b2f8b12ebdd00c05bc7f1ab7b761d9ac335c470c
$(PKG)_SUBDIR := gdal-$($(PKG)_VERSION)
$(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.gdal.org/
@ -76,7 +76,7 @@ define $(PKG)_BUILD
--without-ruby \
--without-python \
--without-macosx-framework \
LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl`"
LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl libtiff-4`"
$(MAKE) -C '$(1)' -j 1 lib-target
$(MAKE) -C '$(1)' -j 1 install-lib
$(MAKE) -C '$(1)/port' -j 1 install
@ -85,5 +85,5 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)/alg' -j 1 install
$(MAKE) -C '$(1)/ogr' -j 1 install OGR_ENABLED=
$(MAKE) -C '$(1)/apps' -j 1 install BIN_LIST=
ln -sf $(PREFIX)/$(TARGET)/bin/gdal-config $(PREFIX)/bin/$(TARGET)-gdal-config
ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config'
endef

10
src/gdb.mk
View File

@ -3,10 +3,10 @@
# gdb
PKG := gdb
$(PKG)_VERSION := 7.2
$(PKG)_CHECKSUM := 14daf8ccf1307f148f80c8db17f8e43f545c2691
$(PKG)_VERSION := 7.3.1
$(PKG)_CHECKSUM := e57f2c7f93536ef54fab728eb733bf2c36550718
$(PKG)_SUBDIR := gdb-$($(PKG)_VERSION)
$(PKG)_FILE := gdb-$($(PKG)_VERSION)a.tar.bz2
$(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://www.gnu.org/software/gdb/
$(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
$(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/$(PKG)/$($(PKG)_FILE)
@ -15,6 +15,8 @@ $(PKG)_DEPS := gcc expat libiconv zlib
define $(PKG)_UPDATE
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 | \
head -1
endef
@ -25,5 +27,5 @@ define $(PKG)_BUILD
--prefix='$(PREFIX)/$(TARGET)' \
CONFIG_SHELL=$(SHELL)
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)/gdb' -j 1 install
$(MAKE) -C '$(1)' -j 1 install
endef

49
src/gdk-pixbuf-1-fixes.patch
View File

@ -3,14 +3,17 @@ See doc/index.html for further information.
Contains ad hoc patches for cross building.
From d5e7a81cbe6339e1d0dbf97f8814c28e2c806d80 Mon Sep 17 00:00:00 2001
From 74e785e4ee6cf375f1c04d9e57e4b70caec6742c Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 23:31:24 +0200
Subject: [PATCH] s,DllMain,static _disabled_DllMain,
Subject: [PATCH 1/3] s,DllMain,static _disabled_DllMain,
---
gdk-pixbuf/gdk-pixbuf-io.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index aa4964f..c925934 100644
index 6a5dbce..e5e1c2d 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -226,12 +226,12 @@ skip_space (const char **pos)
@ -29,15 +32,19 @@ index aa4964f..c925934 100644
LPVOID lpvReserved)
{
--
1.7.1
1.7.8
From e6a5b2472a4a5d554b587dfcb798b95035caa6fd Mon Sep 17 00:00:00 2001
From 076713fb334bd200d41b056001f7e44fcae695fb Mon Sep 17 00:00:00 2001
From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Mon, 24 Jan 2011 10:39:22 +0000
Subject: Use png_jmpbuf macro
Subject: [PATCH 2/3] Use png_jmpbuf macro
This makes the png loader compatible with libpng 1.5
---
gdk-pixbuf/io-png.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index 79c81fd..76f3304 100644
--- a/gdk-pixbuf/io-png.c
@ -96,5 +103,31 @@ index 79c81fd..76f3304 100644
success = FALSE;
goto cleanup;
}
--
cgit v0.8.3.4
--
1.7.8
From 98b7ca46c998a497a1bc6cd563e0201d0cd65de0 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 23 Dec 2011 18:54:01 +0100
Subject: [PATCH 3/3] add libtiff-4 to Requires.private
---
gdk-pixbuf-2.0.pc.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
index 7e61775..bc33627 100644
--- a/gdk-pixbuf-2.0.pc.in
+++ b/gdk-pixbuf-2.0.pc.in
@@ -12,6 +12,7 @@ Name: GdkPixbuf
Description: Image loading and scaling
Version: @VERSION@
Requires: gobject-2.0 gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
+Requires.private: libtiff-4
Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
--
1.7.8

6
src/gdk-pixbuf.mk
View File

@ -21,13 +21,13 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-modules \
--with-included-loaders
--with-included-loaders \
LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`"
$(MAKE) -C '$(1)' -j '$(JOBS)' install
endef

4
src/geos.mk
View File

@ -4,8 +4,8 @@
# GEOS
PKG := geos
$(PKG)_IGNORE :=
$(PKG)_VERSION := 3.3.0rc1
$(PKG)_CHECKSUM := 6a8f7153d887d7a5085dcee62251b6f9c82a2283
$(PKG)_VERSION := 3.3.1
$(PKG)_CHECKSUM := 4f89e62c636dbf3e5d7e1bfcd6d9a7bff1bcfa60
$(PKG)_SUBDIR := geos-$($(PKG)_VERSION)
$(PKG)_FILE := geos-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://trac.osgeo.org/geos/

22
src/glew-test.c Normal file
View File

@ -0,0 +1,22 @@
/* This file is part of mingw-cross-env. */
/* See doc/index.html for further information. */
#include <stdio.h>
#include <GL/glew.h>
int main(int argc, char *argv[])
{
GLenum err;
(void)argc;
(void)argv;
err = glewInit();
if (GLEW_OK != err)
{
fprintf(stderr, "Error: %s\n", glewGetErrorString(err));
}
fprintf(stdout, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
return 0;
}

9
src/glew.mk
View File

@ -4,8 +4,8 @@
# GLEW
PKG := glew
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.6.0
$(PKG)_CHECKSUM := ed555d15d0f01239b262c4cf803e97d60d8a18b6
$(PKG)_VERSION := 1.7.0
$(PKG)_CHECKSUM := 9266f2360c1687a96f2ea06419671d370b2928d1
$(PKG)_SUBDIR := glew-$($(PKG)_VERSION)
$(PKG)_FILE := glew-$($(PKG)_VERSION).tgz
$(PKG)_WEBSITE := http://glew.sourceforge.net/
@ -39,4 +39,9 @@ define $(PKG)_BUILD
$(INSTALL) -d '$(PREFIX)/$(TARGET)/include'
$(INSTALL) -d '$(PREFIX)/$(TARGET)/include/GL'
$(INSTALL) -m644 '$(1)/include/GL/glew.h' '$(1)/include/GL/wglew.h' '$(PREFIX)/$(TARGET)/include/GL/'
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-glew.exe' \
`'$(TARGET)-pkg-config' glew --cflags --libs`
endef

63
src/glib-1-fixes.patch
View File

@ -6,7 +6,7 @@ Contains ad hoc patches for cross building.
From 4693f62d3f01f7b7d26607e6eed843202cbf90f7 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Sep 2010 21:36:04 +0200
Subject: [PATCH 1/7] no gtk doc check
Subject: [PATCH 1/5] no gtk doc check
diff --git a/configure.ac b/configure.ac
@ -29,7 +29,7 @@ index a821267..2e541d2 100644
From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Sep 2010 21:41:51 +0200
Subject: [PATCH 2/7] optional gettext
Subject: [PATCH 2/5] optional gettext
diff --git a/configure.ac b/configure.ac
@ -71,7 +71,7 @@ index c710046..269bfdf 100644
From 3473b5183b2e59d247cd1db053efc6c9ecaf2aab Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Sep 2010 21:42:46 +0200
Subject: [PATCH 3/7] fix tool paths
Subject: [PATCH 3/5] fix tool paths
diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
@ -98,7 +98,7 @@ index 3d1ac12..58e1ecf 100644
From 0e57514812500d5d4dee03e1be8059a25876dd99 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Sep 2010 21:45:50 +0200
Subject: [PATCH 4/7] fix dependency libs
Subject: [PATCH 4/5] fix dependency libs
diff --git a/configure.ac b/configure.ac
@ -132,7 +132,7 @@ index 58e1ecf..17b2133 100644
From 87931c81f6401fb0c25064ec0ba2edca9ec53924 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Sat, 25 Sep 2010 00:07:33 +0200
Subject: [PATCH 5/7] add -ldnsapi to gio-2.0.pc
Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc
diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
@ -149,56 +149,3 @@ index 92cda85..7a4e224 100644
Cflags:
--
1.7.1
From 58d20f08e876298e795f7282ddc6cfccbe6f05fe Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Sun, 3 Oct 2010 20:24:46 +0200
Subject: [PATCH 6/7] darwin config libiconv
diff --git a/configure.ac b/configure.ac
index e472768..a681285 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,6 +374,12 @@ dnl ***********************
dnl
dnl We do this before the gettext checks, to avoid distortion
+case $host in
+ *-*-darwin*)
+ with_libiconv=native
+ ;;
+esac
+
dnl On Windows we use a native implementation
if test x"$glib_native_win32" = xyes; then
--
1.7.1
From a340fa1dfbf9a8ac58cd1b026bd26de30d7fc581 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Sun, 3 Oct 2010 20:25:32 +0200
Subject: [PATCH 7/7] apple iconv
This patch has been taken from:
http://mail.gnome.org/archives/gtk-list/2009-August/msg00146.html
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 52a3dd8..d8b4f89 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -61,7 +61,7 @@
#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
#error GNU libiconv in use but included iconv.h not from libiconv
#endif
-#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined(__APPLE__)
#error GNU libiconv not in use but included iconv.h is from libiconv
#endif
--
1.7.1

7
src/glib.mk
View File

@ -4,8 +4,8 @@
# GLib
PKG := glib
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.28.6
$(PKG)_CHECKSUM := 51996339c823cf36ba28c774c4afad933d5f5744
$(PKG)_VERSION := 2.28.8
$(PKG)_CHECKSUM := 20cd63705a8805260da0320c65b979233f2e3c18
$(PKG)_SUBDIR := glib-$($(PKG)_VERSION)
$(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://www.gtk.org/
@ -53,10 +53,9 @@ define $(PKG)_BUILD
$(INSTALL) -m755 '$(1).native/gio/glib-compile-schemas' '$(PREFIX)/$(TARGET)/bin/'
# cross build
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--with-threads=win32 \

8
src/glibmm.mk
View File

@ -4,8 +4,8 @@
# GLibmm
PKG := glibmm
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.28.1
$(PKG)_CHECKSUM := 76cfba52d8fb1e3f46d14c3fea31269deb49e2fc
$(PKG)_VERSION := 2.28.2
$(PKG)_CHECKSUM := d15bc0fed7dea6fec73746370653687f74e02592
$(PKG)_SUBDIR := glibmm-$($(PKG)_VERSION)
$(PKG)_FILE := glibmm-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://www.gtkmm.org/
@ -20,11 +20,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# cross build
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
CXX='$(TARGET)-c++' \

72
src/gnutls-1-fixes.patch Normal file
View File

@ -0,0 +1,72 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 1b8300eee68e9768ba628d51facf8183255a6e78 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 28 Oct 2011 09:23:41 +0200
Subject: [PATCH 1/3] add missing static library linking
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index 32170b6..de032a2 100644
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -20,6 +20,6 @@ Description: Transport Security Layer implementation for the GNU system
URL: http://www.gnu.org/software/gnutls/
Version: @VERSION@
Libs: -L${libdir} -lgnutls
-Libs.private: @LTLIBNETTLE@
+Libs.private: @LTLIBNETTLE@ @LIBS@
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
--
1.7.7.3
From 84e79eadf2edae75ecb93792cf9899932b9d3a49 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 24 Nov 2011 14:40:11 +0100
Subject: [PATCH 2/3] don't try to build crywrap for windows
diff --git a/configure.ac b/configure.ac
index 028ffe4..9c183ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -431,7 +431,7 @@ AC_CHECK_FUNCS([alarm atexit dup2 epoll_create kqueue memchr memset munmap \
PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no])
-AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$libidn" != "xno")
+AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$have_win" != "xyes" && test "x$libidn" != "xno")
dnl end of crywrap requirements
--
1.7.7.3
From fc59afca0261a79ebca4898c6d70434a7f9895f7 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 24 Nov 2011 15:06:06 +0100
Subject: [PATCH 3/3] disable doc and test (mingw-cross-env specific)
diff --git a/Makefile.am b/Makefile.am
index 14c2642..ec86896 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
-SUBDIRS = gl lib extra po src doc tests
+SUBDIRS = gl lib extra po src
if HAVE_GUILE
SUBDIRS += guile
--
1.7.7.3

16
src/gnutls-test.c Normal file
View File

@ -0,0 +1,16 @@
/* This file is part of mingw-cross-env. */
/* See doc/index.html for further information. */
#include <gnutls/gnutls.h>
int main(int argc, char *argv[])
{
(void)argc;
(void)argv;
gnutls_global_init ();
gnutls_global_deinit ();
return 0;
}

34
src/gnutls.mk
View File

@ -3,28 +3,28 @@
# GnuTLS
PKG := gnutls
$(PKG)_VERSION := 2.12.5
$(PKG)_CHECKSUM := dd45d4fb7c365d18803b9eafef838b310c899d67
$(PKG)_VERSION := 3.0.9
$(PKG)_CHECKSUM := ce0a6a5d56c57a28dc6099e7f84ab85513d86139
$(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION)
$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.bz2
$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz
$(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/
$(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gnutls/$($(PKG)_FILE)
$(PKG)_URL := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE)
$(PKG)_URL_2 := ftp://ftp.gnupg.org/gcrypt/gnutls/$($(PKG)_FILE)
$(PKG)_DEPS := gcc zlib libgcrypt
$(PKG)_DEPS := gcc nettle zlib
define $(PKG)_UPDATE
wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=tags' | \
grep '<a class="list name"' | \
$(SED) -n 's,.*<a[^>]*>gnutls_\([0-9]*_[0-9]*[02468]_[^<]*\)<.*,\1,p' | \
$(SED) 's,_,.,g' | \
grep -v '^2\.' | \
head -1
endef
define $(PKG)_BUILD
echo '/* DEACTIVATED */' > '$(1)/gl/gai_strerror.c'
$(SED) -i 's/^\(SUBDIRS.*\) tests/\1/;' '$(1)/Makefile.in'
$(SED) -i 's/^\(SUBDIRS.*\) doc/\1/;' '$(1)/Makefile.in'
$(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.in'
$(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am'
cd '$(1)' && autoconf
cd '$(1)' && automake
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--enable-static \
@ -34,9 +34,15 @@ define $(PKG)_BUILD
--disable-guile \
--with-included-libtasn1 \
--with-included-libcfg \
--with-included-pakchois \
--with-libgcrypt \
--without-lzo \
LIBS='-lz'
$(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA=
--without-p11-kit \
--disable-silent-rules \
CPPFLAGS='-DWINVER=0x0501' \
LIBS='-lws2_32' \
ac_cv_prog_AR='$(TARGET)-ar'
$(MAKE) -C '$(1)' -j '$(JOBS)' install
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gnutls.exe' \
`'$(TARGET)-pkg-config' gnutls --cflags --libs`
endef

1986
src/graphicsmagick-2-libpng1.5.patch
View File

File diff suppressed because it is too large Load Diff

4
src/graphicsmagick.mk
View File

@ -4,8 +4,8 @@
# GraphicsMagick
PKG := graphicsmagick
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.3.12
$(PKG)_CHECKSUM := 6b8a414af162ad8679f2f04b10f128edc8ee3233
$(PKG)_VERSION := 1.3.13
$(PKG)_CHECKSUM := f1f9e88afbb9729513e8868f718e72e66226e556
$(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION)
$(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://www.graphicsmagick.org/

18
src/gsl-test.c Normal file
View File

@ -0,0 +1,18 @@
/* This file is part of mingw-cross-env. */
/* See doc/index.html for further information. */
#include <stdio.h>
#include <gsl/gsl_sf_bessel.h>
int main(int argc, char *argv[])
{
double x, y;
(void)argc;
(void)argv;
x = 5.0;
y = gsl_sf_bessel_J0 (x);
printf ("J0(%g) = %.18e\n", x, y);
return 0;
}

6
src/gsl.mk
View File

@ -22,9 +22,15 @@ endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared \
--enable-static
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gsl.exe' \
-lgsl
endef

155
src/gsoap-1-fixes.patch
View File

@ -1,76 +1,109 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Patches taken from
https://sourceforge.net/tracker/?func=detail&aid=3288762&group_id=52781&atid=468023
https://sourceforge.net/tracker/?func=detail&aid=3288772&group_id=52781&atid=468023
Contains ad hoc patches for cross building.
From d49ac167169e2db531e1be5a48575186c8bc8799 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Mon, 18 Apr 2011 09:20:27 +0200
Subject: [PATCH 1/2] use ws2spi instead of wspiapi
From a4e9166bc8d78b2aee3c25757d479d4c2e53c7be Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 23 Oct 2011 21:36:53 +0200
Subject: [PATCH 1/3] support static linking to ntlm
---
configure | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
index 238b7f1..ffccf80 100644
--- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# endif
# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
# include <ws2tcpip.h>
-# include <wspiapi.h>
+# include <ws2spi.h>
# ifdef WITH_IPV6
# define SOAP_GAI_STRERROR gai_strerrorA
# endif
diff --git a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
index 238b7f1..ffccf80 100644
--- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# endif
# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
# include <ws2tcpip.h>
-# include <wspiapi.h>
+# include <ws2spi.h>
# ifdef WITH_IPV6
# define SOAP_GAI_STRERROR gai_strerrorA
# endif
diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
index 238b7f1..ffccf80 100644
--- a/gsoap/stdsoap2.h
+++ b/gsoap/stdsoap2.h
@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# endif
# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
# include <ws2tcpip.h>
-# include <wspiapi.h>
+# include <ws2spi.h>
# ifdef WITH_IPV6
# define SOAP_GAI_STRERROR gai_strerrorA
# endif
diff --git a/configure b/configure
index ad1830d..be95edf 100755
--- a/configure
+++ b/configure
@@ -4822,7 +4822,7 @@ case "${host}" in
;;
*-*-cygwin*) platform=CYGWIN ;;
*-*-mingw*) platform=MINGW
- SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32"
+ SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32"
;;
*-*-freebsd*) platform=FREEBSD ;;
*-*-openbsd*) platform=OPENBSD ;;
--
1.7.4.1
1.7.7
From 2ed5f1205a5517c4f1d919942fbebd58327ee3df Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Mon, 18 Apr 2011 10:14:06 +0200
Subject: [PATCH 2/2] add missing libs to gsoapssl++.pc
From da0eb2fc386be0fd914ef8f9a7d6bf73004ea230 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 24 Oct 2011 11:17:13 +0200
Subject: [PATCH 2/3] ntlm support in .pc files
---
gsoap++.pc.in | 2 +-
gsoap.pc.in | 2 +-
gsoapck++.pc.in | 2 +-
gsoapck.pc.in | 2 +-
gsoapssl++.pc.in | 2 +-
gsoapssl.pc.in | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in
index e8c8f4f..07515fe 100644
--- a/gsoapssl++.pc.in
+++ b/gsoapssl++.pc.in
@@ -7,5 +7,5 @@ Name: GSoap
Description: SOAP C++ Web Services with SSL and ZLIB
diff --git a/gsoap++.pc.in b/gsoap++.pc.in
index 035afd9..3411d55 100644
--- a/gsoap++.pc.in
+++ b/gsoap++.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services
Version: @VERSION@
Requires:
-Libs: -L${libdir} -lgsoapssl++
+Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
Cflags: -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
Libs: -L${libdir} -lgsoap++ @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoap.pc.in b/gsoap.pc.in
index e2607aa..96a54b9 100644
--- a/gsoap.pc.in
+++ b/gsoap.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C Web Services
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoap @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoapck++.pc.in b/gsoapck++.pc.in
index cb03e2f..b349049 100644
--- a/gsoapck++.pc.in
+++ b/gsoapck++.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with Cookies Enabled
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoapck++ @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoapck.pc.in b/gsoapck.pc.in
index 859a922..e5ce5eb 100644
--- a/gsoapck.pc.in
+++ b/gsoapck.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C Web Services with Cookies Enabled
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoapck @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in
index 391d820..791408a 100644
--- a/gsoapssl++.pc.in
+++ b/gsoapssl++.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with SSL and ZLIB
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in
index 79c940a..17c9ee3 100644
--- a/gsoapssl.pc.in
+++ b/gsoapssl.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C Web Services with SSL and ZLIB
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoapssl @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
--
1.7.4.1
1.7.7

28
src/gsoap.mk
View File

@ -4,13 +4,13 @@
# gSOAP
PKG := gsoap
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.8.2
$(PKG)_CHECKSUM := 199b7d4cf0b6a5bf81a2198e39f03c092ffc05a7
$(PKG)_VERSION := 2.8.6
$(PKG)_CHECKSUM := ec0d3f06d0afbee481a3afd7f8828704404068c3
$(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG))
$(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip
$(PKG)_WEBSITE := http://gsoap2.sourceforge.net/
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gsoap2/gSOAP/$($(PKG)_FILE)
$(PKG)_DEPS := gcc gnutls
$(PKG)_DEPS := gcc gnutls libgcrypt libntlm
define $(PKG)_UPDATE
wget -q -O- 'http://sourceforge.net/projects/gsoap2/files/gSOAP/' | \
@ -22,8 +22,9 @@ define $(PKG)_BUILD
# Native build to get tools wsdl2h and soapcpp2
cd '$(1)' && ./configure
# Parallel bulds can fail
$(MAKE) -C '$(1)'/gsoap -j 1
# Work around parallel build problem
$(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h
$(MAKE) -C '$(1)'/gsoap -j '$(JOBS)'
# Install the native tools manually
$(INSTALL) -m755 '$(1)'/gsoap/wsdl/wsdl2h '$(PREFIX)/bin/$(TARGET)-wsdl2h'
@ -31,8 +32,8 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j '$(JOBS)' clean
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
# fix hard-coded gnutls dependencies
$(SED) -i "s/-lgnutls/`'$(TARGET)-pkg-config' --libs-only-l gnutls`/g;" '$(1)/configure'
# Build for mingw. Static by default.
# Prevent undefined reference to _rpl_malloc.
@ -40,15 +41,18 @@ define $(PKG)_BUILD
cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \
--prefix='$(PREFIX)/$(TARGET)' \
--host='$(TARGET)' \
--enable-gnutls
--build="`config.guess`" \
--enable-gnutls \
CPPFLAGS='-DWITH_NTLM'
# Building for mingw requires native soapcpp2
ln -s '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)'/gsoap/src/soapcpp2
ln -sf '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2'
# Parallel bulds can fail
$(MAKE) -C '$(1)' -j 1 AR='$(TARGET)-ar'
# Work around parallel build problem
$(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h AR='$(TARGET)-ar'
$(MAKE) -C '$(1)' -j '$(JOBS)' AR='$(TARGET)-ar'
$(MAKE) -C '$(1)' -j 1 install
$(MAKE) -C '$(1)' -j '$(JOBS)' install
# Apparently there is a tradition of compiling gsoap source files into applications.
# Since we linked dom.cpp and dom.c into the libraries, this should not be necessary.
# But we bend to tradition and install these sources into mingw-cross-env.

4
src/gst-plugins-base.mk
View File

@ -4,8 +4,8 @@
# gst-plugins-base
PKG := gst-plugins-base
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.10.34
$(PKG)_CHECKSUM := 4db5f3112fe3a74ba46443e577647cff65b727e7
$(PKG)_VERSION := 0.10.35
$(PKG)_CHECKSUM := 6d7dc463fed5dd43f79a53ad523fcbd6d0916303
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/

4
src/gst-plugins-good.mk
View File

@ -4,8 +4,8 @@
# gst-plugins-good
PKG := gst-plugins-good
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.10.29
$(PKG)_CHECKSUM := a0e55c20ae36c8de18990c56b4d97ed3997cc6e0
$(PKG)_VERSION := 0.10.30
$(PKG)_CHECKSUM := 9c78a751bb2f20ad50a1daf6860e0098e0495f5a
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/

4
src/gstreamer.mk
View File

@ -4,8 +4,8 @@
# gstreamer
PKG := gstreamer
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.10.34
$(PKG)_CHECKSUM := 3ebb64dceb45963e8be17c447a24a63958705164
$(PKG)_VERSION := 0.10.35
$(PKG)_CHECKSUM := ad03b8aca7b2415929b6ecc4c140b178acef39de
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/

134
src/gtk2-1-fixes.patch
View File

@ -3,14 +3,14 @@ See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 1acd5465c0b9f2f612c5904ea7e652475fb3bee6 Mon Sep 17 00:00:00 2001
From 2e42ff35296c81959a8fab06aa8d3dacf19632d8 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 14:43:43 +0200
Subject: [PATCH 01/11] s,DllMain,static _disabled_DllMain,
Subject: [PATCH 01/10] s,DllMain,static _disabled_DllMain,
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 94b7ac7..2c01be6 100644
index dc139be..be2a7ee 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -65,7 +65,7 @@ const GOptionEntry _gdk_windowing_args[] = {
@ -23,10 +23,10 @@ index 94b7ac7..2c01be6 100644
LPVOID reserved)
{
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index fdf4730..428fd96 100644
index d081f70..aa2973d 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -73,7 +73,7 @@
@@ -74,7 +74,7 @@
static HMODULE gtk_dll;
BOOL WINAPI
@ -36,13 +36,13 @@ index fdf4730..428fd96 100644
LPVOID lpvReserved)
{
--
1.7.1
1.7.7.3
From bc446ce0785954ccf28825554c3074a15b4f4071 Mon Sep 17 00:00:00 2001
From 86527a238545e47b4770531c79f5f2ead59aab85 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 14:46:20 +0200
Subject: [PATCH 02/11] s,__declspec(dllimport),,
Subject: [PATCH 02/10] s,__declspec(dllimport),,
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
@ -72,7 +72,7 @@ index 2190973..0a1c43c 100644
#else
# define GTKVAR extern
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 21de92e..2c0f94c 100644
index bbea9cd..059d7d0 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -69,7 +69,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
@ -98,13 +98,13 @@ index c624aea..b792ea5 100644
#else
#define VARIABLE extern
--
1.7.1
1.7.7.3
From 078f0c210e1706b4028907bf55cc55672d5dc7d3 Mon Sep 17 00:00:00 2001
From 7277a7022eb4ffb498475d969057d3a57e687222 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 15:03:28 +0200
Subject: [PATCH 03/11] s,__declspec(dllexport),,
Subject: [PATCH 03/10] s,__declspec(dllexport),,
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
@ -134,7 +134,7 @@ index 0a1c43c..507ff69 100644
# define GTKVAR extern
# endif
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 2c0f94c..9c47b57 100644
index 059d7d0..8c360d0 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -67,7 +67,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
@ -160,13 +160,13 @@ index b792ea5..f382a64 100644
#define VARIABLE extern
#endif
--
1.7.1
1.7.7.3
From 69568bc7c8627d117521548192730665a9623b80 Mon Sep 17 00:00:00 2001
From 604fcdb64972a82c6a430c36debc9f66c7f05d90 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 14:17:22 +0200
Subject: [PATCH 04/11] fix gtk+-2.0.pc.in
Subject: [PATCH 04/10] fix gtk+-2.0.pc.in
diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
@ -181,20 +181,20 @@ index 46853e1..7f3eb22 100644
+Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32
Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@
--
1.7.1
1.7.7.3
From 1f60f6943b5c67a199660618e546de5f0faafeef Mon Sep 17 00:00:00 2001
From a778e96b43b556389f1e3a6712072eaee9e2adb2 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 14:48:31 +0200
Subject: [PATCH 05/11] disable gtkbuiltincache
Subject: [PATCH 05/10] disable gtkbuiltincache
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
index 39a35c2..89bae23 100644
index 76981d8..b6d170f 100644
--- a/gtk/Makefile.in
+++ b/gtk/Makefile.in
@@ -2872,7 +2872,7 @@ stamp-icons: $(STOCK_ICONS)
@@ -2888,7 +2888,7 @@ stamp-icons: $(STOCK_ICONS)
) done \
&& touch stamp-icons
@ -204,20 +204,20 @@ index 39a35c2..89bae23 100644
$(gtk_update_icon_cache_program) --force --ignore-theme-index \
--source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
--
1.7.1
1.7.7.3
From e24f3fb7d18d0690dddd1fdb1a629a06d49b4c11 Mon Sep 17 00:00:00 2001
From 58310acc28f8e6994281eacac1989e8e6c51c150 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 14:49:50 +0200
Subject: [PATCH 06/11] disable test-inline-pixbufs.h
Subject: [PATCH 06/10] disable test-inline-pixbufs.h
diff --git a/demos/Makefile.in b/demos/Makefile.in
index 6bffbb8..c866923 100644
index 9f90d09..2e4f967 100644
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -433,7 +433,7 @@ LDADDS = \
@@ -432,7 +432,7 @@ LDADDS = \
$(GTK_DEP_LIBS) \
$(MATH_LIB)
@ -227,20 +227,20 @@ index 6bffbb8..c866923 100644
testpixbuf_drawable_DEPENDENCIES = $(DEPS)
testpixbuf_save_DEPENDENCIES = $(DEPS)
--
1.7.1
1.7.7.3
From b34df7c9461a798e9a8202eec886ac5e173da3ea Mon Sep 17 00:00:00 2001
From 7532813f3bfe95fe088c06ce11d31c0d3d66c559 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 14:51:04 +0200
Subject: [PATCH 07/11] permit static building
Subject: [PATCH 07/10] permit static building
diff --git a/configure b/configure
index f203b13..51e6619 100755
index 5eedff6..6380da5 100755
--- a/configure
+++ b/configure
@@ -4347,9 +4347,9 @@ if test "${enable_static+set}" = set; then :
@@ -4361,9 +4361,9 @@ if test "${enable_static+set}" = set; then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
@ -252,7 +252,7 @@ index f203b13..51e6619 100755
# Look at the argument we got. We use all the common list separators.
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
for pkg in $enableval; do
@@ -4362,7 +4362,7 @@ if test "${enable_static+set}" = set; then :
@@ -4376,7 +4376,7 @@ if test "${enable_static+set}" = set; then :
;;
esac
else
@ -261,7 +261,7 @@ index f203b13..51e6619 100755
fi
@@ -4930,15 +4930,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4944,15 +4944,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then
@ -283,7 +283,7 @@ index f203b13..51e6619 100755
fi
enable_win32_dll=yes
@@ -8241,7 +8241,7 @@ done
@@ -8752,7 +8752,7 @@ func_stripname_cnf ()
if test "${enable_shared+set}" = set; then :
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
@ -292,7 +292,7 @@ index f203b13..51e6619 100755
no) enable_shared=no ;;
*)
enable_shared=no
@@ -8250,14 +8250,14 @@ if test "${enable_shared+set}" = set; then :
@@ -8761,14 +8761,14 @@ if test "${enable_shared+set}" = set; then :
for pkg in $enableval; do
IFS="$lt_save_ifs"
if test "X$pkg" = "X$p"; then
@ -309,7 +309,7 @@ index f203b13..51e6619 100755
fi
@@ -11970,7 +11970,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
@@ -12632,7 +12632,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
# are all built from PIC.
case $host_os in
aix3*)
@ -318,7 +318,7 @@ index f203b13..51e6619 100755
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -11979,7 +11979,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
@@ -12641,7 +12641,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
@ -328,20 +328,20 @@ index f203b13..51e6619 100755
;;
esac
--
1.7.1
1.7.7.3
From 831f94ccf7a26662bfc9e8d22b9ae9eaea740bbb Mon Sep 17 00:00:00 2001
From 821882bb862fc86b7152eba82966163d054b488e Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 14:53:18 +0200
Subject: [PATCH 08/11] no -Wl
Subject: [PATCH 08/10] no -Wl
diff --git a/configure b/configure
index 51e6619..8c04264 100755
index 6380da5..7283f17 100755
--- a/configure
+++ b/configure
@@ -22951,7 +22951,7 @@ fi
@@ -23788,7 +23788,7 @@ fi
fi
if test "x$gdktarget" = "xwin32"; then
@ -351,20 +351,20 @@ index 51e6619..8c04264 100755
USE_WIN32_TRUE=
USE_WIN32_FALSE='#'
--
1.7.1
1.7.7.3
From 2ec5f9d9ea8d7d80758c5272ff2e94fd0e7856e8 Mon Sep 17 00:00:00 2001
From 80745459d75da07c53dbb83c6a79c3d9896e5fd3 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 14:54:15 +0200
Subject: [PATCH 09/11] gio not gio-unix
Subject: [PATCH 09/10] gio not gio-unix
diff --git a/configure b/configure
index 8c04264..d3e5e21 100755
index 7283f17..50e6a86 100755
--- a/configure
+++ b/configure
@@ -23171,9 +23171,9 @@ fi
@@ -24008,9 +24008,9 @@ fi
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
@ -377,45 +377,13 @@ index 8c04264..d3e5e21 100755
GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
fi
--
1.7.1
1.7.7.3
From 3e9c211536912bf78c44172b7f6ecd8860887166 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 14:55:33 +0200
Subject: [PATCH 10/11] set cross_compiling explicitly to avoid Wine interference
diff --git a/configure b/configure
index d3e5e21..7ae7a5d 100755
--- a/configure
+++ b/configure
@@ -555,7 +555,7 @@ ac_default_prefix=/usr/local
ac_clean_files=
ac_config_libobj_dir=.
LIBOBJS=
-cross_compiling=no
+cross_compiling=yes
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -3872,7 +3872,7 @@ $as_echo "$ac_try_echo"; } >&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }; then
- cross_compiling=no
+ cross_compiling=yes
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
--
1.7.1
From 01cc2d128be8a19c1434b912e378deae3b1bfcf9 Mon Sep 17 00:00:00 2001
From 337e54ef8aa5a4d131e9d9007dedcc42b164e68c Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 15:30:49 +0200
Subject: [PATCH 11/11] removed duplicate _gtk_marshal_OBJECT__VOID()
Subject: [PATCH 10/10] removed duplicate _gtk_marshal_OBJECT__VOID()
diff --git a/perf/marshalers.c b/perf/marshalers.c
@ -467,5 +435,5 @@ index f533ab0..0a37ba4 100644
void
_gtk_marshal_VOID__ENUM_OBJECT_DOUBLE (GClosure *closure,
--
1.7.1
1.7.7.3

1
src/gtk2.mk
View File

@ -24,6 +24,7 @@ endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--enable-explicit-deps \

3
src/gtkglext.mk
View File

@ -22,10 +22,9 @@ endef
define $(PKG)_BUILD
cd '$(1)' && autoconf
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared \
--without-x \

38
src/gtkglextmm-1-fixes.patch
View File

@ -3,10 +3,10 @@ See doc/index.html for further information.
Contains ad hoc patches for cross building.
From c71783745127d3af9ab40f6a4cb95ac13ad2707b Mon Sep 17 00:00:00 2001
From 865936e91293bdc59c2e9c47e5a4b54fb6f1629e Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Wed, 29 Sep 2010 23:08:44 +0200
Subject: [PATCH 1/2] allow deprecated GdkSpanFunc
Subject: [PATCH] allow deprecated GdkSpanFunc
diff --git a/gtkglext/gtkmm/gl/Makefile.in b/gtkglext/gtkmm/gl/Makefile.in
@ -22,37 +22,5 @@ index 13afa02..152f930 100644
-DGTK_DISABLE_DEPRECATED
--
1.7.1
From b3a26572b965ada869cc388b6bfce5c54b6ab704 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Wed, 29 Sep 2010 23:18:40 +0200
Subject: [PATCH 2/2] wine workaround: s,cross_compiling=no,cross_compiling=yes,
diff --git a/configure b/configure
index 508d229..65f61fb 100755
--- a/configure
+++ b/configure
@@ -409,7 +409,7 @@ exec 6>&1
#
ac_default_prefix=/usr/local
ac_config_libobj_dir=.
-cross_compiling=no
+cross_compiling=yes
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -2486,7 +2486,7 @@ if test "$cross_compiling" != yes; then
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- cross_compiling=no
+ cross_compiling=yes
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
--
1.7.1
1.7.7.3

1
src/gtkglextmm.mk
View File

@ -23,6 +23,7 @@ endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared
$(MAKE) -C '$(1)' -j '$(JOBS)' install \

3
src/gtkmm2.mk
View File

@ -22,10 +22,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
MAKE=$(MAKE)

3
src/gtksourceviewmm2.mk
View File

@ -22,10 +22,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared \
MAKE=$(MAKE)

2
src/guile.mk
View File

@ -25,7 +25,7 @@ define $(PKG)_BUILD
# which would fail because we tell Guile not to use Pthreads.
cd '$(1)' && CC_FOR_BUILD=gcc ./configure \
--host='$(TARGET)' \
--build="`sh ./config.guess`" \
--build="`config.guess`" \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared \
--without-threads \

3
src/ilmbase.mk
View File

@ -20,8 +20,6 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
# build the win32 thread sources instead of the posix thread sources
$(SED) -i 's,IlmThreadPosix\.,IlmThreadWin32.,' '$(1)/IlmThread/Makefile.in'
$(SED) -i 's,IlmThreadSemaphorePosix\.,IlmThreadSemaphoreWin32.,' '$(1)/IlmThread/Makefile.in'
@ -31,6 +29,7 @@ define $(PKG)_BUILD
# threading. It will just disable the unwanted check for pthread.
cd '$(1)' && $(SHELL) ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-threading \

9
src/imagemagick.mk
View File

@ -4,10 +4,10 @@
# ImageMagick
PKG := imagemagick
$(PKG)_IGNORE :=
$(PKG)_VERSION := 6.6.9-9
$(PKG)_CHECKSUM := 1d46f9d2b9294b11b9e9c03ee8da7e1df8d92fef
$(PKG)_VERSION := 6.7.2-7
$(PKG)_CHECKSUM := 13198d502e95abb305c23c3d56378e9139fcb7c3
$(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION)
$(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.bz2
$(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.xz
$(PKG)_WEBSITE := http://www.imagemagick.org/
$(PKG)_URL := http://ftp.nluug.nl/ImageMagick/$($(PKG)_FILE)
$(PKG)_DEPS := gcc bzip2 ffmpeg fftw freetype jasper jpeg lcms libpng libtool openexr pthreads tiff zlib
@ -19,10 +19,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared \
--with-x=no \

7
src/lame.mk
View File

@ -4,8 +4,8 @@
# lame
PKG := lame
$(PKG)_IGNORE :=
$(PKG)_VERSION := 3.98.4
$(PKG)_CHECKSUM := eb29c7c937b9b7330ca979dfabc25ab2a31b9db2
$(PKG)_VERSION := 3.99
$(PKG)_CHECKSUM := 91dfd25bedc02759051a6b3af05e61337a575028
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://lame.sourceforge.net/
@ -19,10 +19,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared
$(MAKE) -C '$(1)' -j '$(JOBS)'

18
src/lapack.mk
View File

@ -4,8 +4,8 @@
# lapack
PKG := lapack
$(PKG)_IGNORE :=
$(PKG)_VERSION := 3.3.1
$(PKG)_CHECKSUM := 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac
$(PKG)_VERSION := 3.4.0
$(PKG)_CHECKSUM := 910109a931524f8dcc2734ce23fe927b00ca199f
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tgz
$(PKG)_WEBSITE := http://www.netlib.org/$(PKG)/
@ -20,13 +20,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cp $(1)/make.inc.example $(1)/make.inc
$(SED) -i 's,PLAT =.*,PLAT = _MINGW32,g' '$(1)/make.inc'
$(SED) -i 's,gfortran,$(TARGET)-gfortran,g' '$(1)/make.inc'
$(SED) -i 's, ar, $(TARGET)-ar,g' '$(1)/make.inc'
$(SED) -i 's, ranlib, $(TARGET)-ranlib,g' '$(1)/make.inc'
$(MAKE) -C '$(1)/SRC' -j '$(JOBS)'
$(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
$(INSTALL) -m644 '$(1)/lapack_MINGW32.a' '$(PREFIX)/$(TARGET)/lib/liblapack.a'
cd '$(1)' && cmake \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \
.
$(MAKE) -C '$(1)/SRC' -j '$(JOBS)' install
endef

29
src/lcms-1-fixes.patch Normal file
View File

@ -0,0 +1,29 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 664fb3591893facfe280cb930e20b61355e32ac1 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 23 Dec 2011 00:01:31 +0100
Subject: [PATCH] add missing static dependencies to .pc file
---
lcms2.pc.in | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lcms2.pc.in b/lcms2.pc.in
index b715f59..4a8fdb3 100644
--- a/lcms2.pc.in
+++ b/lcms2.pc.in
@@ -7,5 +7,6 @@ Name: @PACKAGE@
Description: LCMS Color Management Library
Version: @VERSION@
Libs: -L${libdir} -llcms2
-Libs.private: @LIB_MATH@
+Libs.private: -ljpeg @LIB_MATH@
Cflags: -I${includedir}
+Requires.private: libtiff-4
--
1.7.8

7
src/lcms.mk
View File

@ -4,8 +4,8 @@
# lcms
PKG := lcms
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.1
$(PKG)_CHECKSUM := 0ce856a004068ff6e22f9f2d7b94a11b9b469bf9
$(PKG)_VERSION := 2.3
$(PKG)_CHECKSUM := 67d5fabda2f5777ca8387766539b9c871d993133
$(PKG)_SUBDIR := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION))
$(PKG)_FILE := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)).tar.gz
$(PKG)_WEBSITE := http://www.littlecms.com/
@ -19,11 +19,10 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--prefix='$(PREFIX)/$(TARGET)' \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--with-jpeg \
--with-tiff \

25
src/lcms1-1-fixes.patch Normal file
View File

@ -0,0 +1,25 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 6f4063fc97b3acc653605c077c94b862a9808fd4 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 23 Dec 2011 00:07:18 +0100
Subject: [PATCH] add missing static dependencies to .pc file
diff --git a/lcms.pc.in b/lcms.pc.in
index b3897b0..c72ef2f 100755
--- a/lcms.pc.in
+++ b/lcms.pc.in
@@ -7,4 +7,6 @@ Name: @PACKAGE@
Description: LCMS Color Management Library
Version: @VERSION@
Libs: -L${libdir} -llcms
+Libs.private: -ljpeg
Cflags: -I${includedir}
+Requires.private: libtiff-4
--
1.7.8

3
src/lcms1.mk
View File

@ -20,11 +20,10 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--prefix='$(PREFIX)/$(TARGET)' \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--with-jpeg \
--with-tiff \

4
src/libarchive.mk
View File

@ -4,8 +4,8 @@
# Libarchive
PKG := libarchive
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.8.4
$(PKG)_CHECKSUM := b9cc3bbd20bd71f996be9ec738f19fda8653f7af
$(PKG)_VERSION := 2.8.5
$(PKG)_CHECKSUM := e48a3b50de84b1d747f5af9ca5ba90eb6d3a4a78
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://code.google.com/p/libarchive/

8
src/libass.mk
View File

@ -4,13 +4,13 @@
# libass
PKG := libass
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.9.11
$(PKG)_CHECKSUM := 6f69f6c4474c649de4fd7913b050bfd4cf8110cb
$(PKG)_VERSION := 0.10.0
$(PKG)_CHECKSUM := 7a0ea048f687421f3e1314988ca02f04861fc5f0
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2
$(PKG)_FILE := $($(PKG)_SUBDIR).tar.xz
$(PKG)_WEBSITE := http://code.google.com/p/libass/
$(PKG)_URL := http://libass.googlecode.com/files/$($(PKG)_FILE)
$(PKG)_DEPS := gcc freetype fontconfig
$(PKG)_DEPS := gcc freetype fontconfig fribidi
define $(PKG)_UPDATE
wget -q -O- 'http://code.google.com/p/libass/downloads/list?sort=-uploaded' | \

27
src/libdnet-1-fixes.patch Normal file
View File

@ -0,0 +1,27 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Patch taken from http://sourceforge.net/mailarchive/message.php?msg_id=27995461
mingwrt 3.20 provides ssize_t and defines _SSIZE_T_. This patch
allows libdnet to use this ssize_t instead of defining its
own which causes build failure. Applies to libdnet 1.11.
diff --git a/include/dnet/os.h b/include/dnet/os.h
index c12c7b2..9e8bdd2 100644
--- a/include/dnet/os.h
+++ b/include/dnet/os.h
@@ -23,8 +23,10 @@
typedef u_short uint16_t;
typedef u_int uint32_t;
# ifndef __CYGWIN__
+# ifndef _SSIZE_T_
typedef long ssize_t;
# endif
+# endif
#else
# include <sys/param.h>
# include <sys/types.h>
--
1.7.6

10
src/libevent.mk
View File

@ -4,16 +4,16 @@
# libevent
PKG := libevent
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.0.11
$(PKG)_CHECKSUM := 843b5d395054b9d4d5586220c004c29cdcc37fcf
$(PKG)_VERSION := 2.0.16
$(PKG)_CHECKSUM := 9eb9fe3c0ec607525ed2dee6827687efcd0696ac
$(PKG)_SUBDIR := libevent-$($(PKG)_VERSION)-stable
$(PKG)_FILE := libevent-$($(PKG)_VERSION)-stable.tar.gz
$(PKG)_WEBSITE := http://monkey.org/~provos/libevent/
$(PKG)_URL := http://monkey.org/~provos/$($(PKG)_FILE)
$(PKG)_WEBSITE := http://libevent.org
$(PKG)_URL := https://github.com/downloads/$(PKG)/$(PKG)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
wget -q -O- 'http://www.monkey.org/~provos/libevent/' | \
wget -q -O- 'http://libevent.org/' | \
grep 'libevent-' | \
$(SED) -n 's,.*libevent-\([0-9][^>]*\)-stable\.tar.*,\1,p' | \
head -1

31
src/libffi-test.c Normal file
View File

@ -0,0 +1,31 @@
/* This file is part of mingw-cross-env. */
/* See doc/index.html for further information. */
#include <stdio.h>
#include <ffi.h>
int main(int argc, char *argv[])
{
ffi_cif cif;
ffi_type *args[1];
void *values[1];
char *s;
int rc;
(void)argc;
(void)argv;
args[0] = &ffi_type_pointer;
values[0] = &s;
if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1,
&ffi_type_uint, args) == FFI_OK)
{
s = "Hello World!";
ffi_call(&cif, FFI_FN(puts), &rc, values);
s = "Goodbye!";
ffi_call(&cif, FFI_FN(puts), &rc, values);
}
return 0;
}

15
src/libffi.mk
View File

@ -4,8 +4,8 @@
# libffi
PKG := libffi
$(PKG)_IGNORE :=
$(PKG)_VERSION := 3.0.9
$(PKG)_CHECKSUM := 56e41f87780e09d06d279690e53d4ea2c371ea88
$(PKG)_VERSION := 3.0.10
$(PKG)_CHECKSUM := 97abf70e6a6d315d9259d58ac463663051d471e1
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://sourceware.org/$(PKG)/
@ -13,7 +13,7 @@ $(PKG)_URL := ftp://sourceware.org/pub/$(PKG)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
wget -q --no-check-certificate -O- 'http://github.com/atgreen/libffi/downloads' | \
wget -q --no-check-certificate -O- 'http://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
@ -24,6 +24,11 @@ define $(PKG)_BUILD
--host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
$(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)'
$(MAKE) -C '$(1)/$(TARGET)' -j 1 install
'$(TARGET)-gcc' \
-W -Wall -Werror -std=c99 -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libffi.exe' \
`'$(TARGET)-pkg-config' libffi --cflags --libs`
endef

8
src/libgcrypt.mk
View File

@ -4,8 +4,8 @@
# libgcrypt
PKG := libgcrypt
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.4.6
$(PKG)_CHECKSUM := 445b9e158aaf91e24eae3d1040c6213e9d9f5ba6
$(PKG)_VERSION := 1.5.0
$(PKG)_CHECKSUM := 3e776d44375dc1a710560b98ae8437d5da6e32cf
$(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION)
$(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := ftp://ftp.gnupg.org/gcrypt/libgcrypt/
@ -15,14 +15,14 @@ $(PKG)_DEPS := gcc libgpg_error
define $(PKG)_UPDATE
wget -q -O- 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/' | \
$(SED) -n 's,.*libgcrypt-\([0-9][^>]*\)\.tar.*,\1,p' | \
grep -v '^1\.4\.' | \
tail -1
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--with-gpg-error-prefix='$(PREFIX)/$(TARGET)'

2
src/libgeotiff.mk
View File

@ -26,7 +26,7 @@ define $(PKG)_BUILD
--host='$(TARGET)' \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
LIBS='-ljpeg -lz'
LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz"
$(MAKE) -C '$(1)' -j 1 all install EXEEXT=.remove-me MAKE='$(MAKE)'
rm -fv '$(PREFIX)/$(TARGET)'/bin/*.remove-me
endef

18
src/libgnurx-1-build-static-lib.patch Normal file
View File

@ -0,0 +1,18 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
diff -Nur mingw-libgnurx-2.5.1/Makefile.mingw-cross-env mingw-libgnurx-2.5.1-mingw-cross-env/Makefile.mingw-cross-env
--- mingw-libgnurx-2.5.1/Makefile.mingw-cross-env 1970-01-01 01:00:00.000000000 +0100
+++ mingw-libgnurx-2.5.1-mingw-cross-env/Makefile.mingw-cross-env 2011-10-23 16:57:18.579312050 +0200
@@ -0,0 +1,11 @@
+include Makefile
+
+libgnurx.a: $(OBJECTS)
+ rm -f $@
+ $(TARGET)-ar rcu $@ $(OBJECTS)
+ $(TARGET)-ranlib $@
+
+install-static: libgnurx.a
+ mkdir -p ${includedir} ${libdir}
+ cp -p ${srcdir}/regex.h ${includedir}
+ cp -p ${srcdir}/libgnurx.a ${libdir}

29
src/libgnurx.mk Normal file
View File

@ -0,0 +1,29 @@
# This libgnurx is part of mingw-cross-env.
# See doc/index.html for further information.
# libgnurx
PKG := libgnurx
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.5.1
$(PKG)_CHECKSUM := f1e4af2541645dac82362b618aaa849658cd4988
$(PKG)_SUBDIR := mingw-libgnurx-$($(PKG)_VERSION)
$(PKG)_FILE := mingw-libgnurx-$($(PKG)_VERSION)-src.tar.gz
$(PKG)_WEBSITE := http://sourceforge.net/projects/mingw/files/UserContributed/regex/
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/Other/UserContributed/regex/mingw-regex-$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
wget -q -O- 'http://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/' | \
grep 'mingw-regex-' | \
$(SED) -n 's,.*mingw-regex-\([0-9\.]*\).*,\1,p' | \
sort | \
uniq | \
tail -1
endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)'
$(MAKE) -C '$(1)' -f Makefile.mingw-cross-env -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= install-static
endef

4
src/libgomp.mk
View File

@ -18,12 +18,10 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/libgomp/configure'
mkdir -p '$(1)/build/$(TARGET)/libgomp'
cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \
--host='$(TARGET)' \
--build="`config.guess`" \
--target='$(TARGET)' \
--prefix='$(PREFIX)' \
--enable-version-specific-runtime-libs \

3
src/libgpg_error.mk
View File

@ -19,10 +19,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-nls \

37
src/libgsasl-1-fixes.patch Normal file
View File

@ -0,0 +1,37 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Mon, 7 Nov 2011 18:01:56 +0100
Subject: [PATCH] use memxor from nettle
diff --git a/gl/memxor.c b/gl/memxor.c
index 7fec454..d9b62cd 100644
--- a/gl/memxor.c
+++ b/gl/memxor.c
@@ -23,7 +23,7 @@
#include "memxor.h"
void *
-memxor (void *restrict dest, const void *restrict src, size_t n)
+gsasl_memxor (void *restrict dest, const void *restrict src, size_t n)
{
char const *s = src;
char *d = dest;
diff --git a/libgsasl.pc.in b/libgsasl.pc.in
index b0c477d..d8d8ccc 100644
--- a/libgsasl.pc.in
+++ b/libgsasl.pc.in
@@ -16,4 +16,5 @@ URL: http://www.gnu.org/software/gsasl/
Version: @VERSION@
Libs: -L${libdir} -lgsasl
Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@
+Requires.private: nettle
Cflags: -I${includedir}
--
1.7.7

5
src/libgsasl.mk
View File

@ -10,7 +10,7 @@ $(PKG)_SUBDIR := libgsasl-$($(PKG)_VERSION)
$(PKG)_FILE := libgsasl-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.gnu.org/software/gsasl/
$(PKG)_URL := http://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE)
$(PKG)_DEPS := gcc libiconv libidn libntlm libgcrypt
$(PKG)_DEPS := gcc libiconv libidn libntlm libgcrypt nettle
define $(PKG)_UPDATE
wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gsasl.git;a=tags' | \
@ -20,10 +20,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && touch src/libgsasl-7.def && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-nls \

27
src/libgsf-1-fixes.patch
View File

@ -6,7 +6,7 @@ Contains ad hoc patches for cross building.
From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 23:34:26 +0200
Subject: [PATCH 1/2] s,DllMain,static _disabled_DllMain,
Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain,
diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
@ -28,28 +28,3 @@ index d7a7247..cc52d99 100644
--
1.7.1
From ab87b1b623f774244935bf9f1d82365a3203d8db Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Wed, 29 Sep 2010 20:15:48 +0200
Subject: [PATCH 2/2] no gettext
diff --git a/configure.in b/configure.in
index af40c28..7ce5f7b 100644
--- a/configure.in
+++ b/configure.in
@@ -53,10 +53,6 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
dnl Gettext/i18n stuff
-IT_PROG_INTLTOOL([0.35.0])
-
-AM_GLIB_GNU_GETTEXT
-
GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
--
1.7.1

6
src/libgsf.mk
View File

@ -4,8 +4,8 @@
# libgsf
PKG := libgsf
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.14.20
$(PKG)_CHECKSUM := d172b454c1b98f9c111df11e000b1ced050bdac9
$(PKG)_VERSION := 1.14.21
$(PKG)_CHECKSUM := 17981f238f1f8dddb7af01c161bd6a1c4d5e85d2
$(PKG)_SUBDIR := libgsf-$($(PKG)_VERSION)
$(PKG)_FILE := libgsf-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://ftp.gnome.org/pub/gnome/sources/libgsf/
@ -23,8 +23,6 @@ endef
define $(PKG)_BUILD
$(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in
echo 'Libs.private: -lz -lbz2' >> '$(1)'/libgsf-1.pc.in
cd '$(1)' && aclocal -I m4
cd '$(1)' && autoconf
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--disable-shared \

197
src/libical-1-tml.patch
View File

@ -1,197 +0,0 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
This patch has been taken from:
https://build.opensuse.org/package/view_file?file=libical-0.44-tml.patch&package=mingw32-libical&project=windows%3Amingw%3Awin32
--- libical-0.44/autogen.sh 2009-01-08 17:50:28.000000000 +0100
+++ libical-0.44/autogen.sh 2009-04-15 15:25:54.000000000 +0200
@@ -37,11 +37,6 @@
exit 1
}
-if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
-fi
-
case $CC in
*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
esac
@@ -55,7 +50,3 @@
autoconf
cd $ORIGDIR
-$srcdir/configure "$@"
-
-echo
-echo "Now type 'make' to compile $PROJECT."
--- libical-0.44/src/libical/icalrecur.c 2009-01-08 17:50:21.000000000 +0100
+++ libical-0.44/src/libical/icalrecur.c 2009-04-15 15:12:35.000000000 +0200
@@ -141,16 +141,6 @@
#include <limits.h>
-#ifndef HAVE_INTPTR_T
-#if defined (WIN32) || defined (XP_BEOS)
-typedef long intptr_t;
-#endif
-#endif
-
-#ifdef WIN32
-#define strcasecmp stricmp
-#endif
-
#include "icalrecur.h"
#include "icalerror.h"
--- libical-0.44/src/libical/icaltz-util.c 2009-01-08 17:50:21.000000000 +0100
+++ libical-0.44/src/libical/icaltz-util.c 2009-04-15 15:17:06.000000000 +0200
@@ -20,67 +20,24 @@
* Boston, MA 02110-1301, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
#include <string.h>
-
#if defined(sun) && defined(__SVR4)
#include <sys/byteorder.h>
+#elif defined(_WIN32)
+#define BIG_ENDIAN 'B'
+#define LITTLE_ENDIAN 'l'
+#define BYTE_ORDER LITTLE_ENDIAN
+#define bswap32(val) ((((val) & 0x000000ffU) << 24) | (((val) & 0x0000ff00U) << 8) | (((val) & 0x00ff0000U) >> 8) | (((val) & 0xff000000U) >> 24))
+#elif defined(__linux__)
+#include <byteswap.h>
+#include <endian.h>
#else
-# ifdef HAVE_BYTESWAP_H
-# include <byteswap.h>
-# endif
-# ifdef HAVE_SYS_ENDIAN_H
-# include <sys/endian.h>
-# ifdef bswap32
-# define bswap_32 bswap32
-# else
-# define bswap_32 swap32
-# endif
-# endif
-# ifdef HAVE_ENDIAN_H
-# include <endian.h>
-# endif
-#endif
-
-#ifdef WIN32
-#if !defined(HAVE_BYTESWAP_H) && !defined(HAVE_SYS_ENDIAN_H) && !defined(HAVE_ENDIAN_H)
-#define bswap_16(x) (((x) << 8) & 0xff00) | (((x) >> 8 ) & 0xff)
-#define bswap_32(x) (((x) << 24) & 0xff000000) \
- | (((x) << 8) & 0xff0000) \
- | (((x) >> 8) & 0xff00) \
- | (((x) >> 24) & 0xff )
-#define bswap_64(x) ((((x) & 0xff00000000000000ull) >> 56) \
- | (((x) & 0x00ff000000000000ull) >> 40) \
- | (((x) & 0x0000ff0000000000ull) >> 24) \
- | (((x) & 0x000000ff00000000ull) >> 8) \
- | (((x) & 0x00000000ff000000ull) << 8) \
- | (((x) & 0x0000000000ff0000ull) << 24) \
- | (((x) & 0x000000000000ff00ull) << 40) \
- | (((x) & 0x00000000000000ffull) << 56))
+#include <sys/endian.h>
#endif
-#include <io.h>
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX 512
-#endif
-
-#ifndef F_OK
-#define F_OK 0
-#endif
-
-#ifndef R_OK
-#define R_OK 4
-#endif
-
#include <limits.h>
#include <time.h>
#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
#include <libical/icalerror.h>
#include <icaltz-util.h>
@@ -139,7 +96,11 @@
if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
return *(const int *) ptr;
else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
+#ifdef __linux__
return bswap_32 (*(const int *) ptr);
+#else
+ return bswap32 (*(const unsigned *) ptr);
+#endif
#endif
else
{
--- libical-0.44/src/libical/Makefile.am 2009-01-08 17:50:22.000000000 +0100
+++ libical-0.44/src/libical/Makefile.am 2009-04-15 15:27:20.000000000 +0200
@@ -51,7 +51,7 @@
-I$(top_builddir)/src/libical \
-I$(srcdir)
-libical_la_LDFLAGS = -version-info 44:0:44
+libical_la_LDFLAGS = -version-info 44:0:44 -no-undefined
libical_la_LIBADD = $(PTHREAD_LIBS)
--- libical-0.44/src/libical/vsnprintf.c 2009-01-08 17:50:22.000000000 +0100
+++ libical-0.44/src/libical/vsnprintf.c 2009-04-15 15:23:35.000000000 +0200
@@ -1,8 +1,7 @@
-#ifndef WIN32
#include "config.h"
-#endif
+
#ifndef HAVE_SNPRINTF
-#error DO NOT USE libical version of vsnprintf.
+
/*
* Revision 12: http://theos.com/~deraadt/snprintf.c
*
--- libical-0.44/src/libicalcap/Makefile.am 2009-01-08 17:50:20.000000000 +0100
+++ libical-0.44/src/libicalcap/Makefile.am 2009-04-15 15:32:11.000000000 +0200
@@ -34,7 +34,7 @@
-I$(srcdir) \
-DWITH_RR $(RRCAP_CFLAGS)
-libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 44:0:44
+libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 44:0:44 -no-undefined
libicalcap_evolution_la_SOURCES = \
--- libical-0.44/src/libicalss/Makefile.am 2009-01-08 17:50:22.000000000 +0100
+++ libical-0.44/src/libicalss/Makefile.am 2009-04-15 15:34:41.000000000 +0200
@@ -63,8 +63,8 @@
-I$(top_builddir)/src/libical \
$(BDB_INCLUDE)
-libicalss_la_LDFLAGS = -version-info 44:0:44
-libicalss_la_LIBADD = $(BDB_LIBFILES)
+libicalss_la_LDFLAGS = -version-info 44:0:44 -no-undefined
+libicalss_la_LIBADD = $(BDB_LIBFILES) $(top_builddir)/src/libical/libical.la
if DEV
libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
--- libical-0.44/src/libicalvcal/Makefile.am 2009-01-08 17:50:23.000000000 +0100
+++ libical-0.44/src/libicalvcal/Makefile.am 2009-04-15 15:31:48.000000000 +0200
@@ -8,7 +8,7 @@
-I$(top_builddir)/src/libical \
-I$(top_srcdir)/src/libicalss
-libicalvcal_la_LDFLAGS = -version-info 44:0:44
+libicalvcal_la_LDFLAGS = -version-info 44:0:44 -no-undefined
libicalvcal_la_LIBADD = ../libical/.libs/libical.la
if DEV

282
src/libical-2-windows.patch
View File

@ -1,282 +0,0 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
This patch has been taken from:
https://build.opensuse.org/package/view_file?file=libical-0.44-windows.patch&package=mingw32-libical&project=windows%3Amingw%3Awin32
--- libical-0.44/src/libical/icaltime.c 2009-09-27 04:38:51.000000000 +0200
+++ libical-0.44/src/libical/icaltime.c 2010-03-17 14:55:36.000000000 +0100
@@ -45,14 +45,19 @@
#include "icaltimezone.h"
#include "icalvalue.h"
-#ifdef WIN32
+#ifdef _WIN32
#include <windows.h>
#define snprintf _snprintf
#define strcasecmp stricmp
#endif
-#ifdef WIN32
+#ifdef HAVE_PTHREAD
+ #include <pthread.h>
+ static pthread_mutex_t tzid_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
+#ifdef _WIN32
/* Undef the similar macro from pthread.h, it doesn't check if
* gmtime() returns NULL.
*/
@@ -62,11 +67,6 @@
#define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0)
#endif
-#ifdef HAVE_PTHREAD
- #include <pthread.h>
- static pthread_mutex_t tzid_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
/*
* Function to convert a struct tm time specification
* to an ANSI time_t using the specified time zone.
@@ -192,18 +192,20 @@
*
*/
struct icaltimetype
-icaltime_from_timet_with_zone(const time_t tm, const int is_date,
+icaltime_from_timet_with_zone(time_t tm, const int is_date,
const icaltimezone *zone)
{
struct icaltimetype tt;
struct tm t;
icaltimezone *utc_zone;
+ if (tm < 0) tm=0;
+
utc_zone = icaltimezone_get_utc_timezone ();
/* Convert the time_t to a struct tm in UTC time. We can trust gmtime
for this. */
-#ifdef HAVE_PTHREAD
+#if defined(HAVE_PTHREAD) || defined(_WIN32)
gmtime_r (&tm, &t);
#else
t = *(gmtime (&tm));
--- libical-0.44/src/libical/icaltimezone.c 2009-09-27 04:38:51.000000000 +0200
+++ libical-0.44/src/libical/icaltimezone.c 2010-03-19 14:34:25.000000000 +0100
@@ -59,6 +59,61 @@
/** This is the toplevel directory where the timezone data is installed in. */
#define ZONEINFO_DIRECTORY PACKAGE_DATA_DIR "/zoneinfo"
+#ifdef _WIN32
+/* search for data relative to where we are installed */
+
+static HMODULE hmodule;
+
+BOOL WINAPI
+DllMain (HINSTANCE hinstDLL,
+ DWORD fdwReason,
+ LPVOID lpvReserved)
+{
+ switch (fdwReason)
+ {
+ case DLL_PROCESS_ATTACH:
+ hmodule = hinstDLL;
+ break;
+ }
+
+ return TRUE;
+}
+
+char *
+get_zoneinfo_directory (void)
+{
+ static char retval[1000];
+ static int beenhere = 0;
+
+ unsigned char *p;
+
+ if (beenhere)
+ return retval;
+
+ if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 10))
+ return ZONEINFO_DIRECTORY;
+
+ p = _mbsrchr ((const unsigned char *) retval, '\\');
+ *p = '\0';
+ p = _mbsrchr ((const unsigned char *) retval, '\\');
+ if (p) {
+ if (stricmp ((const char *) (p+1), "bin") == 0)
+ *p = '\0';
+ }
+ strcat (retval, "\\share\\libical\\zoneinfo");
+
+ beenhere = 1;
+
+ return retval;
+}
+
+#undef ZONEINFO_DIRECTORY
+#define ZONEINFO_DIRECTORY get_zoneinfo_directory ()
+
+#endif
+
+
+
/** The prefix we use to uniquely identify TZIDs.
It must begin and end with forward slashes.
*/
@@ -1943,96 +1998,7 @@
static const char* get_zone_directory(void)
{
-#ifndef WIN32
return zone_files_directory == NULL ? ZONEINFO_DIRECTORY : zone_files_directory;
-#else
- wchar_t wbuffer[1000];
- char buffer[1000], zoneinfodir[1000], dirname[1000];
- int used_default;
- static char *cache = NULL;
- char *dirslash, *zislash;
- struct stat st;
-
- if (zone_files_directory)
- return zone_files_directory;
-
- if (cache)
- return cache;
-
- /* Get the filename of the application */
- if (!GetModuleFileNameW (NULL, wbuffer, sizeof (wbuffer) / sizeof (wbuffer[0])))
- return ZONEINFO_DIRECTORY;
-
- /* Convert to system codepage */
- if (!WideCharToMultiByte (CP_ACP, 0, wbuffer, -1, buffer, sizeof (buffer),
- NULL, &used_default) ||
- used_default) {
- /* Failed, try 8.3 format */
- if (!GetShortPathNameW (wbuffer, wbuffer,
- sizeof (wbuffer) / sizeof (wbuffer[0])) ||
- !WideCharToMultiByte (CP_ACP, 0, wbuffer, -1, buffer, sizeof (buffer),
- NULL, &used_default) ||
- used_default)
- return ZONEINFO_DIRECTORY;
- }
- /* Look for the zoneinfo directory somewhere in the path where
- * the app is installed. If the path to the app is
- *
- * C:\opt\evo-2.6\bin\evolution-2.6.exe
- *
- * and the compile-time ZONEINFO_DIRECTORY is
- *
- * C:/devel/target/evo/share/evolution-data-server-1.6/zoneinfo,
- *
- * we check the pathnames:
- *
- * C:\opt\evo-2.6/devel/target/evo/share/evolution-data-server-1.6/zoneinfo
- * C:\opt\evo-2.6/target/evo/share/evolution-data-server-1.6/zoneinfo
- * C:\opt\evo-2.6/evo/share/evolution-data-server-1.6/zoneinfo
- * C:\opt\evo-2.6/share/evolution-data-server-1.6/zoneinfo <===
- * C:\opt\evo-2.6/evolution-data-server-1.6/zoneinfo
- * C:\opt\evo-2.6/zoneinfo
- * C:\opt/devel/target/evo/share/evolution-data-server-1.6/zoneinfo
- * C:\opt/target/evo/share/evolution-data-server-1.6/zoneinfo
- * C:\opt/evo/share/evolution-data-server-1.6/zoneinfo
- * C:\opt/share/evolution-data-server-1.6/zoneinfo
- * C:\opt/evolution-data-server-1.6/zoneinfo
- * C:\opt/zoneinfo
- * C:/devel/target/evo/share/evolution-data-server-1.6/zoneinfo
- * C:/target/evo/share/evolution-data-server-1.6/zoneinfo
- * C:/evo/share/evolution-data-server-1.6/zoneinfo
- * C:/share/evolution-data-server-1.6/zoneinfo
- * C:/evolution-data-server-1.6/zoneinfo
- * C:/zoneinfo
- *
- * In Evolution's case, we would get a match already at the
- * fourth pathname check.
- */
-
- /* Strip away basename of app .exe first */
- dirslash = _mbsrchr (buffer, '\\');
- if (dirslash)
- *dirslash = '\0';
-
- while ((dirslash = _mbsrchr (buffer, '\\'))) {
- /* Strip one more directory from app .exe location */
- *dirslash = '\0';
-
- strcpy (zoneinfodir, ZONEINFO_DIRECTORY);
- while ((zislash = _mbschr (zoneinfodir, '/'))) {
- *zislash = '.';
- strcpy (dirname, buffer);
- strcat (dirname, "/");
- strcat (dirname, zislash + 1);
- if (stat (dirname, &st) == 0 &&
- S_ISDIR (st.st_mode)) {
- cache = strdup (dirname);
- return cache;
- }
- }
- }
- return ZONEINFO_DIRECTORY;
-#endif
}
void set_zone_directory(char *path)
--- libical-0.44/src/libical/icaltz-util.c 2010-03-17 15:04:14.000000000 +0100
+++ libical-0.44/src/libical/icaltz-util.c 2010-03-19 14:38:56.000000000 +0100
@@ -41,6 +42,10 @@
#include <libical/icalerror.h>
#include <icaltz-util.h>
+/** This is the filename of the file containing the city names and
+ coordinates of all the builtin timezones. */
+#define ZONES_TAB_FILENAME "zones.tab"
+
typedef struct
{
char ttisgmtcnt [4];
@@ -53,7 +58,7 @@
static int r_pos [] = {1, 2, 3, -2, -1};
-static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"};
+static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo",PACKAGE_DATA_DIR "/zoneinfo"};
static char *zdir = NULL;
#define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0]))
@@ -174,12 +179,24 @@
return;
}
+#ifdef _WIN32
+char * get_zoneinfo_directory (void);
+#endif
+
static void
set_zone_directory (void)
{
char file_path[PATH_MAX];
- const char *fname = ZONES_TAB_SYSTEM_FILENAME;
+
+#ifdef _WIN32
+ const char *fname = ZONES_TAB_FILENAME;
+
+ sprintf (file_path, "%s\\%s", get_zoneinfo_directory(), fname);
+ if (!access (file_path, F_OK|R_OK))
+ zdir = strdup(get_zoneinfo_directory());
+#else
int i;
+ const char *fname = ZONES_TAB_SYSTEM_FILENAME;
for (i = 0;i < NUM_SEARCH_PATHS; i++) {
sprintf (file_path, "%s/%s", search_paths [i], fname);
@@ -188,6 +205,7 @@
break;
}
}
+#endif
}

14
src/libical-3-pthread.patch
View File

@ -1,14 +0,0 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
This patch has been made by: garethcoco@gmail.com
--- libical-0.44/libical.pc.in 2011-02-02 15:33:11.363284126 -0500
+++ libical-0.44/libical.pc.in 2011-02-02 15:32:44.202284263 -0500
@@ -6,6 +6,6 @@
Name: libical
Description: An implementation of basic iCAL protocols
Version: @VERSION@
-Libs: -L${libdir} -lical -licalss -licalvcal
+Libs: -L${libdir} -lical -licalss -licalvcal @PTHREAD_LIBS@
Cflags: -I${includedir}/

26
src/libical.mk
View File

@ -1,16 +1,15 @@
# This file is part of mingw-cross-env.
# See doc/index.html for further information.
# PDcurses
# libical
PKG := libical
$(PKG)_IGNORE := 0.46
$(PKG)_VERSION := 0.44
$(PKG)_CHECKSUM := f781150e2d98806e91b7e0bee02abdc6baf9ac7d
$(PKG)_VERSION := 0.48
$(PKG)_CHECKSUM := 4693cd0438be9f3727146ac1a46aa5b1b93b8c86
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://freeassociation.sourceforge.net/
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeassociation/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc pthreads
$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
wget -q -O- 'http://sourceforge.net/projects/freeassociation/files/$(PKG)/' | \
@ -19,13 +18,16 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
cd '$(1)' && mkdir build
cd '$(1)/build' && cmake .. \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DSTATIC_LIBRARY=true \
-DHAVE_PTHREAD_H=false \
-DCMAKE_HAVE_PTHREAD_H=false
$(MAKE) -C '$(1)/build' -j '$(JOBS)' ical-header
$(MAKE) -C '$(1)/build' -j '$(JOBS)'
$(MAKE) -C '$(1)/build' -j 1 install
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libical.exe' \

4
src/libiconv.mk
View File

@ -4,8 +4,8 @@
# libiconv
PKG := libiconv
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.13.1
$(PKG)_CHECKSUM := 5b0524131cf0d7abd50734077f13aaa5508f6bbe
$(PKG)_VERSION := 1.14
$(PKG)_CHECKSUM := be7d67e50d72ff067b2c0291311bc283add36965
$(PKG)_SUBDIR := libiconv-$($(PKG)_VERSION)
$(PKG)_FILE := libiconv-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.gnu.org/software/libiconv/

25
src/libidn-1-fixes.patch Normal file
View File

@ -0,0 +1,25 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
From ef2bf697ac36cd6b1729fef9c9f994d26d913d60 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 25 Nov 2011 15:58:28 +0100
Subject: [PATCH] fix Libs.private
diff --git a/libidn.pc.in b/libidn.pc.in
index 50ad3ca..57efa8b 100644
--- a/libidn.pc.in
+++ b/libidn.pc.in
@@ -20,5 +20,5 @@ Description: IETF stringprep, nameprep, punycode, IDNA text processing.
URL: http://www.gnu.org/software/libidn/
Version: @VERSION@
Libs: -L${libdir} -lidn
-Libs.private: @LTLIBICONV@
+Libs.private: -lintl -liconv
Cflags: -I${includedir}
--
1.7.7.3

9
src/libidn.mk
View File

@ -4,13 +4,13 @@
# Libidn
PKG := libidn
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.22
$(PKG)_CHECKSUM := 8358e897c24d534438f6b5694c25e85889d860c3
$(PKG)_VERSION := 1.23
$(PKG)_CHECKSUM := 98b00aeb8240a7a6e02f338edd6ef08adbc31a34
$(PKG)_SUBDIR := libidn-$($(PKG)_VERSION)
$(PKG)_FILE := libidn-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.gnu.org/software/libidn/
$(PKG)_URL := ftp://ftp.gnu.org/gnu/libidn/$($(PKG)_FILE)
$(PKG)_DEPS := gcc libiconv
$(PKG)_DEPS := gcc gettext libiconv
define $(PKG)_UPDATE
wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=libidn.git;a=tags' | \
@ -20,10 +20,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--disable-csharp \
--prefix='$(PREFIX)/$(TARGET)' \

172
src/libircclient-1-fixes.patch Normal file
View File

@ -0,0 +1,172 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 7e5a98fd8854295cfde1987cb7d077c5876111b2 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Jun 2011 15:45:49 +1000
Subject: [PATCH 1/3] The wrong source files are specified in the makefile.
There is one wrapper source file which includes all and
implements additional functions.
diff --git a/src/Makefile.in b/src/Makefile.in
index 091c6af..e3b7f81 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -20,7 +20,7 @@ install: lib
cp ../include/libirc_events.h @prefix@/include/libirc_events.h
cp libirc.a @prefix@/include/lib/libirc.a
-$(OBJS): utils.c dcc.c errors.c portable.c sockets.c colors.c
+$(OBJS): libircclient.c
libircclient.a: $(OBJS)
$(AR) libircclient.a $(OBJS)
--
1.7.3.4
From e7a3c62440a8c89c48914d8d45bb2e3d14b9bbd8 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Jun 2011 15:47:52 +1000
Subject: [PATCH 2/3] IPv6 support is broken and is forced to be disabled.
This place is sufficient - IPv6 initialisation will now cause an error.
diff --git a/src/libircclient.c b/src/libircclient.c
index 5d266c0..1ec11c1 100644
--- a/src/libircclient.c
+++ b/src/libircclient.c
@@ -194,7 +194,7 @@ int irc_connect6 (irc_session_t * session,
const char * username,
const char * realname)
{
-#if defined (ENABLE_IPV6)
+#if 0
struct sockaddr_in6 saddr;
struct addrinfo ainfo, *res = NULL;
char portStr[32];
--
1.7.3.4
From 78326f1af372da340197c15897b54fdd45652bf3 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Jun 2011 15:48:33 +1000
Subject: [PATCH 3/3] Use the proper WIN32 define.
diff --git a/include/libircclient.h b/include/libircclient.h
index c78f3b1..23d1a51 100644
--- a/include/libircclient.h
+++ b/include/libircclient.h
@@ -43,7 +43,7 @@
#ifndef INCLUDE_LIBIRC_H
#define INCLUDE_LIBIRC_H
-#if !defined (WIN32)
+#if !defined (_WIN32)
#include <sys/select.h> /* fd_set */
#else
#include <winsock2.h>
diff --git a/src/portable.c b/src/portable.c
index 8071c13..ab8a57b 100644
--- a/src/portable.c
+++ b/src/portable.c
@@ -13,7 +13,7 @@
*/
-#if !defined (WIN32)
+#if !defined (_WIN32)
#include "config.h"
#include <stdio.h>
#include <stdarg.h>
@@ -65,7 +65,7 @@
static inline int libirc_mutex_init (port_mutex_t * mutex)
{
-#if defined (WIN32)
+#if defined (_WIN32)
InitializeCriticalSection (mutex);
return 0;
#elif defined (PTHREAD_MUTEX_RECURSIVE)
@@ -78,13 +78,13 @@ static inline int libirc_mutex_init (port_mutex_t * mutex)
return pthread_mutex_init (mutex, 0);
-#endif /* defined (WIN32) */
+#endif /* defined (_WIN32) */
}
static inline void libirc_mutex_destroy (port_mutex_t * mutex)
{
-#if defined (WIN32)
+#if defined (_WIN32)
DeleteCriticalSection (mutex);
#else
pthread_mutex_destroy (mutex);
@@ -94,7 +94,7 @@ static inline void libirc_mutex_destroy (port_mutex_t * mutex)
static inline void libirc_mutex_lock (port_mutex_t * mutex)
{
-#if defined (WIN32)
+#if defined (_WIN32)
EnterCriticalSection (mutex);
#else
pthread_mutex_lock (mutex);
@@ -104,7 +104,7 @@ static inline void libirc_mutex_lock (port_mutex_t * mutex)
static inline void libirc_mutex_unlock (port_mutex_t * mutex)
{
-#if defined (WIN32)
+#if defined (_WIN32)
LeaveCriticalSection (mutex);
#else
pthread_mutex_unlock (mutex);
diff --git a/src/sockets.c b/src/sockets.c
index c2b33f1..e73f62c 100644
--- a/src/sockets.c
+++ b/src/sockets.c
@@ -15,7 +15,7 @@
/*
* The sockets interface was moved out to simplify going OpenSSL integration.
*/
-#if !defined (WIN32)
+#if !defined (_WIN32)
#include <sys/socket.h>
#include <netdb.h>
#include <arpa/inet.h>
@@ -47,7 +47,7 @@
static int socket_error()
{
-#if !defined (WIN32)
+#if !defined (_WIN32)
return errno;
#else
return WSAGetLastError();
@@ -64,7 +64,7 @@ static int socket_create (int domain, int type, socket_t * sock)
static int socket_make_nonblocking (socket_t * sock)
{
-#if !defined (WIN32)
+#if !defined (_WIN32)
return fcntl (*sock, F_SETFL, fcntl (*sock, F_GETFL,0 ) | O_NONBLOCK) != 0;
#else
unsigned long mode = 0;
@@ -75,7 +75,7 @@ static int socket_make_nonblocking (socket_t * sock)
static int socket_close (socket_t * sock)
{
-#if !defined (WIN32)
+#if !defined (_WIN32)
close (*sock);
#else
closesocket (*sock);
--
1.7.3.4

Some files were not shown because too many files have changed in this diff Show More