1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/media/libjpeg/MOZCHANGES Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,121 @@
1.4 +To upgrade to a new revision of libjpeg-turbo, do the following:
1.5 +
1.6 +* Check out libjpeg-turbo from SVN:
1.7 +
1.8 + $ svn co https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo/trunk libjpeg-turbo
1.9 +
1.10 +* In a clean clone of mozilla-central, run the following commands
1.11 +
1.12 + $ rm -rf media/libjpeg
1.13 + $ svn export --ignore-externals /path/to/libjpeg-turbo media/libjpeg
1.14 + $ cd media/libjpeg
1.15 +
1.16 +* Copy win/jsimdcfg.inc to simd/.
1.17 +
1.18 +* Since libjpeg-turbo normally creates config.h and jconfig.h at build time and
1.19 + we use pre-generated versions, changes to jconfig.h.in and win/config.h.in
1.20 + should be looked for and noted for later inclusion.
1.21 +
1.22 +* Now look through the new files and rm any which are npotb. When I upgraded
1.23 + to libjpeg-turbo 1.1.0, the only files I kept which didn't match
1.24 +
1.25 + *.c *.h *.asm *.inc
1.26 +
1.27 + were README and README-turbo.
1.28 +
1.29 + You can easily look for all non *.c, *.h, *.asm, and *.inc files by running
1.30 +
1.31 + $ hg status -nu | grep -v '\(c\|h\|asm\|inc\)$'
1.32 +
1.33 + Once you're comfortable that you're only deleting files you want to delete
1.34 + (and you've hg add'ed the files you want to keep), you can nuke the remaining
1.35 + files with
1.36 +
1.37 + $ hg status -nu | grep -v '\(c\|h\|asm\|inc\)$' | xargs rm
1.38 +
1.39 + A helpful command for finding the *.c files which aren't *currently* part of
1.40 + the build is
1.41 +
1.42 + diff <(ls *.c | sort) <(grep -o '\w*\.c' Makefile.in | sort)
1.43 +
1.44 + Of course, libjpeg-turbo might have added some new source files, so you'll
1.45 + have to look though and figure out which of these files to keep.
1.46 +
1.47 +* Restore files modified in the Mozilla repository.
1.48 +
1.49 + $ hg revert --no-backup config.h jconfig.h Makefile.in MOZCHANGES \
1.50 + mozilla.diff simd/Makefile.in genTables.py
1.51 +
1.52 +* Update config.h and jconfig.h as noted previously.
1.53 +
1.54 +* Apply Mozilla-specific changes to upstream files.
1.55 +
1.56 + $ patch -p0 -i mozilla.diff
1.57 +
1.58 +* Update Makefile.in to build any new files.
1.59 +
1.60 +* Finally, tell hg that we've added or removed some files:
1.61 +
1.62 + $ hg addremove
1.63 +
1.64 +== March 24, 2014 (libjpeg-turbo v1.3.1 r1205 2014-03-22) ==
1.65 +
1.66 +* Updated to v1.3.1 release.
1.67 +
1.68 +== November 25, 2013 ==
1.69 +
1.70 +* Fix bug 891693.
1.71 +
1.72 +== June 4, 2013 (libjpeg-turbo v1.3.0 r988 2013-05-25) ==
1.73 +
1.74 +* Updated to v1.3.0 release.
1.75 +
1.76 +== December 12, 2012 ==
1.77 +
1.78 +* Replace the runtime computed jpeg_nbits_table with constants in
1.79 + jpeg_nbits_table.h to make it shareable among processes. (bug 815473)
1.80 +
1.81 +== October 13, 2012 ==
1.82 +
1.83 +* Modified config.h to use MOZ_ALWAYS_INLINE (bug 800106).
1.84 +
1.85 +== July 4, 2012 (libjpeg-turbo v1.2.1 r853 2012-06-30) ==
1.86 +
1.87 +* Updated to v1.2.1 stable release.
1.88 +
1.89 +== June 5, 2012 (libjpeg-turbo v1.2.x branch, r831 2012-05-30) ==
1.90 +
1.91 +* Updated to latest version on v1.2.x branch (bug 759891).
1.92 +
1.93 +== February 10, 2012 (libjpeg-turbo v1.2.0 r807 2012-02-10) ==
1.94 +
1.95 +* Imported jchuff.c, jdhuff.c, jdhuff.h under new licensing.
1.96 +
1.97 +* Created mozilla.diff for the required jmorecfg.h changes and to allow for any
1.98 + future changes made by Mozilla to upstream files.
1.99 +
1.100 +* Removed the following files which are unused by the Mozilla build:
1.101 +
1.102 + cderror.h, cdjpeg.h, jconfig.h.in, transupp.h, simd/jsimdcfg.inc.h
1.103 +
1.104 +
1.105 +== March 28, 2011 (initial commit, libjpeg-turbo v1.1.0 r469 2011-02-27) ==
1.106 +
1.107 +* Modified jmorecfg.h to define UINT8, UINT16, INT16, and INT32 in terms of
1.108 + prtypes to fix a build error on Windows.
1.109 +
1.110 +* Defined INLINE as NS_ALWAYS_INLINE in jconfig.h.
1.111 +
1.112 +* Removed the following files which are licensed under the wxWindows license:
1.113 +
1.114 + bmp.c, bmp.h, jpegut.c, jpgtest.cxx, rrtimer.h, rrutil.h, turbojpeg.h,
1.115 + turbojpegl.c
1.116 +
1.117 +* Reverted the following files to what was previously in Mozilla's tree
1.118 + (nominally libjpeg 6.2):
1.119 +
1.120 + jchuff.c, jdhuff.c, jdhuff.h
1.121 +
1.122 + since the versions of these files in libjpeg-turbo are also under the
1.123 + wxWindows license. (It would have been nicer to revert them to the new
1.124 + libjpeg-8b code, but that doesn't easily integrate with libjpeg-turbo.)
