From 5a5b7e6d424e44c9beef3438d7212dfd089d2624 Mon Sep 17 00:00:00 2001
From: Stephen Gauthier <sgauthier@eveny.net>
Date: Mon, 14 Jul 2014 23:21:58 +0000
Subject: [PATCH] version bump for the following curl 7.37.0, nasm 2.11.05,
 libogg 1.3.2, x264 stable snapshot 20140711-2245, ffmpeg 2.2.4, gmp-6.0.0,
 Pillow-2.5.0, lz4 0.7.0, sqlite-autoconf-3080500

git-svn-id: https://xpra.org/svn/Xpra/trunk@6897 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 osx/jhbuild/xpra.modules | 45 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/osx/jhbuild/xpra.modules b/osx/jhbuild/xpra.modules
index 9f9ef49543..a4b16c0ac3 100644
--- a/osx/jhbuild/xpra.modules
+++ b/osx/jhbuild/xpra.modules
@@ -29,8 +29,8 @@
   <repository type="tarball" name="xpra.org" href="http://xpra.org"/>
 
   <autotools id="curl" autogenargs="" autogen-sh="configure">
-    <branch module="/download/curl-7.35.0.tar.gz"
-			version="7.35.0"
+    <branch module="/download/curl-7.37.0.tar.gz"
+			version="7.37.0"
             repo="curl.haxx.se"/>
   </autotools>
 
@@ -41,7 +41,7 @@
   </autotools>
 
   <autotools id="nasm" autogenargs="" autogen-sh="configure">
-    <branch module="/pub/nasm/releasebuilds/2.11.04/nasm-2.11.04.tar.bz2"
+    <branch module="/pub/nasm/releasebuilds/2.11.05/nasm-2.11.05.tar.bz2"
 			version="2.11.04"
             repo="www.nasm.us">
     <patch file="nasm-makefile-destdir.patch" strip="0" />
@@ -49,14 +49,14 @@
   </autotools>
 
   <autotools id="orc" autogenargs="" autogen-sh="configure">
-    <branch module="/data/src/orc/orc-0.4.19.tar.gz"
-			version="0.4.19"
+    <branch module="/data/src/orc/orc-0.4.21.tar.xz"
+			version="0.4.21"
             repo="gstreamer.freedesktop.org"/>
   </autotools>
 
   <autotools id="libogg" autogenargs="" autogen-sh="configure">
-    <branch module="/releases/ogg/libogg-1.3.1.tar.gz"
-			version="1.3.1"
+    <branch module="/releases/ogg/libogg-1.3.2.tar.xz"
+			version="1.3.2"
             repo="downloads.xiph.org"/>
   </autotools>
 
@@ -67,7 +67,7 @@
   </autotools>
 
   <autotools id="libvorbis" autogenargs="" autogen-sh="configure">
-    <branch module="/releases/vorbis/libvorbis-1.3.4.tar.gz"
+    <branch module="/releases/vorbis/libvorbis-1.3.4.tar.xz"
 			version="1.3.4"
             repo="downloads.xiph.org"/>
   </autotools>
@@ -133,8 +133,8 @@
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --libdir=%(libdir)s %(autogenargs)s"
              autogenargs="--enable-pic --enable-shared --enable-static"
              autogen-sh="configure">
-    <branch module="/pub/x264/snapshots/x264-snapshot-20140312-2245-stable.tar.bz2"
-			version="20140312-2245-stable"
+    <branch module="/pub/x264/snapshots/x264-snapshot-20140711-2245-stable.tar.bz2"
+			version="20140711-2245-stable"
             repo="download.videolan.org"/>
   </autotools>
 
@@ -157,9 +157,9 @@
 --disable-filter=atrim --disable-filter=null
 --disable-programs --disable-avfilter"
              autogen-sh="configure">
-    <branch module="/releases/ffmpeg-2.2.1.tar.bz2"
-			version="2.2.1"
-                        hash="md5:b8a1ee4964c2638f46fcc803ed453818"
+    <branch module="/releases/ffmpeg-2.2.4.tar.bz2"
+			version="2.2.4"
+                        hash="md5:5b85aea53d8dcd5b0f7b497f233bc101"
             repo="ffmpeg.org"/>
   </autotools>
 
@@ -195,8 +195,9 @@
   </autotools>
 
   <autotools id="gmplib" autogenargs="--build=i386-darwin" autogen-sh="configure">
-    <branch module="/pub/gmp-5.1.3/gmp-5.1.3.tar.bz2"
-			version="5.1.3"
+    <branch module="/pub/gmp-6.0.0/gmp-6.0.0a.tar.xz"
+			version="6.0.0a"
+                        checkoutdir="gmp-6.0.0"
             repo="ftp.gmplib.org"/>
   </autotools>
 
@@ -244,9 +245,9 @@
 
   <distutils id="python-pillow">
      <branch repo="pypi.python.org"
-	     module="/packages/source/P/Pillow/Pillow-2.4.0.zip"
-             hash="md5:b46ac9f00580920ffafe518bc765e43c"
-	     version="2.4.0"/>
+	     module="/packages/source/P/Pillow/Pillow-2.5.0.zip"
+             hash="md5:3da46b9a4aeba22e22724ba7a15fe617"
+	     version="2.5.0"/>
   </distutils>
 
   <distutils id="python-py2app">
@@ -275,8 +276,8 @@
 
   <distutils id="python-lz4">
      <branch repo="pypi.python.org"
-	     module="/packages/source/l/lz4/lz4-0.6.1.tar.gz"
-	     version="0.6.1"/>
+	     module="/packages/source/l/lz4/lz4-0.7.0.tar.gz"
+	     version="0.7.0"/>
   </distutils>
 
   <distutils id="python-macholib">
@@ -352,8 +353,8 @@
   </autotools>
 
   <autotools id="sqlite" autogenargs="" autogen-sh="configure">
-    <branch module="/2014/sqlite-autoconf-3080401.tar.gz"
-			version="3080401"
+    <branch module="/2014/sqlite-autoconf-3080500.tar.gz"
+			version="3080500"
             repo="sqlite.org"/>
   </autotools>