Bug 584894 - Move libjpeg to media/libjpeg. r=khuey
authorBobby Holley <bobbyholley@gmail.com>
Mon, 17 Oct 2011 21:25:53 -0700
changeset 78842 17405b1eb60024e0f532ad83412fb14335a370c2
parent 78841 3c684b4b8f6805dcd81f345f0c219406503a0fc0
child 78843 e29520632bf325d678814fbdd2e03a092072239a
push id21343
push userbobbyholley@gmail.com
push dateTue, 18 Oct 2011 04:36:09 +0000
treeherdermozilla-central@0a5e72d1b479 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs584894
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 584894 - Move libjpeg to media/libjpeg. r=khuey
configure.in
jpeg/MOZCHANGES
jpeg/Makefile.in
jpeg/README
jpeg/README-turbo.txt
jpeg/cderror.h
jpeg/cdjpeg.h
jpeg/jaricom.c
jpeg/jcapimin.c
jpeg/jcapistd.c
jpeg/jcarith.c
jpeg/jccoefct.c
jpeg/jccolor.c
jpeg/jcdctmgr.c
jpeg/jchuff.c
jpeg/jchuff.h
jpeg/jcinit.c
jpeg/jcmainct.c
jpeg/jcmarker.c
jpeg/jcmaster.c
jpeg/jcomapi.c
jpeg/jconfig.h
jpeg/jconfig.h.in
jpeg/jcparam.c
jpeg/jcphuff.c
jpeg/jcprepct.c
jpeg/jcsample.c
jpeg/jdapimin.c
jpeg/jdapistd.c
jpeg/jdarith.c
jpeg/jdatadst.c
jpeg/jdatasrc.c
jpeg/jdcoefct.c
jpeg/jdcolor.c
jpeg/jdct.h
jpeg/jddctmgr.c
jpeg/jdhuff.c
jpeg/jdhuff.h
jpeg/jdinput.c
jpeg/jdmainct.c
jpeg/jdmarker.c
jpeg/jdmaster.c
jpeg/jdmerge.c
jpeg/jdphuff.c
jpeg/jdpostct.c
jpeg/jdsample.c
jpeg/jdtrans.c
jpeg/jerror.c
jpeg/jerror.h
jpeg/jfdctflt.c
jpeg/jfdctfst.c
jpeg/jfdctint.c
jpeg/jidctflt.c
jpeg/jidctfst.c
jpeg/jidctint.c
jpeg/jidctred.c
jpeg/jinclude.h
jpeg/jmemmgr.c
jpeg/jmemnobs.c
jpeg/jmemsys.h
jpeg/jmorecfg.h
jpeg/jpegcomp.h
jpeg/jpegint.h
jpeg/jpeglib.h
jpeg/jquant1.c
jpeg/jquant2.c
jpeg/jsimd.h
jpeg/jsimd_none.c
jpeg/jsimddct.h
jpeg/jutils.c
jpeg/jversion.h
jpeg/simd/Makefile.in
jpeg/simd/jcclrmmx.asm
jpeg/simd/jcclrss2-64.asm
jpeg/simd/jcclrss2.asm
jpeg/simd/jccolmmx.asm
jpeg/simd/jccolss2-64.asm
jpeg/simd/jccolss2.asm
jpeg/simd/jcolsamp.inc
jpeg/simd/jcqnt3dn.asm
jpeg/simd/jcqntmmx.asm
jpeg/simd/jcqnts2f-64.asm
jpeg/simd/jcqnts2f.asm
jpeg/simd/jcqnts2i-64.asm
jpeg/simd/jcqnts2i.asm
jpeg/simd/jcqntsse.asm
jpeg/simd/jcsammmx.asm
jpeg/simd/jcsamss2-64.asm
jpeg/simd/jcsamss2.asm
jpeg/simd/jdclrmmx.asm
jpeg/simd/jdclrss2-64.asm
jpeg/simd/jdclrss2.asm
jpeg/simd/jdcolmmx.asm
jpeg/simd/jdcolss2-64.asm
jpeg/simd/jdcolss2.asm
jpeg/simd/jdct.inc
jpeg/simd/jdmermmx.asm
jpeg/simd/jdmerss2-64.asm
jpeg/simd/jdmerss2.asm
jpeg/simd/jdmrgmmx.asm
jpeg/simd/jdmrgss2-64.asm
jpeg/simd/jdmrgss2.asm
jpeg/simd/jdsammmx.asm
jpeg/simd/jdsamss2-64.asm
jpeg/simd/jdsamss2.asm
jpeg/simd/jf3dnflt.asm
jpeg/simd/jfmmxfst.asm
jpeg/simd/jfmmxint.asm
jpeg/simd/jfss2fst-64.asm
jpeg/simd/jfss2fst.asm
jpeg/simd/jfss2int-64.asm
jpeg/simd/jfss2int.asm
jpeg/simd/jfsseflt-64.asm
jpeg/simd/jfsseflt.asm
jpeg/simd/ji3dnflt.asm
jpeg/simd/jimmxfst.asm
jpeg/simd/jimmxint.asm
jpeg/simd/jimmxred.asm
jpeg/simd/jiss2flt-64.asm
jpeg/simd/jiss2flt.asm
jpeg/simd/jiss2fst-64.asm
jpeg/simd/jiss2fst.asm
jpeg/simd/jiss2int-64.asm
jpeg/simd/jiss2int.asm
jpeg/simd/jiss2red-64.asm
jpeg/simd/jiss2red.asm
jpeg/simd/jisseflt.asm
jpeg/simd/jsimd.h
jpeg/simd/jsimd_i386.c
jpeg/simd/jsimd_x86_64.c
jpeg/simd/jsimdcfg.inc
jpeg/simd/jsimdcfg.inc.h
jpeg/simd/jsimdcpu.asm
jpeg/simd/jsimdext.inc
jpeg/transupp.h
media/libjpeg/MOZCHANGES
media/libjpeg/Makefile.in
media/libjpeg/README
media/libjpeg/README-turbo.txt
media/libjpeg/cderror.h
media/libjpeg/cdjpeg.h
media/libjpeg/jaricom.c
media/libjpeg/jcapimin.c
media/libjpeg/jcapistd.c
media/libjpeg/jcarith.c
media/libjpeg/jccoefct.c
media/libjpeg/jccolor.c
media/libjpeg/jcdctmgr.c
media/libjpeg/jchuff.c
media/libjpeg/jchuff.h
media/libjpeg/jcinit.c
media/libjpeg/jcmainct.c
media/libjpeg/jcmarker.c
media/libjpeg/jcmaster.c
media/libjpeg/jcomapi.c
media/libjpeg/jconfig.h
media/libjpeg/jconfig.h.in
media/libjpeg/jcparam.c
media/libjpeg/jcphuff.c
media/libjpeg/jcprepct.c
media/libjpeg/jcsample.c
media/libjpeg/jdapimin.c
media/libjpeg/jdapistd.c
media/libjpeg/jdarith.c
media/libjpeg/jdatadst.c
media/libjpeg/jdatasrc.c
media/libjpeg/jdcoefct.c
media/libjpeg/jdcolor.c
media/libjpeg/jdct.h
media/libjpeg/jddctmgr.c
media/libjpeg/jdhuff.c
media/libjpeg/jdhuff.h
media/libjpeg/jdinput.c
media/libjpeg/jdmainct.c
media/libjpeg/jdmarker.c
media/libjpeg/jdmaster.c
media/libjpeg/jdmerge.c
media/libjpeg/jdphuff.c
media/libjpeg/jdpostct.c
media/libjpeg/jdsample.c
media/libjpeg/jdtrans.c
media/libjpeg/jerror.c
media/libjpeg/jerror.h
media/libjpeg/jfdctflt.c
media/libjpeg/jfdctfst.c
media/libjpeg/jfdctint.c
media/libjpeg/jidctflt.c
media/libjpeg/jidctfst.c
media/libjpeg/jidctint.c
media/libjpeg/jidctred.c
media/libjpeg/jinclude.h
media/libjpeg/jmemmgr.c
media/libjpeg/jmemnobs.c
media/libjpeg/jmemsys.h
media/libjpeg/jmorecfg.h
media/libjpeg/jpegcomp.h
media/libjpeg/jpegint.h
media/libjpeg/jpeglib.h
media/libjpeg/jquant1.c
media/libjpeg/jquant2.c
media/libjpeg/jsimd.h
media/libjpeg/jsimd_none.c
media/libjpeg/jsimddct.h
media/libjpeg/jutils.c
media/libjpeg/jversion.h
media/libjpeg/simd/Makefile.in
media/libjpeg/simd/jcclrmmx.asm
media/libjpeg/simd/jcclrss2-64.asm
media/libjpeg/simd/jcclrss2.asm
media/libjpeg/simd/jccolmmx.asm
media/libjpeg/simd/jccolss2-64.asm
media/libjpeg/simd/jccolss2.asm
media/libjpeg/simd/jcolsamp.inc
media/libjpeg/simd/jcqnt3dn.asm
media/libjpeg/simd/jcqntmmx.asm
media/libjpeg/simd/jcqnts2f-64.asm
media/libjpeg/simd/jcqnts2f.asm
media/libjpeg/simd/jcqnts2i-64.asm
media/libjpeg/simd/jcqnts2i.asm
media/libjpeg/simd/jcqntsse.asm
media/libjpeg/simd/jcsammmx.asm
media/libjpeg/simd/jcsamss2-64.asm
media/libjpeg/simd/jcsamss2.asm
media/libjpeg/simd/jdclrmmx.asm
media/libjpeg/simd/jdclrss2-64.asm
media/libjpeg/simd/jdclrss2.asm
media/libjpeg/simd/jdcolmmx.asm
media/libjpeg/simd/jdcolss2-64.asm
media/libjpeg/simd/jdcolss2.asm
media/libjpeg/simd/jdct.inc
media/libjpeg/simd/jdmermmx.asm
media/libjpeg/simd/jdmerss2-64.asm
media/libjpeg/simd/jdmerss2.asm
media/libjpeg/simd/jdmrgmmx.asm
media/libjpeg/simd/jdmrgss2-64.asm
media/libjpeg/simd/jdmrgss2.asm
media/libjpeg/simd/jdsammmx.asm
media/libjpeg/simd/jdsamss2-64.asm
media/libjpeg/simd/jdsamss2.asm
media/libjpeg/simd/jf3dnflt.asm
media/libjpeg/simd/jfmmxfst.asm
media/libjpeg/simd/jfmmxint.asm
media/libjpeg/simd/jfss2fst-64.asm
media/libjpeg/simd/jfss2fst.asm
media/libjpeg/simd/jfss2int-64.asm
media/libjpeg/simd/jfss2int.asm
media/libjpeg/simd/jfsseflt-64.asm
media/libjpeg/simd/jfsseflt.asm
media/libjpeg/simd/ji3dnflt.asm
media/libjpeg/simd/jimmxfst.asm
media/libjpeg/simd/jimmxint.asm
media/libjpeg/simd/jimmxred.asm
media/libjpeg/simd/jiss2flt-64.asm
media/libjpeg/simd/jiss2flt.asm
media/libjpeg/simd/jiss2fst-64.asm
media/libjpeg/simd/jiss2fst.asm
media/libjpeg/simd/jiss2int-64.asm
media/libjpeg/simd/jiss2int.asm
media/libjpeg/simd/jiss2red-64.asm
media/libjpeg/simd/jiss2red.asm
media/libjpeg/simd/jisseflt.asm
media/libjpeg/simd/jsimd.h
media/libjpeg/simd/jsimd_i386.c
media/libjpeg/simd/jsimd_x86_64.c
media/libjpeg/simd/jsimdcfg.inc
media/libjpeg/simd/jsimdcfg.inc.h
media/libjpeg/simd/jsimdcpu.asm
media/libjpeg/simd/jsimdext.inc
media/libjpeg/transupp.h
toolkit/toolkit-makefiles.sh
toolkit/toolkit-tiers.mk
tools/relic/relic
--- a/configure.in
+++ b/configure.in
@@ -1287,17 +1287,17 @@ LIB_SUFFIX=a
 ASM_SUFFIX=s
 IMPORT_LIB_SUFFIX=
 TARGET_MD_ARCH=unix
 DIRENT_INO=d_ino
 WIN_TOP_SRC=
 MOZ_USER_DIR=".mozilla"
 
 MOZ_JPEG_CFLAGS=
-MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/jpeg)'
+MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/media/libjpeg)'
 MOZ_ZLIB_CFLAGS=
 MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/modules/zlib/src)'
 MOZ_BZ2_CFLAGS=
 MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)'
 MOZ_PNG_CFLAGS=
 MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/modules/libimg/png)'
 
 MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
@@ -2286,17 +2286,17 @@ ia64*-hpux*)
             dnl but we work around it here.
             PROFILE_USE_CFLAGS="-GL -wd4624 -wd4952"
             dnl XXX: should be -LTCG:PGOPTIMIZE, but that fails on libxul.
             dnl Probably also a compiler bug, but what can you do?
             PROFILE_USE_LDFLAGS="-LTCG:PGUPDATE"
             LDFLAGS="$LDFLAGS -DYNAMICBASE"
         fi
     fi
-    MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg32$(VERSION_NUMBER),$(DEPTH)/jpeg)'
+    MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg32$(VERSION_NUMBER),$(DEPTH)/media/libjpeg)'
     MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/modules/libimg/png)'
     AC_DEFINE(HAVE_SNPRINTF)
     AC_DEFINE(_WINDOWS)
     AC_DEFINE(WIN32)
     AC_DEFINE(XP_WIN)
     AC_DEFINE(XP_WIN32)
     AC_DEFINE(HW_THREADS)
     AC_DEFINE(STDC_HEADERS)
rename from jpeg/MOZCHANGES
rename to media/libjpeg/MOZCHANGES
rename from jpeg/Makefile.in
rename to media/libjpeg/Makefile.in
--- a/jpeg/Makefile.in
+++ b/media/libjpeg/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS		= simd
 MODULE		= jpeg
@@ -102,17 +102,17 @@ CSRCS		+= \
 		jcparam.c \
 		jcphuff.c \
 		jcprepct.c \
 		jcsample.c \
 		$(NULL)
 
 AS=$(LIBJPEG_TURBO_AS)
 ASM_SUFFIX=asm
-ASFLAGS=$(LIBJPEG_TURBO_ASFLAGS) -I$(topsrcdir)/jpeg/simd/
+ASFLAGS=$(LIBJPEG_TURBO_ASFLAGS) -I$(topsrcdir)/media/libjpeg/simd/
 
 ifeq ($(AS),yasm)
   # yasm doesn't like -c
   AS_DASH_C_FLAG=
 endif
 
 # No SIMD support?
 ifeq (,$(LIBJPEG_TURBO_X86_ASM)$(LIBJPEG_TURBO_X64_ASM))
rename from jpeg/README
rename to media/libjpeg/README
rename from jpeg/README-turbo.txt
rename to media/libjpeg/README-turbo.txt
rename from jpeg/cderror.h
rename to media/libjpeg/cderror.h
rename from jpeg/cdjpeg.h
rename to media/libjpeg/cdjpeg.h
rename from jpeg/jaricom.c
rename to media/libjpeg/jaricom.c
rename from jpeg/jcapimin.c
rename to media/libjpeg/jcapimin.c
rename from jpeg/jcapistd.c
rename to media/libjpeg/jcapistd.c
rename from jpeg/jcarith.c
rename to media/libjpeg/jcarith.c
rename from jpeg/jccoefct.c
rename to media/libjpeg/jccoefct.c
rename from jpeg/jccolor.c
rename to media/libjpeg/jccolor.c
rename from jpeg/jcdctmgr.c
rename to media/libjpeg/jcdctmgr.c
rename from jpeg/jchuff.c
rename to media/libjpeg/jchuff.c
rename from jpeg/jchuff.h
rename to media/libjpeg/jchuff.h
rename from jpeg/jcinit.c
rename to media/libjpeg/jcinit.c
rename from jpeg/jcmainct.c
rename to media/libjpeg/jcmainct.c
rename from jpeg/jcmarker.c
rename to media/libjpeg/jcmarker.c
rename from jpeg/jcmaster.c
rename to media/libjpeg/jcmaster.c
rename from jpeg/jcomapi.c
rename to media/libjpeg/jcomapi.c
rename from jpeg/jconfig.h
rename to media/libjpeg/jconfig.h
rename from jpeg/jconfig.h.in
rename to media/libjpeg/jconfig.h.in
rename from jpeg/jcparam.c
rename to media/libjpeg/jcparam.c
rename from jpeg/jcphuff.c
rename to media/libjpeg/jcphuff.c
rename from jpeg/jcprepct.c
rename to media/libjpeg/jcprepct.c
rename from jpeg/jcsample.c
rename to media/libjpeg/jcsample.c
rename from jpeg/jdapimin.c
rename to media/libjpeg/jdapimin.c
rename from jpeg/jdapistd.c
rename to media/libjpeg/jdapistd.c
rename from jpeg/jdarith.c
rename to media/libjpeg/jdarith.c
rename from jpeg/jdatadst.c
rename to media/libjpeg/jdatadst.c
rename from jpeg/jdatasrc.c
rename to media/libjpeg/jdatasrc.c
rename from jpeg/jdcoefct.c
rename to media/libjpeg/jdcoefct.c
rename from jpeg/jdcolor.c
rename to media/libjpeg/jdcolor.c
rename from jpeg/jdct.h
rename to media/libjpeg/jdct.h
rename from jpeg/jddctmgr.c
rename to media/libjpeg/jddctmgr.c
rename from jpeg/jdhuff.c
rename to media/libjpeg/jdhuff.c
rename from jpeg/jdhuff.h
rename to media/libjpeg/jdhuff.h
rename from jpeg/jdinput.c
rename to media/libjpeg/jdinput.c
rename from jpeg/jdmainct.c
rename to media/libjpeg/jdmainct.c
rename from jpeg/jdmarker.c
rename to media/libjpeg/jdmarker.c
rename from jpeg/jdmaster.c
rename to media/libjpeg/jdmaster.c
rename from jpeg/jdmerge.c
rename to media/libjpeg/jdmerge.c
rename from jpeg/jdphuff.c
rename to media/libjpeg/jdphuff.c
rename from jpeg/jdpostct.c
rename to media/libjpeg/jdpostct.c
rename from jpeg/jdsample.c
rename to media/libjpeg/jdsample.c
rename from jpeg/jdtrans.c
rename to media/libjpeg/jdtrans.c
rename from jpeg/jerror.c
rename to media/libjpeg/jerror.c
rename from jpeg/jerror.h
rename to media/libjpeg/jerror.h
rename from jpeg/jfdctflt.c
rename to media/libjpeg/jfdctflt.c
rename from jpeg/jfdctfst.c
rename to media/libjpeg/jfdctfst.c
rename from jpeg/jfdctint.c
rename to media/libjpeg/jfdctint.c
rename from jpeg/jidctflt.c
rename to media/libjpeg/jidctflt.c
rename from jpeg/jidctfst.c
rename to media/libjpeg/jidctfst.c
rename from jpeg/jidctint.c
rename to media/libjpeg/jidctint.c
rename from jpeg/jidctred.c
rename to media/libjpeg/jidctred.c
rename from jpeg/jinclude.h
rename to media/libjpeg/jinclude.h
rename from jpeg/jmemmgr.c
rename to media/libjpeg/jmemmgr.c
rename from jpeg/jmemnobs.c
rename to media/libjpeg/jmemnobs.c
rename from jpeg/jmemsys.h
rename to media/libjpeg/jmemsys.h
rename from jpeg/jmorecfg.h
rename to media/libjpeg/jmorecfg.h
rename from jpeg/jpegcomp.h
rename to media/libjpeg/jpegcomp.h
rename from jpeg/jpegint.h
rename to media/libjpeg/jpegint.h
rename from jpeg/jpeglib.h
rename to media/libjpeg/jpeglib.h
rename from jpeg/jquant1.c
rename to media/libjpeg/jquant1.c
rename from jpeg/jquant2.c
rename to media/libjpeg/jquant2.c
rename from jpeg/jsimd.h
rename to media/libjpeg/jsimd.h
rename from jpeg/jsimd_none.c
rename to media/libjpeg/jsimd_none.c
rename from jpeg/jsimddct.h
rename to media/libjpeg/jsimddct.h
rename from jpeg/jutils.c
rename to media/libjpeg/jutils.c
rename from jpeg/jversion.h
rename to media/libjpeg/jversion.h
rename from jpeg/simd/Makefile.in
rename to media/libjpeg/simd/Makefile.in
--- a/jpeg/simd/Makefile.in
+++ b/media/libjpeg/simd/Makefile.in
@@ -31,17 +31,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # empty makefile so this directory gets created in the objdir.
 
rename from jpeg/simd/jcclrmmx.asm
rename to media/libjpeg/simd/jcclrmmx.asm
rename from jpeg/simd/jcclrss2-64.asm
rename to media/libjpeg/simd/jcclrss2-64.asm
rename from jpeg/simd/jcclrss2.asm
rename to media/libjpeg/simd/jcclrss2.asm
rename from jpeg/simd/jccolmmx.asm
rename to media/libjpeg/simd/jccolmmx.asm
rename from jpeg/simd/jccolss2-64.asm
rename to media/libjpeg/simd/jccolss2-64.asm
rename from jpeg/simd/jccolss2.asm
rename to media/libjpeg/simd/jccolss2.asm
rename from jpeg/simd/jcolsamp.inc
rename to media/libjpeg/simd/jcolsamp.inc
rename from jpeg/simd/jcqnt3dn.asm
rename to media/libjpeg/simd/jcqnt3dn.asm
rename from jpeg/simd/jcqntmmx.asm
rename to media/libjpeg/simd/jcqntmmx.asm
rename from jpeg/simd/jcqnts2f-64.asm
rename to media/libjpeg/simd/jcqnts2f-64.asm
rename from jpeg/simd/jcqnts2f.asm
rename to media/libjpeg/simd/jcqnts2f.asm
rename from jpeg/simd/jcqnts2i-64.asm
rename to media/libjpeg/simd/jcqnts2i-64.asm
rename from jpeg/simd/jcqnts2i.asm
rename to media/libjpeg/simd/jcqnts2i.asm
rename from jpeg/simd/jcqntsse.asm
rename to media/libjpeg/simd/jcqntsse.asm
rename from jpeg/simd/jcsammmx.asm
rename to media/libjpeg/simd/jcsammmx.asm
rename from jpeg/simd/jcsamss2-64.asm
rename to media/libjpeg/simd/jcsamss2-64.asm
rename from jpeg/simd/jcsamss2.asm
rename to media/libjpeg/simd/jcsamss2.asm
rename from jpeg/simd/jdclrmmx.asm
rename to media/libjpeg/simd/jdclrmmx.asm
rename from jpeg/simd/jdclrss2-64.asm
rename to media/libjpeg/simd/jdclrss2-64.asm
rename from jpeg/simd/jdclrss2.asm
rename to media/libjpeg/simd/jdclrss2.asm
rename from jpeg/simd/jdcolmmx.asm
rename to media/libjpeg/simd/jdcolmmx.asm
rename from jpeg/simd/jdcolss2-64.asm
rename to media/libjpeg/simd/jdcolss2-64.asm
rename from jpeg/simd/jdcolss2.asm
rename to media/libjpeg/simd/jdcolss2.asm
rename from jpeg/simd/jdct.inc
rename to media/libjpeg/simd/jdct.inc
rename from jpeg/simd/jdmermmx.asm
rename to media/libjpeg/simd/jdmermmx.asm
rename from jpeg/simd/jdmerss2-64.asm
rename to media/libjpeg/simd/jdmerss2-64.asm
rename from jpeg/simd/jdmerss2.asm
rename to media/libjpeg/simd/jdmerss2.asm
rename from jpeg/simd/jdmrgmmx.asm
rename to media/libjpeg/simd/jdmrgmmx.asm
rename from jpeg/simd/jdmrgss2-64.asm
rename to media/libjpeg/simd/jdmrgss2-64.asm
rename from jpeg/simd/jdmrgss2.asm
rename to media/libjpeg/simd/jdmrgss2.asm
rename from jpeg/simd/jdsammmx.asm
rename to media/libjpeg/simd/jdsammmx.asm
rename from jpeg/simd/jdsamss2-64.asm
rename to media/libjpeg/simd/jdsamss2-64.asm
rename from jpeg/simd/jdsamss2.asm
rename to media/libjpeg/simd/jdsamss2.asm
rename from jpeg/simd/jf3dnflt.asm
rename to media/libjpeg/simd/jf3dnflt.asm
rename from jpeg/simd/jfmmxfst.asm
rename to media/libjpeg/simd/jfmmxfst.asm
rename from jpeg/simd/jfmmxint.asm
rename to media/libjpeg/simd/jfmmxint.asm
rename from jpeg/simd/jfss2fst-64.asm
rename to media/libjpeg/simd/jfss2fst-64.asm
rename from jpeg/simd/jfss2fst.asm
rename to media/libjpeg/simd/jfss2fst.asm
rename from jpeg/simd/jfss2int-64.asm
rename to media/libjpeg/simd/jfss2int-64.asm
rename from jpeg/simd/jfss2int.asm
rename to media/libjpeg/simd/jfss2int.asm
rename from jpeg/simd/jfsseflt-64.asm
rename to media/libjpeg/simd/jfsseflt-64.asm
rename from jpeg/simd/jfsseflt.asm
rename to media/libjpeg/simd/jfsseflt.asm
rename from jpeg/simd/ji3dnflt.asm
rename to media/libjpeg/simd/ji3dnflt.asm
rename from jpeg/simd/jimmxfst.asm
rename to media/libjpeg/simd/jimmxfst.asm
rename from jpeg/simd/jimmxint.asm
rename to media/libjpeg/simd/jimmxint.asm
rename from jpeg/simd/jimmxred.asm
rename to media/libjpeg/simd/jimmxred.asm
rename from jpeg/simd/jiss2flt-64.asm
rename to media/libjpeg/simd/jiss2flt-64.asm
rename from jpeg/simd/jiss2flt.asm
rename to media/libjpeg/simd/jiss2flt.asm
rename from jpeg/simd/jiss2fst-64.asm
rename to media/libjpeg/simd/jiss2fst-64.asm
rename from jpeg/simd/jiss2fst.asm
rename to media/libjpeg/simd/jiss2fst.asm
rename from jpeg/simd/jiss2int-64.asm
rename to media/libjpeg/simd/jiss2int-64.asm
rename from jpeg/simd/jiss2int.asm
rename to media/libjpeg/simd/jiss2int.asm
rename from jpeg/simd/jiss2red-64.asm
rename to media/libjpeg/simd/jiss2red-64.asm
rename from jpeg/simd/jiss2red.asm
rename to media/libjpeg/simd/jiss2red.asm
rename from jpeg/simd/jisseflt.asm
rename to media/libjpeg/simd/jisseflt.asm
rename from jpeg/simd/jsimd.h
rename to media/libjpeg/simd/jsimd.h
rename from jpeg/simd/jsimd_i386.c
rename to media/libjpeg/simd/jsimd_i386.c
rename from jpeg/simd/jsimd_x86_64.c
rename to media/libjpeg/simd/jsimd_x86_64.c
rename from jpeg/simd/jsimdcfg.inc
rename to media/libjpeg/simd/jsimdcfg.inc
rename from jpeg/simd/jsimdcfg.inc.h
rename to media/libjpeg/simd/jsimdcfg.inc.h
rename from jpeg/simd/jsimdcpu.asm
rename to media/libjpeg/simd/jsimdcpu.asm
rename from jpeg/simd/jsimdext.inc
rename to media/libjpeg/simd/jsimdext.inc
rename from jpeg/transupp.h
rename to media/libjpeg/transupp.h
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -972,17 +972,17 @@ if test -n "$MOZ_PSM"; then
     security/manager/pki/src/Makefile
     security/manager/pki/public/Makefile
     security/manager/locales/Makefile
   "
 fi
 
 if [ ! "$SYSTEM_JPEG" ]; then
   add_makefiles "
-    jpeg/Makefile
+    media/libjpeg/Makefile
   "
 fi
 
 if [ ! "$SYSTEM_ZLIB" ]; then
   add_makefiles "
     modules/zlib/Makefile
     modules/zlib/src/Makefile
   "
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -69,17 +69,17 @@ ifdef MOZ_AUTH_EXTENSION
 tier_platform_dirs += extensions/auth
 endif
 
 #
 # "external" - 3rd party individual libraries
 #
 
 ifndef MOZ_NATIVE_JPEG
-tier_platform_dirs	+= jpeg
+tier_platform_dirs	+= media/libjpeg
 endif
 
 ifdef MOZ_UPDATER
 ifndef MOZ_NATIVE_BZ2
 tier_platform_dirs += modules/libbz2
 endif
 tier_platform_dirs += modules/libmar
 tier_platform_dirs += other-licenses/bsdiff
--- a/tools/relic/relic
+++ b/tools/relic/relic
@@ -276,18 +276,17 @@ log = logging.getLogger("relic")
     
     # These could be done, but no-one's clamouring for it, and it's a hassle
     # sorting it all out, so let sleeping dogs lie.
     "msgsdk",
     "java",
     "privacy",
 
     # These have their own BSD-like license
-    "jpeg",
-    "modules/libimg/mng",
+    "media/libjpeg",
     
     # The following are not supposed to be relicensed, but they do have a
     # few files in we care about (like makefiles)
     "modules/libimg/png",
     "modules/zlib",
     "gc/boehm",
     "other-licenses",