1 To upgrade to a new revision of libjpeg-turbo, do the following:
3 * Check out libjpeg-turbo from git:
5 $ git clone https://github.com/libjpeg-turbo/libjpeg-turbo.git
7 * In a clean clone of mozilla-central, run the update script (tag defaults to HEAD):
9 $ ./media/update-libjpeg.sh /path/to/libjpeg-turbo [tag]
11 and fix up any rejects from applying the Mozilla specific patches at the end
14 * Since libjpeg-turbo normally creates jconfig.h and jconfigint.h at build time
15 and we use pre-generated versions, changes to jconfig.h.in and jconfigint.h.in
16 should be looked for and noted for later inclusion.
18 * Now look through the new files and rm any which are npotb. When I upgraded
19 to libjpeg-turbo 1.1.0, the only files I kept which didn't match
23 were README and README-turbo.
25 You can easily look for all non *.c, *.h, *.asm, and *.inc files by running
27 $ hg status -nu | grep -v '\(c\|h\|asm\|inc\|md\|ijg\)$'
29 Once you're comfortable that you're only deleting files you want to delete
30 (and you've hg add'ed the files you want to keep), you can nuke the remaining
33 $ hg status -nu | grep -v '\(c\|h\|asm\|inc\|md\|ijg\)$' | xargs rm
35 A helpful command for finding the *.c files which aren't *currently* part of
38 diff <(ls *.c | sort) <(grep -o '\w*\.c' Makefile.in | sort)
40 Of course, libjpeg-turbo might have added some new source files, so you'll
41 have to look though and figure out which of these files to keep.
43 * Update jconfig.h and jconfigint.h as noted previously.
45 * Update moz.build to build any new files.
47 * Finally, tell hg that we've added or removed some files:
51 == February 28, 2022 (libjpeg-turbo v2.1.3 c5f269eb9665435271c05fbcaf8721fa58e9eafa 2022-02-25) ==
53 * Updated to v2.1.3 release.
55 == September 9, 2021 (libjpeg-turbo v2.1.1 0a9b9721782d3a60a5c16c8c9a7abf3d4b1ecd42 2020-08-10) ==
57 * Updated to v2.1.1 release.
59 == November 19, 2020 (libjpeg-turbo v2.0.6 10ba6ed3365615ed5c2995fe2d240cb2d5000173 2020-11-16) ==
61 * Updated to v2.0.6 release.
63 == January 6, 2020 (libjpeg-turbo v2.0.4 166e34213e4f4e2363ce058a7bcc69fd03e38b76 2019-12-31) ==
65 * Updated to v2.0.4 release.
67 == September 5, 2019 (libjpeg-turbo v2.0.3 5db6a6819d0f904e0b58f34ae928fea234adb1a0 2019-09-04) ==
69 * Updated to v2.0.3 release.
71 == October 4, 2018 (libjpeg-turbo v2.0.0 574f3a772c96dc9db2c98ef24706feb3f6dbda9a 2018-06-27) ==
73 * Updated to v2.0.0 release.
75 == July 13, 2017 (libjpeg-turbo v1.5.2 e5c1613ccdfeffcd060fd94248b7c8ac7c0cfb0f 2017-08-09) ==
77 * Updated to v1.5.2 release.
79 == September 22, 2016 (libjpeg-turbo v1.5.1 cb88e5da8003afcdc443b787fdcb77285e5a8a02 2016-09-20) ==
81 * Updated to v1.5.1 release.
83 == June 23, 2016 (libjpeg-turbo v1.5.0 3ff13e651bbe6de9c6f15d05235d1d4f26f63ffc 2016-05-31) ==
85 * Updated to v1.5.0 release.
87 == October 5, 2015 (libjpeg-turbo v1.4.2 d8da49effe6460d55239c4c009c57f42d8e4a494 2015-09-21) ==
89 * Updated to v1.4.2 release.
91 == January 15, 2015 (libjpeg-turbo v1.4.0 r1481 2015-01-07) ==
93 * Updated to v1.4.0 release.
95 == March 24, 2014 (libjpeg-turbo v1.3.1 r1205 2014-03-22) ==
97 * Updated to v1.3.1 release.
99 == November 25, 2013 ==
103 == June 4, 2013 (libjpeg-turbo v1.3.0 r988 2013-05-25) ==
105 * Updated to v1.3.0 release.
107 == December 12, 2012 ==
109 * Replace the runtime computed jpeg_nbits_table with constants in
110 jpeg_nbits_table.h to make it shareable among processes. (bug 815473)
112 == October 13, 2012 ==
114 * Modified config.h to use MOZ_ALWAYS_INLINE (bug 800106).
116 == July 4, 2012 (libjpeg-turbo v1.2.1 r853 2012-06-30) ==
118 * Updated to v1.2.1 stable release.
120 == June 5, 2012 (libjpeg-turbo v1.2.x branch, r831 2012-05-30) ==
122 * Updated to latest version on v1.2.x branch (bug 759891).
124 == February 10, 2012 (libjpeg-turbo v1.2.0 r807 2012-02-10) ==
126 * Imported jchuff.c, jdhuff.c, jdhuff.h under new licensing.
128 * Created mozilla.diff for the required jmorecfg.h changes and to allow for any
129 future changes made by Mozilla to upstream files.
131 * Removed the following files which are unused by the Mozilla build:
133 cderror.h, cdjpeg.h, jconfig.h.in, transupp.h, simd/jsimdcfg.inc.h
136 == March 28, 2011 (initial commit, libjpeg-turbo v1.1.0 r469 2011-02-27) ==
138 * Modified jmorecfg.h to define UINT8, UINT16, INT16, and INT32 in terms of
139 prtypes to fix a build error on Windows.
141 * Defined INLINE as NS_ALWAYS_INLINE in jconfig.h.
143 * Removed the following files which are licensed under the wxWindows license:
145 bmp.c, bmp.h, jpegut.c, jpgtest.cxx, rrtimer.h, rrutil.h, turbojpeg.h,
148 * Reverted the following files to what was previously in Mozilla's tree
149 (nominally libjpeg 6.2):
151 jchuff.c, jdhuff.c, jdhuff.h
153 since the versions of these files in libjpeg-turbo are also under the
154 wxWindows license. (It would have been nicer to revert them to the new
155 libjpeg-8b code, but that doesn't easily integrate with libjpeg-turbo.)