From 647f5ed23682f650fad1f23ced693a24258ac7dc Mon Sep 17 00:00:00 2001 From: dak180 Date: Tue, 23 Oct 2012 17:23:39 -0400 Subject: [PATCH] Update PhysFS to 2.0.3. Refs #3700. --- macosx/Warzone.xcodeproj/project.pbxproj | 15 --------------- macosx/configs/fetchscripts/PhysFS-FetchSource.sh | 8 ++++---- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/macosx/Warzone.xcodeproj/project.pbxproj b/macosx/Warzone.xcodeproj/project.pbxproj index eb89f9f66..64c1b60ae 100644 --- a/macosx/Warzone.xcodeproj/project.pbxproj +++ b/macosx/Warzone.xcodeproj/project.pbxproj @@ -17,7 +17,6 @@ 438B0C26137732A5008184FC /* Ogg - Fetch source */, 438B0C1E13773258008184FC /* Png - Fetch source */, 438B0C32137733B4008184FC /* PhysFS - Fetch source */, - 43962C5C15F0F1D200B146F2 /* PhysFS - Patch */, 438B0C2B1377336E008184FC /* Vorbis - Fetch source */, 43964E45150EDCE2007BCC60 /* Vorbis - Patch */, 438B0C3A137733F8008184FC /* Theora - Fetch source */, @@ -4401,20 +4400,6 @@ shellPath = /bin/sh; shellScript = ". configs/fetchscripts/Theora-FetchSource.sh"; }; - 43962C5C15F0F1D200B146F2 /* PhysFS - Patch */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "PhysFS - Patch"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd ${SRCROOT}/external/physfs\n\nif [[ -f \"882cdbd7d0a3.diff\" ]] && [[ -f \"8qzAkGJa.diff\" ]]; then\n\texit 0\nfi\n\nif ! curl -LfC - --connect-timeout \"30\" -o \"882cdbd7d0a3.diff\" \"http://hg.icculus.org/icculus/physfs/raw-rev/882cdbd7d0a3\"; then\n\tif ! curl -LfOC - --connect-timeout \"30\" \"http://wz2100.net/~dak180/BuildTools/Mac/882cdbd7d0a3.diff\"; then\n\t\techo \"error: Unable to fetch 882cdbd7d0a3.diff\" >&2\n\t\texit 1\n\tfi\nfi\n\nif ! curl -LfC - --connect-timeout \"30\" -o \"8qzAkGJa.diff\" \"http://pastebin.com/raw.php?i=8qzAkGJa\"; then\n\tif ! curl -LfOC - --connect-timeout \"30\" \"http://wz2100.net/~dak180/BuildTools/Mac/8qzAkGJa.diff\"; then\n\t\techo \"error: Unable to fetch 8qzAkGJa.diff\" >&2\n\t\texit 1\n\tfi\nfi\nperl -pi -e 's/\\r\\n/\\n/g' 8qzAkGJa.diff\nsed -i -e '$a\\' \"8qzAkGJa.diff\"\n\nif ! cat \"882cdbd7d0a3.diff\" \"8qzAkGJa.diff\" `echo ` | patch --posix -sNfp1; then\n\techo \"error: Unable to apply vorbis.diff\" >&2\n\texit 1\nfi\n\nexit 0\n"; - }; 43964E45150EDCE2007BCC60 /* Vorbis - Patch */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/macosx/configs/fetchscripts/PhysFS-FetchSource.sh b/macosx/configs/fetchscripts/PhysFS-FetchSource.sh index 0c74de758..b219edf9e 100755 --- a/macosx/configs/fetchscripts/PhysFS-FetchSource.sh +++ b/macosx/configs/fetchscripts/PhysFS-FetchSource.sh @@ -1,10 +1,10 @@ #!/bin/sh -DirectorY="physfs-2.0.2" OutDir="physfs" -FileName="physfs-2.0.2.tar.gz" -SourceDLP="http://icculus.org/physfs/downloads/physfs-2.0.2.tar.gz" -MD5Sum="4e8927c3d30279b03e2592106eb9184a" +DirectorY="${OutDir}-2.0.3" +FileName="${DirectorY}.tar.bz2" +SourceDLP="http://icculus.org/physfs/downloads/${FileName}" +MD5Sum="c2c727a8a8deb623b521b52d0080f613" configs/FetchSource.sh "${DirectorY}" "${OutDir}" "${FileName}" "${SourceDLP}" "${MD5Sum}" exit ${?}