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

Merge branch 'master' of https://github.com/mxe/mxe

This commit is contained in:
Timothy Gu 2014-05-09 20:50:22 -07:00
parent 20969b9645 f4de8cfc99
commit 726e91d6e3
13 changed files with 102 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/gcc-4-weak-x64.patch Normal file
View File

@ -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)

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

@ -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)

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

@ -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)

4
src/gstreamer.mk
View File

@ -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)

3
src/lame.mk
View File

@ -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

15
src/lensfun-3-mac-build.patch Normal file
View File

@ -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

17
src/pcl-1-disable-sse-check.patch
View File

@ -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")

16
src/pcl-1-disable-tools.patch Normal file
View File

@ -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)

30
src/pcl-2-disable-executables.patch
View File

@ -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()
-

14
src/pcl-3-fix-hashmap.patch
View File

@ -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 <hash_map>
using namespace stdext;
#else // !WIN32

34
src/pcl.mk
View File

@ -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 '<a href=.*tar' | \
$(SED) -n 's,.*PCL-\([0-9][^>]*\)-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)' && \
CXXFLAGS="-D__FLOAT_H -DFLT_MAX=__FLT_MAX__ -DFLT_MIN=__FLT_MIN__ -DDBL_MAX=__DBL_MAX__ -DDBL_MIN=__DBL_MIN__" \
cmake . \
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__ -DDBL_EPSILON=__DBL_EPSILON__" \
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 =

29
src/xvidcore-1-fixes.patch
View File

@ -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

4
src/xvidcore.mk
View File

@ -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)