# HG changeset patch # User Volker Grabsch # Date 1325500166 -3600 # Node ID d9e4f3b2002a44b554147e681ba36ec3657ff7e3 # Parent 6e83c7eb09459ebf967fbd1349bed28060f90ea9# Parent 6fc390a6e4714973a5704d7f7db79bd9e7c661eb merge diff -r 6e83c7eb0945 -r d9e4f3b2002a .hgignore --- a/.hgignore Mon Jan 02 11:28:35 2012 +0100 +++ b/.hgignore Mon Jan 02 11:29:26 2012 +0100 @@ -2,3 +2,4 @@ ^log($|/) ^pkg($|/) ^dist($|/) +^wip($|/) diff -r 6e83c7eb0945 -r d9e4f3b2002a Makefile --- a/Makefile Mon Jan 02 11:28:35 2012 +0100 +++ b/Makefile Mon Jan 02 11:29:26 2012 +0100 @@ -154,6 +154,7 @@ $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(1)-*.patch)), (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) $$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test) + (du -k -d 0 '$(2)' 2>/dev/null || du -k --max-depth 0 '$(2)') | $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p' rm -rfv '$(2)' ,) [ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed' diff -r 6e83c7eb0945 -r d9e4f3b2002a doc/index.html --- a/doc/index.html Mon Jan 02 11:28:35 2012 +0100 +++ b/doc/index.html Mon Jan 02 11:29:26 2012 +0100 @@ -450,28 +450,15 @@
-
2011-06-07 – Release 2.21
+
2011-xx-xx – Release 2.22

- Download | - Changelog + Download | + Changelog

- Minor bugfixes in several packages. -

- -

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

- -

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

- -

- New packages are supported: - libass, poco, and t4k_common. + Almost all packages were updated to their latest version.

@@ -622,6 +609,10 @@ + GNU Gettext + + + GNU Make ≥ 3.81 @@ -683,11 +674,11 @@ -

Debian

+

Debian (GNU/kFreeBSD & GNU/Linux)

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 @@
 
     
     
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
@@ -715,7 +706,7 @@
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
@@ -739,7 +730,7 @@
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
@@ -754,6 +745,7 @@
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 @@
     

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

@@ -797,8 +789,8 @@ On 64-bit openSUSE, install also:

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

Open Issues with NSIS

@@ -1192,6 +1184,31 @@
+
2011-06-07 – Release 2.21
+
+

+ Download | + Changelog +

+ +

+ Minor bugfixes in several packages. +

+ +

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

+ +

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

+ +

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

+
+
2011-04-05 – Release 2.20

diff -r 6e83c7eb0945 -r d9e4f3b2002a src/agg.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/agg.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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,.* '$(PREFIX)/$(TARGET)/share/config.site' + cd '$(1)' && ./configure \ --target='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)' \ --with-gcc \ --with-gnu-ld \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/boost.mk --- a/src/boost.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/boost.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ # make the build script generate .a library files instead of .lib $(SED) -i 's,windows : lib ;,windows : a ;,' '$(1)/tools/build/v2/tools/types/lib.jam' # compile boost jam - cd '$(1)/tools/build/v2/engine/src' && ./build.sh - cd '$(1)' && tools/build/v2/engine/src/bin.*/bjam \ + cd '$(1)/tools/build/v2/engine' && ./build.sh + cd '$(1)' && tools/build/v2/engine/bin.*/bjam \ -j '$(JOBS)' \ --ignore-site-config \ --user-config=user-config.jam \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/cblas.mk --- a/src/cblas.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/cblas.mk Mon Jan 02 11:29:26 2012 +0100 @@ -23,7 +23,7 @@ $(SED) -i 's,FC =.*,FC = $(TARGET)-gfortran,g' '$(1)/Makefile.MINGW32' $(SED) -i 's, make , $(MAKE) ,g' '$(1)/Makefile' rm '$(1)/Makefile.in' - ln -s '$(1)/Makefile.MINGW32' '$(1)/Makefile.in' + ln -sf '$(1)/Makefile.MINGW32' '$(1)/Makefile.in' mkdir '$(1)/MINGW32' $(MAKE) -C '$(1)' -j '$(JOBS)' alllib cd '$(1)' && $(TARGET)-ar cr libcblas.a src/*.o diff -r 6e83c7eb0945 -r d9e4f3b2002a src/cgal-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cgal-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 + #include + #include ++#ifndef Q_MOC_RUN + #include ++#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 ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + 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() + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/cgal.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cgal.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 diff -r 6e83c7eb0945 -r d9e4f3b2002a src/curl-1-fix-static.patch --- a/src/curl-1-fix-static.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://sourceforge.net/tracker/?func=detail&aid=3016471&group_id=976&atid=100976 - -diff -r f9016ca5bace include/curl/curlbuild.h.in ---- a/include/curl/curlbuild.h.in Tue Jun 15 13:55:53 2010 +0200 -+++ b/include/curl/curlbuild.h.in Tue Jun 15 14:00:13 2010 +0200 -@@ -111,6 +111,9 @@ - /* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ - /* ================================================================ */ - -+/* Configure process defines this to 1 when static linking is requested. */ -+#undef CURL_STATICLIB -+ - /* Configure process defines this to 1 when it finds out that system */ - /* header file ws2tcpip.h must be included by the external interface. */ - #undef CURL_PULL_WS2TCPIP_H diff -r 6e83c7eb0945 -r d9e4f3b2002a src/curl-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/curl-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 +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 +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 ++# include ++ + #elif defined(USE_GNUTLS) + + # include +@@ -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 ++# include ++# include ++# define MD5_DIGEST_LENGTH 16 ++ + #elif defined(USE_GNUTLS) + + # include +@@ -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 + #include ++#ifndef USE_GNUTLS_NETTLE + #include ++#endif + + #ifdef HAVE_SYS_SOCKET_H + #include +@@ -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 ++ ++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 +@@ -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 +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 +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 +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 +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 +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 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/curl.mk --- a/src/curl.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/curl.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' + cd '$(1)' && ./buildconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-gnutls \ --with-libidn \ - LIBS="-lgcrypt -liconv `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs`" - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + --enable-sspi \ + --with-libssh2 + $(MAKE) -C '$(1)' -j '$(JOBS)' install '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/dbus-1-fixes.patch --- a/src/dbus-1-fixes.patch Mon Jan 02 11:28:35 2012 +0100 +++ b/src/dbus-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 +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 @@ # 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 + #include + ++__CRT_INLINE VOID MemoryBarrier(VOID) ++{ ++ LONG Barrier = 0; ++ __asm__ __volatile__("xchgl %%eax,%0 " ++ :"=r" (Barrier)); ++} ++ + /* Declarations missing in mingw's headers */ + extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR StringSid, PSID *Sid); + extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid); +-- +1.7.6.3 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/dbus.mk --- a/src/dbus.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/dbus.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ define $(PKG)_UPDATE wget -q -O- 'http://cgit.freedesktop.org/dbus/dbus/refs/tags' | \ $(SED) -n "s,.*]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && \ + cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/exiv2-r2469.patch --- a/src/exiv2-r2469.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. - -This patch has been taken from: -http://dev.exiv2.org/issues/764 - -Index: trunk/src/psdimage.cpp -=================================================================== ---- trunk/src/psdimage.cpp (revision 2468) -+++ trunk/src/psdimage.cpp (revision 2469) -@@ -400,7 +400,7 @@ - uint32_t resourceType = getULong(buf, bigEndian); - - if (resourceType != kPhotoshopResourceType) { -- break; // bad resource type -+ throw Error(3, "Photoshop"); // bad resource type - } - uint16_t resourceId = getUShort(buf + 4, bigEndian); - uint32_t resourceNameLength = buf[6]; -@@ -416,13 +416,13 @@ - if (io_->read(buf, 4) != 4) throw Error(3, "Photoshop"); - - uint32_t resourceSize = getULong(buf, bigEndian); -+ uint32_t pResourceSize = (resourceSize + 1) & ~1; // padded resource size - uint32_t curOffset = io_->tell(); - - // Write IPTC_NAA resource block - if ((resourceId == kPhotoshopResourceID_IPTC_NAA || - resourceId > kPhotoshopResourceID_IPTC_NAA) && iptcDone == false) { - newResLength += writeIptcData(iptcData_, outIo); -- resourceSize = (resourceSize + 1) & ~1; // adjust for padding - iptcDone = true; - } - -@@ -430,7 +430,6 @@ - else if ((resourceId == kPhotoshopResourceID_ExifInfo || - resourceId > kPhotoshopResourceID_ExifInfo) && exifDone == false) { - newResLength += writeExifData(exifData_, outIo); -- resourceSize = (resourceSize + 1) & ~1; // adjust for padding - exifDone = true; - } - -@@ -438,7 +437,6 @@ - else if ((resourceId == kPhotoshopResourceID_XMPPacket || - resourceId > kPhotoshopResourceID_XMPPacket) && xmpDone == false) { - newResLength += writeXmpData(xmpData_, outIo); -- resourceSize = (resourceSize + 1) & ~1; // adjust for padding - xmpDone = true; - } - -@@ -467,10 +465,9 @@ - - readTotal = 0; - toRead = 0; -- resourceSize = (resourceSize + 1) & ~1; // pad to even -- while (readTotal < resourceSize) { -- toRead = static_cast(resourceSize - readTotal) < lbuf.size_ -- ? static_cast(resourceSize - readTotal) : lbuf.size_; -+ while (readTotal < pResourceSize) { -+ toRead = static_cast(pResourceSize - readTotal) < lbuf.size_ -+ ? static_cast(pResourceSize - readTotal) : lbuf.size_; - if (io_->read(lbuf.pData_, toRead) != toRead) { - throw Error(3, "Photoshop"); - } -@@ -478,11 +475,11 @@ - if (outIo.write(lbuf.pData_, toRead) != toRead) throw Error(21); - } - if (outIo.error()) throw Error(21); -- newResLength += resourceSize + adjResourceNameLen + 12; -+ newResLength += pResourceSize + adjResourceNameLen + 12; - } - -- io_->seek(curOffset + resourceSize, BasicIo::beg); -- oldResLength -= (12 + adjResourceNameLen + resourceSize); -+ io_->seek(curOffset + pResourceSize, BasicIo::beg); -+ oldResLength -= (12 + adjResourceNameLen + pResourceSize); - } - - // Append IPTC_NAA resource block, if not yet written diff -r 6e83c7eb0945 -r d9e4f3b2002a src/exiv2-r2472.patch --- a/src/exiv2-r2472.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. - -This patch has been taken from: -http://dev.exiv2.org/issues/767 - -Index: trunk/config/configure.ac -=================================================================== ---- trunk/config/configure.ac (revision 2471) -+++ trunk/config/configure.ac (revision 2472) -@@ -31,12 +31,6 @@ - AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_CANONICAL_HOST --# Add flag for DLL on Windows --case "$host_os" in --*mingw* | *cygwin*) -- LDFLAGS="$LDFLAGS -no-undefined" -- ;; --esac - - # --------------------------------------------------------------------------- - # i18n support -@@ -204,6 +198,17 @@ - fi - AC_SUBST(EXV_LIB_STATIC) - -+# Add flag for DLL on Windows -+# -+# This must happen after all other configure checks, because -+# the "-no-undefined" flag is only for libtool and may not be -+# passed to GCC by accident. -+case "$host_os" in -+*mingw* | *cygwin*) -+ LDFLAGS="$LDFLAGS -no-undefined" -+ ;; -+esac -+ - # --------------------------------------------------------------------------- - # Create output files. - # --------------------------------------------------------------------------- diff -r 6e83c7eb0945 -r d9e4f3b2002a src/exiv2-r2619.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/exiv2-r2619.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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); diff -r 6e83c7eb0945 -r d9e4f3b2002a src/exiv2.mk --- a/src/exiv2.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/exiv2.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ endef define $(PKG)_BUILD - # rebuild configure script as one of the patches modifies configure.ac - $(MAKE) -C '$(1)/config' -f config.make - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-visibility \ --disable-nls \ --with-expat - # fix pkg-config linker flags - $(SED) -i 's,-no-undefined,,' '$(1)/config/exiv2.pc' $(MAKE) -C '$(1)/xmpsdk/src' -j '$(JOBS)' $(MAKE) -C '$(1)/src' -j '$(JOBS)' install-lib endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/ffmpeg.mk --- a/src/ffmpeg.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/ffmpeg.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/fftw.mk --- a/src/fftw.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/fftw.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/file-1-fix-cross-compilation-detection.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/file-1-fix-cross-compilation-detection.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 diff -r 6e83c7eb0945 -r d9e4f3b2002a src/file.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/file.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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.10 +$(PKG)_CHECKSUM := 72fd435e78955ee122b7b3d323ff2f92e6263e89 +$(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 diff -r 6e83c7eb0945 -r d9e4f3b2002a src/fltk.mk --- a/src/fltk.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/fltk.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ 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 @@ # 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 \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/fontconfig.mk --- a/src/fontconfig.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/fontconfig.mk Mon Jan 02 11:29:26 2012 +0100 @@ -22,11 +22,10 @@ # ensure there is no (buggy) attempt to install the *.dll.a file # (remove this line of you want to link dynamically) $(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(1)/src/Makefile.in' - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' $(SED) -i 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' '$(1)/fontconfig.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-arch='$(TARGET)' \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/freeglut-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/freeglut-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/freeglut-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/freeglut-test.c Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,20 @@ +/* This file is part of mingw-cross-env. */ +/* See doc/index.html for further information. */ + +#include + +#include + +int main(int argc, char *argv[]) +{ + glutInit(&argc, argv); + glutInitWindowSize(640,480); + glutInitWindowPosition(10,10); + glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); + + glutCreateWindow("FreeGLUT Shapes"); + + glutMainLoop(); + + return(0); +} diff -r 6e83c7eb0945 -r d9e4f3b2002a src/freeglut.mk --- a/src/freeglut.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/freeglut.mk Mon Jan 02 11:29:26 2012 +0100 @@ -19,6 +19,7 @@ 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 @@ --disable-debug \ --without-progs \ --without-x - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= EXPORT_FLAGS='-DFREEGLUT_STATIC' + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-freeglut.exe' \ + `'$(TARGET)-pkg-config' glut --cflags --libs` endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/freeimage.mk --- a/src/freeimage.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/freeimage.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/freetds.mk --- a/src/freetds.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/freetds.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' - cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-rpath \ --disable-dependency-tracking \ --disable-shared \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/freetype.mk --- a/src/freetype.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/freetype.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gcc-1-mingw-float.patch --- a/src/gcc-1-mingw-float.patch Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gcc-1-mingw-float.patch Mon Jan 02 11:29:26 2012 +0100 @@ -8,7 +8,7 @@ diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h --- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 +++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 -@@ -236,3 +236,7 @@ +@@ -275,3 +275,7 @@ #endif /* __STDC_WANT_DEC_FP__ */ #endif /* _FLOAT_H___ */ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gcc-2-darwin-no-pie.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gcc-2-darwin-no-pie.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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=' + ' diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gcc-mpfr.mk --- a/src/gcc-mpfr.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gcc-mpfr.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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,.* '$(CMAKE_TOOLCHAIN_FILE)' diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gdal-1-png.patch --- a/src/gdal-1-png.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -http://trac.osgeo.org/gdal/changeset/21526 -Index: /branches/1.8/gdal/frmts/png/pngdataset.cpp -=================================================================== ---- a/frmts/png/pngdataset.cpp (revision 21032) -+++ b/frmts/png/pngdataset.cpp (revision 21526) -@@ -1316,5 +1316,5 @@ - */ - check = (png_size_t)VSIFReadL(data, (png_size_t)1, length, -- (VSILFILE*)png_ptr->io_ptr); -+ (VSILFILE*)png_get_io_ptr(png_ptr)); - - if (check != length) -@@ -1331,5 +1331,5 @@ - png_uint_32 check; - -- check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_ptr->io_ptr)); -+ check = VSIFWriteL(data, 1, length, (VSILFILE*)png_get_io_ptr(png_ptr)); - - if (check != length) -@@ -1342,5 +1342,5 @@ - static void png_vsi_flush(png_structp png_ptr) - { -- VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) ); -+ VSIFFlushL( (VSILFILE*)png_get_io_ptr(png_ptr) ); - } - -@@ -1358,5 +1358,5 @@ - // semantics. Ugg. - -- jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr; -+ jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr); - if (psSetJmpContext) - { diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gdal.mk --- a/src/gdal.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gdal.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ --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 @@ $(MAKE) -C '$(1)/alg' -j 1 install $(MAKE) -C '$(1)/ogr' -j 1 install OGR_ENABLED= $(MAKE) -C '$(1)/apps' -j 1 install BIN_LIST= - ln -sf $(PREFIX)/$(TARGET)/bin/gdal-config $(PREFIX)/bin/$(TARGET)-gdal-config + ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config' endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gdb.mk --- a/src/gdb.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gdb.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ define $(PKG)_UPDATE wget -q -O- 'http://ftp.gnu.org/gnu/gdb/?C=M;O=D' | \ $(SED) -n 's,.* Date: Mon, 24 Jan 2011 10:39:22 +0000 -Subject: Use png_jmpbuf macro +Subject: [PATCH 2/3] Use png_jmpbuf macro This makes the png loader compatible with libpng 1.5 --- + gdk-pixbuf/io-png.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c index 79c81fd..76f3304 100644 --- a/gdk-pixbuf/io-png.c @@ -96,5 +103,31 @@ success = FALSE; goto cleanup; } --- -cgit v0.8.3.4 +-- +1.7.8 + + +From 98b7ca46c998a497a1bc6cd563e0201d0cd65de0 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Fri, 23 Dec 2011 18:54:01 +0100 +Subject: [PATCH 3/3] add libtiff-4 to Requires.private + +--- + gdk-pixbuf-2.0.pc.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in +index 7e61775..bc33627 100644 +--- a/gdk-pixbuf-2.0.pc.in ++++ b/gdk-pixbuf-2.0.pc.in +@@ -12,6 +12,7 @@ Name: GdkPixbuf + Description: Image loading and scaling + Version: @VERSION@ + Requires: gobject-2.0 gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ ++Requires.private: libtiff-4 + Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@ + Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@ + +-- +1.7.8 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gdk-pixbuf.mk --- a/src/gdk-pixbuf.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gdk-pixbuf.mk Mon Jan 02 11:29:26 2012 +0100 @@ -21,13 +21,13 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-modules \ - --with-included-loaders + --with-included-loaders \ + LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/geos.mk --- a/src/geos.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/geos.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/glew-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glew-test.c Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,22 @@ +/* This file is part of mingw-cross-env. */ +/* See doc/index.html for further information. */ + +#include +#include + +int main(int argc, char *argv[]) +{ + GLenum err; + + (void)argc; + (void)argv; + + err = glewInit(); + if (GLEW_OK != err) + { + fprintf(stderr, "Error: %s\n", glewGetErrorString(err)); + } + fprintf(stdout, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION)); + + return 0; +} diff -r 6e83c7eb0945 -r d9e4f3b2002a src/glew.mk --- a/src/glew.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/glew.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ $(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 diff -r 6e83c7eb0945 -r d9e4f3b2002a src/glib-1-fixes.patch --- a/src/glib-1-fixes.patch Mon Jan 02 11:28:35 2012 +0100 +++ b/src/glib-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -6,7 +6,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ Cflags: -- 1.7.1 - - -From 58d20f08e876298e795f7282ddc6cfccbe6f05fe Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Sun, 3 Oct 2010 20:24:46 +0200 -Subject: [PATCH 6/7] darwin config libiconv - - -diff --git a/configure.ac b/configure.ac -index e472768..a681285 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -374,6 +374,12 @@ dnl *********************** - dnl - dnl We do this before the gettext checks, to avoid distortion - -+case $host in -+ *-*-darwin*) -+ with_libiconv=native -+ ;; -+esac -+ - dnl On Windows we use a native implementation - - if test x"$glib_native_win32" = xyes; then --- -1.7.1 - - -From a340fa1dfbf9a8ac58cd1b026bd26de30d7fc581 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Sun, 3 Oct 2010 20:25:32 +0200 -Subject: [PATCH 7/7] apple iconv - -This patch has been taken from: -http://mail.gnome.org/archives/gtk-list/2009-August/msg00146.html - -diff --git a/glib/gconvert.c b/glib/gconvert.c -index 52a3dd8..d8b4f89 100644 ---- a/glib/gconvert.c -+++ b/glib/gconvert.c -@@ -61,7 +61,7 @@ - #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) - #error GNU libiconv in use but included iconv.h not from libiconv - #endif --#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) -+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined(__APPLE__) - #error GNU libiconv not in use but included iconv.h is from libiconv - #endif - --- -1.7.1 - diff -r 6e83c7eb0945 -r d9e4f3b2002a src/glib.mk --- a/src/glib.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/glib.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ $(INSTALL) -m755 '$(1).native/gio/glib-compile-schemas' '$(PREFIX)/$(TARGET)/bin/' # cross build - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-threads=win32 \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/glibmm.mk --- a/src/glibmm.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/glibmm.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ endef define $(PKG)_BUILD - # cross build - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ CXX='$(TARGET)-c++' \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gnutls-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gnutls-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gnutls-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gnutls-test.c Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,16 @@ +/* This file is part of mingw-cross-env. */ +/* See doc/index.html for further information. */ + +#include + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + gnutls_global_init (); + + gnutls_global_deinit (); + + return 0; +} diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gnutls.mk --- a/src/gnutls.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gnutls.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 ']*>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 @@ --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 diff -r 6e83c7eb0945 -r d9e4f3b2002a src/graphicsmagick-2-libpng1.5.patch --- a/src/graphicsmagick-2-libpng1.5.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1986 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/coders/png.c.diff?r1=1.457;r2=1.410.2.4 - ---- GraphicsMagick/coders/png.c 2010/03/07 21:23:50 1.410.2.4 -+++ GraphicsMagick/coders/png.c 2010/09/19 23:35:45 1.457 -@@ -88,26 +88,7 @@ - #include "zlib.h" - - --/* -- * TO DO: rewrite using png_get_tRNS() instead of direct access to the -- * ping and ping_info structs. -- */ --#if PNG_LIBPNG_VER < 10400 --# define trans_color trans_values /* Changed at libpng-1.4.0beta35 */ --# define trans_alpha trans /* Changed at libpng-1.4.0beta74 */ --#else -- /* We could parse PNG_LIBPNG_VER_STRING here but it's too much bother.. -- * Just don't use libpng-1.4.0beta32-34 or beta67-73 -- */ --# ifndef PNG_USER_CHUNK_CACHE_MAX /* Added at libpng-1.4.0beta32 */ --# define trans_color trans_values /* Changed at libpng-1.4.0beta35 */ --# endif --# ifndef PNG_TRANSFORM_GRAY_TO_RGB /* Added at libpng-1.4.0beta67 */ --# define trans_alpha trans /* Changed at libpng-1.4.0beta74 */ --# endif --#endif -- --#if PNG_LIBPNG_VER > 95 -+#if PNG_LIBPNG_VER > 10011 - /* - Optional declarations. Define or undefine them as you like. - */ -@@ -164,10 +145,6 @@ static SemaphoreInfo - PNG_MNG_FEATURES_SUPPORTED is disabled by default in libpng-1.0.9 and - will be enabled by default in libpng-1.2.0. - */ --#if (PNG_LIBPNG_VER == 10009) /* work around libpng-1.0.9 bug */ --# undef PNG_READ_EMPTY_PLTE_SUPPORTED --# undef PNG_WRITE_EMPTY_PLTE_SUPPORTED --#endif - #ifdef PNG_MNG_FEATURES_SUPPORTED - # ifndef PNG_READ_EMPTY_PLTE_SUPPORTED - # define PNG_READ_EMPTY_PLTE_SUPPORTED -@@ -244,6 +221,16 @@ static png_byte FARDATA mng_tIME[5]={116 - static png_byte FARDATA mng_zTXt[5]={122, 84, 88, 116, '\0'}; - */ - -+typedef struct _UShortPixelPacket -+{ -+ unsigned short -+ red, -+ green, -+ blue, -+ opacity, -+ index; -+} UShortPixelPacket; -+ - typedef struct _MngBox - { - long -@@ -492,7 +479,6 @@ static const char* PngColorTypeToString( - return result; - } - --#if PNG_LIBPNG_VER > 95 - #if defined(PNG_SORT_PALETTE) - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@@ -785,7 +771,6 @@ static MagickPassFail CompressColormapTr - return(MagickPass); - } - #endif --#endif /* PNG_LIBPNG_VER > 95 */ - #endif /* HasPNG */ - - /* -@@ -907,7 +892,7 @@ static MagickPassFail IsPNG(const unsign - extern "C" { - #endif - --#if (PNG_LIBPNG_VER > 95) -+#if (PNG_LIBPNG_VER > 10011) - static size_t WriteBlobMSBULong(Image *image,const unsigned long value) - { - unsigned char -@@ -956,13 +941,13 @@ static void LogPNGChunk(int logging, png - " Writing %c%c%c%c chunk, length: %lu", - type[0],type[1],type[2],type[3],length); - } --#endif /* PNG_LIBPNG_VER > 95 */ -+#endif /* PNG_LIBPNG_VER > 10011 */ - - #if defined(__cplusplus) || defined(c_plusplus) - } - #endif - --#if PNG_LIBPNG_VER > 95 -+#if PNG_LIBPNG_VER > 10011 - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % % -@@ -1351,7 +1336,11 @@ static void PNGErrorHandler(png_struct * - " libpng-%.1024s error: %.1024s", - PNG_LIBPNG_VER_STRING, message); - (void) ThrowException2(&image->exception,CoderError,message,image->filename); -+#if (PNG_LIBPNG_VER < 10500) - longjmp(ping->jmpbuf,1); -+#else -+ png_longjmp(ping,1); -+#endif - } - - static void PNGWarningHandler(png_struct *ping,png_const_charp message) -@@ -1372,19 +1361,8 @@ static void PNGWarningHandler(png_struct - #ifdef PNG_USER_MEM_SUPPORTED - static png_voidp png_IM_malloc(png_structp png_ptr,png_uint_32 size) - { --#if (PNG_LIBPNG_VER < 10011) -- png_voidp -- ret; -- -- png_ptr=png_ptr; -- ret=MagickAllocateMemory(png_voidp,(size_t) size); -- if (ret == NULL) -- png_error("Insufficient memory."); -- return (ret); --#else - png_ptr=png_ptr; - return MagickAllocateMemory(png_voidp,(size_t) size); --#endif - } - - /* -@@ -1560,11 +1538,24 @@ static Image *ReadOnePNGImage(MngInfo *m - logging, - num_text, - num_passes, -- pass; -+ pass, -+ ping_bit_depth, -+ ping_colortype, -+ ping_interlace_method, -+ ping_compression_method, -+ ping_filter_method, -+ ping_num_trans; - -- PixelPacket -+ UShortPixelPacket - transparent_color; - -+ png_bytep -+ ping_trans_alpha; -+ -+ png_color_16p -+ ping_background, -+ ping_trans_color; -+ - png_info - *end_info, - *ping_info; -@@ -1572,6 +1563,11 @@ static Image *ReadOnePNGImage(MngInfo *m - png_struct - *ping; - -+ png_uint_32 -+ ping_rowbytes, -+ ping_width, -+ ping_height; -+ - png_textp - text; - -@@ -1619,23 +1615,12 @@ static Image *ReadOnePNGImage(MngInfo *m - LockSemaphoreInfo(png_semaphore); - #endif - --#if (PNG_LIBPNG_VER < 10007) -+#if (PNG_LIBPNG_VER < 10012) - if (image_info->verbose) - printf("Your PNG library (libpng-%s) is rather old.\n", - PNG_LIBPNG_VER_STRING); - #endif - --#if (PNG_LIBPNG_VER >= 10400) --# ifndef PNG_TRANSFORM_GRAY_TO_RGB /* Added at libpng-1.4.0beta67 */ -- if (image_info->verbose) -- { -- printf("Your PNG library (libpng-%s) is an old beta version.\n", -- PNG_LIBPNG_VER_STRING); -- printf("Please update it.\n"); -- } --# endif --#endif -- - image=mng_info->image; - - /* -@@ -1665,7 +1650,7 @@ static Image *ReadOnePNGImage(MngInfo *m - ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image); - } - png_pixels=(unsigned char *) NULL; -- if (setjmp(ping->jmpbuf)) -+ if (setjmp(png_jmpbuf(ping))) - { - /* - PNG image is corrupt. -@@ -1740,18 +1725,32 @@ static Image *ReadOnePNGImage(MngInfo *m - - png_read_info(ping,ping_info); - -+ (void) png_get_IHDR(ping,ping_info, -+ &ping_width, -+ &ping_height, -+ &ping_bit_depth, -+ &ping_colortype, -+ &ping_interlace_method, -+ &ping_compression_method, -+ &ping_filter_method); -+ -+ (void) png_get_tRNS(ping, ping_info, &ping_trans_alpha, &ping_num_trans, -+ &ping_trans_color); -+ -+ (void) png_get_bKGD(ping, ping_info, &ping_background); -+ - #if (QuantumDepth == 8) - image->depth=8; - #else -- if (ping_info->bit_depth > 8) -+ if (ping_bit_depth > 8) - image->depth=16; - else - image->depth=8; - #endif - -- if (ping_info->bit_depth < 8) -+ if (ping_bit_depth < 8) - { -- if ((ping_info->color_type == PNG_COLOR_TYPE_PALETTE)) -+ if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - { - png_set_packing(ping); - image->depth=8; -@@ -1761,21 +1760,22 @@ static Image *ReadOnePNGImage(MngInfo *m - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG width: %lu, height: %lu", -- (unsigned long)ping_info->width, -- (unsigned long)ping_info->height); -+ (unsigned long)ping_width, -+ (unsigned long)ping_height); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG color_type: %d, bit_depth: %d", -- ping_info->color_type, ping_info->bit_depth); -+ ping_colortype, ping_bit_depth); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG compression_method: %d", -- ping_info->compression_type); -+ ping_compression_method); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG interlace_method: %d, filter_method: %d", -- ping_info->interlace_type,ping_info->filter_type); -+ ping_interlace_method, -+ ping_filter_method); - } - --#if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) -- if (ping_info->valid & PNG_INFO_iCCP) -+#if defined(PNG_READ_iCCP_SUPPORTED) -+ if (png_get_valid(ping, ping_info, PNG_INFO_iCCP)) - { - int - compression; -@@ -1803,15 +1803,19 @@ static Image *ReadOnePNGImage(MngInfo *m - } - } - } --#endif /* #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) */ -+#endif /* #if defined(PNG_READ_iCCP_SUPPORTED) */ - #if defined(PNG_READ_sRGB_SUPPORTED) - { - int - intent; - -- if (mng_info->have_global_srgb) -- image->rendering_intent=(RenderingIntent) -- (mng_info->global_srgb_intent+1); -+ if (!png_get_sRGB(ping,ping_info,&intent)) -+ { -+ if (mng_info->have_global_srgb) -+ { -+ png_set_sRGB(ping,ping_info,(mng_info->global_srgb_intent+1)); -+ } -+ } - if (png_get_sRGB(ping,ping_info,&intent)) - { - image->rendering_intent=(RenderingIntent) (intent+1); -@@ -1827,8 +1831,11 @@ static Image *ReadOnePNGImage(MngInfo *m - double - file_gamma; - -- if (mng_info->have_global_gama) -- image->gamma=mng_info->global_gamma; -+ if (!png_get_gAMA(ping,ping_info,&file_gamma)) -+ { -+ if (mng_info->have_global_gama) -+ png_set_gAMA(ping,ping_info,mng_info->global_gamma); -+ } - if (png_get_gAMA(ping,ping_info,&file_gamma)) - { - image->gamma=(float) file_gamma; -@@ -1838,9 +1845,20 @@ static Image *ReadOnePNGImage(MngInfo *m - file_gamma); - } - } -- if (mng_info->have_global_chrm) -- image->chromaticity=mng_info->global_chrm; -- if (ping_info->valid & PNG_INFO_cHRM) -+ if (!png_get_valid(ping, ping_info, PNG_INFO_cHRM)) -+ { -+ if (mng_info->have_global_chrm) -+ (void) png_set_cHRM(ping,ping_info, -+ mng_info->global_chrm.white_point.x, -+ mng_info->global_chrm.white_point.y, -+ mng_info->global_chrm.red_primary.x, -+ mng_info->global_chrm.red_primary.y, -+ mng_info->global_chrm.green_primary.x, -+ mng_info->global_chrm.green_primary.y, -+ mng_info->global_chrm.blue_primary.x, -+ mng_info->global_chrm.blue_primary.y); -+ } -+ if (png_get_valid(ping, ping_info, PNG_INFO_cHRM)) - { - (void) png_get_cHRM(ping,ping_info, - &image->chromaticity.white_point.x, -@@ -1867,12 +1885,9 @@ static Image *ReadOnePNGImage(MngInfo *m - image->chromaticity.white_point.x=0.3127f; - image->chromaticity.white_point.y=0.3290f; - } -- if (mng_info->have_global_gama || image->rendering_intent) -- ping_info->valid|=PNG_INFO_gAMA; -- if (mng_info->have_global_chrm || image->rendering_intent) -- ping_info->valid|=PNG_INFO_cHRM; - #if defined(PNG_oFFs_SUPPORTED) -- if (mng_info->mng_type == 0 && (ping_info->valid & PNG_INFO_oFFs)) -+ if (mng_info->mng_type == 0 && (png_get_valid(ping, ping_info, -+ PNG_INFO_oFFs))) - { - image->page.x=png_get_x_offset_pixels(ping, ping_info); - image->page.y=png_get_y_offset_pixels(ping, ping_info); -@@ -1885,7 +1900,17 @@ static Image *ReadOnePNGImage(MngInfo *m - } - #endif - #if defined(PNG_pHYs_SUPPORTED) -- if (ping_info->valid & PNG_INFO_pHYs) -+ if (!png_get_valid(ping, ping_info, PNG_INFO_pHYs)) -+ { -+ if (mng_info->have_global_phys) -+ { -+ png_set_pHYs(ping,ping_info, -+ mng_info->global_x_pixels_per_unit, -+ mng_info->global_y_pixels_per_unit, -+ mng_info->global_phys_unit_type); -+ } -+ } -+ if (png_get_valid(ping, ping_info, PNG_INFO_pHYs)) - { - int - unit_type; -@@ -1915,25 +1940,8 @@ static Image *ReadOnePNGImage(MngInfo *m - (unsigned long)y_resolution, - unit_type); - } -- else -- { -- if (mng_info->have_global_phys) -- { -- image->x_resolution=(float) mng_info->global_x_pixels_per_unit; -- image->y_resolution=(float) mng_info->global_y_pixels_per_unit; -- if (mng_info->global_phys_unit_type == PNG_RESOLUTION_METER) -- { -- image->units=PixelsPerCentimeterResolution; -- image->x_resolution=(double) -- mng_info->global_x_pixels_per_unit/100.0; -- image->y_resolution=(double) -- mng_info->global_y_pixels_per_unit/100.0; -- } -- ping_info->valid|=PNG_INFO_pHYs; -- } -- } - #endif -- if (ping_info->valid & PNG_INFO_PLTE) -+ if (png_get_valid(ping, ping_info, PNG_INFO_PLTE)) - { - int - number_colors; -@@ -1942,14 +1950,14 @@ static Image *ReadOnePNGImage(MngInfo *m - palette; - - (void) png_get_PLTE(ping,ping_info,&palette,&number_colors); -- if (number_colors == 0 && ping_info->color_type == -+ if (number_colors == 0 && ping_colortype == - PNG_COLOR_TYPE_PALETTE) - { - if (mng_info->global_plte_length) - { - png_set_PLTE(ping,ping_info,mng_info->global_plte, - (int) mng_info->global_plte_length); -- if (!(ping_info->valid & PNG_INFO_tRNS)) -+ if (!(png_get_valid(ping, ping_info, PNG_INFO_tRNS))) - if (mng_info->global_trns_length) - { - if (mng_info->global_trns_length > -@@ -1966,7 +1974,7 @@ static Image *ReadOnePNGImage(MngInfo *m - #ifndef PNG_READ_EMPTY_PLTE_SUPPORTED - mng_info->have_saved_bkgd_index || - #endif -- ping_info->valid & PNG_INFO_bKGD) -+ png_get_valid(ping, ping_info, PNG_INFO_bKGD)) - { - png_color_16 - background; -@@ -1974,9 +1982,9 @@ static Image *ReadOnePNGImage(MngInfo *m - #ifndef PNG_READ_EMPTY_PLTE_SUPPORTED - if (mng_info->have_saved_bkgd_index) - background.index=mng_info->saved_bkgd_index; -- else - #endif -- background.index=ping_info->background.index; -+ if (png_get_valid(ping, ping_info, PNG_INFO_bKGD)) -+ background.index=ping_background->index; - background.red=(png_uint_16) - mng_info->global_plte[background.index].red; - background.green=(png_uint_16) -@@ -1995,34 +2003,76 @@ static Image *ReadOnePNGImage(MngInfo *m - } - - #if defined(PNG_READ_bKGD_SUPPORTED) -- if (mng_info->have_global_bkgd && !(ping_info->valid & PNG_INFO_bKGD)) -+ if (mng_info->have_global_bkgd && -+ !(png_get_valid(ping,ping_info, PNG_INFO_bKGD))) - image->background_color=mng_info->mng_global_bkgd; -- if (ping_info->valid & PNG_INFO_bKGD) -+ if (png_get_valid(ping, ping_info, PNG_INFO_bKGD)) - { - /* - Set image background color. - */ -+ - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Reading PNG bKGD chunk."); -- if (ping_info->bit_depth <= QuantumDepth) -+ -+ if (ping_bit_depth == QuantumDepth) - { -- image->background_color.red=ping_info->background.red; -- image->background_color.green=ping_info->background.green; -- image->background_color.blue=ping_info->background.blue; -+ image->background_color.red = ping_background->red; -+ image->background_color.green= ping_background->green; -+ image->background_color.blue = ping_background->blue; - } -- else -+ else /* Scale background components to 16-bit */ - { -+ unsigned int -+ bkgd_scale; -+ -+ if (logging != MagickFalse) -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " raw ping_background=(%d,%d,%d).",ping_background->red, -+ ping_background->green,ping_background->blue); -+ -+ bkgd_scale = 1; -+ if (ping_bit_depth == 1) -+ bkgd_scale = 255; -+ else if (ping_bit_depth == 2) -+ bkgd_scale = 85; -+ else if (ping_bit_depth == 4) -+ bkgd_scale = 17; -+ if (ping_bit_depth <= 8) -+ bkgd_scale *= 257; -+ -+ ping_background->red *= bkgd_scale; -+ ping_background->green *= bkgd_scale; -+ ping_background->blue *= bkgd_scale; -+ -+ if (logging != MagickFalse) -+ { -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " bkgd_scale=%d.",bkgd_scale); -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " ping_background=(%d,%d,%d).",ping_background->red, -+ ping_background->green,ping_background->blue); -+ } -+ - image->background_color.red= -- ScaleShortToQuantum(ping_info->background.red); -+ ScaleShortToQuantum(ping_background->red); - image->background_color.green= -- ScaleShortToQuantum(ping_info->background.green); -+ ScaleShortToQuantum(ping_background->green); - image->background_color.blue= -- ScaleShortToQuantum(ping_info->background.blue); -+ ScaleShortToQuantum(ping_background->blue); -+ image->background_color.opacity=OpaqueOpacity; -+ -+ if (logging != MagickFalse) -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " image->background_color=(%d,%d,%d).", -+ image->background_color.red, -+ image->background_color.green,image->background_color.blue); - } - } - #endif -- if (ping_info->valid & PNG_INFO_tRNS) -+ -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - { - int - bit_mask; -@@ -2031,49 +2081,70 @@ static Image *ReadOnePNGImage(MngInfo *m - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Reading PNG tRNS chunk."); - -- bit_mask = (1 << ping_info->bit_depth) - 1; -+ bit_mask = (1 << ping_bit_depth) - 1; - - /* - Image has a transparent background. - */ -+ - transparent_color.red= -- (Quantum)(ping_info->trans_color.red & bit_mask); -+ (unsigned short)(ping_trans_color->red & bit_mask); - transparent_color.green= -- (Quantum) (ping_info->trans_color.green & bit_mask); -+ (unsigned short) (ping_trans_color->green & bit_mask); - transparent_color.blue= -- (Quantum) (ping_info->trans_color.blue & bit_mask); -+ (unsigned short) (ping_trans_color->blue & bit_mask); - transparent_color.opacity= -- (Quantum) (ping_info->trans_color.gray & bit_mask); -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ (unsigned short) (ping_trans_color->gray & bit_mask); -+ -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - { -+#if (Quantum_depth == 8) -+ if (ping_bit_depth < Quantum_depth) -+#endif -+ transparent_color.opacity=(unsigned short) ( -+ ping_trans_color->gray * -+ (65535L/((1UL << ping_bit_depth)-1))); -+ -+#if (Quantum_depth == 8) -+ else -+ transparent_color.opacity=(unsigned short) ( -+ (ping_trans_color->gray * 65535L)/ -+ ((1UL << ping_bit_depth)-1)); -+#endif -+ if (logging != MagickFalse) -+ { -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " Raw tRNS graylevel is %d.",ping_trans_color->gray); -+ (void) LogMagickEvent(CoderEvent,GetMagickModule(), -+ " scaled graylevel is %d.",transparent_color.opacity); -+ } - transparent_color.red=transparent_color.opacity; - transparent_color.green=transparent_color.opacity; - transparent_color.blue=transparent_color.opacity; - } - } - #if defined(PNG_READ_sBIT_SUPPORTED) -- if (mng_info->have_global_sbit) -- { -- int -- not_valid; -- not_valid=!ping_info->valid; -- if (not_valid & PNG_INFO_sBIT) -+ if (!png_get_valid(ping, ping_info, PNG_INFO_sBIT)) -+ if (mng_info->have_global_sbit) - png_set_sBIT(ping,ping_info,&mng_info->global_sbit); -- } - #endif - num_passes=png_set_interlace_handling(ping); -+ - png_read_update_info(ping,ping_info); -+ -+ ping_rowbytes=png_get_rowbytes(ping,ping_info); -+ - /* - Initialize image structure. - */ - mng_info->image_box.left=0; -- mng_info->image_box.right=(long) ping_info->width; -+ mng_info->image_box.right=(long) ping_width; - mng_info->image_box.top=0; -- mng_info->image_box.bottom=(long) ping_info->height; -+ mng_info->image_box.bottom=(long) ping_height; - if (mng_info->mng_type == 0) - { -- mng_info->mng_width=ping_info->width; -- mng_info->mng_height=ping_info->height; -+ mng_info->mng_width=ping_width; -+ mng_info->mng_height=ping_height; - mng_info->frame=mng_info->image_box; - mng_info->clip=mng_info->image_box; - } -@@ -2082,14 +2153,14 @@ static Image *ReadOnePNGImage(MngInfo *m - image->page.y=mng_info->y_off[mng_info->object_id]; - } - image->compression=ZipCompression; -- image->columns=ping_info->width; -- image->rows=ping_info->height; -- if ((ping_info->color_type == PNG_COLOR_TYPE_PALETTE) || -- (ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) || -- (ping_info->color_type == PNG_COLOR_TYPE_GRAY)) -+ image->columns=ping_width; -+ image->rows=ping_height; -+ if ((ping_colortype == PNG_COLOR_TYPE_PALETTE) || -+ (ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA) || -+ (ping_colortype == PNG_COLOR_TYPE_GRAY)) - { - image->storage_class=PseudoClass; -- image->colors=1 << ping_info->bit_depth; -+ image->colors=1 << ping_bit_depth; - #if (QuantumDepth == 8) - if (image->colors > 256) - image->colors=256; -@@ -2097,7 +2168,7 @@ static Image *ReadOnePNGImage(MngInfo *m - if (image->colors > 65536L) - image->colors=65536L; - #endif -- if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - { - int - number_colors; -@@ -2121,7 +2192,7 @@ static Image *ReadOnePNGImage(MngInfo *m - */ - if (!AllocateImageColormap(image,image->colors)) - ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image); -- if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - { - int - number_colors; -@@ -2142,7 +2213,7 @@ static Image *ReadOnePNGImage(MngInfo *m - unsigned long - scale; - -- scale=(MaxRGB/((1 << ping_info->bit_depth)-1)); -+ scale=(MaxRGB/((1 << ping_bit_depth)-1)); - if (scale < 1) - scale=1; - for (i=0; i < (long) image->colors; i++) -@@ -2182,10 +2253,9 @@ static Image *ReadOnePNGImage(MngInfo *m - " Reading PNG IDAT chunk(s)"); - if (num_passes > 1) - png_pixels=MagickAllocateMemory(unsigned char *, -- ping_info->rowbytes*image->rows); -+ ping_rowbytes*image->rows); - else -- png_pixels=MagickAllocateMemory(unsigned char *, -- ping_info->rowbytes); -+ png_pixels=MagickAllocateMemory(unsigned char *, ping_rowbytes); - if (png_pixels == (unsigned char *) NULL) - ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image); - -@@ -2205,20 +2275,20 @@ static Image *ReadOnePNGImage(MngInfo *m - int - depth; - -- depth=(long) ping_info->bit_depth; -+ depth=(long) ping_bit_depth; - #endif -- image->matte=((ping_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) || -- (ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) || -- (ping_info->valid & PNG_INFO_tRNS)); -+ image->matte=((ping_colortype == PNG_COLOR_TYPE_RGB_ALPHA) || -+ (ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA) || -+ (png_get_valid(ping, ping_info, PNG_INFO_tRNS))); - - for (y=0; y < (long) image->rows; y++) - { - if (num_passes > 1) -- row_offset=ping_info->rowbytes*y; -+ row_offset=ping_rowbytes*y; - else - row_offset=0; - png_read_row(ping,png_pixels+row_offset,NULL); -- if (!SetImagePixels(image,0,y,image->columns,1)) /* Was GetImagePixels() */ -+ if (!SetImagePixels(image,0,y,image->columns,1)) - break; - #if (QuantumDepth == 8) - if (depth == 16) -@@ -2229,13 +2299,13 @@ static Image *ReadOnePNGImage(MngInfo *m - - r=png_pixels+row_offset; - p=r; -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - { - for (x=(long) image->columns; x > 0; x--) - { - *r++=*p++; - p++; -- if ((ping_info->valid & PNG_INFO_tRNS) && -+ if ((png_get_valid(ping, ping_info, PNG_INFO_tRNS)) && - (((*(p-2) << 8)|*(p-1)) - == transparent_color.opacity)) - { -@@ -2246,9 +2316,9 @@ static Image *ReadOnePNGImage(MngInfo *m - *r++=OpaqueOpacity; - } - } -- else if (ping_info->color_type == PNG_COLOR_TYPE_RGB) -+ else if (ping_colortype == PNG_COLOR_TYPE_RGB) - { -- if (ping_info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - for (x=(long) image->columns; x > 0; x--) - { - *r++=*p++; -@@ -2282,25 +2352,25 @@ static Image *ReadOnePNGImage(MngInfo *m - *r++=OpaqueOpacity; - } - } -- else if (ping_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ else if (ping_colortype == PNG_COLOR_TYPE_RGB_ALPHA) - for (x=(long) (4*image->columns); x > 0; x--) - { - *r++=*p++; - p++; - } -- else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ else if (ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA) - for (x=(long) (2*image->columns); x > 0; x--) - { - *r++=*p++; - p++; - } - } -- if (depth == 8 && ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (depth == 8 && ping_colortype == PNG_COLOR_TYPE_GRAY) - (void) ImportImagePixelArea(image,(QuantumType) GrayQuantum, - image->depth,png_pixels+ - row_offset,0,0); -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY || -- ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY || -+ ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA) - { - image->depth=8; - (void) ImportImagePixelArea(image, -@@ -2309,12 +2379,12 @@ static Image *ReadOnePNGImage(MngInfo *m - row_offset,0,0); - image->depth=depth; - } -- else if (depth == 8 && ping_info->color_type == PNG_COLOR_TYPE_RGB) -+ else if (depth == 8 && ping_colortype == PNG_COLOR_TYPE_RGB) - (void) ImportImagePixelArea(image,(QuantumType) RGBQuantum, - image->depth,png_pixels+ - row_offset,0,0); -- else if (ping_info->color_type == PNG_COLOR_TYPE_RGB || -- ping_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ else if (ping_colortype == PNG_COLOR_TYPE_RGB || -+ ping_colortype == PNG_COLOR_TYPE_RGB_ALPHA) - { - image->depth=8; - (void) ImportImagePixelArea(image,(QuantumType) RGBAQuantum, -@@ -2322,28 +2392,28 @@ static Image *ReadOnePNGImage(MngInfo *m - row_offset,0,0); - image->depth=depth; - } -- else if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ else if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - (void) ImportImagePixelArea(image,(QuantumType) IndexQuantum, -- ping_info->bit_depth,png_pixels+ -+ ping_bit_depth,png_pixels+ - row_offset,0,0); - /* FIXME, sample size ??? */ - #else /* (QuantumDepth != 8) */ - -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - (void) ImportImagePixelArea(image,(QuantumType) GrayQuantum, - image->depth,png_pixels+ - row_offset,0,0); -- else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ else if (ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA) - (void) ImportImagePixelArea(image,(QuantumType) GrayAlphaQuantum, - image->depth,png_pixels+ - row_offset,0,0); -- else if (ping_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ else if (ping_colortype == PNG_COLOR_TYPE_RGB_ALPHA) - (void) ImportImagePixelArea(image,(QuantumType) RGBAQuantum, - image->depth,png_pixels+ - row_offset,0,0); -- else if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ else if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - (void) ImportImagePixelArea(image,(QuantumType) IndexQuantum, -- ping_info->bit_depth,png_pixels+ -+ ping_bit_depth,png_pixels+ - row_offset,0,0); - /* FIXME, sample size ??? */ - else -@@ -2372,7 +2442,7 @@ static Image *ReadOnePNGImage(MngInfo *m - /* - Convert grayscale image to PseudoClass pixel packets. - */ -- image->matte=ping_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA; -+ image->matte=ping_colortype == PNG_COLOR_TYPE_GRAY_ALPHA; - quantum_scanline=MagickAllocateMemory(Quantum *, - (image->matte ? 2 : 1) * - image->columns*sizeof(Quantum)); -@@ -2385,7 +2455,7 @@ static Image *ReadOnePNGImage(MngInfo *m - *p; - - if (num_passes > 1) -- row_offset=ping_info->rowbytes*y; -+ row_offset=ping_rowbytes*y; - else - row_offset=0; - png_read_row(ping,png_pixels+row_offset,NULL); -@@ -2395,7 +2465,7 @@ static Image *ReadOnePNGImage(MngInfo *m - indexes=AccessMutableIndexes(image); - p=png_pixels+row_offset; - r=quantum_scanline; -- switch (ping_info->bit_depth) -+ switch (ping_bit_depth) - { - case 1: - { -@@ -2445,7 +2515,7 @@ static Image *ReadOnePNGImage(MngInfo *m - } - case 8: - { -- if (ping_info->color_type == 4) -+ if (ping_colortype == 4) - for (x=(long) image->columns; x > 0; x--) - { - *r++=*p++; -@@ -2473,7 +2543,7 @@ static Image *ReadOnePNGImage(MngInfo *m - *r=0; - *r|=(*p++); - r++; -- if (ping_info->color_type == 4) -+ if (ping_colortype == 4) - { - q->opacity=((*p++) << 8); - q->opacity|=(*p++); -@@ -2488,7 +2558,7 @@ static Image *ReadOnePNGImage(MngInfo *m - *r=0; - *r|=(*p++); - r++; -- if (ping_info->color_type == 4) -+ if (ping_colortype == 4) - { - q->opacity=((*p++) << 8); - q->opacity|=(*p++); -@@ -2499,7 +2569,7 @@ static Image *ReadOnePNGImage(MngInfo *m - #else /* QuantumDepth == 8 */ - *r++=(*p++); - p++; /* strip low byte */ -- if (ping_info->color_type == 4) -+ if (ping_colortype == 4) - { - q->opacity=(Quantum) (MaxRGB-(*p++)); - p++; -@@ -2549,7 +2619,7 @@ static Image *ReadOnePNGImage(MngInfo *m - " exit ReadOnePNGImage()."); - return (image); - } -- if (ping_info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - { - ClassType - storage_class; -@@ -2572,25 +2642,26 @@ static Image *ReadOnePNGImage(MngInfo *m - IndexPacket - index; - -- if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - for (x=0; x < (long) image->columns; x++) - { - index=indexes[x]; -- if (index < ping_info->num_trans) -+ if (index < ping_num_trans) - q->opacity= -- ScaleCharToQuantum(255-ping_info->trans_alpha[index]); -+ ScaleCharToQuantum(255-ping_trans_alpha[index]); - else - q->opacity=OpaqueOpacity; - q++; - } -- else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ else if (ping_colortype == PNG_COLOR_TYPE_GRAY) - for (x=0; x < (long) image->columns; x++) - { - index=indexes[x]; - q->red=image->colormap[index].red; - q->green=image->colormap[index].green; - q->blue=image->colormap[index].blue; -- if (q->red == transparent_color.opacity) -+ if (ScaleQuantumToShort(q->red) == -+ transparent_color.opacity) - q->opacity=TransparentOpacity; - else - q->opacity=OpaqueOpacity; -@@ -2600,9 +2671,9 @@ static Image *ReadOnePNGImage(MngInfo *m - else - for (x=(long) image->columns; x > 0; x--) - { -- if (q->red == transparent_color.red && -- q->green == transparent_color.green && -- q->blue == transparent_color.blue) -+ if (ScaleQuantumToShort(q->red) == transparent_color.red && -+ ScaleQuantumToShort(q->green) == transparent_color.green && -+ ScaleQuantumToShort(q->blue) == transparent_color.blue) - q->opacity=TransparentOpacity; - else - q->opacity=OpaqueOpacity; -@@ -2714,7 +2785,7 @@ static Image *ReadOnePNGImage(MngInfo *m - mng_info->ob[object_id]->interlace_method=interlace_method; - mng_info->ob[object_id]->compression_method=compression_method; - mng_info->ob[object_id]->filter_method=filter_method; -- if (ping_info->valid & PNG_INFO_PLTE) -+ if (png_get_valid(ping, ping_info, PNG_INFO_PLTE)) - { - int - number_colors; -@@ -5734,7 +5805,7 @@ static Image *ReadMNGImage(const ImageIn - (void) LogMagickEvent(CoderEvent,GetMagickModule(),"exit ReadMNGImage()"); - return(image); - } --#else /* PNG_LIBPNG_VER > 95 */ -+#else /* PNG_LIBPNG_VER > 10011 */ - static Image *ReadPNGImage(const ImageInfo *image_info, - ExceptionInfo *exception) - { -@@ -5749,7 +5820,7 @@ static Image *ReadMNGImage(const ImageIn - { - return (ReadPNGImage(image_info,exception)); - } --#endif /* PNG_LIBPNG_VER > 95 */ -+#endif /* PNG_LIBPNG_VER > 10011 */ - #endif - - /* -@@ -5960,7 +6031,7 @@ ModuleExport void UnregisterPNGImage(voi - } - - #if defined(HasPNG) --#if PNG_LIBPNG_VER > 95 -+#if PNG_LIBPNG_VER > 10011 - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % % -@@ -6043,20 +6114,6 @@ ModuleExport void UnregisterPNGImage(voi - */ - - --#if (PNG_LIBPNG_VER > 99 && PNG_LIBPNG_VER < 10007) --/* This function became available in libpng version 1.0.6g. */ --static void --png_set_compression_buffer_size(png_structp png_ptr, png_uint_32 size) --{ -- if (png_ptr->zbuf) -- png_free(png_ptr, png_ptr->zbuf); png_ptr->zbuf=NULL; -- png_ptr->zbuf_size=(png_size_t) size; -- png_ptr->zbuf=(png_bytep) png_malloc(png_ptr, size); -- if (!png_ptr->zbuf) -- png_error(png_ptr,"Unable to allocate zbuf"); --} --#endif -- - static void - png_write_raw_profile(const ImageInfo *image_info,png_struct *ping, - png_info *ping_info, const char *profile_type, -@@ -6064,7 +6121,6 @@ png_write_raw_profile(const ImageInfo *i - const unsigned char *profile_data, - png_uint_32 length) - { --#if (PNG_LIBPNG_VER > 10005) - png_textp - text; - -@@ -6083,25 +6139,12 @@ png_write_raw_profile(const ImageInfo *i - - unsigned char - hex[16]={'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; --#endif - --#if (PNG_LIBPNG_VER <= 10005) -- if (image_info->verbose) -- (void) printf("Not "); -- (void) image_info; -- (void) ping; -- (void) ping_info; -- (void) profile_type; -- (void) profile_description; -- (void) profile_data; -- (void) length; --#endif - if (image_info->verbose) - { - (void) printf("writing raw profile: type=%.1024s, length=%lu\n", - profile_type, (unsigned long)length); - } --#if (PNG_LIBPNG_VER > 10005) - text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text)); - description_length=strlen((const char *) profile_description); - allocated_length=(png_uint_32) (length*2 + (length >> 5) + 20 -@@ -6137,7 +6180,6 @@ png_write_raw_profile(const ImageInfo *i - png_free(ping,text[0].text); - png_free(ping,text[0].key); - png_free(ping,text); --#endif - } - - static MagickPassFail WriteOnePNGImage(MngInfo *mng_info, -@@ -6152,17 +6194,34 @@ static MagickPassFail WriteOnePNGImage(M - - int - num_passes, -- pass; -+ pass, -+ ping_bit_depth = 0, -+ ping_colortype = 0, -+ ping_interlace_method = 0, -+ ping_compression_method = 0, -+ ping_filter_method = 0, -+ ping_num_trans = 0; -+ -+ png_bytep -+ ping_trans_alpha = NULL; - - png_colorp - palette; - -+ png_color_16 -+ ping_background, -+ ping_trans_color; -+ - png_info - *ping_info; - - png_struct - *ping; - -+ png_uint_32 -+ ping_width, -+ ping_height; -+ - long - y; - -@@ -6181,8 +6240,7 @@ static MagickPassFail WriteOnePNGImage(M - image_depth, - image_matte, - logging, -- matte, -- not_valid; -+ matte; - - unsigned long - quantum_size, /* depth for ExportImage */ -@@ -6211,6 +6269,18 @@ static MagickPassFail WriteOnePNGImage(M - return MagickFail; - } - -+ /* Initialize some stuff */ -+ ping_background.red = 0; -+ ping_background.green = 0; -+ ping_background.blue = 0; -+ ping_background.gray = 0; -+ ping_background.index = 0; -+ -+ ping_trans_color.red=0; -+ ping_trans_color.green=0; -+ ping_trans_color.blue=0; -+ ping_trans_color.gray=0; -+ - image_colors=image->colors; - image_depth=image->depth; - image_matte=image->matte; -@@ -6259,7 +6329,7 @@ static MagickPassFail WriteOnePNGImage(M - LockSemaphoreInfo(png_semaphore); - #endif - -- if (setjmp(ping->jmpbuf)) -+ if (setjmp(png_jmpbuf(ping))) - { - /* - PNG write failed. -@@ -6288,16 +6358,16 @@ static MagickPassFail WriteOnePNGImage(M - # endif - #endif - x=0; -- ping_info->width=image->columns; -- ping_info->height=image->rows; -+ ping_width=image->columns; -+ ping_height=image->rows; - if (logging) - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " width=%lu", -- (unsigned long)ping_info->width); -+ (unsigned long)ping_width); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " height=%lu", -- (unsigned long)ping_info->height); -+ (unsigned long)ping_height); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image->depth=%u",image_depth); - } -@@ -6306,12 +6376,12 @@ static MagickPassFail WriteOnePNGImage(M - quantum_size=(image_depth > 8) ? 16:8; - - save_image_depth=image_depth; -- ping_info->bit_depth=(png_byte) save_image_depth; -+ ping_bit_depth=(png_byte) save_image_depth; - if (logging) - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " ping_info->bit_depth=%u", -- ping_info->bit_depth); -+ " ping_bit_depth=%u", -+ ping_bit_depth); - } - #if defined(PNG_pHYs_SUPPORTED) - if ((image->x_resolution != 0) && (image->y_resolution != 0) && -@@ -6398,8 +6468,8 @@ static MagickPassFail WriteOnePNGImage(M - matte=image_matte; - if (mng_info->write_png8) - { -- ping_info->color_type=PNG_COLOR_TYPE_PALETTE; -- ping_info->bit_depth=8; -+ ping_colortype=PNG_COLOR_TYPE_PALETTE; -+ ping_bit_depth=8; - { - /* TO DO: make this a function cause it's used twice, except - for reducing the sample depth from 8. */ -@@ -6424,13 +6494,13 @@ static MagickPassFail WriteOnePNGImage(M - " Colors quantized to %ld", - number_colors); - } -- if (matte) -- ping_info->valid|=PNG_INFO_tRNS; -+ - /* - Set image palette. - */ -- ping_info->color_type=PNG_COLOR_TYPE_PALETTE; -- ping_info->valid|=PNG_INFO_PLTE; -+ -+ ping_colortype=PNG_COLOR_TYPE_PALETTE; -+ - #if defined(PNG_SORT_PALETTE) - save_number_colors=image_colors; - if (CompressColormapTransFirst(image) == MagickFail) -@@ -6465,20 +6535,17 @@ static MagickPassFail WriteOnePNGImage(M - - } - png_set_PLTE(ping,ping_info,palette,(int) number_colors); --#if (PNG_LIBPNG_VER > 10008) - MagickFreeMemory(palette); --#endif - /* - Identify which colormap entry is transparent. - */ -- ping_info->trans_alpha=MagickAllocateMemory(unsigned char *, -- number_colors); -- if (ping_info->trans_alpha == (unsigned char *) NULL) -+ ping_trans_alpha=MagickAllocateMemory(unsigned char *, number_colors); -+ if (ping_trans_alpha == (unsigned char *) NULL) - ThrowWriterException(ResourceLimitError,MemoryAllocationFailed, - image); - assert(number_colors <= 256); - for (i=0; i < (long) number_colors; i++) -- ping_info->trans_alpha[i]=255; -+ ping_trans_alpha[i]=255; - for (y=0; y < (long) image->rows; y++) - { - register const PixelPacket -@@ -6498,29 +6565,29 @@ static MagickPassFail WriteOnePNGImage(M - - index=indexes[x]; - assert((unsigned long) index < number_colors); -- ping_info->trans_alpha[index]=(png_byte) (255- -+ ping_trans_alpha[index]=(png_byte) (255- - ScaleQuantumToChar(p->opacity)); - } - p++; - } - } -- ping_info->num_trans=0; -+ ping_num_trans=0; - for (i=0; i < (long) number_colors; i++) -- if (ping_info->trans_alpha[i] != 255) -- ping_info->num_trans=(unsigned short) (i+1); -- if (ping_info->num_trans == 0) -- ping_info->valid&=(~PNG_INFO_tRNS); -- if (!(ping_info->valid & PNG_INFO_tRNS)) -- ping_info->num_trans=0; -- if (ping_info->num_trans == 0) -- MagickFreeMemory(ping_info->trans_alpha); -+ if (ping_trans_alpha[i] != 255) -+ ping_num_trans=(unsigned short) (i+1); -+ if (ping_num_trans == 0) -+ png_set_invalid(ping,ping_info,PNG_INFO_tRNS); -+ if (!(png_get_valid(ping,ping_info,PNG_INFO_tRNS))) -+ ping_num_trans=0; -+ if (ping_num_trans == 0) -+ MagickFreeMemory(ping_trans_alpha); - /* - Identify which colormap entry is the background color. - */ - for (i=0; i < (long) Max(number_colors-1,1); i++) -- if (RGBColorMatchExact(ping_info->background,image->colormap[i])) -+ if (RGBColorMatchExact(ping_background,image->colormap[i])) - break; -- ping_info->background.index=(png_uint_16) i; -+ ping_background.index=(png_uint_16) i; - } - if (image_matte) - { -@@ -6530,79 +6597,79 @@ static MagickPassFail WriteOnePNGImage(M - else if (mng_info->write_png24) - { - image_matte=MagickFalse; -- ping_info->color_type=PNG_COLOR_TYPE_RGB; -+ ping_colortype=PNG_COLOR_TYPE_RGB; - } - else if (mng_info->write_png32) - { - image_matte=MagickTrue; -- ping_info->color_type=PNG_COLOR_TYPE_RGB_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_RGB_ALPHA; - } - else - { -- if (ping_info->bit_depth < 8) -- ping_info->bit_depth=8; -+ if (ping_bit_depth < 8) -+ ping_bit_depth=8; - -- ping_info->color_type=PNG_COLOR_TYPE_RGB; -+ ping_colortype=PNG_COLOR_TYPE_RGB; - if (characteristics.monochrome) - { - if (characteristics.opaque) - { -- ping_info->color_type=PNG_COLOR_TYPE_GRAY; -- ping_info->bit_depth=1; -+ ping_colortype=PNG_COLOR_TYPE_GRAY; -+ ping_bit_depth=1; - } - else - { -- ping_info->color_type=PNG_COLOR_TYPE_GRAY_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_GRAY_ALPHA; - } - } - else if (characteristics.grayscale) - { - if (characteristics.opaque) -- ping_info->color_type=PNG_COLOR_TYPE_GRAY; -+ ping_colortype=PNG_COLOR_TYPE_GRAY; - else -- ping_info->color_type=PNG_COLOR_TYPE_GRAY_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_GRAY_ALPHA; - } - else if (characteristics.palette && image_colors <= 256) - { -- ping_info->color_type=PNG_COLOR_TYPE_PALETTE; -- ping_info->bit_depth=8; -+ ping_colortype=PNG_COLOR_TYPE_PALETTE; -+ ping_bit_depth=8; - mng_info->IsPalette=MagickTrue; - } - else - { - if (characteristics.opaque) -- ping_info->color_type=PNG_COLOR_TYPE_RGB; -+ ping_colortype=PNG_COLOR_TYPE_RGB; - else -- ping_info->color_type=PNG_COLOR_TYPE_RGB_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_RGB_ALPHA; - } - if (image_info->type == BilevelType) - { - if (characteristics.monochrome) - { - if (!image_matte) -- ping_info->bit_depth=1; -+ ping_bit_depth=1; - } - } - if (image_info->type == GrayscaleType) -- ping_info->color_type=PNG_COLOR_TYPE_GRAY; -+ ping_colortype=PNG_COLOR_TYPE_GRAY; - if (image_info->type == GrayscaleMatteType) -- ping_info->color_type=PNG_COLOR_TYPE_GRAY_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_GRAY_ALPHA; - /* if (!mng_info->optimize && matte) */ -- /* ping_info->color_type=PNG_COLOR_TYPE_RGB_ALPHA; */ -+ /* ping_colortype=PNG_COLOR_TYPE_RGB_ALPHA; */ - - if (logging) - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Tentative PNG color type: %s (%d)", -- PngColorTypeToString(ping_info->color_type), -- ping_info->color_type); -+ PngColorTypeToString(ping_colortype), -+ ping_colortype); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image_info->type: %d",image_info->type); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image->depth: %u",image_depth); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " ping_info->bit_depth: %d", -- ping_info->bit_depth); -+ " ping_bit_depth: %d", -+ ping_bit_depth); - } - - if (matte && (mng_info->optimize || mng_info->IsPalette)) -@@ -6614,10 +6681,10 @@ static MagickPassFail WriteOnePNGImage(M - { - /* - No transparent pixels are present. Change 4 or 6 to 0 or 2, -- and do not set the PNG_INFO_tRNS flag in ping_info->valid. -+ and do not set the PNG_INFO_tRNS flag. - */ - image_matte=MagickFalse; -- ping_info->color_type&=0x03; -+ ping_colortype&=0x03; - } - else - { -@@ -6625,13 +6692,13 @@ static MagickPassFail WriteOnePNGImage(M - mask; - - mask=0xffff; -- if (ping_info->bit_depth == 8) -+ if (ping_bit_depth == 8) - mask=0x00ff; -- if (ping_info->bit_depth == 4) -+ if (ping_bit_depth == 4) - mask=0x000f; -- if (ping_info->bit_depth == 2) -+ if (ping_bit_depth == 2) - mask=0x0003; -- if (ping_info->bit_depth == 1) -+ if (ping_bit_depth == 1) - mask=0x0001; - - /* -@@ -6655,19 +6722,20 @@ static MagickPassFail WriteOnePNGImage(M - if ((p != (const PixelPacket *) NULL) && - (p->opacity != OpaqueOpacity)) - { -- ping_info->valid|=PNG_INFO_tRNS; -- ping_info->trans_color.red=ScaleQuantumToShort(p->red)&mask; -- ping_info->trans_color.green=ScaleQuantumToShort(p->green) -+ ping_trans_color.red=ScaleQuantumToShort(p->red)&mask; -+ ping_trans_color.green=ScaleQuantumToShort(p->green) - &mask; -- ping_info->trans_color.blue=ScaleQuantumToShort(p->blue) -+ ping_trans_color.blue=ScaleQuantumToShort(p->blue) - &mask; -- ping_info->trans_color.gray= -+ ping_trans_color.gray= - (png_uint_16) ScaleQuantumToShort(PixelIntensity(p))&mask; -- ping_info->trans_color.index=(unsigned char) -+ ping_trans_color.index=(unsigned char) - (ScaleQuantumToChar(MaxRGB-p->opacity)); -+ (void) png_set_tRNS(ping, ping_info, NULL, 0, -+ &ping_trans_color); - } - } -- if (ping_info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - { - /* - Determine if there is one and only one transparent color -@@ -6684,7 +6752,7 @@ static MagickPassFail WriteOnePNGImage(M - { - if (p->opacity != OpaqueOpacity) - { -- if (!RGBColorMatchExact(ping_info->trans_color,*p)) -+ if (!RGBColorMatchExact(ping_trans_color,*p)) - { - break; /* Can't use RGB + tRNS for multiple - transparent colors. */ -@@ -6697,7 +6765,7 @@ static MagickPassFail WriteOnePNGImage(M - } - else - { -- if (RGBColorMatchExact(ping_info->trans_color,*p)) -+ if (RGBColorMatchExact(ping_trans_color,*p)) - break; /* Can't use RGB + tRNS when another pixel - having the same RGB samples is - transparent. */ -@@ -6708,50 +6776,50 @@ static MagickPassFail WriteOnePNGImage(M - break; - } - if (x != 0) -- ping_info->valid&=(~PNG_INFO_tRNS); -+ png_set_invalid(ping, ping_info, PNG_INFO_tRNS); - } -- if (ping_info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - { -- ping_info->color_type &= 0x03; /* changes 4 or 6 to 0 or 2 */ -+ ping_colortype &= 0x03; /* changes 4 or 6 to 0 or 2 */ - if (image_depth == 8) - { -- ping_info->trans_color.red&=0xff; -- ping_info->trans_color.green&=0xff; -- ping_info->trans_color.blue&=0xff; -- ping_info->trans_color.gray&=0xff; -+ ping_trans_color.red&=0xff; -+ ping_trans_color.green&=0xff; -+ ping_trans_color.blue&=0xff; -+ ping_trans_color.gray&=0xff; - } - } - } - matte=image_matte; -- if (ping_info->valid & PNG_INFO_tRNS) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - image_matte=MagickFalse; - if ((mng_info->optimize || mng_info->IsPalette) && - characteristics.grayscale && (!image_matte || image_depth >= 8)) - { - if (image_matte) -- ping_info->color_type=PNG_COLOR_TYPE_GRAY_ALPHA; -+ ping_colortype=PNG_COLOR_TYPE_GRAY_ALPHA; - else - { -- ping_info->color_type=PNG_COLOR_TYPE_GRAY; -+ ping_colortype=PNG_COLOR_TYPE_GRAY; - if (save_image_depth == 16 && image_depth == 8) -- ping_info->trans_color.gray*=0x0101; -+ ping_trans_color.gray*=0x0101; - } - if (image_depth > QuantumDepth) - image_depth=QuantumDepth; - if (image_colors == 0 || image_colors-1 > MaxRGB) - image_colors=1 << image_depth; - if (image_depth > 8) -- ping_info->bit_depth=16; -+ ping_bit_depth=16; - else - { -- if (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (ping_colortype == PNG_COLOR_TYPE_PALETTE) - { -- ping_info->bit_depth=1; -- while ((int) (1 << ping_info->bit_depth) < -+ ping_bit_depth=1; -+ while ((int) (1 << ping_bit_depth) < - (long) image_colors) -- ping_info->bit_depth <<= 1; -+ ping_bit_depth <<= 1; - } -- else if (mng_info->optimize && ping_info->color_type == -+ else if (mng_info->optimize && ping_colortype == - PNG_COLOR_TYPE_GRAY && image_colors < 17 && - mng_info->IsPalette) - { -@@ -6779,11 +6847,11 @@ static MagickPassFail WriteOnePNGImage(M - depth_1_ok=MagickFalse; - } - if (depth_1_ok) -- ping_info->bit_depth=1; -+ ping_bit_depth=1; - else if (depth_2_ok) -- ping_info->bit_depth=2; -+ ping_bit_depth=2; - else if (depth_4_ok) -- ping_info->bit_depth=4; -+ ping_bit_depth=4; - } - } - } -@@ -6796,13 +6864,10 @@ static MagickPassFail WriteOnePNGImage(M - number_colors; - - number_colors=image_colors; -- if (matte) -- ping_info->valid|=PNG_INFO_tRNS; - /* - Set image palette. - */ -- ping_info->color_type=PNG_COLOR_TYPE_PALETTE; -- ping_info->valid|=PNG_INFO_PLTE; -+ ping_colortype=PNG_COLOR_TYPE_PALETTE; - if (mng_info->have_write_global_plte && !matte) - { - png_set_PLTE(ping,ping_info,NULL,0); -@@ -6847,14 +6912,12 @@ static MagickPassFail WriteOnePNGImage(M - " Setting up PLTE chunk with %d colors", - (int) number_colors); - png_set_PLTE(ping,ping_info,palette,(int) number_colors); --#if (PNG_LIBPNG_VER > 10008) - MagickFreeMemory(palette); --#endif - } -- ping_info->bit_depth=1; -- while ((1UL << ping_info->bit_depth) < number_colors) -- ping_info->bit_depth <<= 1; -- ping_info->num_trans=0; -+ ping_bit_depth=1; -+ while ((1UL << ping_bit_depth) < number_colors) -+ ping_bit_depth <<= 1; -+ ping_num_trans=0; - if (matte) - { - int -@@ -6890,7 +6953,7 @@ static MagickPassFail WriteOnePNGImage(M - if (trans_alpha[index] != (png_byte) (255- - ScaleQuantumToChar(p->opacity))) - { -- ping_info->color_type= -+ ping_colortype= - PNG_COLOR_TYPE_RGB_ALPHA; - break; - } -@@ -6900,11 +6963,11 @@ static MagickPassFail WriteOnePNGImage(M - } - p++; - } -- if (ping_info->color_type==PNG_COLOR_TYPE_RGB_ALPHA) -+ if (ping_colortype==PNG_COLOR_TYPE_RGB_ALPHA) - { -- ping_info->num_trans=0; -- ping_info->valid&=(~PNG_INFO_tRNS); -- ping_info->valid&=(~PNG_INFO_PLTE); -+ ping_num_trans=0; -+ png_set_invalid(ping, ping_info, PNG_INFO_tRNS); -+ png_set_invalid(ping, ping_info, PNG_INFO_PLTE); - mng_info->IsPalette=MagickFalse; - (void) SyncImage(image); - if (logging) -@@ -6916,40 +6979,41 @@ static MagickPassFail WriteOnePNGImage(M - break; - } - } -- if ((ping_info->valid & PNG_INFO_tRNS)) -+ if (png_get_valid(ping, ping_info, PNG_INFO_tRNS)) - { - for (i=0; i < (long) number_colors; i++) - { - if (trans_alpha[i] == 256) - trans_alpha[i]=255; - if (trans_alpha[i] != 255) -- ping_info->num_trans=(unsigned short) (i+1); -+ ping_num_trans=(unsigned short) (i+1); - } - } -- if (ping_info->num_trans == 0) -- ping_info->valid&=(~PNG_INFO_tRNS); -- if (!(ping_info->valid & PNG_INFO_tRNS)) -- ping_info->num_trans=0; -- if (ping_info->num_trans != 0) -+ if (ping_num_trans == 0) -+ png_set_invalid(ping, ping_info, PNG_INFO_tRNS); -+ if (!png_get_valid(ping, ping_info, PNG_INFO_tRNS)) -+ ping_num_trans=0; -+ -+ if (ping_num_trans != 0) - { -- ping_info->trans_alpha=MagickAllocateMemory( -- unsigned char *, number_colors); -- if (ping_info->trans_alpha == (unsigned char *) NULL) -- ThrowWriterException(ResourceLimitError, -- MemoryAllocationFailed,image); -- for (i=0; i < (long) number_colors; i++) -- ping_info->trans_alpha[i]=(png_byte) trans_alpha[i]; -+ for (i=0; i<256; i++) -+ ping_trans_alpha[i]=(png_byte) trans_alpha[i]; - } -+ -+ (void) png_set_tRNS(ping, ping_info, -+ ping_trans_alpha, -+ ping_num_trans, -+ &ping_trans_color); - } - - /* - Identify which colormap entry is the background color. - */ - for (i=0; i < (long) Max(number_colors-1,1); i++) -- if (RGBColorMatchExact(ping_info->background, -+ if (RGBColorMatchExact(ping_background, - image->colormap[i])) - break; -- ping_info->background.index=(png_uint_16) i; -+ ping_background.index=(png_uint_16) i; - } - } - else -@@ -6958,10 +7022,10 @@ static MagickPassFail WriteOnePNGImage(M - image_depth=8; - if ((save_image_depth == 16) && (image_depth == 8)) - { -- ping_info->trans_color.red*=0x0101; -- ping_info->trans_color.green*=0x0101; -- ping_info->trans_color.blue*=0x0101; -- ping_info->trans_color.gray*=0x0101; -+ ping_trans_color.red*=0x0101; -+ ping_trans_color.green*=0x0101; -+ ping_trans_color.blue*=0x0101; -+ ping_trans_color.gray*=0x0101; - } - } - -@@ -6969,7 +7033,7 @@ static MagickPassFail WriteOnePNGImage(M - Adjust background and transparency samples in sub-8-bit - grayscale files. - */ -- if (ping_info->bit_depth < 8 && ping_info->color_type == -+ if (ping_bit_depth < 8 && ping_colortype == - PNG_COLOR_TYPE_GRAY) - { - png_uint_16 -@@ -6978,7 +7042,7 @@ static MagickPassFail WriteOnePNGImage(M - png_color_16 - background; - -- maxval=(1 << ping_info->bit_depth)-1; -+ maxval=(1 << ping_bit_depth)-1; - - - background.gray=(png_uint_16) -@@ -6989,28 +7053,26 @@ static MagickPassFail WriteOnePNGImage(M - " Setting up bKGD chunk"); - png_set_bKGD(ping,ping_info,&background); - -- ping_info->trans_color.gray=(png_uint_16)(maxval* -- ping_info->trans_color.gray/ -- MaxRGB); -+ ping_trans_color.gray=(png_uint_16)(maxval* -+ ping_trans_color.gray/ -+ MaxRGB); - } - } - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG color type: %s (%d)", -- PngColorTypeToString(ping_info->color_type), -- ping_info->color_type); -+ PngColorTypeToString(ping_colortype), -+ ping_colortype); - /* - Initialize compression level and filtering. - */ - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Setting up deflate compression"); --#if (PNG_LIBPNG_VER > 99) - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Compression buffer size: 32768"); - png_set_compression_buffer_size(ping,32768L); --#endif - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Compression mem level: 9"); -@@ -7044,7 +7106,7 @@ static MagickPassFail WriteOnePNGImage(M - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Filter_type: PNG_INTRAPIXEL_DIFFERENCING"); -- ping_info->filter_type=PNG_INTRAPIXEL_DIFFERENCING; -+ ping_filter_method=PNG_INTRAPIXEL_DIFFERENCING; - } - else - if (logging) -@@ -7061,8 +7123,8 @@ static MagickPassFail WriteOnePNGImage(M - if ((image_info->quality % 10) != 5) - base_filter=(int) image_info->quality % 10; - else -- if ((ping_info->color_type == PNG_COLOR_TYPE_GRAY) || -- (ping_info->color_type == PNG_COLOR_TYPE_PALETTE) || -+ if ((ping_colortype == PNG_COLOR_TYPE_GRAY) || -+ (ping_colortype == PNG_COLOR_TYPE_PALETTE) || - (image_info->quality < 50)) - base_filter=PNG_NO_FILTERS; - else -@@ -7099,7 +7161,7 @@ static MagickPassFail WriteOnePNGImage(M - { - if (LocaleCompare(profile_name,"ICM") == 0) - { --#if (PNG_LIBPNG_VER > 10008) && defined(PNG_WRITE_iCCP_SUPPORTED) -+#if defined(PNG_WRITE_iCCP_SUPPORTED) - { - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -@@ -7170,8 +7232,8 @@ static MagickPassFail WriteOnePNGImage(M - (void) png_set_sRGB(ping,ping_info,PerceptualIntent); - png_set_gAMA(ping,ping_info,0.45455); - } -- not_valid=(!ping_info->valid); -- if ((!mng_info->write_mng) || not_valid & PNG_INFO_sRGB) -+ if ((!mng_info->write_mng) || -+ !png_get_valid(ping, ping_info, PNG_INFO_sRGB)) - #endif - { - if (!mng_info->have_write_global_gama && (image->gamma != 0.0)) -@@ -7210,7 +7272,7 @@ static MagickPassFail WriteOnePNGImage(M - bp.x,bp.y); - } - } -- ping_info->interlace_type=(image_info->interlace == LineInterlace); -+ ping_interlace_method=(image_info->interlace == LineInterlace); - - if (mng_info->write_mng) - png_set_sig_bytes(ping,8); -@@ -7219,6 +7281,15 @@ static MagickPassFail WriteOnePNGImage(M - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Writing PNG header chunks"); - -+ png_set_IHDR(ping,ping_info, -+ ping_width, -+ ping_height, -+ ping_bit_depth, -+ ping_colortype, -+ ping_interlace_method, -+ ping_compression_method, -+ ping_filter_method); -+ - png_write_info(ping,ping_info); - - #if (PNG_LIBPNG_VER == 10206) -@@ -7313,7 +7384,7 @@ static MagickPassFail WriteOnePNGImage(M - { - if ((!mng_info->write_png8 && !mng_info->write_png24 && - !mng_info->write_png32) && -- (!image_matte || (ping_info->bit_depth >= QuantumDepth)) && -+ (!image_matte || (ping_bit_depth >= QuantumDepth)) && - (mng_info->optimize || mng_info->IsPalette) && - IsGrayImage(image,&image->exception)) - { -@@ -7325,7 +7396,7 @@ static MagickPassFail WriteOnePNGImage(M - if (!AcquireImagePixels(image,0,y,image->columns,1, - &image->exception)) - break; -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - { - if (mng_info->IsPalette) - (void) ExportImagePixelArea(image, -@@ -7368,14 +7439,14 @@ static MagickPassFail WriteOnePNGImage(M - " pass %d, Image Is RGB," - " PNG colortype is %s (%d)",pass, - PngColorTypeToString( -- ping_info->color_type), -- ping_info->color_type); -+ ping_colortype), -+ ping_colortype); - for (y=0; y < (long) image->rows; y++) - { - if (!AcquireImagePixels(image,0,y,image->columns,1, - &image->exception)) - break; -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - { - if (image->storage_class == DirectClass) - (void) ExportImagePixelArea(image,(QuantumType) -@@ -7388,7 +7459,7 @@ static MagickPassFail WriteOnePNGImage(M - quantum_size, - png_pixels,0,0); - } -- else if (ping_info->color_type == -+ else if (ping_colortype == - PNG_COLOR_TYPE_GRAY_ALPHA) - (void) ExportImagePixelArea(image,(QuantumType) - GrayAlphaQuantum, -@@ -7433,12 +7504,12 @@ static MagickPassFail WriteOnePNGImage(M - if (!AcquireImagePixels(image,0,y,image->columns,1, - &image->exception)) - break; -- if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) -+ if (ping_colortype == PNG_COLOR_TYPE_GRAY) - (void) ExportImagePixelArea(image,(QuantumType) - GrayQuantum, - quantum_size, - png_pixels,0,0); -- else if (ping_info->color_type == -+ else if (ping_colortype == - PNG_COLOR_TYPE_GRAY_ALPHA) - (void) ExportImagePixelArea(image,(QuantumType) - GrayAlphaQuantum, -@@ -7471,38 +7542,32 @@ static MagickPassFail WriteOnePNGImage(M - " Writing PNG image data"); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Width: %lu", -- (unsigned long)ping_info->width); -+ (unsigned long)ping_width); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Height: %lu", -- (unsigned long)ping_info->height); -+ (unsigned long)ping_height); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " PNG sample depth: %d",ping_info->bit_depth); -+ " PNG sample depth: %d",ping_bit_depth); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG color type: %s (%d)", -- PngColorTypeToString(ping_info->color_type), -- ping_info->color_type); -+ PngColorTypeToString(ping_colortype), -+ ping_colortype); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " PNG Interlace method: %d", -- ping_info->interlace_type); -+ ping_interlace_method); - } - /* - Generate text chunks. - */ --#if (PNG_LIBPNG_VER <= 10005) -- ping_info->num_text=0; --#endif - attribute=GetImageAttribute(image,(char *) NULL); - for ( ; attribute != (const ImageAttribute *) NULL; - attribute=attribute->next) - { --#if (PNG_LIBPNG_VER > 10005) - png_textp - text; --#endif - - if (*attribute->key == '[') - continue; --#if (PNG_LIBPNG_VER > 10005) - text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text)); - text[0].key=attribute->key; - text[0].text=attribute->value; -@@ -7519,40 +7584,6 @@ static MagickPassFail WriteOnePNGImage(M - } - png_set_text(ping,ping_info,text,1); - png_free(ping,text); --#else -- /* Work directly with ping_info struct; -- * png_set_text before libpng version -- * 1.0.5a is leaky */ -- if (ping_info->num_text == 0) -- { -- ping_info->text=MagickAllocateMemory(png_text *, -- 256*sizeof(png_text)); -- if (ping_info->text == (png_text *) NULL) -- (void) ThrowException(&image->exception,(ExceptionType) -- ResourceLimitError,MemoryAllocationFailed, -- image->filename); -- } -- i=ping_info->num_text++; -- if (i > 255) -- (void) ThrowException(&image->exception,(ExceptionType) -- ResourceLimitError, -- "Cannot write more than 256 PNG text chunks", -- image->filename); -- ping_info->text[i].key=attribute->key; -- ping_info->text[i].text=attribute->value; -- ping_info->text[i].text_length=strlen(attribute->value); -- ping_info->text[i].compression= -- image_info->compression == NoCompression || -- (image_info->compression == UndefinedCompression && -- ping_info->text[i].text_length < 128) ? -1 : 0; -- if (logging) -- { -- (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " Setting up text chunk"); -- (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " keyword: %s",ping_info->text[i].key); -- } --#endif - } - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -@@ -7560,9 +7591,9 @@ static MagickPassFail WriteOnePNGImage(M - png_write_end(ping,ping_info); - if (mng_info->need_fram && (int) image->dispose == BackgroundDispose) - { -- if (mng_info->page.x || mng_info->page.y || (ping_info->width != -+ if (mng_info->page.x || mng_info->page.y || (ping_width != - mng_info->page.width) || -- (ping_info->height != mng_info->page.height)) -+ (ping_height != mng_info->page.height)) - { - unsigned char - chunk[32]; -@@ -7583,10 +7614,10 @@ static MagickPassFail WriteOnePNGImage(M - chunk[14]=0; /* clipping boundaries delta type */ - PNGLong(chunk+15,(png_uint_32) (mng_info->page.x)); /* left cb */ - PNGLong(chunk+19,(png_uint_32) (mng_info->page.x + -- ping_info->width)); -+ ping_width)); - PNGLong(chunk+23,(png_uint_32) (mng_info->page.y)); /* top cb */ - PNGLong(chunk+27,(png_uint_32) (mng_info->page.y + -- ping_info->height)); -+ ping_height)); - (void) WriteBlob(image,31,(char *) chunk); - (void) WriteBlobMSBULong(image,crc32(0,chunk,31)); - mng_info->old_framing_mode=4; -@@ -7605,7 +7636,7 @@ static MagickPassFail WriteOnePNGImage(M - - /* Save depth actually written */ - -- s[0]=(char) ping_info->bit_depth; -+ s[0]=(char) ping_bit_depth; - s[1]='\0'; - - (void) SetImageAttribute(image,"[png:bit-depth-written]",s); -@@ -7613,18 +7644,6 @@ static MagickPassFail WriteOnePNGImage(M - /* - Free PNG resources. - */ --#if (PNG_LIBPNG_VER < 10007) -- if (ping_info->valid & PNG_INFO_PLTE) -- { -- MagickFreeMemory(ping_info->palette); -- ping_info->valid&=(~PNG_INFO_PLTE); -- } --#endif -- if (ping_info->valid & PNG_INFO_tRNS) -- { -- MagickFreeMemory(ping_info->trans_alpha); -- ping_info->valid&=(~PNG_INFO_tRNS); -- } - png_destroy_write_struct(&ping,&ping_info); - - MagickFreeMemory(png_pixels); -@@ -8365,23 +8384,12 @@ static unsigned int WriteMNGImage(const - final_delay=0, - initial_delay; - --#if (PNG_LIBPNG_VER < 10007) -+#if (PNG_LIBPNG_VER < 10200) - if (image_info->verbose) - printf("Your PNG library (libpng-%s) is rather old.\n", - PNG_LIBPNG_VER_STRING); - #endif - --#if (PNG_LIBPNG_VER >= 10400) --# ifndef PNG_TRANSFORM_GRAY_TO_RGB /* Added at libpng-1.4.0beta67 */ -- if (image_info->verbose) -- { -- printf("Your PNG library (libpng-%s) is an old beta version.\n", -- PNG_LIBPNG_VER_STRING); -- printf("Please update it.\n"); -- } --# endif --#endif -- - /* - Open image file. - */ -@@ -9196,7 +9204,7 @@ static unsigned int WriteMNGImage(const - (void) LogMagickEvent(CoderEvent,GetMagickModule(),"exit WriteMNGImage()"); - return(MagickPass); - } --#else /* PNG_LIBPNG_VER > 95 */ -+#else /* PNG_LIBPNG_VER > 10011 */ - static unsigned int WritePNGImage(const ImageInfo *image_info,Image *image) - { - image=image; -@@ -9208,5 +9216,5 @@ static unsigned int WriteMNGImage(const - { - return (WritePNGImage(image_info,image)); - } --#endif /* PNG_LIBPNG_VER > 95 */ -+#endif /* PNG_LIBPNG_VER > 10011 */ - #endif - \ No newline at end of file diff -r 6e83c7eb0945 -r d9e4f3b2002a src/graphicsmagick.mk --- a/src/graphicsmagick.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/graphicsmagick.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gsl-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gsl-test.c Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,18 @@ +/* This file is part of mingw-cross-env. */ +/* See doc/index.html for further information. */ + +#include +#include + +int main(int argc, char *argv[]) +{ + double x, y; + + (void)argc; + (void)argv; + + x = 5.0; + y = gsl_sf_bessel_J0 (x); + printf ("J0(%g) = %.18e\n", x, y); + return 0; +} diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gsl.mk --- a/src/gsl.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gsl.mk Mon Jan 02 11:29:26 2012 +0100 @@ -22,9 +22,15 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --enable-static $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gsl.exe' \ + -lgsl endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gsoap-1-fixes.patch --- a/src/gsoap-1-fixes.patch Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gsoap-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 a4e9166bc8d78b2aee3c25757d479d4c2e53c7be Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Sun, 23 Oct 2011 21:36:53 +0200 +Subject: [PATCH 1/3] support static linking to ntlm + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) -From d49ac167169e2db531e1be5a48575186c8bc8799 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Mon, 18 Apr 2011 09:20:27 +0200 -Subject: [PATCH 1/2] use ws2spi instead of wspiapi +diff --git a/configure b/configure +index ad1830d..be95edf 100755 +--- a/configure ++++ b/configure +@@ -4822,7 +4822,7 @@ case "${host}" in + ;; + *-*-cygwin*) platform=CYGWIN ;; + *-*-mingw*) platform=MINGW +- SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32" ++ SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32" + ;; + *-*-freebsd*) platform=FREEBSD ;; + *-*-openbsd*) platform=OPENBSD ;; +-- +1.7.7 -diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h -index 238b7f1..ffccf80 100644 ---- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h -+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h -@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com - # endif - # include /* Visual Studio 2005 users: you must install the Platform SDK (R2) */ - # include --# include -+# include - # ifdef WITH_IPV6 - # define SOAP_GAI_STRERROR gai_strerrorA - # endif -diff --git a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h -index 238b7f1..ffccf80 100644 ---- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h -+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h -@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com - # endif - # include /* Visual Studio 2005 users: you must install the Platform SDK (R2) */ - # include --# include -+# include - # ifdef WITH_IPV6 - # define SOAP_GAI_STRERROR gai_strerrorA - # endif -diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h -index 238b7f1..ffccf80 100644 ---- a/gsoap/stdsoap2.h -+++ b/gsoap/stdsoap2.h -@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com - # endif - # include /* Visual Studio 2005 users: you must install the Platform SDK (R2) */ - # include --# include -+# include - # ifdef WITH_IPV6 - # define SOAP_GAI_STRERROR gai_strerrorA - # endif +From da0eb2fc386be0fd914ef8f9a7d6bf73004ea230 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Mon, 24 Oct 2011 11:17:13 +0200 +Subject: [PATCH 2/3] ntlm support in .pc files + +--- + gsoap++.pc.in | 2 +- + gsoap.pc.in | 2 +- + gsoapck++.pc.in | 2 +- + gsoapck.pc.in | 2 +- + gsoapssl++.pc.in | 2 +- + gsoapssl.pc.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/gsoap++.pc.in b/gsoap++.pc.in +index 035afd9..3411d55 100644 +--- a/gsoap++.pc.in ++++ b/gsoap++.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoap++ @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir} +diff --git a/gsoap.pc.in b/gsoap.pc.in +index e2607aa..96a54b9 100644 +--- a/gsoap.pc.in ++++ b/gsoap.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C Web Services + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoap @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir} +diff --git a/gsoapck++.pc.in b/gsoapck++.pc.in +index cb03e2f..b349049 100644 +--- a/gsoapck++.pc.in ++++ b/gsoapck++.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with Cookies Enabled + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoapck++ @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir} +diff --git a/gsoapck.pc.in b/gsoapck.pc.in +index 859a922..e5ce5eb 100644 +--- a/gsoapck.pc.in ++++ b/gsoapck.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C Web Services with Cookies Enabled + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoapck @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir} +diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in +index 391d820..791408a 100644 +--- a/gsoapssl++.pc.in ++++ b/gsoapssl++.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with SSL and ZLIB + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir} +diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in +index 79c940a..17c9ee3 100644 +--- a/gsoapssl.pc.in ++++ b/gsoapssl.pc.in +@@ -8,4 +8,4 @@ Description: SOAP C Web Services with SSL and ZLIB + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lgsoapssl @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ +-Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} ++Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir} -- -1.7.4.1 +1.7.7 -From 2ed5f1205a5517c4f1d919942fbebd58327ee3df Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Mon, 18 Apr 2011 10:14:06 +0200 -Subject: [PATCH 2/2] add missing libs to gsoapssl++.pc - - -diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in -index e8c8f4f..07515fe 100644 ---- a/gsoapssl++.pc.in -+++ b/gsoapssl++.pc.in -@@ -7,5 +7,5 @@ Name: GSoap - Description: SOAP C++ Web Services with SSL and ZLIB - Version: @VERSION@ - Requires: --Libs: -L${libdir} -lgsoapssl++ -+Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ - Cflags: -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} --- -1.7.4.1 - diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gsoap.mk --- a/src/gsoap.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gsoap.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ # 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 @@ $(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 @@ 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. diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gst-plugins-base.mk --- a/src/gst-plugins-base.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gst-plugins-base.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gst-plugins-good.mk --- a/src/gst-plugins-good.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gst-plugins-good.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gstreamer.mk --- a/src/gstreamer.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gstreamer.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gtk2-1-fixes.patch --- a/src/gtk2-1-fixes.patch Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gtk2-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -3,14 +3,14 @@ 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 @@ LPVOID reserved) { diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c -index fdf4730..428fd96 100644 +index d081f70..aa2973d 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c -@@ -73,7 +73,7 @@ +@@ -74,7 +74,7 @@ static HMODULE gtk_dll; BOOL WINAPI @@ -36,13 +36,13 @@ LPVOID lpvReserved) { -- -1.7.1 +1.7.7.3 -From bc446ce0785954ccf28825554c3074a15b4f4071 Mon Sep 17 00:00:00 2001 +From 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 @@ #else # define GTKVAR extern diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h -index 21de92e..2c0f94c 100644 +index bbea9cd..059d7d0 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -69,7 +69,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget, @@ -98,13 +98,13 @@ #else #define VARIABLE extern -- -1.7.1 +1.7.7.3 -From 078f0c210e1706b4028907bf55cc55672d5dc7d3 Mon Sep 17 00:00:00 2001 +From 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 @@ # define GTKVAR extern # endif diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h -index 2c0f94c..9c47b57 100644 +index 059d7d0..8c360d0 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -67,7 +67,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget, @@ -160,13 +160,13 @@ #define VARIABLE extern #endif -- -1.7.1 +1.7.7.3 -From 69568bc7c8627d117521548192730665a9623b80 Mon Sep 17 00:00:00 2001 +From 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 @@ +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 @@ $(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 @@ 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 @@ # Look at the argument we got. We use all the common list separators. lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do -@@ -4362,7 +4362,7 @@ if test "${enable_static+set}" = set; then : +@@ -4376,7 +4376,7 @@ if test "${enable_static+set}" = set; then : ;; esac else @@ -261,7 +261,7 @@ fi -@@ -4930,15 +4930,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -4944,15 +4944,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -283,7 +283,7 @@ fi enable_win32_dll=yes -@@ -8241,7 +8241,7 @@ done +@@ -8752,7 +8752,7 @@ func_stripname_cnf () if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in @@ -292,7 +292,7 @@ no) enable_shared=no ;; *) enable_shared=no -@@ -8250,14 +8250,14 @@ if test "${enable_shared+set}" = set; then : +@@ -8761,14 +8761,14 @@ if test "${enable_shared+set}" = set; then : for pkg in $enableval; do IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then @@ -309,7 +309,7 @@ fi -@@ -11970,7 +11970,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } +@@ -12632,7 +12632,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } # are all built from PIC. case $host_os in aix3*) @@ -318,7 +318,7 @@ if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' -@@ -11979,7 +11979,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } +@@ -12641,7 +12641,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } aix[4-9]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then @@ -328,20 +328,20 @@ ;; esac -- -1.7.1 +1.7.7.3 -From 831f94ccf7a26662bfc9e8d22b9ae9eaea740bbb Mon Sep 17 00:00:00 2001 +From 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 @@ 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 @@ GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend" fi -- -1.7.1 - - -From 3e9c211536912bf78c44172b7f6ecd8860887166 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Fri, 24 Sep 2010 14:55:33 +0200 -Subject: [PATCH 10/11] set cross_compiling explicitly to avoid Wine interference +1.7.7.3 -diff --git a/configure b/configure -index d3e5e21..7ae7a5d 100755 ---- a/configure -+++ b/configure -@@ -555,7 +555,7 @@ ac_default_prefix=/usr/local - ac_clean_files= - ac_config_libobj_dir=. - LIBOBJS= --cross_compiling=no -+cross_compiling=yes - subdirs= - MFLAGS= - MAKEFLAGS= -@@ -3872,7 +3872,7 @@ $as_echo "$ac_try_echo"; } >&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then -- cross_compiling=no -+ cross_compiling=yes - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes --- -1.7.1 - - -From 01cc2d128be8a19c1434b912e378deae3b1bfcf9 Mon Sep 17 00:00:00 2001 +From 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 @@ void _gtk_marshal_VOID__ENUM_OBJECT_DOUBLE (GClosure *closure, -- -1.7.1 +1.7.7.3 diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gtk2.mk --- a/src/gtk2.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gtk2.mk Mon Jan 02 11:29:26 2012 +0100 @@ -24,6 +24,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-explicit-deps \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gtkglext.mk --- a/src/gtkglext.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gtkglext.mk Mon Jan 02 11:29:26 2012 +0100 @@ -22,10 +22,9 @@ define $(PKG)_BUILD cd '$(1)' && autoconf - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --without-x \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gtkglextmm-1-fixes.patch --- a/src/gtkglextmm-1-fixes.patch Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gtkglextmm-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -3,10 +3,10 @@ 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 @@ -DGTK_DISABLE_DEPRECATED -- -1.7.1 - - -From b3a26572b965ada869cc388b6bfce5c54b6ab704 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 29 Sep 2010 23:18:40 +0200 -Subject: [PATCH 2/2] wine workaround: s,cross_compiling=no,cross_compiling=yes, - +1.7.7.3 -diff --git a/configure b/configure -index 508d229..65f61fb 100755 ---- a/configure -+++ b/configure -@@ -409,7 +409,7 @@ exec 6>&1 - # - ac_default_prefix=/usr/local - ac_config_libobj_dir=. --cross_compiling=no -+cross_compiling=yes - subdirs= - MFLAGS= - MAKEFLAGS= -@@ -2486,7 +2486,7 @@ if test "$cross_compiling" != yes; then - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- cross_compiling=no -+ cross_compiling=yes - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes --- -1.7.1 - diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gtkglextmm.mk --- a/src/gtkglextmm.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gtkglextmm.mk Mon Jan 02 11:29:26 2012 +0100 @@ -23,6 +23,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' install \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gtkmm2.mk --- a/src/gtkmm2.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gtkmm2.mk Mon Jan 02 11:29:26 2012 +0100 @@ -22,10 +22,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE) diff -r 6e83c7eb0945 -r d9e4f3b2002a src/gtksourceviewmm2.mk --- a/src/gtksourceviewmm2.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/gtksourceviewmm2.mk Mon Jan 02 11:29:26 2012 +0100 @@ -22,10 +22,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ MAKE=$(MAKE) diff -r 6e83c7eb0945 -r d9e4f3b2002a src/guile.mk --- a/src/guile.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/guile.mk Mon Jan 02 11:29:26 2012 +0100 @@ -25,7 +25,7 @@ # which would fail because we tell Guile not to use Pthreads. cd '$(1)' && CC_FOR_BUILD=gcc ./configure \ --host='$(TARGET)' \ - --build="`sh ./config.guess`" \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --without-threads \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/ilmbase.mk --- a/src/ilmbase.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/ilmbase.mk Mon Jan 02 11:29:26 2012 +0100 @@ -20,8 +20,6 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' # build the win32 thread sources instead of the posix thread sources $(SED) -i 's,IlmThreadPosix\.,IlmThreadWin32.,' '$(1)/IlmThread/Makefile.in' $(SED) -i 's,IlmThreadSemaphorePosix\.,IlmThreadSemaphoreWin32.,' '$(1)/IlmThread/Makefile.in' @@ -31,6 +29,7 @@ # threading. It will just disable the unwanted check for pthread. cd '$(1)' && $(SHELL) ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-threading \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/imagemagick.mk --- a/src/imagemagick.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/imagemagick.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ 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 \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/lame.mk --- a/src/lame.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/lame.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 6e83c7eb0945 -r d9e4f3b2002a src/lapack.mk --- a/src/lapack.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/lapack.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ endef define $(PKG)_BUILD - cp $(1)/make.inc.example $(1)/make.inc - $(SED) -i 's,PLAT =.*,PLAT = _MINGW32,g' '$(1)/make.inc' - $(SED) -i 's,gfortran,$(TARGET)-gfortran,g' '$(1)/make.inc' - $(SED) -i 's, ar, $(TARGET)-ar,g' '$(1)/make.inc' - $(SED) -i 's, ranlib, $(TARGET)-ranlib,g' '$(1)/make.inc' - - $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/lapack_MINGW32.a' '$(PREFIX)/$(TARGET)/lib/liblapack.a' + cd '$(1)' && cmake \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ + . + $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' install endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/lcms-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/lcms-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/lcms.mk --- a/src/lcms.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/lcms.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --with-jpeg \ --with-tiff \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/lcms1-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/lcms1-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/lcms1.mk --- a/src/lcms1.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/lcms1.mk Mon Jan 02 11:29:26 2012 +0100 @@ -20,11 +20,10 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --with-jpeg \ --with-tiff \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libarchive.mk --- a/src/libarchive.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libarchive.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libass.mk --- a/src/libass.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libass.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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' | \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libdnet-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libdnet-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 + # include +-- +1.7.6 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libevent.mk --- a/src/libevent.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libevent.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libffi-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libffi-test.c Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,31 @@ +/* This file is part of mingw-cross-env. */ +/* See doc/index.html for further information. */ + +#include +#include + +int main(int argc, char *argv[]) +{ + ffi_cif cif; + ffi_type *args[1]; + void *values[1]; + char *s; + int rc; + + (void)argc; + (void)argv; + + args[0] = &ffi_type_pointer; + values[0] = &s; + + if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, + &ffi_type_uint, args) == FFI_OK) + { + s = "Hello World!"; + ffi_call(&cif, FFI_FN(puts), &rc, values); + s = "Goodbye!"; + ffi_call(&cif, FFI_FN(puts), &rc, values); + } + + return 0; +} diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libffi.mk --- a/src/libffi.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libffi.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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)_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 ']*\)\.tar.*,\1,p' | \ + grep -v '^1\.4\.' | \ tail -1 endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-gpg-error-prefix='$(PREFIX)/$(TARGET)' diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libgeotiff.mk --- a/src/libgeotiff.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libgeotiff.mk Mon Jan 02 11:29:26 2012 +0100 @@ -26,7 +26,7 @@ --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - LIBS='-ljpeg -lz' + LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz" $(MAKE) -C '$(1)' -j 1 all install EXEEXT=.remove-me MAKE='$(MAKE)' rm -fv '$(PREFIX)/$(TARGET)'/bin/*.remove-me endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libgnurx-1-build-static-lib.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libgnurx-1-build-static-lib.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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} diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libgnurx.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libgnurx.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libgomp.mk --- a/src/libgomp.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libgomp.mk Mon Jan 02 11:29:26 2012 +0100 @@ -18,12 +18,10 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/libgomp/configure' - mkdir -p '$(1)/build/$(TARGET)/libgomp' cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \ --host='$(TARGET)' \ + --build="`config.guess`" \ --target='$(TARGET)' \ --prefix='$(PREFIX)' \ --enable-version-specific-runtime-libs \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libgpg_error.mk --- a/src/libgpg_error.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libgpg_error.mk Mon Jan 02 11:29:26 2012 +0100 @@ -19,10 +19,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libgsasl-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libgsasl-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libgsasl.mk --- a/src/libgsasl.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libgsasl.mk Mon Jan 02 11:29:26 2012 +0100 @@ -10,7 +10,7 @@ $(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 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && touch src/libgsasl-7.def && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libgsf-1-fixes.patch --- a/src/libgsf-1-fixes.patch Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libgsf-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -6,7 +6,7 @@ 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 @@ -- 1.7.1 - -From ab87b1b623f774244935bf9f1d82365a3203d8db Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 29 Sep 2010 20:15:48 +0200 -Subject: [PATCH 2/2] no gettext - - -diff --git a/configure.in b/configure.in -index af40c28..7ce5f7b 100644 ---- a/configure.in -+++ b/configure.in -@@ -53,10 +53,6 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - dnl Gettext/i18n stuff - --IT_PROG_INTLTOOL([0.35.0]) -- --AM_GLIB_GNU_GETTEXT -- - GETTEXT_PACKAGE=AC_PACKAGE_NAME - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) --- -1.7.1 - diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libgsf.mk --- a/src/libgsf.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libgsf.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ define $(PKG)_BUILD $(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in echo 'Libs.private: -lz -lbz2' >> '$(1)'/libgsf-1.pc.in - cd '$(1)' && aclocal -I m4 - cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libical-1-tml.patch --- a/src/libical-1-tml.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,197 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -https://build.opensuse.org/package/view_file?file=libical-0.44-tml.patch&package=mingw32-libical&project=windows%3Amingw%3Awin32 - ---- libical-0.44/autogen.sh 2009-01-08 17:50:28.000000000 +0100 -+++ libical-0.44/autogen.sh 2009-04-15 15:25:54.000000000 +0200 -@@ -37,11 +37,6 @@ - exit 1 - } - --if test -z "$*"; then -- echo "I am going to run ./configure with no arguments - if you wish " -- echo "to pass any to it, please specify them on the $0 command line." --fi -- - case $CC in - *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;; - esac -@@ -55,7 +50,3 @@ - autoconf - cd $ORIGDIR - --$srcdir/configure "$@" -- --echo --echo "Now type 'make' to compile $PROJECT." ---- libical-0.44/src/libical/icalrecur.c 2009-01-08 17:50:21.000000000 +0100 -+++ libical-0.44/src/libical/icalrecur.c 2009-04-15 15:12:35.000000000 +0200 -@@ -141,16 +141,6 @@ - - #include - --#ifndef HAVE_INTPTR_T --#if defined (WIN32) || defined (XP_BEOS) --typedef long intptr_t; --#endif --#endif -- --#ifdef WIN32 --#define strcasecmp stricmp --#endif -- - #include "icalrecur.h" - - #include "icalerror.h" ---- libical-0.44/src/libical/icaltz-util.c 2009-01-08 17:50:21.000000000 +0100 -+++ libical-0.44/src/libical/icaltz-util.c 2009-04-15 15:17:06.000000000 +0200 -@@ -20,67 +20,24 @@ - * Boston, MA 02110-1301, USA. - */ - --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif - #include -- - #if defined(sun) && defined(__SVR4) - #include -+#elif defined(_WIN32) -+#define BIG_ENDIAN 'B' -+#define LITTLE_ENDIAN 'l' -+#define BYTE_ORDER LITTLE_ENDIAN -+#define bswap32(val) ((((val) & 0x000000ffU) << 24) | (((val) & 0x0000ff00U) << 8) | (((val) & 0x00ff0000U) >> 8) | (((val) & 0xff000000U) >> 24)) -+#elif defined(__linux__) -+#include -+#include - #else --# ifdef HAVE_BYTESWAP_H --# include --# endif --# ifdef HAVE_SYS_ENDIAN_H --# include --# ifdef bswap32 --# define bswap_32 bswap32 --# else --# define bswap_32 swap32 --# endif --# endif --# ifdef HAVE_ENDIAN_H --# include --# endif --#endif -- --#ifdef WIN32 --#if !defined(HAVE_BYTESWAP_H) && !defined(HAVE_SYS_ENDIAN_H) && !defined(HAVE_ENDIAN_H) --#define bswap_16(x) (((x) << 8) & 0xff00) | (((x) >> 8 ) & 0xff) --#define bswap_32(x) (((x) << 24) & 0xff000000) \ -- | (((x) << 8) & 0xff0000) \ -- | (((x) >> 8) & 0xff00) \ -- | (((x) >> 24) & 0xff ) --#define bswap_64(x) ((((x) & 0xff00000000000000ull) >> 56) \ -- | (((x) & 0x00ff000000000000ull) >> 40) \ -- | (((x) & 0x0000ff0000000000ull) >> 24) \ -- | (((x) & 0x000000ff00000000ull) >> 8) \ -- | (((x) & 0x00000000ff000000ull) << 8) \ -- | (((x) & 0x0000000000ff0000ull) << 24) \ -- | (((x) & 0x000000000000ff00ull) << 40) \ -- | (((x) & 0x00000000000000ffull) << 56)) -+#include - #endif --#include --#endif -- --#ifndef PATH_MAX --#define PATH_MAX 512 --#endif -- --#ifndef F_OK --#define F_OK 0 --#endif -- --#ifndef R_OK --#define R_OK 4 --#endif -- - #include - #include - #include --#ifdef HAVE_UNISTD_H - #include --#endif - #include - #include - -@@ -139,7 +96,11 @@ - if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4) - return *(const int *) ptr; - else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4) -+#ifdef __linux__ - return bswap_32 (*(const int *) ptr); -+#else -+ return bswap32 (*(const unsigned *) ptr); -+#endif - #endif - else - { ---- libical-0.44/src/libical/Makefile.am 2009-01-08 17:50:22.000000000 +0100 -+++ libical-0.44/src/libical/Makefile.am 2009-04-15 15:27:20.000000000 +0200 -@@ -51,7 +51,7 @@ - -I$(top_builddir)/src/libical \ - -I$(srcdir) - --libical_la_LDFLAGS = -version-info 44:0:44 -+libical_la_LDFLAGS = -version-info 44:0:44 -no-undefined - - libical_la_LIBADD = $(PTHREAD_LIBS) - ---- libical-0.44/src/libical/vsnprintf.c 2009-01-08 17:50:22.000000000 +0100 -+++ libical-0.44/src/libical/vsnprintf.c 2009-04-15 15:23:35.000000000 +0200 -@@ -1,8 +1,7 @@ --#ifndef WIN32 - #include "config.h" --#endif -+ - #ifndef HAVE_SNPRINTF --#error DO NOT USE libical version of vsnprintf. -+ - /* - * Revision 12: http://theos.com/~deraadt/snprintf.c - * ---- libical-0.44/src/libicalcap/Makefile.am 2009-01-08 17:50:20.000000000 +0100 -+++ libical-0.44/src/libicalcap/Makefile.am 2009-04-15 15:32:11.000000000 +0200 -@@ -34,7 +34,7 @@ - -I$(srcdir) \ - -DWITH_RR $(RRCAP_CFLAGS) - --libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 44:0:44 -+libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 44:0:44 -no-undefined - - - libicalcap_evolution_la_SOURCES = \ ---- libical-0.44/src/libicalss/Makefile.am 2009-01-08 17:50:22.000000000 +0100 -+++ libical-0.44/src/libicalss/Makefile.am 2009-04-15 15:34:41.000000000 +0200 -@@ -63,8 +63,8 @@ - -I$(top_builddir)/src/libical \ - $(BDB_INCLUDE) - --libicalss_la_LDFLAGS = -version-info 44:0:44 --libicalss_la_LIBADD = $(BDB_LIBFILES) -+libicalss_la_LDFLAGS = -version-info 44:0:44 -no-undefined -+libicalss_la_LIBADD = $(BDB_LIBFILES) $(top_builddir)/src/libical/libical.la - - if DEV - libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y ---- libical-0.44/src/libicalvcal/Makefile.am 2009-01-08 17:50:23.000000000 +0100 -+++ libical-0.44/src/libicalvcal/Makefile.am 2009-04-15 15:31:48.000000000 +0200 -@@ -8,7 +8,7 @@ - -I$(top_builddir)/src/libical \ - -I$(top_srcdir)/src/libicalss - --libicalvcal_la_LDFLAGS = -version-info 44:0:44 -+libicalvcal_la_LDFLAGS = -version-info 44:0:44 -no-undefined - libicalvcal_la_LIBADD = ../libical/.libs/libical.la - - if DEV diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libical-2-windows.patch --- a/src/libical-2-windows.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,282 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -https://build.opensuse.org/package/view_file?file=libical-0.44-windows.patch&package=mingw32-libical&project=windows%3Amingw%3Awin32 - ---- libical-0.44/src/libical/icaltime.c 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/icaltime.c 2010-03-17 14:55:36.000000000 +0100 -@@ -45,14 +45,19 @@ - #include "icaltimezone.h" - #include "icalvalue.h" - --#ifdef WIN32 -+#ifdef _WIN32 - #include - - #define snprintf _snprintf - #define strcasecmp stricmp - #endif - --#ifdef WIN32 -+#ifdef HAVE_PTHREAD -+ #include -+ static pthread_mutex_t tzid_mutex = PTHREAD_MUTEX_INITIALIZER; -+#endif -+ -+#ifdef _WIN32 - /* Undef the similar macro from pthread.h, it doesn't check if - * gmtime() returns NULL. - */ -@@ -62,11 +67,6 @@ - #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) - #endif - --#ifdef HAVE_PTHREAD -- #include -- static pthread_mutex_t tzid_mutex = PTHREAD_MUTEX_INITIALIZER; --#endif -- - /* - * Function to convert a struct tm time specification - * to an ANSI time_t using the specified time zone. -@@ -192,18 +192,20 @@ - * - */ - struct icaltimetype --icaltime_from_timet_with_zone(const time_t tm, const int is_date, -+icaltime_from_timet_with_zone(time_t tm, const int is_date, - const icaltimezone *zone) - { - struct icaltimetype tt; - struct tm t; - icaltimezone *utc_zone; - -+ if (tm < 0) tm=0; -+ - utc_zone = icaltimezone_get_utc_timezone (); - - /* Convert the time_t to a struct tm in UTC time. We can trust gmtime - for this. */ --#ifdef HAVE_PTHREAD -+#if defined(HAVE_PTHREAD) || defined(_WIN32) - gmtime_r (&tm, &t); - #else - t = *(gmtime (&tm)); ---- libical-0.44/src/libical/icaltimezone.c 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/icaltimezone.c 2010-03-19 14:34:25.000000000 +0100 -@@ -59,6 +59,61 @@ - /** This is the toplevel directory where the timezone data is installed in. */ - #define ZONEINFO_DIRECTORY PACKAGE_DATA_DIR "/zoneinfo" - -+#ifdef _WIN32 -+/* search for data relative to where we are installed */ -+ -+static HMODULE hmodule; -+ -+BOOL WINAPI -+DllMain (HINSTANCE hinstDLL, -+ DWORD fdwReason, -+ LPVOID lpvReserved) -+{ -+ switch (fdwReason) -+ { -+ case DLL_PROCESS_ATTACH: -+ hmodule = hinstDLL; -+ break; -+ } -+ -+ return TRUE; -+} -+ -+char * -+get_zoneinfo_directory (void) -+{ -+ static char retval[1000]; -+ static int beenhere = 0; -+ -+ unsigned char *p; -+ -+ if (beenhere) -+ return retval; -+ -+ if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 10)) -+ return ZONEINFO_DIRECTORY; -+ -+ p = _mbsrchr ((const unsigned char *) retval, '\\'); -+ *p = '\0'; -+ p = _mbsrchr ((const unsigned char *) retval, '\\'); -+ if (p) { -+ if (stricmp ((const char *) (p+1), "bin") == 0) -+ *p = '\0'; -+ } -+ strcat (retval, "\\share\\libical\\zoneinfo"); -+ -+ beenhere = 1; -+ -+ return retval; -+} -+ -+#undef ZONEINFO_DIRECTORY -+#define ZONEINFO_DIRECTORY get_zoneinfo_directory () -+ -+#endif -+ -+ -+ - /** The prefix we use to uniquely identify TZIDs. - It must begin and end with forward slashes. - */ -@@ -1943,96 +1998,7 @@ - - static const char* get_zone_directory(void) - { --#ifndef WIN32 - return zone_files_directory == NULL ? ZONEINFO_DIRECTORY : zone_files_directory; --#else -- wchar_t wbuffer[1000]; -- char buffer[1000], zoneinfodir[1000], dirname[1000]; -- int used_default; -- static char *cache = NULL; -- char *dirslash, *zislash; -- struct stat st; -- -- if (zone_files_directory) -- return zone_files_directory; -- -- if (cache) -- return cache; -- -- /* Get the filename of the application */ -- if (!GetModuleFileNameW (NULL, wbuffer, sizeof (wbuffer) / sizeof (wbuffer[0]))) -- return ZONEINFO_DIRECTORY; -- -- /* Convert to system codepage */ -- if (!WideCharToMultiByte (CP_ACP, 0, wbuffer, -1, buffer, sizeof (buffer), -- NULL, &used_default) || -- used_default) { -- /* Failed, try 8.3 format */ -- if (!GetShortPathNameW (wbuffer, wbuffer, -- sizeof (wbuffer) / sizeof (wbuffer[0])) || -- !WideCharToMultiByte (CP_ACP, 0, wbuffer, -1, buffer, sizeof (buffer), -- NULL, &used_default) || -- used_default) -- return ZONEINFO_DIRECTORY; -- } -- /* Look for the zoneinfo directory somewhere in the path where -- * the app is installed. If the path to the app is -- * -- * C:\opt\evo-2.6\bin\evolution-2.6.exe -- * -- * and the compile-time ZONEINFO_DIRECTORY is -- * -- * C:/devel/target/evo/share/evolution-data-server-1.6/zoneinfo, -- * -- * we check the pathnames: -- * -- * C:\opt\evo-2.6/devel/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt\evo-2.6/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt\evo-2.6/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt\evo-2.6/share/evolution-data-server-1.6/zoneinfo <=== -- * C:\opt\evo-2.6/evolution-data-server-1.6/zoneinfo -- * C:\opt\evo-2.6/zoneinfo -- * C:\opt/devel/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt/evo/share/evolution-data-server-1.6/zoneinfo -- * C:\opt/share/evolution-data-server-1.6/zoneinfo -- * C:\opt/evolution-data-server-1.6/zoneinfo -- * C:\opt/zoneinfo -- * C:/devel/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:/target/evo/share/evolution-data-server-1.6/zoneinfo -- * C:/evo/share/evolution-data-server-1.6/zoneinfo -- * C:/share/evolution-data-server-1.6/zoneinfo -- * C:/evolution-data-server-1.6/zoneinfo -- * C:/zoneinfo -- * -- * In Evolution's case, we would get a match already at the -- * fourth pathname check. -- */ -- -- /* Strip away basename of app .exe first */ -- dirslash = _mbsrchr (buffer, '\\'); -- if (dirslash) -- *dirslash = '\0'; -- -- while ((dirslash = _mbsrchr (buffer, '\\'))) { -- /* Strip one more directory from app .exe location */ -- *dirslash = '\0'; -- -- strcpy (zoneinfodir, ZONEINFO_DIRECTORY); -- while ((zislash = _mbschr (zoneinfodir, '/'))) { -- *zislash = '.'; -- strcpy (dirname, buffer); -- strcat (dirname, "/"); -- strcat (dirname, zislash + 1); -- if (stat (dirname, &st) == 0 && -- S_ISDIR (st.st_mode)) { -- cache = strdup (dirname); -- return cache; -- } -- } -- } -- return ZONEINFO_DIRECTORY; --#endif - } - - void set_zone_directory(char *path) ---- libical-0.44/src/libical/icaltz-util.c 2010-03-17 15:04:14.000000000 +0100 -+++ libical-0.44/src/libical/icaltz-util.c 2010-03-19 14:38:56.000000000 +0100 -@@ -41,6 +42,10 @@ - #include - #include - -+/** This is the filename of the file containing the city names and -+ coordinates of all the builtin timezones. */ -+#define ZONES_TAB_FILENAME "zones.tab" -+ - typedef struct - { - char ttisgmtcnt [4]; -@@ -53,7 +58,7 @@ - - static int r_pos [] = {1, 2, 3, -2, -1}; - --static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; -+static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo",PACKAGE_DATA_DIR "/zoneinfo"}; - static char *zdir = NULL; - - #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) -@@ -174,12 +179,24 @@ - return; - } - -+#ifdef _WIN32 -+char * get_zoneinfo_directory (void); -+#endif -+ - static void - set_zone_directory (void) - { - char file_path[PATH_MAX]; -- const char *fname = ZONES_TAB_SYSTEM_FILENAME; -+ -+#ifdef _WIN32 -+ const char *fname = ZONES_TAB_FILENAME; -+ -+ sprintf (file_path, "%s\\%s", get_zoneinfo_directory(), fname); -+ if (!access (file_path, F_OK|R_OK)) -+ zdir = strdup(get_zoneinfo_directory()); -+#else - int i; -+ const char *fname = ZONES_TAB_SYSTEM_FILENAME; - - for (i = 0;i < NUM_SEARCH_PATHS; i++) { - sprintf (file_path, "%s/%s", search_paths [i], fname); -@@ -188,6 +205,7 @@ - break; - } - } -+#endif - } - - diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libical-3-pthread.patch --- a/src/libical-3-pthread.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been made by: garethcoco@gmail.com - ---- libical-0.44/libical.pc.in 2011-02-02 15:33:11.363284126 -0500 -+++ libical-0.44/libical.pc.in 2011-02-02 15:32:44.202284263 -0500 -@@ -6,6 +6,6 @@ - Name: libical - Description: An implementation of basic iCAL protocols - Version: @VERSION@ --Libs: -L${libdir} -lical -licalss -licalvcal -+Libs: -L${libdir} -lical -licalss -licalvcal @PTHREAD_LIBS@ - Cflags: -I${includedir}/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libical.mk --- a/src/libical.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libical.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install - + cd '$(1)' && mkdir build + cd '$(1)/build' && cmake .. \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DSTATIC_LIBRARY=true \ + -DHAVE_PTHREAD_H=false \ + -DCMAKE_HAVE_PTHREAD_H=false + $(MAKE) -C '$(1)/build' -j '$(JOBS)' ical-header + $(MAKE) -C '$(1)/build' -j '$(JOBS)' + $(MAKE) -C '$(1)/build' -j 1 install + '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libical.exe' \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libiconv.mk --- a/src/libiconv.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libiconv.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libidn-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libidn-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libidn.mk --- a/src/libidn.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libidn.mk Mon Jan 02 11:29:26 2012 +0100 @@ -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 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --disable-csharp \ --prefix='$(PREFIX)/$(TARGET)' \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libircclient-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libircclient-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -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 /* fd_set */ + #else + #include +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 + #include +@@ -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 + #include + #include +@@ -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 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libircclient-test.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libircclient-test.cpp Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,16 @@ +/* This file is part of mingw-cross-env. */ +/* See doc/index.html for further information. */ + +#include + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + irc_callbacks_t callbacks; + memset(&callbacks, 0, sizeof(callbacks)); + + irc_create_session(&callbacks); + return 0; +} diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libircclient.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libircclient.mk Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,43 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +# libircclient +# Note that IPv6 support is partly broken and therefore disabled. +PKG := libircclient +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.3 +$(PKG)_CHECKSUM := 19b01d0227e717b58630037131798ee34fb0b414 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://sourceforge.net/projects/$(PKG)/ +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + wget -q -O- 'http://sourceforge.net/projects/libircclient/files/libircclient/' | \ + $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --prefix='$(PREFIX)/$(TARGET)' \ + --host='$(TARGET)' \ + --disable-debug \ + --enable-threads \ + --disable-ipv6 + $(MAKE) -C '$(1)'/src -j '$(JOBS)' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/src/libircclient.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libircclient.h' '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_errors.h' '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_events.h' '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_rfcnumeric.h' '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_options.h' '$(PREFIX)/$(TARGET)/include/libircclient' + + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-libircclient.exe' \ + -lircclient -lws2_32 +endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libmikmod.mk --- a/src/libmikmod.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libmikmod.mk Mon Jan 02 11:29:26 2012 +0100 @@ -29,6 +29,7 @@ ./configure \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-esd $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libmng-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libmng-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,32 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From 1a94342a8f86ab72b8d6c24b8ecd974d2821be04 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Thu, 3 Nov 2011 14:40:24 +0100 +Subject: [PATCH] add pkg-config file + + +diff --git a/libmng.pc.in b/libmng.pc.in +new file mode 100644 +index 0000000..1dfc9fa +--- /dev/null ++++ b/libmng.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: libmng ++Description: The MNG library. ++Version: @VERSION@ ++Libs: -L${libdir} -lmng ++Libs.private: @mng_libs_private@ ++Cflags: -I${includedir} ++Requires.private: @mng_requires_private@ +-- +1.7.7 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libmng.mk --- a/src/libmng.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libmng.mk Mon Jan 02 11:29:26 2012 +0100 @@ -27,4 +27,10 @@ $(INSTALL) -m644 '$(1)/libmng.a' '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' $(INSTALL) -m644 '$(1)/libmng.h' '$(1)/libmng_conf.h' '$(1)/libmng_types.h' '$(PREFIX)/$(TARGET)/include/' + $(SED) -e 's^@prefix@^$(PREFIX)/$(TARGET)^;' \ + -e 's^@VERSION@^$(libmng_VERSION)^;' \ + -e 's^@mng_libs_private@^-ljpeg^;' \ + -e 's^@mng_requires_private@^lcms zlib^;' \ + < '$(1)/libmng.pc.in' > '$(1)/libmng.pc' + $(INSTALL) -m644 '$(1)/libmng.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libntlm.mk --- a/src/libntlm.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libntlm.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # Libntlm PKG := libntlm $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2 -$(PKG)_CHECKSUM := 27538a3375690a37574fa991fbd327d150d8b505 +$(PKG)_VERSION := 1.3 +$(PKG)_CHECKSUM := 5dd798d5fb9a75656225052aa88ceb9befbbd4a0 $(PKG)_SUBDIR := libntlm-$($(PKG)_VERSION) $(PKG)_FILE := libntlm-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.nongnu.org/libntlm/ @@ -20,10 +20,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 6e83c7eb0945 -r d9e4f3b2002a src/liboauth.mk --- a/src/liboauth.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/liboauth.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # liboauth PKG := liboauth $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.4 -$(PKG)_CHECKSUM := 9c48dcfe9bb2f7b0fa4825e645056bdf77640454 +$(PKG)_VERSION := 0.9.6 +$(PKG)_CHECKSUM := 9182ca5d7e127589d132377b807d0c8a8878b122 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://liboauth.sourceforge.net/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libpano13.mk --- a/src/libpano13.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libpano13.mk Mon Jan 02 11:29:26 2012 +0100 @@ -32,6 +32,7 @@ --with-jpeg='$(PREFIX)/$(TARGET)'/lib \ --with-tiff='$(PREFIX)/$(TARGET)'/lib \ --with-png='$(PREFIX)/$(TARGET)'/lib \ - --with-zlib='$(PREFIX)/$(TARGET)'/lib + --with-zlib='$(PREFIX)/$(TARGET)'/lib \ + LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libpng.mk --- a/src/libpng.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libpng.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # libpng PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.2 -$(PKG)_CHECKSUM := 50243a46c4745b39e7fcda7a39f498f38e084ad6 +$(PKG)_VERSION := 1.5.7 +$(PKG)_CHECKSUM := 534ba6b97f0a14eea83f197beb2d60648392c25c $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_WEBSITE := http://www.libpng.org/ @@ -20,7 +20,7 @@ grep -v alpha | \ grep -v beta | \ grep -v rc | \ - grep -v '^1\.4\.' | \ + grep -v '^1\.[1-4]\.' | \ head -1 endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/librsvg.mk --- a/src/librsvg.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/librsvg.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # librsvg PKG := librsvg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.34.0 -$(PKG)_CHECKSUM := 59e01568a6b201fc45828a76b942f790859cddeb +$(PKG)_VERSION := 2.34.2 +$(PKG)_CHECKSUM := 75d0da1136c2c515161799b5dd9d903ed34e552c $(PKG)_SUBDIR := librsvg-$($(PKG)_VERSION) $(PKG)_FILE := librsvg-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://librsvg.sourceforge.net/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libsamplerate.mk --- a/src/libsamplerate.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libsamplerate.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # libsamplerate PKG := libsamplerate $(PKG)_IGNORE := -$(PKG)_VERSION := 0.1.7 -$(PKG)_CHECKSUM := f3f803ec5feae5a3fdb0fa3937277669e854386e +$(PKG)_VERSION := 0.1.8 +$(PKG)_CHECKSUM := e5fe82c4786be2fa33ca6bd4897db4868347fe70 $(PKG)_SUBDIR := libsamplerate-$($(PKG)_VERSION) $(PKG)_FILE := libsamplerate-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.mega-nerd.com/SRC/ @@ -21,10 +21,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - #$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libsigc++.mk --- a/src/libsigc++.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libsigc++.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # libsigc++ PKG := libsigc++ $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.9 -$(PKG)_CHECKSUM := ce3bc95c66feda3ed124197d325902f09ea5cdf9 +$(PKG)_VERSION := 2.2.10 +$(PKG)_CHECKSUM := 240d3e0a02e764a6362f6ce1b32de71401e50844 $(PKG)_SUBDIR := libsigc++-$($(PKG)_VERSION) $(PKG)_FILE := libsigc++-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://libsigc.sourceforge.net/ @@ -20,11 +20,9 @@ endef define $(PKG)_BUILD - # cross build - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ CXX='$(TARGET)-c++' \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libsndfile.mk --- a/src/libsndfile.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libsndfile.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # libsndfile PKG := libsndfile $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.24 -$(PKG)_CHECKSUM := ade2dad272b52f61bb58aca3a4004b28549ee0f8 +$(PKG)_VERSION := 1.0.25 +$(PKG)_CHECKSUM := e95d9fca57f7ddace9f197071cbcfb92fa16748e $(PKG)_SUBDIR := libsndfile-$($(PKG)_VERSION) $(PKG)_FILE := libsndfile-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.mega-nerd.com/libsndfile/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libssh2-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libssh2-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,19 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +diff -Naur libssh2-1.3.0.orig/include/libssh2.h libssh2-1.3.0/include/libssh2.h +--- libssh2-1.3.0.orig/include/libssh2.h 2011-09-06 15:56:34.000000000 -0500 ++++ libssh2-1.3.0/include/libssh2.h 2011-10-17 10:10:13.000000000 -0500 +@@ -88,8 +88,8 @@ + extern "C" { + #endif + #ifdef _WIN32 +-# include +-# include ++# include ++# include + #endif + + #include diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libssh2-test.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libssh2-test.c Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,15 @@ +/* This file is part of mingw-cross-env. */ +/* See doc/index.html for further information. */ + +#include +#include + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + libssh2_init(0); + printf("libssh2 version: %s", libssh2_version(0) ); + libssh2_exit(); + return 0; +} diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libssh2.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libssh2.mk Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,37 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +# libssh2 +PKG := libssh2 +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.3.0 +$(PKG)_CHECKSUM := d342e06abe38a29b1bbb9c58d50dd093eab0bee9 +$(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) +$(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://www.libssh2.org +$(PKG)_URL := http://www.libssh2.org/download/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libgcrypt zlib + +define $(PKG)_UPDATE + wget -q -O- 'http://www.libssh2.org/download/?C=M;O=D' | \ + grep 'libssh2-' | \ + $(SED) -n 's,.*libssh2-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' \ + --without-openssl \ + --with-libgcrypt \ + PKG_CONFIG='$(TARGET)-pkg-config' \ + LIBS="-lgcrypt `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs`" + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libssh2.exe' \ + `'$(TARGET)-pkg-config' --cflags --libs libssh2` +endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libtool.mk --- a/src/libtool.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libtool.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # GNU Libtool PKG := libtool $(PKG)_IGNORE := -$(PKG)_VERSION := 2.4 -$(PKG)_CHECKSUM := 149e9d7a993b643d13149a94d07bbca1085e601c +$(PKG)_VERSION := 2.4.2 +$(PKG)_CHECKSUM := 22b71a8b5ce3ad86e1094e7285981cae10e6ff88 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.gnu.org/software/$(PKG)/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libusb.mk --- a/src/libusb.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libusb.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # LibUsb PKG := libusb $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.4.0 -$(PKG)_CHECKSUM := 9a0959a9a4fc537553786dd38207663e974ac6f1 +$(PKG)_VERSION := 1.2.5.0 +$(PKG)_CHECKSUM := a1b1a23f4f1d7dd42e2a861e69d32cdbcea7b879 $(PKG)_SUBDIR := $(PKG)-win32-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-win32-src-$($(PKG)_VERSION).zip $(PKG)_WEBSITE := http://libusb-win32.sourceforge.net/ @@ -33,7 +33,7 @@ --output-lib libusb.a $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/src/usb.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m644 '$(1)/src/lusb0_usb.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' $(INSTALL) -m644 '$(1)/libusb.a' '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -m644 '$(1)/libusbd.a' '$(PREFIX)/$(TARGET)/lib/' diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libvpx.mk --- a/src/libvpx.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/libvpx.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # vpx PKG := libvpx $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.6 -$(PKG)_CHECKSUM := a3522bd2b73d52381ba767ded1cbf4760e9cc6f8 +$(PKG)_VERSION := 0.9.7-p1 +$(PKG)_CHECKSUM := dacfefaf3363f781de43858f09cdd0b0d469e6fc $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://code.google.com/p/webm/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/libxml++.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libxml++.mk Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,30 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +# libxml2 +PKG := libxml++ +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.34.2 +$(PKG)_CHECKSUM := 466740a4d384ea5eefc1adbcae95e7c723a74038 +$(PKG)_SUBDIR := libxml++-$($(PKG)_VERSION) +$(PKG)_FILE := libxml++-$($(PKG)_VERSION).tar.bz2 +$(PKG)_WEBSITE := http://libxmlplusplus.sourceforge.net/ +$(PKG)_URL := http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libxml2 glibmm + +define $(PKG)_UPDATE + wget -q -O- 'http://git.gnome.org/browse/libxml++/refs/tags' | \ + grep ']*\)\.tar.*,\1,p' | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= +endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/mingw-utils.mk --- a/src/mingw-utils.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/mingw-utils.mk Mon Jan 02 11:29:26 2012 +0100 @@ -9,11 +9,11 @@ $(PKG)_SUBDIR := $(PKG)-$(word 1,$(subst -, ,$($(PKG)_VERSION))) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-mingw32-src.tar.lzma $(PKG)_WEBSITE := http://www.mingw.org/ -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Utilities/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Extension/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Utilities/mingw-utils/' | \ + wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Extension/mingw-utils/' | \ $(SED) -n 's,.*mingw-utils-\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/mingwrt-1-float.patch --- a/src/mingwrt-1-float.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 -http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html - -diff -urN a/include/float.h b/include/float.h ---- a/include/float.h 2010-03-07 04:31:41.000000000 +0100 -+++ b/include/float.h 2010-06-05 12:29:08.899723741 +0200 -@@ -16,8 +16,6 @@ - * - */ - --#include_next -- - #ifndef _MINGW_FLOAT_H_ - #define _MINGW_FLOAT_H_ - diff -r 6e83c7eb0945 -r d9e4f3b2002a src/mingwrt.mk --- a/src/mingwrt.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/mingwrt.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,16 +4,16 @@ # MinGW Runtime PKG := mingwrt $(PKG)_IGNORE := -$(PKG)_VERSION := 3.18 -$(PKG)_CHECKSUM := 0c562f3b6a89f376b9edba48ccd7388c535f8c8d +$(PKG)_VERSION := 3.20 +$(PKG)_CHECKSUM := 7c63f3695968054b7236282f35562bb3a2c388d4 $(PKG)_SUBDIR := . $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-mingw32-dev.tar.gz $(PKG)_WEBSITE := http://www.mingw.org/ -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Base/mingw-rt/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := define $(PKG)_UPDATE - wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/' | \ + wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/' | \ $(SED) -n 's,.*mingwrt-\([0-9][^"]*\)/".*,\1,p' | \ head -1 endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/mpfr.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mpfr.mk Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,34 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +# mpfr +PKG := mpfr +$(PKG)_IGNORE := +$(PKG)_VERSION := 3.1.0 +$(PKG)_CHECKSUM := 9ba6dfe62dad298f0570daf182db31660f7f016c +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_WEBSITE := http://www.mpfr.org/ +$(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) +$(PKG)_URL_2 := http://www.mpfr.org/mpfr-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc gmp + +define $(PKG)_UPDATE + wget -q -O- 'http://www.mpfr.org/mpfr-current/#download' | \ + grep 'mpfr-' | \ + $(SED) -n 's,.*mpfr-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --enable-static \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' \ + --enable-threads=win32 \ + --with-gmp-include='$(PREFIX)/$(TARGET)/include/' + --with-gmp-lib='$(PREFIX)/$(TARGET)/lib/' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/mxml.mk --- a/src/mxml.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/mxml.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # Mini-XML PKG := mxml $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6 -$(PKG)_CHECKSUM := df180bd2e3890c97fa8a05dd131f9285468cffe1 +$(PKG)_VERSION := 2.7 +$(PKG)_CHECKSUM := a3bdcab48307794c297e790435bcce7becb9edae $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.minixml.org/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/nettle.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/nettle.mk Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,28 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +# nettle +PKG := nettle +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.4 +$(PKG)_CHECKSUM := 1df0cd013e83f73b78a5521411a67e331de3dfa6 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://www.lysator.liu.se/~nisse/nettle/ +$(PKG)_URL := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE) +$(PKG)_DEPS := gcc gmp + +define $(PKG)_UPDATE + wget -q -O- 'http://www.lysator.liu.se/~nisse/archive/' | \ + $(SED) -n 's,.*nettle-\([0-9][^>]*\)\.tar.*,\1,p' | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --enable-static \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/ogg.mk --- a/src/ogg.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/ogg.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # OGG PKG := ogg $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.2 -$(PKG)_CHECKSUM := deeb1959f84de9277e74bca17ec66fa20ced9f08 +$(PKG)_VERSION := 1.3.0 +$(PKG)_CHECKSUM := a900af21b6d7db1c7aa74eb0c39589ed9db991b8 $(PKG)_SUBDIR := libogg-$($(PKG)_VERSION) $(PKG)_FILE := libogg-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.xiph.org/ogg/ @@ -19,10 +19,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 6e83c7eb0945 -r d9e4f3b2002a src/opencsg-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opencsg-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,46 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From 71c4f0a34399fd74d4e39f9985a4c2c56f8b9a43 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Sat, 22 Oct 2011 01:29:03 +0200 +Subject: [PATCH] configure for mingw-cross-env + + +diff --git a/example/example.pro b/example/example.pro +index 8891a28..02c1fe0 100644 +--- a/example/example.pro ++++ b/example/example.pro +@@ -1,10 +1,11 @@ + TEMPLATE = app + TARGET = opencsgexample + +-CONFIG += opengl warn_on release ++CONFIG += opengl warn_on release link_pkgconfig + INCLUDEPATH += ../glew/include ../include + +-LIBS += -L../lib -lopencsg -lglut -L../glew/lib -lGLEW ++LIBS += -L../lib -lopencsg ++PKGCONFIG += glew glut + + HEADERS = displaylistPrimitive.h + SOURCES = displaylistPrimitive.cpp main.cpp +diff --git a/src/src.pro b/src/src.pro +index db5e1fb..4c664ab 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -3,7 +3,8 @@ TARGET = opencsg + VERSION = 1.3.1 + DESTDIR = ../lib + +-CONFIG += opengl warn_on release ++CONFIG += opengl warn_on release staticlib link_pkgconfig ++PKGCONFIG += glew glut + INCLUDEPATH += ../include ../glew/include ../ + + HEADERS = ../include/opencsg.h \ +-- +1.7.7 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/opencsg.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opencsg.mk Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,31 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +# opencsg +PKG := opencsg +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.3.2 +$(PKG)_CHECKSUM := e2b4abf169ae3e319eb5f6d9ae6136fa96710a05 +$(PKG)_SUBDIR := OpenCSG-$($(PKG)_VERSION) +$(PKG)_FILE := OpenCSG-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://www.opencsg.org/ +$(PKG)_URL := http://www.opencsg.org/$($(PKG)_FILE) +$(PKG)_DEPS := gcc freeglut glew qt + +define $(PKG)_UPDATE + wget -q -O- 'http://www.opencsg.org/#download' | \ + grep 'OpenCSG-' | \ + $(SED) -n 's,.*OpenCSG-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)/src' && '$(TARGET)-qmake' src.pro + $(MAKE) -C '$(1)/src' -j '$(JOBS)' + $(INSTALL) -m644 '$(1)/include/opencsg.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m644 '$(1)/lib/libopencsg.a' '$(PREFIX)/$(TARGET)/lib/' + + cd '$(1)/example' && '$(TARGET)-qmake' example.pro + $(MAKE) -C '$(1)/example' -j '$(JOBS)' + $(INSTALL) -m755 '$(1)/example/release/opencsgexample.exe' '$(PREFIX)/$(TARGET)/bin/test-opencsg.exe' +endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/openexr-1-disable-zlib_winapi.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openexr-1-disable-zlib_winapi.patch Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,25 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -urN a/IlmImf/ImfPxr24Compressor.cpp b/IlmImf/ImfPxr24Compressor.cpp +--- a/IlmImf/ImfPxr24Compressor.cpp 2010-07-17 01:11:52.000000000 +0200 ++++ b/IlmImf/ImfPxr24Compressor.cpp 2011-09-21 23:41:28.130452657 +0200 +@@ -62,7 +62,6 @@ + // string of bytes is compressed with zlib. + // + //----------------------------------------------------------------------------- +-#define ZLIB_WINAPI + + #include + #include +diff -urN a/IlmImf/ImfZipCompressor.cpp b/IlmImf/ImfZipCompressor.cpp +--- a/IlmImf/ImfZipCompressor.cpp 2010-07-17 01:11:52.000000000 +0200 ++++ b/IlmImf/ImfZipCompressor.cpp 2011-09-21 23:42:01.154288691 +0200 +@@ -39,7 +39,6 @@ + // class ZipCompressor + // + //----------------------------------------------------------------------------- +-#define ZLIB_WINAPI + + #include + #include diff -r 6e83c7eb0945 -r d9e4f3b2002a src/openexr.mk --- a/src/openexr.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/openexr.mk Mon Jan 02 11:29:26 2012 +0100 @@ -24,7 +24,9 @@ cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,ilmbase) $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/ilmbase-*.patch)), (cd '$(1)/$(ilmbase_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) + echo 'echo $1' > '$(1)/$(ilmbase_SUBDIR)/config.sub' cd '$(1)/$(ilmbase_SUBDIR)' && $(SHELL) ./configure \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(1)/ilmbase' \ --enable-threading=no \ @@ -32,10 +34,9 @@ CONFIG_SHELL=$(SHELL) $(MAKE) -C '$(1)/$(ilmbase_SUBDIR)' -j '$(JOBS)' install \ bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-threading \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/openscenegraph-1-static.patch --- a/src/openscenegraph-1-static.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - ---- OpenSceneGraph-2.8.2.orig/src/osgPlugins/exr/ReaderWriterEXR.cpp 2008-11-27 10:36:18.000000000 +0100 -+++ OpenSceneGraph-2.8.2/src/osgPlugins/exr/ReaderWriterEXR.cpp 2010-01-26 21:36:31.000000000 +0100 -@@ -4,7 +4,7 @@ - #include - #include - --#ifdef _WIN32 -+#if defined _WIN32 && !defined OSG_LIBRARY_STATIC - //Make the half format work against openEXR libs - #define OPENEXR_DLL - #endif diff -r 6e83c7eb0945 -r d9e4f3b2002a src/openscenegraph-2-no-asprintf.patch --- a/src/openscenegraph-2-no-asprintf.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -urN a/src/osgPlugins/xine/ReaderWriterXine.cpp b/src/osgPlugins/xine/ReaderWriterXine.cpp ---- a/src/osgPlugins/xine/ReaderWriterXine.cpp 2010-03-13 11:38:10.000000000 +0100 -+++ b/src/osgPlugins/xine/ReaderWriterXine.cpp 2010-04-28 22:54:29.203481468 +0200 -@@ -326,9 +326,8 @@ - const char* user_home = xine_get_homedir(); - if(user_home) - { -- char* cfgfile = NULL; -- int result = asprintf(&(cfgfile), "%s/.xine/config", user_home); -- if (result>0) xine_config_load(_xine, cfgfile); -+ std::string configFile(std::string(user_home)+"/.xine/config"); -+ xine_config_load(_xine, configFile.c_str()); - } - - xine_init(_xine); diff -r 6e83c7eb0945 -r d9e4f3b2002a src/openscenegraph-3-pkg-config.patch --- a/src/openscenegraph-3-pkg-config.patch Mon Jan 02 11:28:35 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,368 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -uNr OpenSceneGraph-2.8.3.orig/CMakeLists.txt OpenSceneGraph-2.8.3/CMakeLists.txt ---- OpenSceneGraph-2.8.3.orig/CMakeLists.txt 2010-04-01 11:02:54.000000000 +0200 -+++ OpenSceneGraph-2.8.3/CMakeLists.txt 2010-04-20 07:41:05.000000000 +0200 -@@ -802,12 +802,34 @@ - - # Generate pkg-config configuration file - --CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph.pc.in -- ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc -+SET(PKGCONFIG_FILES -+ openscenegraph -+ openscenegraph-osg -+ openscenegraph-osgDB -+ openscenegraph-osgFX -+ openscenegraph-osgGA -+ openscenegraph-osgParticle -+ openscenegraph-osgSim -+ openscenegraph-osgText -+ openscenegraph-osgUtil -+ openscenegraph-osgTerrain -+ openscenegraph-osgManipulator -+ openscenegraph-osgViewer -+ openscenegraph-osgWidget -+ openscenegraph-osgShadow -+ openscenegraph-osgAnimation -+ openscenegraph-osgVolume -+ openscenegraph-osgIntrospection -+ openscenegraph-osgPlugins -+) -+ -+FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES}) -+ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc.in -+ ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc - @ONLY - ) -- --INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) -+ INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) -+ENDFOREACH(PKGCONFIG_FILE) - - # Run this as late as possible so users can easier spot the message - IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local") -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgAnimation -+Description: Skinning and morphing library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osg openscenegraph-osgText openscenegraph-osgGA openscenegraph-osgViewer openthreads -+Conflicts: -+Libs: -L${libdir} -losgAnimation -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgDB.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgDB.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgDB.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgDB.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgDB -+Description: File format reading library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgDB -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgFX.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgFX.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgFX.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgFX.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgFX -+Description: Special effects library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgFX -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgGA.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgGA.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgGA.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgGA.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgGA -+Description: GUI event library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgGA -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgIntrospection -+Description: Introspection library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgIntrospection -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgManipulator.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgManipulator -+Description: Manipulator library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgUtil openscenegraph-osgGA openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgManipulator -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgParticle.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgParticle.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgParticle.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgParticle.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgParticle -+Description: Particle system library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgParticle -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osg.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osg.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osg.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osg.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osg -+Description: 3D scenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openthreads -+Conflicts: -+Libs: -L${libdir} -losg -+Libs.private: -lglu32 -lopengl32 -+Cflags: -I${includedir} -DOSG_LIBRARY_STATIC -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgPlugins.pc.in 2010-01-17 18:59:13.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgPlugins -+Description: Plugins for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgParticle openscenegraph-osgWidget openscenegraph-osgVolume openscenegraph-osgShadow openscenegraph-osgTerrain openscenegraph-osgFX openscenegraph-osgSim openscenegraph-osgText openscenegraph-osgAnimation openscenegraph-osgViewer openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads -+Conflicts: -+Libs: -+Libs.private: -L${libdir}/osgPlugins-@OPENSCENEGRAPH_VERSION@ -losgdb_3dc -losgdb_3ds -losgdb_ac -losgdb_bmp -losgdb_bsp -losgdb_bvh -losgdb_cfg -losgdb_curl -losgdb_dds -losgdb_dot -losgdb_dw -losgdb_dxf -losgdb_exr -losgdb_freetype -losgdb_gdal -losgdb_geo -losgdb_gif -losgdb_glsl -losgdb_gz -losgdb_hdr -losgdb_ive -losgdb_jp2 -losgdb_jpeg -losgdb_logo -losgdb_lwo -losgdb_lws -losgdb_md2 -losgdb_mdl -losgdb_normals -losgdb_obj -losgdb_ogr -losgdb_openflight -losgdb_osg -losgdb_osga -losgdb_osganimation -losgdb_osgfx -losgdb_osgparticle -losgdb_osgshadow -losgdb_osgsim -losgdb_osgterrain -losgdb_osgtext -losgdb_osgtgz -losgdb_osgviewer -losgdb_osgvolume -losgdb_osgwidget -losgdb_pic -losgdb_png -losgdb_pnm -losgdb_rgb -losgdb_rot -losgdb_scale -losgdb_shp -losgdb_stl -losgdb_tga -losgdb_tgz -losgdb_tiff -losgdb_trans -losgdb_txf -losgdb_txp -losgdb_vtf -losgdb_x -losgdb_zip -lcurl -lgnutls -lgcrypt -lgpg-error -lidn -lIlmImf -lHalf -lImath -lIlmThread -lIex -lfreetype -lgdal -ltiff -lgif -ljasper -ljpeg -lpng -liconv -lz -lws2_32 -lwinmm -lwldap32 -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgShadow.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgShadow.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgShadow.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgShadow.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgShadow -+Description: Shadow techniques library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgShadow -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgSim.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgSim.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgSim.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgSim.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgSim -+Description: Simulator utility library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgText openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgSim -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgTerrain.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgTerrain -+Description: Terrain library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgTerrain -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgText.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgText.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgText.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgText.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgText -+Description: Text rendering library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgDB openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgText -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgUtil.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgUtil.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgUtil.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgUtil.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgUtil -+Description: Utility library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgUtil -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgViewer.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgViewer.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgViewer.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgViewer.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgViewer -+Description: Windowing system setup, thread scene manager library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgText openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osgGA openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgViewer -+Libs.private: -lgdi32 -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgVolume.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgVolume.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgVolume.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgVolume.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgVolume -+Description: Volume library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgUtil openscenegraph-osgDB openscenegraph-osgGA openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgVolume -+Libs.private: -+Cflags: -I${includedir} -diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgWidget.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgWidget.pc.in ---- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgWidget.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgWidget.pc.in 2010-01-17 16:58:31.000000000 +0100 -@@ -0,0 +1,15 @@ -+# pkg-config source file -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib@LIB_POSTFIX@ -+includedir=${prefix}/include -+ -+Name: openscenegraph-osgWidget -+Description: Windowing toolkit library for Openscenegraph -+Version: @OPENSCENEGRAPH_VERSION@ -+Requires: openscenegraph-osgText openscenegraph-osgViewer openscenegraph-osgDB openscenegraph-osgGA openscenegraph-osg openthreads -+Conflicts: -+Libs: -L${libdir} -losgWidget -+Libs.private: -+Cflags: -I${includedir} diff -r 6e83c7eb0945 -r d9e4f3b2002a src/openscenegraph.mk --- a/src/openscenegraph.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/openscenegraph.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,14 +4,14 @@ # OpenSceneGraph PKG := openscenegraph $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.4 -$(PKG)_CHECKSUM := 356ecd39f7e714dabb6776e23303fe3f1798a7cf +$(PKG)_VERSION := 3.0.1 +$(PKG)_CHECKSUM := 13c7e39f6d62047ad944d8d28a0f0eb60384ce33 $(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION) $(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip $(PKG)_WEBSITE := http://www.openscenegraph.org/ $(PKG)_URL := http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$($(PKG)_VERSION)/source/$($(PKG)_FILE) $(PKG)_URL_2 := http://distfiles.macports.org/OpenSceneGraph/$($(PKG)_FILE) -$(PKG)_DEPS := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib +$(PKG)_DEPS := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib dcmtk qt define $(PKG)_UPDATE wget -q -O- 'http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/tags?order=date&desc=1' | \ @@ -30,5 +30,5 @@ -DDYNAMIC_OPENSCENEGRAPH=OFF \ -DBUILD_OSG_APPLICATIONS=OFF \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 - $(MAKE) -C '$(1)' -j '$(JOBS)' install + $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/openssl.mk --- a/src/openssl.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/openssl.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # openssl PKG := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.0d -$(PKG)_CHECKSUM := 32ca934f380a547061ddab7221b1a34e4e07e8d5 +$(PKG)_VERSION := 1.0.0e +$(PKG)_CHECKSUM := 235eb68e5a31b0f7a23bc05f52d7a39c596e2e69 $(PKG)_SUBDIR := openssl-$($(PKG)_VERSION) $(PKG)_FILE := openssl-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.openssl.org/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/pango-1-fixes.patch --- a/src/pango-1-fixes.patch Mon Jan 02 11:28:35 2012 +0100 +++ b/src/pango-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -3,17 +3,17 @@ Contains ad hoc patches for cross building. -From ed3371ed8a13f169cfd1920ecc794b30bb69cc0b Mon Sep 17 00:00:00 2001 +From 987d02305fd8187bd10bfd292db38f7da705a7f3 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Wed, 29 Sep 2010 00:52:59 +0200 -Subject: [PATCH 1/5] s,DllMain,static _disabled_DllMain, +Subject: [PATCH 1/4] s,DllMain,static _disabled_DllMain, diff --git a/pango/pango-utils.c b/pango/pango-utils.c -index 100dbc7..f60be42 100644 +index 44ec353..72e13f1 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c -@@ -657,12 +657,12 @@ pango_config_key_get (const char *key) +@@ -658,12 +658,12 @@ pango_config_key_get (const char *key) #ifdef G_OS_WIN32 @@ -29,20 +29,20 @@ LPVOID lpvReserved) { -- -1.7.1 +1.7.7.3 -From b33f70af495cdaddab9ddccd79aef777e005bb85 Mon Sep 17 00:00:00 2001 +From f0c5d358e54fd9d69133eeff972fdb05592789f3 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Wed, 29 Sep 2010 00:55:07 +0200 -Subject: [PATCH 2/5] static, not shared +Subject: [PATCH 2/4] static, not shared diff --git a/configure b/configure -index 352c9c4..a78ace5 100755 +index fb173ce..beb3290 100755 --- a/configure +++ b/configure -@@ -5942,9 +5942,9 @@ if test "${enable_static+set}" = set; then : +@@ -5832,9 +5832,9 @@ if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -54,7 +54,7 @@ # Look at the argument we got. We use all the common list separators. lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do -@@ -5957,7 +5957,7 @@ if test "${enable_static+set}" = set; then : +@@ -5847,7 +5847,7 @@ if test "${enable_static+set}" = set; then : ;; esac else @@ -63,7 +63,7 @@ fi -@@ -5971,15 +5971,15 @@ fi +@@ -5861,15 +5861,15 @@ fi if test "$pango_os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -85,7 +85,7 @@ fi case `pwd` in -@@ -8969,7 +8969,7 @@ fi +@@ -8968,7 +8968,7 @@ func_stripname_cnf () if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in @@ -94,7 +94,7 @@ no) enable_shared=no ;; *) enable_shared=no -@@ -8978,14 +8978,14 @@ if test "${enable_shared+set}" = set; then : +@@ -8977,14 +8977,14 @@ if test "${enable_shared+set}" = set; then : for pkg in $enableval; do IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then @@ -111,7 +111,7 @@ fi -@@ -12572,7 +12572,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } +@@ -12848,7 +12848,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } # are all built from PIC. case $host_os in aix3*) @@ -120,7 +120,7 @@ if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' -@@ -12581,7 +12581,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } +@@ -12857,7 +12857,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } aix[4-9]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then @@ -130,20 +130,20 @@ ;; esac -- -1.7.1 +1.7.7.3 -From 4601f723ef49c010656ef800ce705cd8677833d4 Mon Sep 17 00:00:00 2001 +From 08292532296e3a0f135f6bcd683851d2f41836c6 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Wed, 29 Sep 2010 00:57:12 +0200 -Subject: [PATCH 3/5] no pango-querymodules +Subject: [PATCH 3/4] no pango-querymodules diff --git a/modules/Makefile.in b/modules/Makefile.in -index 0d48e08..df71e02 100644 +index 49813f7..afc29c5 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in -@@ -643,7 +643,7 @@ uninstall-am: uninstall-local +@@ -647,7 +647,7 @@ uninstall-am: uninstall-local @CROSS_COMPILING_FALSE@all-local: pango.modules @@ -153,45 +153,13 @@ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ -- -1.7.1 - - -From 53bd7d3d3a83e40eb7d02568b560840ceadd7c0a Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 29 Sep 2010 00:58:13 +0200 -Subject: [PATCH 4/5] wine workaround s,^install-data-local:.*,install-data-local:, +1.7.7.3 -diff --git a/configure b/configure -index a78ace5..92b1334 100755 ---- a/configure -+++ b/configure -@@ -694,7 +694,7 @@ ac_default_prefix=/usr/local - ac_clean_files= - ac_config_libobj_dir=. - LIBOBJS= --cross_compiling=no -+cross_compiling=yes - subdirs= - MFLAGS= - MAKEFLAGS= -@@ -3873,7 +3873,7 @@ $as_echo "$ac_try_echo"; } >&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then -- cross_compiling=no -+ cross_compiling=yes - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes --- -1.7.1 - - -From ccd472e0aee0109932e261eb1f7d9d24bbf1870c Mon Sep 17 00:00:00 2001 +From c646ee7869c20a1e093f63ec8de8e83e7ca88b27 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Wed, 29 Sep 2010 00:50:08 +0200 -Subject: [PATCH 5/5] add missing lib to pango.pc for static linking +Subject: [PATCH 4/4] add missing lib to pango.pc for static linking diff --git a/pango.pc.in b/pango.pc.in @@ -206,5 +174,5 @@ +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10 Cflags: -I${includedir}/pango-1.0 -- -1.7.1 +1.7.7.3 diff -r 6e83c7eb0945 -r d9e4f3b2002a src/pango.mk --- a/src/pango.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/pango.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # Pango PKG := pango $(PKG)_IGNORE := -$(PKG)_VERSION := 1.28.4 -$(PKG)_CHECKSUM := e715954a5a3b358889d15b6235e1965303dbb622 +$(PKG)_VERSION := 1.29.3 +$(PKG)_CHECKSUM := 467a3dacc0f3173e6fd457524b9ccd9772039a62 $(PKG)_SUBDIR := pango-$($(PKG)_VERSION) $(PKG)_FILE := pango-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.pango.org/ @@ -22,6 +22,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-gtk-doc \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/pangomm.mk --- a/src/pangomm.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/pangomm.mk Mon Jan 02 11:29:26 2012 +0100 @@ -20,10 +20,9 @@ endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE) diff -r 6e83c7eb0945 -r d9e4f3b2002a src/pcre.mk --- a/src/pcre.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/pcre.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # PCRE PKG := pcre $(PKG)_IGNORE := -$(PKG)_VERSION := 8.12 -$(PKG)_CHECKSUM := 2219b372bff53ee29a7e44ecf5977ad15df01cea +$(PKG)_VERSION := 8.21 +$(PKG)_CHECKSUM := 52abf655d94f5208377258ffff27c7b35c53af39 $(PKG)_SUBDIR := pcre-$($(PKG)_VERSION) $(PKG)_FILE := pcre-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.pcre.org/ @@ -21,10 +21,9 @@ define $(PKG)_BUILD $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcre.h.in' $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h' - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-utf8 \ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/pfstools.mk --- a/src/pfstools.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/pfstools.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # pfstools PKG := pfstools $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.3 -$(PKG)_CHECKSUM := b13d1863944afc4a88eb6ec92954677995399ab7 +$(PKG)_VERSION := 1.8.5 +$(PKG)_CHECKSUM := dc595438f0fd8b40a05d9f9c498892363a1b3f05 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://$(PKG).sourceforge.net/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/pixman.mk --- a/src/pixman.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/pixman.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,8 +4,8 @@ # pixman PKG := pixman $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.8 -$(PKG)_CHECKSUM := fe0118cc00c266e364bf391b839ebaadd42d1692 +$(PKG)_VERSION := 0.23.8 +$(PKG)_CHECKSUM := 2e29552bde39683d37dbfd079c1ffd3103a3d12a $(PKG)_SUBDIR := pixman-$($(PKG)_VERSION) $(PKG)_FILE := pixman-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://cairographics.org/ diff -r 6e83c7eb0945 -r d9e4f3b2002a src/postgresql-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/postgresql-1-fixes.patch Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,59 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From 778910e8d10e548c50abe80342490b8725ea6244 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Mon, 24 Oct 2011 14:02:33 +0200 +Subject: [PATCH 1/2] use unix style names for openssl on mingw-cross-env + + +diff --git a/configure.in b/configure.in +index 79b565d..db30511 100644 +--- a/configure.in ++++ b/configure.in +@@ -941,13 +941,8 @@ fi + + if test "$with_openssl" = yes ; then + dnl Order matters! +- if test "$PORTNAME" != "win32"; then +- AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) +- AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) +- else +- AC_CHECK_LIB(eay32, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'eay32' is required for OpenSSL])]) +- AC_CHECK_LIB(ssleay32, SSL_library_init, [], [AC_MSG_ERROR([library 'ssleay32' is required for OpenSSL])]) +- fi ++ AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) ++ AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) + fi + + if test "$with_pam" = yes ; then +-- +1.7.7 + + +From ebeea4b87a1b11205b5870e738882117ad0f628c Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Mon, 24 Oct 2011 14:09:38 +0200 +Subject: [PATCH 2/2] do not check autoconf version + + +diff --git a/configure.in b/configure.in +index db30511..4da0143 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros + + AC_INIT([PostgreSQL], [9.1.1], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2011, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) +-- +1.7.7 + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/postgresql.mk --- a/src/postgresql.mk Mon Jan 02 11:28:35 2012 +0100 +++ b/src/postgresql.mk Mon Jan 02 11:29:26 2012 +0100 @@ -4,13 +4,12 @@ # PostgreSQL PKG := postgresql $(PKG)_IGNORE := -$(PKG)_VERSION := 9.0.4 -$(PKG)_CHECKSUM := 5c4ebc2abbbc63ce2973974a7d020e7d14a01e73 +$(PKG)_VERSION := 9.1.2 +$(PKG)_CHECKSUM := 7d57b96eb1c764ec234c72b70511a5f7e23fb2b0 $(PKG)_SUBDIR := postgresql-$($(PKG)_VERSION) $(PKG)_FILE := postgresql-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.postgresql.org/ -$(PKG)_URL := http://ftp2.nl.postgresql.org/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_URL_2 := http://ftp10.us.postgresql.org/postgresql/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib openssl define $(PKG)_UPDATE @@ -18,18 +17,13 @@ grep 'refs/tags/REL9[0-9_]*"' | \ $(SED) 's,.*refs/tags/REL\(.*\)".*,\1,g;' | \ $(SED) 's,_,.,g' | \ + grep -v '^9\.\0' | \ head -1 endef define $(PKG)_BUILD + cd '$(1)' && autoconf cp -Rp '$(1)' '$(1).native' - # The static OpenSSL libraries are in unix (not win32) naming style. - $(SED) -i 's,SSLEAY32,SSL,' '$(1)'/configure - $(SED) -i 's,ssleay32,ssl,' '$(1)'/configure - $(SED) -i 's,EAY32,CRYPTO,' '$(1)'/configure - $(SED) -i 's,eay32,crypto,' '$(1)'/configure - $(SED) -i 's,ssleay32,ssl,' '$(1)'/src/interfaces/libpq/Makefile - $(SED) -i 's,eay32,crypto,' '$(1)'/src/interfaces/libpq/Makefile # Since we build only client libary, use bogus tzdata to satisfy configure. cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -51,7 +45,7 @@ --without-libxslt \ --with-zlib \ --with-system-tzdata=/dev/null \ - LIBS='-lsecur32 -lws2_32 -lgdi32' + LIBS="-lsecur32 `'$(TARGET)-pkg-config' openssl --libs`" $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= shlib= $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' haslibarule= shlib= $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= shlib= @@ -79,6 +73,6 @@ --without-zlib \ --with-system-tzdata=/dev/null $(MAKE) -C '$(1).native'/src/port -j '$(JOBS)' - $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' - $(INSTALL) -m755 '$(1).native'/src/bin/pg_config/pg_config '$(PREFIX)/bin/$(TARGET)-pg_config' + $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install + ln -sf '$(PREFIX)/$(TARGET)/bin/pg_config' '$(PREFIX)/bin/$(TARGET)-pg_config' endef diff -r 6e83c7eb0945 -r d9e4f3b2002a src/qjson-1-static.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qjson-1-static.patch Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,84 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch taken from: +http://sourceforge.net/mailarchive/forum.php?thread_name=4E1DBC0D.10000%40jrit.at&forum_name=qjson-devel + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4ed5478..9a378a1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,6 +30,13 @@ IF(QJSON_VERBOSE_DEBUG_OUTPUT) + ADD_DEFINITIONS("-DQJSON_VERBOSE_DEBUG_OUTPUT") + endif(QJSON_VERBOSE_DEBUG_OUTPUT) + ++# For Static builds ++IF(LIBTYPE STREQUAL "STATIC") ++ ADD_DEFINITIONS("-DQJSON_STATIC") ++ ADD_DEFINITIONS("-DQT_NODLL") ++ SET(PKG_CONFIG_CFLAGS -DQJSON_STATIC ${PKG_CONFIG_CFLAGS}) ++endif() ++ + # Find Qt4 + FIND_PACKAGE( Qt4 REQUIRED ) + +@@ -51,13 +58,13 @@ set(QJSON_LIB_VERSION_STRING "${QJSON_LIB_MAJOR_VERSION}.${QJSON_LIB_MINOR_VERSI + set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" ) + + # pkg-config +-IF (NOT WIN32) ++if (NOT WIN32 OR MINGW) + CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/QJson.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc + @ONLY) + INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc + DESTINATION lib${LIB_SUFFIX}/pkgconfig) +-ENDIF (NOT WIN32) ++endif() + + # Include the cmake file needed to use qt4 + INCLUDE( ${QT_USE_FILE} ) +diff --git a/QJson.pc.in b/QJson.pc.in +index e4704bd..bf5fd01 100644 +--- a/QJson.pc.in ++++ b/QJson.pc.in +@@ -8,4 +8,4 @@ Description: QJson is a qt-based library that maps JSON data to QVariant objects + Version: @QJSON_LIB_MAJOR_VERSION@.@QJSON_LIB_MINOR_VERSION@.@QJSON_LIB_PATCH_VERSION@ + Requires: QtCore + Libs: -L${libdir} -lqjson +-Cflags: -I${includedir} +\ No newline at end of file ++Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ced213d..d0d9c68 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -26,7 +26,12 @@ qt4_wrap_cpp(qjson_MOC_SRCS ${qjson_MOC_HDRS}) + + set (qjson_SRCS parser.cpp qobjecthelper.cpp json_scanner.cpp json_parser.cc parserrunnable.cpp serializer.cpp serializerrunnable.cpp) + +-add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS}) ++IF(LIBTYPE STREQUAL "STATIC") ++ add_library (qjson STATIC ${qjson_SRCS} ${qjson_MOC_SRCS}) ++else() ++ add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS}) ++endif() ++ + target_link_libraries( qjson ${QT_LIBRARIES}) + + set_target_properties(qjson PROPERTIES +diff --git a/src/qjson_export.h b/src/qjson_export.h +index c7f5325..d5871e2 100644 +--- a/src/qjson_export.h ++++ b/src/qjson_export.h +@@ -23,7 +23,9 @@ + #include + + #ifndef QJSON_EXPORT +-# if defined(QJSON_MAKEDLL) ++# ifdef QJSON_STATIC ++# define QJSON_EXPORT ++# elif defined(QJSON_MAKEDLL) + /* We are building this library */ + # define QJSON_EXPORT Q_DECL_EXPORT + # else diff -r 6e83c7eb0945 -r d9e4f3b2002a src/qjson.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qjson.mk Mon Jan 02 11:29:26 2012 +0100 @@ -0,0 +1,30 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +PKG := qjson +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.7.1 +$(PKG)_CHECKSUM := 19bbef24132b238e99744bb35194c6dadece98f9 +$(PKG)_SUBDIR := $(PKG) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_WEBSITE := http://$(PKG).sourceforge.net/ +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qt + +define $(PKG)_UPDATE + wget -q -O- 'http://sourceforge.net/projects/qjson/files/qjson/' | \ + $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + echo '$(PREFIX)/bin/$(TARGET)-qmake' + mkdir '$(1)/build' + cd '$(1)/build' && cmake .. \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DCMAKE_BUILD_TYPE=Release \ + -DLIBTYPE=STATIC + + $(MAKE) -C '$(1)/build' -j '$(JOBS)' install +endef + diff -r 6e83c7eb0945 -r d9e4f3b2002a src/qt-1-cherrypicks.patch --- a/src/qt-1-cherrypicks.patch Mon Jan 02 11:28:35 2012 +0100 +++ b/src/qt-1-cherrypicks.patch Mon Jan 02 11:29:26 2012 +0100 @@ -1,1311 +1,79868 @@ This file is part of mingw-cross-env. See doc/index.html for further information. -Commits backported (cherry-picked) from Qt 4.7 branch. +Commits backported (cherry-picked) from upstream branch or merge requests. http://qt.gitorious.org/qt +Also contains mingw-cross-env specific fixes. -From bb75d02785da59c967dee09006700488af9f482e Mon Sep 17 00:00:00 2001 +From f0444553928adaca520af24d76b3f8c328b7ed39 Mon Sep 17 00:00:00 2001 From: Mark Brand -Date: Fri, 15 Oct 2010 14:56:03 +0200 -Subject: [PATCH 01/16] removed obsolete -qt-gif configure option +Date: Thu, 30 Jun 2011 10:22:33 +0200 +Subject: [PATCH 01/12] do not detect or configure iconv for Windows -Since "-system-gif" is not offered, offering "-qt-gif" is unnecessary -and perhaps misleading. By default the GIF handler is built from code -included with Qt, unless suppressed by "-no-gif". +Qt doesn't use iconv on Windows, but configuring it will appear to +work and the build will complete. The result is that character +set conversions do not work. -Merge-request: 859 -Reviewed-by: Oswald Buddenhagen -(cherry picked from commit dfe9084344d73d59f4569c8be6104ce83ae0df95) +Configure.exe already disables iconv for Windows. --- - configure | 7 ++----- - tools/configure/configureapp.cpp | 5 +---- - 2 files changed, 3 insertions(+), 9 deletions(-) + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure b/configure -index 7abe0eb..c159cd4 100755 +index 5a5ef1d..e113544 100755 --- a/configure +++ b/configure -@@ -1570,8 +1570,7 @@ while [ "$#" -gt 0 ]; do - fi - ;; - gif) -- [ "$VAL" = "qt" ] && VAL=auto -- if [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then -+ if [ "$VAL" = "no" ]; then - CFG_GIF="$VAL" - else - UNKNOWN_OPT=yes -@@ -3544,7 +3543,7 @@ Usage: $relconf [-h] [-prefix

] [-prefix-install] [-bindir ] [-libdir - [-accessibility] [-no-stl] [-stl] [-no-sql-] [-sql-] - [-plugin-sql-] [-system-sqlite] [-no-qt3support] [-qt3support] - [-platform] [-D ] [-I ] [-L ] [-help] -- [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff] -+ [-qt-zlib] [-system-zlib] [-no-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff] - [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng] - [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make ] - [-nomake ] [-R ] [-l ] [-no-rpath] [-rpath] [-continue] -@@ -3773,8 +3772,6 @@ Third Party Libraries: - See http://www.gzip.org/zlib +@@ -5600,7 +5600,7 @@ fi - -no-gif ............ Do not compile GIF reading support. -- * -qt-gif ............ Compile GIF reading support. -- See also src/gui/image/qgifhandler_p.h + # auto-detect iconv(3) support + if [ "$CFG_ICONV" != "no" ]; then +- if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then ++ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then + CFG_ICONV=no + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then + CFG_ICONV=yes +-- +1.7.8 + + +From 986dc8a13a0ac35082af274427f25f11cafbfe76 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Sun, 3 Jul 2011 22:45:15 +0200 +Subject: [PATCH 02/12] add missing multiple inclusion guard + +--- + src/plugins/codecs/kr/cp949codetbl.h | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/src/plugins/codecs/kr/cp949codetbl.h b/src/plugins/codecs/kr/cp949codetbl.h +index f54db8d..8b254e0 100644 +--- a/src/plugins/codecs/kr/cp949codetbl.h ++++ b/src/plugins/codecs/kr/cp949codetbl.h +@@ -39,6 +39,9 @@ + ** + ****************************************************************************/ - -no-libtiff ........ Do not compile TIFF support. - -qt-libtiff ........ Use the libtiff bundled with Qt. -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 15c0ddb..dd5647b 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -590,8 +590,6 @@ void Configure::parseCmdLine() - // Image formats -------------------------------------------- - else if (configCmdLine.at(i) == "-no-gif") - dictionary[ "GIF" ] = "no"; -- else if (configCmdLine.at(i) == "-qt-gif") -- dictionary[ "GIF" ] = "plugin"; ++#ifndef CP949CODETBL_H ++#define CP494CODETBL_H ++ + static const unsigned short cp949_icode_to_unicode[] = { + 0xac02, 0xac03, 0xac05, 0xac06, 0xac0b, 0xac0c, 0xac0d, 0xac0e, 0xac0f, 0xac18, 0xac1e, 0xac1f, 0xac21, 0xac22, 0xac23, + 0xac25, 0xac26, 0xac27, 0xac28, 0xac29, 0xac2a, 0xac2b, 0xac2e, 0xac32, 0xac33, 0xac34, 0xac35, 0xac36, 0xac37, 0xac3a, +@@ -630,3 +633,5 @@ static const unsigned short cp949_icode_to_unicode[] = { + 0xd78e, 0xd78f, 0xd791, 0xd792, 0xd793, 0xd794, 0xd795, 0xd796, 0xd797, 0xd79a, 0xd79c, 0xd79e, 0xd79f, 0xd7a0, 0xd7a1, + 0xd7a2, 0xd7a3 + }; ++ ++#endif // CP494CODETBL_H +-- +1.7.8 + + +From 520a67aa51bb02aad5e7f96cff3b36442ab33102 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Mon, 4 Jul 2011 00:42:24 +0200 +Subject: [PATCH 03/12] load plugin codecs regardless of iconv + +Otherwise Windows applications linking to static Qt will have to +import the static plugins to avoid linking failure even if they +do not use the codecs. + +Also, this is preparation for moving these codecs into QtCore +proper. +--- + src/corelib/codecs/qtextcodec.cpp | 14 +++++--------- + 1 files changed, 5 insertions(+), 9 deletions(-) + +diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp +index dd06a2a..dbe6f6eb 100644 +--- a/src/corelib/codecs/qtextcodec.cpp ++++ b/src/corelib/codecs/qtextcodec.cpp +@@ -65,15 +65,14 @@ + # include "qtsciicodec_p.h" + # include "qisciicodec_p.h" + #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) +-# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) +-// no iconv(3) support, must build all codecs into the library ++# if !defined(QT_BOOTSTRAPPED) + # include "../../plugins/codecs/cn/qgb18030codec.h" + # include "../../plugins/codecs/jp/qeucjpcodec.h" + # include "../../plugins/codecs/jp/qjiscodec.h" + # include "../../plugins/codecs/jp/qsjiscodec.h" + # include "../../plugins/codecs/kr/qeuckrcodec.h" + # include "../../plugins/codecs/tw/qbig5codec.h" +-# endif // QT_NO_ICONV ++# endif // !QT_BOOTSTRAPPED + # if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED) + # include "qfontlaocodec_p.h" + # include "../../plugins/codecs/jp/qfontjpcodec.h" +@@ -759,8 +758,6 @@ static void setup() + # if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED) + // no font codecs when bootstrapping + (void)new QFontLaoCodec; +-# if defined(QT_NO_ICONV) +- // no iconv(3) support, must build all codecs into the library + (void)new QFontGb2312Codec; + (void)new QFontGbkCodec; + (void)new QFontGb18030_0Codec; +@@ -769,12 +766,11 @@ static void setup() + (void)new QFontKsc5601Codec; + (void)new QFontBig5hkscsCodec; + (void)new QFontBig5Codec; +-# endif // QT_NO_ICONV && !QT_BOOTSTRAPPED +-# endif // Q_WS_X11 ++# endif // Q_WS_X11 && !QT_BOOTSTRAPPED - else if (configCmdLine.at(i) == "-no-libtiff") { - dictionary[ "TIFF"] = "no"; -@@ -1661,7 +1659,7 @@ bool Configure::displayHelp() - "[-no-qmake] [-qmake] [-dont-process] [-process]\n" - "[-no-style-