summaryrefslogtreecommitdiff
path: root/media/update-libjpeg.sh
diff options
context:
space:
mode:
Diffstat (limited to 'media/update-libjpeg.sh')
-rw-r--r--[-rwxr-xr-x]media/update-libjpeg.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/media/update-libjpeg.sh b/media/update-libjpeg.sh
index 68a8e988ac..6a1b377bec 100755..100644
--- a/media/update-libjpeg.sh
+++ b/media/update-libjpeg.sh
@@ -17,14 +17,12 @@ tag=${2-HEAD}
(cd $repo; git archive --prefix=media/libjpeg/ $tag) | (cd $srcdir/..; tar xf -)
cd $srcdir/libjpeg
-cp win/jsimdcfg.inc simd/
-revert_files="1050342.diff jconfig.h jconfigint.h moz.build MOZCHANGES mozilla.diff simd/jsimdcfg.inc"
+revert_files="jconfig.h jconfigint.h moz.build MOZCHANGES mozilla.diff"
if test -d ${topsrcdir}/.hg; then
hg revert --no-backup $revert_files
-elif test -d ${topsrcdir}/.git; then
+elif test -e ${topsrcdir}/.git; then
git checkout HEAD -- $revert_files
fi
patch -p0 -i mozilla.diff
-patch -p0 -i 1050342.diff