Volker Grabsch
13 years ago
commit
6ca88cec3a
@ -0,0 +1,216 @@
|
||||
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] adjustments for mingw-cross-env
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e5af443..7d77f9d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -135,6 +135,8 @@ set(ALL_CGAL_LIBRARIES CGAL CGAL_Core CGAL_ImageIO CGAL_Qt3 CGAL_Qt4 CACHE INTER
|
||||
#
|
||||
#--------------------------------------------------------------------------------------------------
|
||||
|
||||
+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,139 @@
|
||||
+SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_DENORMALS_COMPILE_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_IEEE_754_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_ISTREAM_INT_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_LONGNAME_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_MATCHING_BUG_5
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_MATCHING_BUG_6
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_ARRAY
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_AUTO
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_DECLTYPE
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_ISFINITE
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_LAMBDAS
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_LONG_LONG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_TUPLE
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_LIMITS
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_NEXTAFTER
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_STL
|
||||
+ 0
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_TR1_ARRAY
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_TR1_TUPLE
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_NUMERIC_LIMITS_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( GCC_RUN_RES
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( GMP_RUN_RES
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( MPFR_RUN_RES
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( QT4_RUN_RES
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( ZLIB_RUN_RES
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( GCC_RUN_RES__TRYRUN_OUTPUT
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( GMP_RUN_RES__TRYRUN_OUTPUT
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( MPFR_RUN_RES__TRYRUN_OUTPUT
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( QT4_RUN_RES__TRYRUN_OUTPUT
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" FORCE)
|
||||
+SET( ZLIB_RUN_RES__TRYRUN_OUTPUT
|
||||
+ FAILED_TO_RUN
|
||||
+ CACHE STRING "Result from TRY_RUN" 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
|
||||
|
||||
@ -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.8
|
||||
$(PKG)_CHECKSUM := 23748df1e60d62da166d2e395732ae2fe274317d
|
||||
$(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/28500/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc boost gmp mpfr
|
||||
|
||||
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.8" \
|
||||
-DCGAL_INSTALL_BIN_DIR:STRING="bin" \
|
||||
-DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
|
||||
-DWITH_CGAL_Qt3:BOOL="0" \
|
||||
-DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake \
|
||||
-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=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake \
|
||||
-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
|
||||
@ -0,0 +1,26 @@
|
||||
# This file is part of mingw-cross-env.
|
||||
# See doc/index.html for further information.
|
||||
|
||||
# eigen
|
||||
PKG := eigen
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 2.0.16
|
||||
$(PKG)_CHECKSUM := 16732775f93174563e575c3570395a11a5e57104
|
||||
$(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_WEBSITE := http://eigen.tuxfamily.org/
|
||||
$(PKG)_URL := http://bitbucket.org/$(PKG)/$(PKG)/get/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
wget -q -O- 'http://eigen.tuxfamily.org/index.php?title=Main_Page#Download' | \
|
||||
grep 'eigen/get/' | \
|
||||
$(SED) -n 's,.*eigen/get/\(2[^>]*\)\.tar.*,\1,p' | \
|
||||
head -1
|
||||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(1)' && \
|
||||
cmake . -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install
|
||||
endef
|
||||
@ -1,79 +0,0 @@
|
||||
# This file is part of mingw-cross-env.
|
||||
# See doc/index.html for further information.
|
||||
|
||||
This patch has been taken from:
|
||||
http://dev.exiv2.org/issues/764
|
||||
|
||||
Index: trunk/src/psdimage.cpp
|
||||
===================================================================
|
||||
--- trunk/src/psdimage.cpp (revision 2468)
|
||||
+++ trunk/src/psdimage.cpp (revision 2469)
|
||||
@@ -400,7 +400,7 @@
|
||||
uint32_t resourceType = getULong(buf, bigEndian);
|
||||
|
||||
if (resourceType != kPhotoshopResourceType) {
|
||||
- break; // bad resource type
|
||||
+ throw Error(3, "Photoshop"); // bad resource type
|
||||
}
|
||||
uint16_t resourceId = getUShort(buf + 4, bigEndian);
|
||||
uint32_t resourceNameLength = buf[6];
|
||||
@@ -416,13 +416,13 @@
|
||||
if (io_->read(buf, 4) != 4) throw Error(3, "Photoshop");
|
||||
|
||||
uint32_t resourceSize = getULong(buf, bigEndian);
|
||||
+ uint32_t pResourceSize = (resourceSize + 1) & ~1; // padded resource size
|
||||
uint32_t curOffset = io_->tell();
|
||||
|
||||
// Write IPTC_NAA resource block
|
||||
if ((resourceId == kPhotoshopResourceID_IPTC_NAA ||
|
||||
resourceId > kPhotoshopResourceID_IPTC_NAA) && iptcDone == false) {
|
||||
newResLength += writeIptcData(iptcData_, outIo);
|
||||
- resourceSize = (resourceSize + 1) & ~1; // adjust for padding
|
||||
iptcDone = true;
|
||||
}
|
||||
|
||||
@@ -430,7 +430,6 @@
|
||||
else if ((resourceId == kPhotoshopResourceID_ExifInfo ||
|
||||
resourceId > kPhotoshopResourceID_ExifInfo) && exifDone == false) {
|
||||
newResLength += writeExifData(exifData_, outIo);
|
||||
- resourceSize = (resourceSize + 1) & ~1; // adjust for padding
|
||||
exifDone = true;
|
||||
}
|
||||
|
||||
@@ -438,7 +437,6 @@
|
||||
else if ((resourceId == kPhotoshopResourceID_XMPPacket ||
|
||||
resourceId > kPhotoshopResourceID_XMPPacket) && xmpDone == false) {
|
||||
newResLength += writeXmpData(xmpData_, outIo);
|
||||
- resourceSize = (resourceSize + 1) & ~1; // adjust for padding
|
||||
xmpDone = true;
|
||||
}
|
||||
|
||||
@@ -467,10 +465,9 @@
|
||||
|
||||
readTotal = 0;
|
||||
toRead = 0;
|
||||
- resourceSize = (resourceSize + 1) & ~1; // pad to even
|
||||
- while (readTotal < resourceSize) {
|
||||
- toRead = static_cast<long>(resourceSize - readTotal) < lbuf.size_
|
||||
- ? static_cast<long>(resourceSize - readTotal) : lbuf.size_;
|
||||
+ while (readTotal < pResourceSize) {
|
||||
+ toRead = static_cast<long>(pResourceSize - readTotal) < lbuf.size_
|
||||
+ ? static_cast<long>(pResourceSize - readTotal) : lbuf.size_;
|
||||
if (io_->read(lbuf.pData_, toRead) != toRead) {
|
||||
throw Error(3, "Photoshop");
|
||||
}
|
||||
@@ -478,11 +475,11 @@
|
||||
if (outIo.write(lbuf.pData_, toRead) != toRead) throw Error(21);
|
||||
}
|
||||
if (outIo.error()) throw Error(21);
|
||||
- newResLength += resourceSize + adjResourceNameLen + 12;
|
||||
+ newResLength += pResourceSize + adjResourceNameLen + 12;
|
||||
}
|
||||
|
||||
- io_->seek(curOffset + resourceSize, BasicIo::beg);
|
||||
- oldResLength -= (12 + adjResourceNameLen + resourceSize);
|
||||
+ io_->seek(curOffset + pResourceSize, BasicIo::beg);
|
||||
+ oldResLength -= (12 + adjResourceNameLen + pResourceSize);
|
||||
}
|
||||
|
||||
// Append IPTC_NAA resource block, if not yet written
|
||||
@ -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.
|
||||
# ---------------------------------------------------------------------------
|
||||
@ -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);
|
||||
@ -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
|
||||
@ -0,0 +1,38 @@
|
||||
# This file is part of mingw-cross-env.
|
||||
# See doc/index.html for further information.
|
||||
|
||||
# file
|
||||
PKG := file
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 5.09
|
||||
$(PKG)_CHECKSUM := 9d905f9e50033c3f5be3728473cbb709a41550fb
|
||||
$(PKG)_SUBDIR := file-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := file-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_WEBSITE := http://www.darwinsys.com/file/
|
||||
$(PKG)_URL := ftp://ftp.astron.com/pub/file/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc libgnurx
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
wget -q -O- 'ftp://ftp.astron.com/pub/file/' | \
|
||||
grep 'file-' | \
|
||||
$(SED) -n 's,.*file-\([0-9][^>]*\)\.tar.*,\1,p' | \
|
||||
tail -1
|
||||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
# "file" needs a runnable version of the "file" utility
|
||||
# itself. This must match the source code regarding its
|
||||
# version. Therefore we build a native one ourselves first.
|
||||
|
||||
cd '$(1)' && ./configure \
|
||||
--disable-shared
|
||||
$(MAKE) -C '$(1)/src' -j '$(JOBS)' file
|
||||
cp '$(1)/src/file' '$(1)/src/file.local'
|
||||
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)'
|
||||
$(MAKE) -C '$(1)' clean
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
||||
endef
|
||||
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
/* This file is part of mingw-cross-env. */
|
||||
/* See doc/index.html for further information. */
|
||||
|
||||
#include <GL/glut.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
glutInit(&argc, argv);
|
||||
glutInitWindowSize(640,480);
|
||||
glutInitWindowPosition(10,10);
|
||||
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
|
||||
|
||||
glutCreateWindow("FreeGLUT Shapes");
|
||||
|
||||
glutMainLoop();
|
||||
|
||||
return(0);
|
||||
}
|
||||
@ -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)
|
||||
{
|
||||
@ -0,0 +1,22 @@
|
||||
/* This file is part of mingw-cross-env. */
|
||||
/* See doc/index.html for further information. */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <GL/glew.h>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
GLenum err;
|
||||
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
|
||||
err = glewInit();
|
||||
if (GLEW_OK != err)
|
||||
{
|
||||
fprintf(stderr, "Error: %s\n", glewGetErrorString(err));
|
||||
}
|
||||
fprintf(stdout, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
This file is part of mingw-cross-env.
|
||||
See doc/index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 2f8e6d6727a6140e12b8af09a64cdec05054162e Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Wed, 17 Aug 2011 14:01:51 +0200
|
||||
Subject: [PATCH] adding missing ws2_32 to Libs.private
|
||||
|
||||
|
||||
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
|
||||
index bac5f42..eb4e6df 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: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@
|
||||
+Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @P11_KIT_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@ -lws2_32
|
||||
@GNUTLS_REQUIRES_PRIVATE@
|
||||
Cflags: -I${includedir}
|
||||
--
|
||||
1.7.6
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
/* This file is part of mingw-cross-env. */
|
||||
/* See doc/index.html for further information. */
|
||||
|
||||
#include <gnutls/gnutls.h>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
|
||||
gnutls_global_init ();
|
||||
|
||||
gnutls_global_deinit ();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
/* This file is part of mingw-cross-env. */
|
||||
/* See doc/index.html for further information. */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <gsl/gsl_sf_bessel.h>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
double x, y;
|
||||
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
|
||||
x = 5.0;
|
||||
y = gsl_sf_bessel_J0 (x);
|
||||
printf ("J0(%g) = %.18e\n", x, y);
|
||||
return 0;
|
||||
}
|
||||
@ -1,76 +1,97 @@
|
||||
This file is part of mingw-cross-env.
|
||||
See doc/index.html for further information.
|
||||
|
||||
Patches taken from
|
||||
https://sourceforge.net/tracker/?func=detail&aid=3288762&group_id=52781&atid=468023
|
||||
https://sourceforge.net/tracker/?func=detail&aid=3288772&group_id=52781&atid=468023
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From d49ac167169e2db531e1be5a48575186c8bc8799 Mon Sep 17 00:00:00 2001
|
||||
From a4e9166bc8d78b2aee3c25757d479d4c2e53c7be 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
|
||||
Date: Sun, 23 Oct 2011 21:36:53 +0200
|
||||
Subject: [PATCH 1/2] support static linking to ntlm
|
||||
|
||||
|
||||
diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
|
||||
index 238b7f1..ffccf80 100644
|
||||
--- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
|
||||
+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
|
||||
@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
|
||||
# endif
|
||||
# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||
# include <ws2tcpip.h>
|
||||
-# include <wspiapi.h>
|
||||
+# include <ws2spi.h>
|
||||
# ifdef WITH_IPV6
|
||||
# define SOAP_GAI_STRERROR gai_strerrorA
|
||||
# endif
|
||||
diff --git a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
|
||||
index 238b7f1..ffccf80 100644
|
||||
--- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
|
||||
+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
|
||||
@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
|
||||
# endif
|
||||
# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||
# include <ws2tcpip.h>
|
||||
-# include <wspiapi.h>
|
||||
+# include <ws2spi.h>
|
||||
# ifdef WITH_IPV6
|
||||
# define SOAP_GAI_STRERROR gai_strerrorA
|
||||
# endif
|
||||
diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
|
||||
index 238b7f1..ffccf80 100644
|
||||
--- a/gsoap/stdsoap2.h
|
||||
+++ b/gsoap/stdsoap2.h
|
||||
@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
|
||||
# endif
|
||||
# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
|
||||
# include <ws2tcpip.h>
|
||||
-# include <wspiapi.h>
|
||||
+# include <ws2spi.h>
|
||||
# ifdef WITH_IPV6
|
||||
# define SOAP_GAI_STRERROR gai_strerrorA
|
||||
# endif
|
||||
diff --git a/configure b/configure
|
||||
index ad1830d..be95edf 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -4822,7 +4822,7 @@ case "${host}" in
|
||||
;;
|
||||
*-*-cygwin*) platform=CYGWIN ;;
|
||||
*-*-mingw*) platform=MINGW
|
||||
- SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32"
|
||||
+ SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32"
|
||||
;;
|
||||
*-*-freebsd*) platform=FREEBSD ;;
|
||||
*-*-openbsd*) platform=OPENBSD ;;
|
||||
--
|
||||
1.7.4.1
|
||||
1.7.7
|
||||
|
||||
|
||||
From 2ed5f1205a5517c4f1d919942fbebd58327ee3df Mon Sep 17 00:00:00 2001
|
||||
From da0eb2fc386be0fd914ef8f9a7d6bf73004ea230 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
|
||||
Date: Mon, 24 Oct 2011 11:17:13 +0200
|
||||
Subject: [PATCH 2/2] ntlm support in .pc files
|
||||
|
||||
|
||||
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 e8c8f4f..07515fe 100644
|
||||
index 391d820..791408a 100644
|
||||
--- a/gsoapssl++.pc.in
|
||||
+++ b/gsoapssl++.pc.in
|
||||
@@ -7,5 +7,5 @@ Name: GSoap
|
||||
Description: SOAP C++ Web Services with SSL and ZLIB
|
||||
@@ -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++
|
||||
+Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
|
||||
Cflags: -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
|
||||
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
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,27 @@
|
||||
This file is part of mingw-cross-env.
|
||||
See doc/index.html for further information.
|
||||
|
||||
Patch taken from http://sourceforge.net/mailarchive/message.php?msg_id=27995461
|
||||
|
||||
mingwrt 3.20 provides ssize_t and defines _SSIZE_T_. This patch
|
||||
allows libdnet to use this ssize_t instead of defining its
|
||||
own which causes build failure. Applies to libdnet 1.11.
|
||||
|
||||
diff --git a/include/dnet/os.h b/include/dnet/os.h
|
||||
index c12c7b2..9e8bdd2 100644
|
||||
--- a/include/dnet/os.h
|
||||
+++ b/include/dnet/os.h
|
||||
@@ -23,8 +23,10 @@
|
||||
typedef u_short uint16_t;
|
||||
typedef u_int uint32_t;
|
||||
# ifndef __CYGWIN__
|
||||
+# ifndef _SSIZE_T_
|
||||
typedef long ssize_t;
|
||||
# endif
|
||||
+# endif
|
||||
#else
|
||||
# include <sys/param.h>
|
||||
# include <sys/types.h>
|
||||
--
|
||||
1.7.6
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
/* This file is part of mingw-cross-env. */
|
||||
/* See doc/index.html for further information. */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <ffi.h>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
ffi_cif cif;
|
||||
ffi_type *args[1];
|
||||
void *values[1];
|
||||
char *s;
|
||||
int rc;
|
||||
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
|
||||
args[0] = &ffi_type_pointer;
|
||||
values[0] = &s;
|
||||
|
||||
if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1,
|
||||
&ffi_type_uint, args) == FFI_OK)
|
||||
{
|
||||
s = "Hello World!";
|
||||
ffi_call(&cif, FFI_FN(puts), &rc, values);
|
||||
s = "Goodbye!";
|
||||
ffi_call(&cif, FFI_FN(puts), &rc, values);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -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}
|
||||
@ -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/UserContributed/regex/mingw-regex-$($(PKG)_VERSION)/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
wget -q -O- 'http://sourceforge.net/projects/mingw/files/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
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,172 @@
|
||||
This file is part of mingw-cross-env.
|
||||
See doc/index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 7e5a98fd8854295cfde1987cb7d077c5876111b2 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Thu, 23 Jun 2011 15:45:49 +1000
|
||||
Subject: [PATCH 1/3] The wrong source files are specified in the makefile.
|
||||
|
||||
There is one wrapper source file which includes all and
|
||||
implements additional functions.
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 091c6af..e3b7f81 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -20,7 +20,7 @@ install: lib
|
||||
cp ../include/libirc_events.h @prefix@/include/libirc_events.h
|
||||
cp libirc.a @prefix@/include/lib/libirc.a
|
||||
|
||||
-$(OBJS): utils.c dcc.c errors.c portable.c sockets.c colors.c
|
||||
+$(OBJS): libircclient.c
|
||||
|
||||
libircclient.a: $(OBJS)
|
||||
$(AR) libircclient.a $(OBJS)
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
|
||||
From e7a3c62440a8c89c48914d8d45bb2e3d14b9bbd8 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Thu, 23 Jun 2011 15:47:52 +1000
|
||||
Subject: [PATCH 2/3] IPv6 support is broken and is forced to be disabled.
|
||||
|
||||
This place is sufficient - IPv6 initialisation will now cause an error.
|
||||
|
||||
diff --git a/src/libircclient.c b/src/libircclient.c
|
||||
index 5d266c0..1ec11c1 100644
|
||||
--- a/src/libircclient.c
|
||||
+++ b/src/libircclient.c
|
||||
@@ -194,7 +194,7 @@ int irc_connect6 (irc_session_t * session,
|
||||
const char * username,
|
||||
const char * realname)
|
||||
{
|
||||
-#if defined (ENABLE_IPV6)
|
||||
+#if 0
|
||||
struct sockaddr_in6 saddr;
|
||||
struct addrinfo ainfo, *res = NULL;
|
||||
char portStr[32];
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
|
||||
From 78326f1af372da340197c15897b54fdd45652bf3 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Thu, 23 Jun 2011 15:48:33 +1000
|
||||
Subject: [PATCH 3/3] Use the proper WIN32 define.
|
||||
|
||||
|
||||
diff --git a/include/libircclient.h b/include/libircclient.h
|
||||
index c78f3b1..23d1a51 100644
|
||||
--- a/include/libircclient.h
|
||||
+++ b/include/libircclient.h
|
||||
@@ -43,7 +43,7 @@
|
||||
#ifndef INCLUDE_LIBIRC_H
|
||||
#define INCLUDE_LIBIRC_H
|
||||
|
||||
-#if !defined (WIN32)
|
||||
+#if !defined (_WIN32)
|
||||
#include <sys/select.h> /* fd_set */
|
||||
#else
|
||||
#include <winsock2.h>
|
||||
diff --git a/src/portable.c b/src/portable.c
|
||||
index 8071c13..ab8a57b 100644
|
||||
--- a/src/portable.c
|
||||
+++ b/src/portable.c
|
||||
@@ -13,7 +13,7 @@
|
||||
*/
|
||||
|
||||
|
||||
-#if !defined (WIN32)
|
||||
+#if !defined (_WIN32)
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
@@ -65,7 +65,7 @@
|
||||
|
||||
static inline int libirc_mutex_init (port_mutex_t * mutex)
|
||||
{
|
||||
-#if defined (WIN32)
|
||||
+#if defined (_WIN32)
|
||||
InitializeCriticalSection (mutex);
|
||||
return 0;
|
||||
#elif defined (PTHREAD_MUTEX_RECURSIVE)
|
||||
@@ -78,13 +78,13 @@ static inline int libirc_mutex_init (port_mutex_t * mutex)
|
||||
|
||||
return pthread_mutex_init (mutex, 0);
|
||||
|
||||
-#endif /* defined (WIN32) */
|
||||
+#endif /* defined (_WIN32) */
|
||||
}
|
||||
|
||||
|
||||
static inline void libirc_mutex_destroy (port_mutex_t * mutex)
|
||||
{
|
||||
-#if defined (WIN32)
|
||||
+#if defined (_WIN32)
|
||||
DeleteCriticalSection (mutex);
|
||||
#else
|
||||
pthread_mutex_destroy (mutex);
|
||||
@@ -94,7 +94,7 @@ static inline void libirc_mutex_destroy (port_mutex_t * mutex)
|
||||
|
||||
static inline void libirc_mutex_lock (port_mutex_t * mutex)
|
||||
{
|
||||
-#if defined (WIN32)
|
||||
+#if defined (_WIN32)
|
||||
EnterCriticalSection (mutex);
|
||||
#else
|
||||
pthread_mutex_lock (mutex);
|
||||
@@ -104,7 +104,7 @@ static inline void libirc_mutex_lock (port_mutex_t * mutex)
|
||||
|
||||
static inline void libirc_mutex_unlock (port_mutex_t * mutex)
|
||||
{
|
||||
-#if defined (WIN32)
|
||||
+#if defined (_WIN32)
|
||||
LeaveCriticalSection (mutex);
|
||||
#else
|
||||
pthread_mutex_unlock (mutex);
|
||||
diff --git a/src/sockets.c b/src/sockets.c
|
||||
index c2b33f1..e73f62c 100644
|
||||
--- a/src/sockets.c
|
||||
+++ b/src/sockets.c
|
||||
@@ -15,7 +15,7 @@
|
||||
/*
|
||||
* The sockets interface was moved out to simplify going OpenSSL integration.
|
||||
*/
|
||||
-#if !defined (WIN32)
|
||||
+#if !defined (_WIN32)
|
||||
#include <sys/socket.h>
|
||||
#include <netdb.h>
|
||||
#include <arpa/inet.h>
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
static int socket_error()
|
||||
{
|
||||
-#if !defined (WIN32)
|
||||
+#if !defined (_WIN32)
|
||||
return errno;
|
||||
#else
|
||||
return WSAGetLastError();
|
||||
@@ -64,7 +64,7 @@ static int socket_create (int domain, int type, socket_t * sock)
|
||||
|
||||
static int socket_make_nonblocking (socket_t * sock)
|
||||
{
|
||||
-#if !defined (WIN32)
|
||||
+#if !defined (_WIN32)
|
||||
return fcntl (*sock, F_SETFL, fcntl (*sock, F_GETFL,0 ) | O_NONBLOCK) != 0;
|
||||
#else
|
||||
unsigned long mode = 0;
|
||||
@@ -75,7 +75,7 @@ static int socket_make_nonblocking (socket_t * sock)
|
||||
|
||||
static int socket_close (socket_t * sock)
|
||||
{
|
||||
-#if !defined (WIN32)
|
||||
+#if !defined (_WIN32)
|
||||
close (*sock);
|
||||
#else
|
||||
closesocket (*sock);
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
/* This file is part of mingw-cross-env. */
|
||||
/* See doc/index.html for further information. */
|
||||
|
||||
#include <libircclient/libircclient.h>
|
||||
|
||||
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;
|
||||
}
|
||||
@ -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
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -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 <BaseTsd.h>
|
||||
-# include <WinSock2.h>
|
||||
+# include <basetsd.h>
|
||||
+# include <winsock2.h>
|
||||
#endif
|
||||
|
||||
#include <stddef.h>
|
||||
@ -0,0 +1,14 @@
|
||||
/* This file is part of mingw-cross-env. */
|
||||
/* See doc/index.html for further information. */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <libssh2.h>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
|
||||
printf("libssh2 version: %s", libssh2_version(0) );
|
||||
return 0;
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
# 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'
|
||||
$(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' \
|
||||
-lssh2
|
||||
endef
|
||||
@ -0,0 +1,29 @@
|
||||
# This file is part of mingw-cross-env.
|
||||
# See doc/index.html for further information.
|
||||
|
||||
# lzo
|
||||
PKG := lzo
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 2.06
|
||||
$(PKG)_CHECKSUM := a11768b8a168ec607750842bbef406f11547b904
|
||||
$(PKG)_SUBDIR := lzo-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := lzo-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_WEBSITE := http://www.oberhumer.com/opensource/lzo/
|
||||
$(PKG)_URL := http://www.oberhumer.com/opensource/lzo/download/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
wget -q -O- 'http://www.oberhumer.com/opensource/lzo/download/' | \
|
||||
grep 'lzo-' | \
|
||||
grep -v 'minilzo-' | \
|
||||
$(SED) -n 's,.*lzo-\([0-9][^>]*\)\.tar.*,\1,p' | \
|
||||
tail -1
|
||||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
||||
endef
|
||||
@ -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<float.h>
|
||||
-
|
||||
#ifndef _MINGW_FLOAT_H_
|
||||
#define _MINGW_FLOAT_H_
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
|
||||
@ -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.1
|
||||
$(PKG)_CHECKSUM := d94c22d4e824c6b5e69a97a726b514ecaf9e4596
|
||||
$(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
|
||||
File diff suppressed because it is too large
Load Diff
@ -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 <ImfPxr24Compressor.h>
|
||||
#include <ImfHeader.h>
|
||||
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 <ImfZipCompressor.h>
|
||||
#include <ImfCheckedArithmetic.h>
|
||||
@ -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 <osg/Image>
|
||||
#include <osg/GL>
|
||||
|
||||
-#ifdef _WIN32
|
||||
+#if defined _WIN32 && !defined OSG_LIBRARY_STATIC
|
||||
//Make the half format work against openEXR libs
|
||||
#define OPENEXR_DLL
|
||||
#endif
|
||||
@ -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);
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue