Commits

Brad Pitcher committed c93fdfa Merge

merge

Comments (0)

Files changed (10)

src/dbus-1-fixes.patch

 This file is part of mingw-cross-env.
 See doc/index.html for further information.
 
-From 7241e09abbfc2021f2a7e5cbded70222023fa7e6 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
+Contains ad hoc patches for cross building.
+
+From 9c99802fc9d0e3b2c90b00ba877ae8be9bab615f Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
 Date: Tue, 4 Jan 2011 00:47:49 +0100
-Subject: [PATCH 1/1] always static in mingw-cross-env
+Subject: [PATCH 1/2] always static in mingw-cross-env
 
 
 diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
-index d1e40ec..3a32355 100644
+index dcd3eeb..8324278 100644
 --- a/dbus/dbus-macros.h
 +++ b/dbus/dbus-macros.h
 @@ -172,6 +172,7 @@
  #  define DBUS_EXPORT
  #  elif defined(dbus_1_EXPORTS)
 -- 
-1.7.1
+1.7.6.3
 
+
+From d7bc1aff67132c09d154999c282e1b391bbe7a39 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Fri, 23 Sep 2011 16:24:46 +0200
+Subject: [PATCH 2/2] add missing MemoryBarrier (mingw-cross-env specific)
+
+Windows API has this, but it's not in MinGW.
+See http://lists-archives.org/mingw-users/15935-missing-definition-of-memorybarrier.html
+
+diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
+index b492b09..082225f 100644
+--- a/dbus/dbus-sysdeps-win.c
++++ b/dbus/dbus-sysdeps-win.c
+@@ -55,6 +55,13 @@
+ #include <ws2tcpip.h>
+ #include <wincrypt.h>
+ 
++__CRT_INLINE VOID MemoryBarrier(VOID)
++{
++  LONG Barrier = 0;
++  __asm__ __volatile__("xchgl %%eax,%0 "
++    :"=r" (Barrier));
++}
++
+ /* Declarations missing in mingw's headers */
+ extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR  StringSid, PSID *Sid);
+ extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
+-- 
+1.7.6.3
+
 # dbus
 PKG             := dbus
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.5.4
-$(PKG)_CHECKSUM := 11bd5828ac56a3e8f125a487b5743f09914ecea6
+$(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/
 # ffmpeg
 PKG             := ffmpeg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.8.3
-$(PKG)_CHECKSUM := cea7bd5eb1c12fa5559610f9237aa8253b06f455
+$(PKG)_VERSION  := 0.8.4
+$(PKG)_CHECKSUM := 70fc95f2711defe4953862bd42a5a228cee803b8
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.ffmpeg.org/
 # libass
 PKG             := libass
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.9.13
-$(PKG)_CHECKSUM := 05e210bd081af3e542778bd3a687724547fcd2ca
+$(PKG)_VERSION  := 0.10.0
+$(PKG)_CHECKSUM := 7a0ea048f687421f3e1314988ca02f04861fc5f0
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.xz
 $(PKG)_WEBSITE  := http://code.google.com/p/libass/
 # libpng
 PKG             := libpng
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.5.4
-$(PKG)_CHECKSUM := acf6626a7ea6ff89e30c9c9eeffe992ee1605447
+$(PKG)_VERSION  := 1.5.5
+$(PKG)_CHECKSUM := 3583126fdd70a94f4c33c1b717f3ff4201d619af
 $(PKG)_SUBDIR   := libpng-$($(PKG)_VERSION)
 $(PKG)_FILE     := libpng-$($(PKG)_VERSION).tar.xz
 $(PKG)_WEBSITE  := http://www.libpng.org/

src/openexr-2-disable-zlib_winapi.patch

+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>
 # SQLite
 PKG             := sqlite
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3070701
-$(PKG)_CHECKSUM := ee405037ab49f46f657a9b314e66eec6009d5fc6
+$(PKG)_VERSION  := 3070800
+$(PKG)_CHECKSUM := 34852cfd49ddea440eb26a35ad32deee0176a724
 $(PKG)_SUBDIR   := $(PKG)-autoconf-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.sqlite.org/

src/vigra-1-png.patch

-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-Posted 4 March 2011 on:
-https://mailhost.informatik.uni-hamburg.de/pipermail/vigra/
-
-diff --git a/src/impex/png.cxx b/src/impex/png.cxx
-index 23786ef..08822bd 100644
---- a/src/impex/png.cxx
-+++ b/src/impex/png.cxx
-@@ -320,7 +320,11 @@ namespace vigra {
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
-         char * dummyName;
-         int dummyCompType;
-+#if (PNG_LIBPNG_VER < 10500)
-         char * profilePtr;
-+#else
-+        png_byte * profilePtr;
-+#endif
-         png_uint_32 profileLen;
-         if (png_get_valid( png, info, PNG_INFO_iCCP )) {
-             png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-@@ -592,7 +596,11 @@ namespace vigra {
-         // set icc profile
-         if (iccProfile.size() > 0) {
-             png_set_iCCP(png, info, (png_charp)("icc"), 0,
-+#if (PNG_LIBPNG_VER < 10500)
-                          (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+#else
-+                         (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+#endif
-         }
- #endif
- 
 # vigra
 PKG             := vigra
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.7.1
-$(PKG)_CHECKSUM := f90f54da31a6544057c25df7dbcc6954604de079
+$(PKG)_VERSION  := 1.8.0
+$(PKG)_CHECKSUM := 09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2
 $(PKG)_SUBDIR   := vigra-$(word 1,$(subst -, ,$($(PKG)_VERSION)))
 $(PKG)_FILE     := vigra-$($(PKG)_VERSION)-src.tar.gz
 $(PKG)_WEBSITE  := http://hci.iwr.uni-heidelberg.de/vigra
 $(PKG)_URL      := $($(PKG)_WEBSITE)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc jpeg tiff libpng
+$(PKG)_DEPS     := gcc jpeg tiff libpng openexr
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://hci.iwr.uni-heidelberg.de/vigra/' | \
         -DWITH_VALGRIND=OFF
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
 
-    $(TARGET)-gcc \
+    $(TARGET)-g++ \
         '$(2).cpp' -o $(PREFIX)/$(TARGET)/bin/test-vigra.exe \
         -DVIGRA_STATIC_LIB \
-        -lvigraimpex -ltiff -lpng -ljpeg -lz -lstdc++
+        -lvigraimpex `'$(TARGET)-pkg-config' OpenEXR --cflags --libs` -ltiff -lpng -ljpeg -lz
 endef
-
 # x264
 PKG             := x264
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 20110917-2245
-$(PKG)_CHECKSUM := 14b20146966a1d850895b05bbed732f3b5ca2630
+$(PKG)_VERSION  := 20110922-2245
+$(PKG)_CHECKSUM := 11ffbb5ce253afbfb3e6d5bf6f190e935b538ae2
 $(PKG)_SUBDIR   := $(PKG)-snapshot-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.videolan.org/developers/x264.html