From d159b84d9f8d74927cd9df5d55b24fc6f2085454 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 9 May 2014 19:47:05 +1000 Subject: [PATCH 1/7] package gcc: workaround for weak default functions --- src/gcc-4-weak-x64.patch | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/gcc-4-weak-x64.patch diff --git a/src/gcc-4-weak-x64.patch b/src/gcc-4-weak-x64.patch new file mode 100644 index 00000000..c194f7cf --- /dev/null +++ b/src/gcc-4-weak-x64.patch @@ -0,0 +1,42 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from: +https://github.com/mxe/mxe/issues/402 +http://gcc.gnu.org/viewcvs/gcc/branches/gcc-4_9-branch/libgcc/config/i386/cygming-crtbegin.c?view=patch&r1=209304&r2=209946&pathrev=209946 + +--- a/libgcc/config/i386/cygming-crtbegin.c 2014/04/11 12:49:40209304 ++++ b/libgcc/config/i386/cygming-crtbegin.c 2014/04/30 18:09:06209946 +@@ -54,6 +54,11 @@ + TARGET_ATTRIBUTE_WEAK; + extern void *__deregister_frame_info (__attribute__((unused)) const void *) + TARGET_ATTRIBUTE_WEAK; ++ ++/* Work around for current cygwin32 build problems (Bug gas/16858). ++ Compile weak default functions only for 64-bit systems, ++ when absolutely necessary. */ ++#ifdef __x86_64__ + TARGET_ATTRIBUTE_WEAK void + __register_frame_info (__attribute__((unused)) const void *p, + __attribute__((unused)) struct object *o) +@@ -65,16 +70,19 @@ + { + return (void*) 0; + } ++#endif + #endif /* DWARF2_UNWIND_INFO */ + + #if TARGET_USE_JCR_SECTION + extern void _Jv_RegisterClasses (__attribute__((unused)) const void *) + TARGET_ATTRIBUTE_WEAK; + ++#ifdef __x86_64__ + TARGET_ATTRIBUTE_WEAK void + _Jv_RegisterClasses (__attribute__((unused)) const void *p) + { + } ++#endif + #endif /* TARGET_USE_JCR_SECTION */ + + #if defined(HAVE_LD_RO_RW_SECTION_MIXING) + From 220dd9123a4534a987e11501f4d85cd9738b9bef Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 9 May 2014 21:15:18 +1000 Subject: [PATCH 2/7] package pcl: update and enable x86_64 build --- src/pcl-1-disable-sse-check.patch | 17 --------------- src/pcl-1-disable-tools.patch | 16 +++++++++++++++ src/pcl-2-disable-executables.patch | 30 --------------------------- src/pcl-3-fix-hashmap.patch | 14 ------------- src/pcl.mk | 32 ++++++++++++++++------------- 5 files changed, 34 insertions(+), 75 deletions(-) delete mode 100644 src/pcl-1-disable-sse-check.patch create mode 100644 src/pcl-1-disable-tools.patch delete mode 100644 src/pcl-2-disable-executables.patch delete mode 100644 src/pcl-3-fix-hashmap.patch diff --git a/src/pcl-1-disable-sse-check.patch b/src/pcl-1-disable-sse-check.patch deleted file mode 100644 index b9f87072..00000000 --- a/src/pcl-1-disable-sse-check.patch +++ /dev/null @@ -1,17 +0,0 @@ -This file is part of MXE. -See index.html for further information. - ---- a/CMakeLists.txt 2012-12-06 14:21:15.914117050 +0100 -+++ b/CMakeLists.txt 2012-12-06 14:20:53.342117928 +0100 -@@ -86,8 +86,9 @@ - endif() - - # check for SSE flags --include(${PCL_SOURCE_DIR}/cmake/pcl_find_sse.cmake) --PCL_CHECK_FOR_SSE() -+#include(${PCL_SOURCE_DIR}/cmake/pcl_find_sse.cmake) -+#PCL_CHECK_FOR_SSE() -+set(SSE_FLAGS) - - if (__COMPILER_PATHSCALE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-uninitialized -zerouv -pthread -mp") diff --git a/src/pcl-1-disable-tools.patch b/src/pcl-1-disable-tools.patch new file mode 100644 index 00000000..ea3005b0 --- /dev/null +++ b/src/pcl-1-disable-tools.patch @@ -0,0 +1,16 @@ +This file is part of MXE. +See index.html for further information. + +diff -ur pcl-pcl-1.7.1.orig/visualization/CMakeLists.txt pcl-pcl-1.7.1/visualization/CMakeLists.txt +--- pcl-pcl-1.7.1.orig/visualization/CMakeLists.txt 2014-05-09 20:37:41.000000000 +1000 ++++ pcl-pcl-1.7.1/visualization/CMakeLists.txt 2014-05-09 20:48:58.000000000 +1000 +@@ -171,6 +171,8 @@ + add_subdirectory(test) + endif(BUILD_TESTS) + +- add_subdirectory(tools) ++ if(BUILD_tools) ++ add_subdirectory(tools) ++ endif(BUILD_tools) + + endif(build) diff --git a/src/pcl-2-disable-executables.patch b/src/pcl-2-disable-executables.patch deleted file mode 100644 index c2907181..00000000 --- a/src/pcl-2-disable-executables.patch +++ /dev/null @@ -1,30 +0,0 @@ -This file is part of MXE. -See index.html for further information. - ---- a/visualization/tools/CMakeLists.txt 2012-12-06 09:40:39.354741544 +0100 -+++ b/visualization/tools/CMakeLists.txt 2012-12-06 09:40:46.562742448 +0100 -@@ -1,24 +0,0 @@ --PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcd_viewer ${SUBSYS_NAME} pcd_viewer.cpp) --target_link_libraries(pcd_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) -- --PCL_ADD_EXECUTABLE_OPT_BUNDLE(timed_trigger_test ${SUBSYS_NAME} timed_trigger_test.cpp) --target_link_libraries(timed_trigger_test pcl_io pcl_common pcl_kdtree pcl_visualization) -- --if(OPENNI_FOUND AND BUILD_OPENNI) -- -- PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcd_grabber_viewer ${SUBSYS_NAME} pcd_grabber_viewer.cpp) -- target_link_libraries(pcd_grabber_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) -- -- #PCL_ADD_EXECUTABLE(openni_viewer_simple ${SUBSYS_NAME} openni_viewer_simple.cpp) -- #target_link_libraries(openni_viewer_simple pcl_common pcl_io pcl_kdtree pcl_visualization) -- -- PCL_ADD_EXECUTABLE_OPT_BUNDLE(oni_viewer ${SUBSYS_NAME} oni_viewer_simple.cpp) -- target_link_libraries(oni_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) -- -- PCL_ADD_EXECUTABLE_OPT_BUNDLE(openni_viewer ${SUBSYS_NAME} openni_viewer.cpp) -- target_link_libraries(openni_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) -- -- PCL_ADD_EXECUTABLE_OPT_BUNDLE(openni_image ${SUBSYS_NAME} openni_image.cpp) -- target_link_libraries(openni_image pcl_common pcl_io pcl_kdtree pcl_visualization) --endif() -- diff --git a/src/pcl-3-fix-hashmap.patch b/src/pcl-3-fix-hashmap.patch deleted file mode 100644 index 245b944f..00000000 --- a/src/pcl-3-fix-hashmap.patch +++ /dev/null @@ -1,14 +0,0 @@ -This file is part of MXE. -See index.html for further information. - ---- a/surface/include/pcl/surface/poisson/hash.h 2012-12-06 09:09:17.962812894 +0100 -+++ b/surface/include/pcl/surface/poisson/hash.h 2012-12-06 09:09:29.630812193 +0100 -@@ -43,7 +43,7 @@ - #define PCL_POISSON_HASH_H_ - - --#ifdef WIN32 -+#ifdef _MSC_VER - #include - using namespace stdext; - #else // !WIN32 diff --git a/src/pcl.mk b/src/pcl.mk index cd7c91d7..ce53ca22 100644 --- a/src/pcl.mk +++ b/src/pcl.mk @@ -3,17 +3,17 @@ PKG := pcl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.0 -$(PKG)_CHECKSUM := 45a2e155d7faf5901abe609fd40d5f1659015e9e -$(PKG)_SUBDIR := PCL-$($(PKG)_VERSION)-Source -$(PKG)_FILE := PCL-$($(PKG)_VERSION)-Source.tar.bz2 -$(PKG)_URL := http://www.pointclouds.org/assets/files/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_VERSION := 1.7.1 +$(PKG)_CHECKSUM := 784bce606141260423ea04f37b093f59d4c94c6a +$(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/PointCloudLibrary/pcl/archive/$($(PKG)_FILE) $(PKG)_DEPS := gcc libgomp boost eigen flann vtk define $(PKG)_UPDATE - $(WGET) -q -O- "http://www.pointclouds.org/downloads/" | \ + $(WGET) -q -O- "https://github.com/PointCloudLibrary/pcl/releases" | \ grep ']*\)-Source.*,\1,p' | \ + $(SED) -n 's,.*pcl-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef @@ -24,9 +24,10 @@ endef # that PCL wants to use. define $(PKG)_BUILD - cd '$(1)' && \ + mkdir '$(1).build' + cd '$(1).build' && \ CXXFLAGS="-D__FLOAT_H -DFLT_MAX=__FLT_MAX__ -DFLT_MIN=__FLT_MIN__ -DDBL_MAX=__DBL_MAX__ -DDBL_MIN=__DBL_MIN__" \ - cmake . \ + cmake '$(1)' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DVTK_DIR='$(PREFIX)/$(TARGET)/lib/vtk-5.8' \ -DCMAKE_BUILD_TYPE=Release \ @@ -37,11 +38,14 @@ define $(PKG)_BUILD -DBUILD_apps=OFF \ -DBUILD_examples=OFF \ -DBUILD_global_tests=OFF \ - -DBUILD_tools=OFF - $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1)' -j 1 VERBOSE=1 - $(MAKE) -C '$(1)' -j 1 install VERBOSE=1 + -DBUILD_tools=OFF \ + -DHAVE_MM_MALLOC_EXITCODE=0 \ + -DHAVE_SSE4_1_EXTENSIONS_EXITCODE=0 \ + -DHAVE_SSE3_EXTENSIONS_EXITCODE=0 \ + -DHAVE_SSE2_EXTENSIONS_EXITCODE=0 \ + -DHAVE_SSE_EXTENSIONS_EXITCODE=0 + $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1)' -j 1 VERBOSE=1 + $(MAKE) -C '$(1).build' -j 1 install VERBOSE=1 endef -$(PKG)_BUILD_x86_64-w64-mingw32 = - $(PKG)_BUILD_SHARED = From 6a94a6acb0542b2d3bdb06947a41f20681bf7063 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 9 May 2014 21:38:49 +1000 Subject: [PATCH 3/7] package pcl: another float.h fix --- src/pcl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pcl.mk b/src/pcl.mk index ce53ca22..1be92c61 100644 --- a/src/pcl.mk +++ b/src/pcl.mk @@ -26,7 +26,7 @@ endef define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && \ - CXXFLAGS="-D__FLOAT_H -DFLT_MAX=__FLT_MAX__ -DFLT_MIN=__FLT_MIN__ -DDBL_MAX=__DBL_MAX__ -DDBL_MIN=__DBL_MIN__" \ + CXXFLAGS="-D__FLOAT_H -DFLT_MAX=__FLT_MAX__ -DFLT_MIN=__FLT_MIN__ -DDBL_MAX=__DBL_MAX__ -DDBL_MIN=__DBL_MIN__ -DDBL_EPSILON=__DBL_EPSILON__" \ cmake '$(1)' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DVTK_DIR='$(PREFIX)/$(TARGET)/lib/vtk-5.8' \ From d2dd2e66328e5a86412fc1cd314c465fd9c0a606 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 10 May 2014 01:23:00 +1000 Subject: [PATCH 4/7] package lame: disable exe build --- src/lame.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lame.mk b/src/lame.mk index 0488c9af..acdf3976 100644 --- a/src/lame.mk +++ b/src/lame.mk @@ -21,7 +21,8 @@ endef define $(PKG)_BUILD cd '$(1)' && autoreconf -i && ./configure \ - $(MXE_CONFIGURE_OPTS) + $(MXE_CONFIGURE_OPTS) \ + --disable-frontend $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef From 3d7cce8ce78d42c493d9de5e5e8c630d7db1c875 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 10 May 2014 02:44:32 +1000 Subject: [PATCH 5/7] update package gstreamer and plugins --- src/gst-plugins-base.mk | 4 ++-- src/gst-plugins-good.mk | 4 ++-- src/gstreamer.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk index d3b26276..229bfb7d 100644 --- a/src/gst-plugins-base.mk +++ b/src/gst-plugins-base.mk @@ -3,8 +3,8 @@ PKG := gst-plugins-base $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.2 -$(PKG)_CHECKSUM := cce95c868bdfccb8bcd37ccaa543af5c464240e1 +$(PKG)_VERSION := 1.3.1 +$(PKG)_CHECKSUM := 638749dddd93e8619fff08e1751d89cde5781dfd $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk index aa6d6a24..40fc9ebb 100644 --- a/src/gst-plugins-good.mk +++ b/src/gst-plugins-good.mk @@ -3,8 +3,8 @@ PKG := gst-plugins-good $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.2 -$(PKG)_CHECKSUM := d8c52f7883e98ffb35cd4b86cbd27420573ca864 +$(PKG)_VERSION := 1.3.1 +$(PKG)_CHECKSUM := c763f6480c7df905ef38c9404868841766a57df8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) diff --git a/src/gstreamer.mk b/src/gstreamer.mk index 5385133b..7568f99f 100644 --- a/src/gstreamer.mk +++ b/src/gstreamer.mk @@ -3,8 +3,8 @@ PKG := gstreamer $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.2 -$(PKG)_CHECKSUM := f57418b6de15fe2ed2e0b42209b3e1e0f7add70f +$(PKG)_VERSION := 1.3.1 +$(PKG)_CHECKSUM := 1fedc2a0db8b9a7d5fa044810e947263100f3cbf $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) From 03306a11f7c5702cd0b1b98fb0b88aaeddf69f41 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 10 May 2014 03:11:42 +1000 Subject: [PATCH 6/7] package lensfun: portability fix --- src/lensfun-3-mac-build.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/lensfun-3-mac-build.patch diff --git a/src/lensfun-3-mac-build.patch b/src/lensfun-3-mac-build.patch new file mode 100644 index 00000000..61f26219 --- /dev/null +++ b/src/lensfun-3-mac-build.patch @@ -0,0 +1,15 @@ +This file is part of MXE. +See index.html for further information. + +diff -ur lensfun-0.2.8.orig/build/tibs/compiler/pkgconfig.mak lensfun-0.2.8/build/tibs/compiler/pkgconfig.mak +--- lensfun-0.2.8.orig/build/tibs/compiler/pkgconfig.mak 2014-05-10 03:07:49.000000000 +1000 ++++ lensfun-0.2.8/build/tibs/compiler/pkgconfig.mak 2014-05-10 03:08:38.000000000 +1000 +@@ -4,7 +4,7 @@ + # Try to guess here if target supports pkgconfig + # - Any POSIX platform + # - Cross-compiling on a POSIX target for WINDOWS (mingw32) +-ifneq ($(findstring /posix/,/$(TARGET)/)$(findstring /posix-windows/,/$(HOST)-$(TARGET)/),) ++ifneq ($(findstring /posix/,/$(TARGET)/)$(findstring /posix-windows/,/$(HOST)-$(TARGET)/)$(findstring /mac-windows/,/$(HOST)-$(TARGET)/),) + + XFNAME.PKGCONFIG = $(addprefix $$(OUT),$1) + MKDEPS.PKGCONFIG = $1 From f4de8cfc99004014d9a07f821daece08e2dfcbec Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 9 May 2014 23:47:58 -0400 Subject: [PATCH 7/7] Update xvidcore Signed-off-by: Timothy Gu --- src/xvidcore-1-fixes.patch | 29 ----------------------------- src/xvidcore.mk | 4 ++-- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 src/xvidcore-1-fixes.patch diff --git a/src/xvidcore-1-fixes.patch b/src/xvidcore-1-fixes.patch deleted file mode 100644 index 6c65c1cc..00000000 --- a/src/xvidcore-1-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From dce4564d204160aee0da5107e69cbdefe2bec921 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Mon, 28 Mar 2011 00:00:51 +0200 -Subject: [PATCH] remove obsolete -mno-cygwin - - -diff --git a/configure.in b/configure.in -index 0536fe1..b954a10 100644 ---- a/configure.in -+++ b/configure.in -@@ -286,8 +286,8 @@ case "$target_os" in - AC_MSG_RESULT([ok]) - STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)" - SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)" -- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" -- SPECIFIC_CFLAGS="-mno-cygwin" -+ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" -+ SPECIFIC_CFLAGS="" - ;; - darwin*|raphsody*) - STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" --- -1.7.4.1 - diff --git a/src/xvidcore.mk b/src/xvidcore.mk index c6f24ad9..27072864 100644 --- a/src/xvidcore.mk +++ b/src/xvidcore.mk @@ -3,8 +3,8 @@ PKG := xvidcore $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.2 -$(PKG)_CHECKSUM := 56e065d331545ade04c63c91153b9624b51d6e1b +$(PKG)_VERSION := 1.3.3 +$(PKG)_CHECKSUM := 465763c92679ca230526d4890d17dbf6d6974b08 $(PKG)_SUBDIR := xvidcore/build/generic $(PKG)_FILE := xvidcore-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.xvid.org/downloads/$($(PKG)_FILE)