media/libjpeg/MOZCHANGES@b8a032363ba2 (annotated)
media/libjpeg/MOZCHANGES
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
| michael@0 | 1 | To upgrade to a new revision of libjpeg-turbo, do the following: |
| michael@0 | 2 | |
| michael@0 | 3 | * Check out libjpeg-turbo from SVN: |
| michael@0 | 4 | |
| michael@0 | 5 | $ svn co https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo/trunk libjpeg-turbo |
| michael@0 | 6 | |
| michael@0 | 7 | * In a clean clone of mozilla-central, run the following commands |
| michael@0 | 8 | |
| michael@0 | 9 | $ rm -rf media/libjpeg |
| michael@0 | 10 | $ svn export --ignore-externals /path/to/libjpeg-turbo media/libjpeg |
| michael@0 | 11 | $ cd media/libjpeg |
| michael@0 | 12 | |
| michael@0 | 13 | * Copy win/jsimdcfg.inc to simd/. |
| michael@0 | 14 | |
| michael@0 | 15 | * Since libjpeg-turbo normally creates config.h and jconfig.h at build time and |
| michael@0 | 16 | we use pre-generated versions, changes to jconfig.h.in and win/config.h.in |
| michael@0 | 17 | should be looked for and noted for later inclusion. |
| michael@0 | 18 | |
| michael@0 | 19 | * Now look through the new files and rm any which are npotb. When I upgraded |
| michael@0 | 20 | to libjpeg-turbo 1.1.0, the only files I kept which didn't match |
| michael@0 | 21 | |
| michael@0 | 22 | *.c *.h *.asm *.inc |
| michael@0 | 23 | |
| michael@0 | 24 | were README and README-turbo. |
| michael@0 | 25 | |
| michael@0 | 26 | You can easily look for all non *.c, *.h, *.asm, and *.inc files by running |
| michael@0 | 27 | |
| michael@0 | 28 | $ hg status -nu | grep -v '\(c\|h\|asm\|inc\)$' |
| michael@0 | 29 | |
| michael@0 | 30 | Once you're comfortable that you're only deleting files you want to delete |
| michael@0 | 31 | (and you've hg add'ed the files you want to keep), you can nuke the remaining |
| michael@0 | 32 | files with |
| michael@0 | 33 | |
| michael@0 | 34 | $ hg status -nu | grep -v '\(c\|h\|asm\|inc\)$' | xargs rm |
| michael@0 | 35 | |
| michael@0 | 36 | A helpful command for finding the *.c files which aren't *currently* part of |
| michael@0 | 37 | the build is |
| michael@0 | 38 | |
| michael@0 | 39 | diff <(ls *.c | sort) <(grep -o '\w*\.c' Makefile.in | sort) |
| michael@0 | 40 | |
| michael@0 | 41 | Of course, libjpeg-turbo might have added some new source files, so you'll |
| michael@0 | 42 | have to look though and figure out which of these files to keep. |
| michael@0 | 43 | |
| michael@0 | 44 | * Restore files modified in the Mozilla repository. |
| michael@0 | 45 | |
| michael@0 | 46 | $ hg revert --no-backup config.h jconfig.h Makefile.in MOZCHANGES \ |
| michael@0 | 47 | mozilla.diff simd/Makefile.in genTables.py |
| michael@0 | 48 | |
| michael@0 | 49 | * Update config.h and jconfig.h as noted previously. |
| michael@0 | 50 | |
| michael@0 | 51 | * Apply Mozilla-specific changes to upstream files. |
| michael@0 | 52 | |
| michael@0 | 53 | $ patch -p0 -i mozilla.diff |
| michael@0 | 54 | |
| michael@0 | 55 | * Update Makefile.in to build any new files. |
| michael@0 | 56 | |
| michael@0 | 57 | * Finally, tell hg that we've added or removed some files: |
| michael@0 | 58 | |
| michael@0 | 59 | $ hg addremove |
| michael@0 | 60 | |
| michael@0 | 61 | == March 24, 2014 (libjpeg-turbo v1.3.1 r1205 2014-03-22) == |
| michael@0 | 62 | |
| michael@0 | 63 | * Updated to v1.3.1 release. |
| michael@0 | 64 | |
| michael@0 | 65 | == November 25, 2013 == |
| michael@0 | 66 | |
| michael@0 | 67 | * Fix bug 891693. |
| michael@0 | 68 | |
| michael@0 | 69 | == June 4, 2013 (libjpeg-turbo v1.3.0 r988 2013-05-25) == |
| michael@0 | 70 | |
| michael@0 | 71 | * Updated to v1.3.0 release. |
| michael@0 | 72 | |
| michael@0 | 73 | == December 12, 2012 == |
| michael@0 | 74 | |
| michael@0 | 75 | * Replace the runtime computed jpeg_nbits_table with constants in |
| michael@0 | 76 | jpeg_nbits_table.h to make it shareable among processes. (bug 815473) |
| michael@0 | 77 | |
| michael@0 | 78 | == October 13, 2012 == |
| michael@0 | 79 | |
| michael@0 | 80 | * Modified config.h to use MOZ_ALWAYS_INLINE (bug 800106). |
| michael@0 | 81 | |
| michael@0 | 82 | == July 4, 2012 (libjpeg-turbo v1.2.1 r853 2012-06-30) == |
| michael@0 | 83 | |
| michael@0 | 84 | * Updated to v1.2.1 stable release. |
| michael@0 | 85 | |
| michael@0 | 86 | == June 5, 2012 (libjpeg-turbo v1.2.x branch, r831 2012-05-30) == |
| michael@0 | 87 | |
| michael@0 | 88 | * Updated to latest version on v1.2.x branch (bug 759891). |
| michael@0 | 89 | |
| michael@0 | 90 | == February 10, 2012 (libjpeg-turbo v1.2.0 r807 2012-02-10) == |
| michael@0 | 91 | |
| michael@0 | 92 | * Imported jchuff.c, jdhuff.c, jdhuff.h under new licensing. |
| michael@0 | 93 | |
| michael@0 | 94 | * Created mozilla.diff for the required jmorecfg.h changes and to allow for any |
| michael@0 | 95 | future changes made by Mozilla to upstream files. |
| michael@0 | 96 | |
| michael@0 | 97 | * Removed the following files which are unused by the Mozilla build: |
| michael@0 | 98 | |
| michael@0 | 99 | cderror.h, cdjpeg.h, jconfig.h.in, transupp.h, simd/jsimdcfg.inc.h |
| michael@0 | 100 | |
| michael@0 | 101 | |
| michael@0 | 102 | == March 28, 2011 (initial commit, libjpeg-turbo v1.1.0 r469 2011-02-27) == |
| michael@0 | 103 | |
| michael@0 | 104 | * Modified jmorecfg.h to define UINT8, UINT16, INT16, and INT32 in terms of |
| michael@0 | 105 | prtypes to fix a build error on Windows. |
| michael@0 | 106 | |
| michael@0 | 107 | * Defined INLINE as NS_ALWAYS_INLINE in jconfig.h. |
| michael@0 | 108 | |
| michael@0 | 109 | * Removed the following files which are licensed under the wxWindows license: |
| michael@0 | 110 | |
| michael@0 | 111 | bmp.c, bmp.h, jpegut.c, jpgtest.cxx, rrtimer.h, rrutil.h, turbojpeg.h, |
| michael@0 | 112 | turbojpegl.c |
| michael@0 | 113 | |
| michael@0 | 114 | * Reverted the following files to what was previously in Mozilla's tree |
| michael@0 | 115 | (nominally libjpeg 6.2): |
| michael@0 | 116 | |
| michael@0 | 117 | jchuff.c, jdhuff.c, jdhuff.h |
| michael@0 | 118 | |
| michael@0 | 119 | since the versions of these files in libjpeg-turbo are also under the |
| michael@0 | 120 | wxWindows license. (It would have been nicer to revert them to the new |
| michael@0 | 121 | libjpeg-8b code, but that doesn't easily integrate with libjpeg-turbo.) |
