Bug 584894 - Move libpng to media/libpng. r=khuey
authorBobby Holley <bobbyholley@gmail.com>
Mon, 17 Oct 2011 21:25:53 -0700
changeset 80489 e29520632bf325d678814fbdd2e03a092072239a
parent 80488 17405b1eb60024e0f532ad83412fb14335a370c2
child 80490 0a5e72d1b479b9f015a407e33e9001e5ad0aa786
push id90
push userffxbld
push dateSun, 29 Jan 2012 07:46:52 +0000
treeherdermozilla-release@acddb6b6a01c [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 libpng to media/libpng. r=khuey
configure.in
media/libpng/CHANGES
media/libpng/LICENSE
media/libpng/MOZCHANGES
media/libpng/Makefile.in
media/libpng/README
media/libpng/crashtests/374810-1.html
media/libpng/crashtests/crashtests.list
media/libpng/libpng.txt
media/libpng/mozpngconf.h
media/libpng/png.c
media/libpng/png.h
media/libpng/pngconf.h
media/libpng/pngerror.c
media/libpng/pngget.c
media/libpng/pngmem.c
media/libpng/pngpread.c
media/libpng/pngpriv.h
media/libpng/pngread.c
media/libpng/pngrio.c
media/libpng/pngrtran.c
media/libpng/pngrutil.c
media/libpng/pngset.c
media/libpng/pngtrans.c
media/libpng/pngwio.c
media/libpng/pngwrite.c
media/libpng/pngwtran.c
media/libpng/pngwutil.c
modules/libimg/png/CHANGES
modules/libimg/png/LICENSE
modules/libimg/png/MOZCHANGES
modules/libimg/png/Makefile.in
modules/libimg/png/README
modules/libimg/png/crashtests/374810-1.html
modules/libimg/png/crashtests/crashtests.list
modules/libimg/png/libpng.txt
modules/libimg/png/mozpngconf.h
modules/libimg/png/png.c
modules/libimg/png/png.h
modules/libimg/png/pngconf.h
modules/libimg/png/pngerror.c
modules/libimg/png/pngget.c
modules/libimg/png/pngmem.c
modules/libimg/png/pngpread.c
modules/libimg/png/pngpriv.h
modules/libimg/png/pngread.c
modules/libimg/png/pngrio.c
modules/libimg/png/pngrtran.c
modules/libimg/png/pngrutil.c
modules/libimg/png/pngset.c
modules/libimg/png/pngtrans.c
modules/libimg/png/pngwio.c
modules/libimg/png/pngwrite.c
modules/libimg/png/pngwtran.c
modules/libimg/png/pngwutil.c
testing/crashtest/crashtests.list
toolkit/toolkit-makefiles.sh
toolkit/toolkit-tiers.mk
tools/relic/relic
--- a/configure.in
+++ b/configure.in
@@ -1293,17 +1293,17 @@ MOZ_USER_DIR=".mozilla"
 
 MOZ_JPEG_CFLAGS=
 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_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
 
 MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
 MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
 DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
 MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
 XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
 LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
 XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
@@ -2287,17 +2287,17 @@ ia64*-hpux*)
             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)/media/libjpeg)'
-    MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/modules/libimg/png)'
+    MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/media/libpng)'
     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)
     AC_DEFINE(NEW_H, <new>)
rename from modules/libimg/png/CHANGES
rename to media/libpng/CHANGES
rename from modules/libimg/png/LICENSE
rename to media/libpng/LICENSE
rename from modules/libimg/png/MOZCHANGES
rename to media/libpng/MOZCHANGES
rename from modules/libimg/png/Makefile.in
rename to media/libpng/Makefile.in
--- a/modules/libimg/png/Makefile.in
+++ b/media/libpng/Makefile.in
@@ -30,17 +30,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
 
 MODULE		= png
 LIBRARY_NAME	= mozpng
rename from modules/libimg/png/README
rename to media/libpng/README
rename from modules/libimg/png/crashtests/374810-1.html
rename to media/libpng/crashtests/374810-1.html
rename from modules/libimg/png/crashtests/crashtests.list
rename to media/libpng/crashtests/crashtests.list
rename from modules/libimg/png/libpng.txt
rename to media/libpng/libpng.txt
rename from modules/libimg/png/mozpngconf.h
rename to media/libpng/mozpngconf.h
rename from modules/libimg/png/png.c
rename to media/libpng/png.c
rename from modules/libimg/png/png.h
rename to media/libpng/png.h
rename from modules/libimg/png/pngconf.h
rename to media/libpng/pngconf.h
rename from modules/libimg/png/pngerror.c
rename to media/libpng/pngerror.c
rename from modules/libimg/png/pngget.c
rename to media/libpng/pngget.c
rename from modules/libimg/png/pngmem.c
rename to media/libpng/pngmem.c
rename from modules/libimg/png/pngpread.c
rename to media/libpng/pngpread.c
rename from modules/libimg/png/pngpriv.h
rename to media/libpng/pngpriv.h
rename from modules/libimg/png/pngread.c
rename to media/libpng/pngread.c
rename from modules/libimg/png/pngrio.c
rename to media/libpng/pngrio.c
rename from modules/libimg/png/pngrtran.c
rename to media/libpng/pngrtran.c
rename from modules/libimg/png/pngrutil.c
rename to media/libpng/pngrutil.c
rename from modules/libimg/png/pngset.c
rename to media/libpng/pngset.c
rename from modules/libimg/png/pngtrans.c
rename to media/libpng/pngtrans.c
rename from modules/libimg/png/pngwio.c
rename to media/libpng/pngwio.c
rename from modules/libimg/png/pngwrite.c
rename to media/libpng/pngwrite.c
rename from modules/libimg/png/pngwtran.c
rename to media/libpng/pngwtran.c
rename from modules/libimg/png/pngwutil.c
rename to media/libpng/pngwutil.c
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -54,11 +54,11 @@ include ../../parser/htmlparser/tests/cr
 include ../../security/manager/ssl/crashtests/crashtests.list
 
 include ../../view/crashtests/crashtests.list
 
 include ../../widget/src/cocoa/crashtests/crashtests.list
 include ../../widget/src/gtk2/crashtests/crashtests.list
 include ../../widget/src/crashtests/crashtests.list
 
-include ../../modules/libimg/png/crashtests/crashtests.list
+include ../../media/libpng/crashtests/crashtests.list
 
 include ../../xpcom/string/crashtests/crashtests.list
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -999,17 +999,17 @@ if test -n "$MOZ_UPDATE_PACKAGING"; then
   add_makefiles "
     tools/update-packaging/Makefile
     other-licenses/bsdiff/Makefile
   "
 fi
 
 if [ ! "$SYSTEM_PNG" ]; then
   add_makefiles "
-    modules/libimg/png/Makefile
+    media/libpng/Makefile
   "
 fi
 
 if [ -f ${srcdir}/l10n/makefiles.all ]; then
   MAKEFILES_langpacks=`cat ${srcdir}/l10n/makefiles.all`
   add_makefiles "
     $MAKEFILES_langpacks
   "
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -153,17 +153,17 @@ endif
 
 ifdef MOZ_SYDNEYAUDIO
 tier_platform_dirs += \
 		media/libsydneyaudio \
 		$(NULL)
 endif
 
 ifndef MOZ_NATIVE_PNG
-tier_platform_dirs += modules/libimg/png
+tier_platform_dirs += media/libpng
 endif
 
 tier_platform_dirs	+= \
 		uriloader \
 		caps \
 		parser \
 		gfx \
 		modules/libpr0n \
--- a/tools/relic/relic
+++ b/tools/relic/relic
@@ -280,17 +280,17 @@ log = logging.getLogger("relic")
     "java",
     "privacy",
 
     # These have their own BSD-like license
     "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",
+    "media/libpng",
     "modules/zlib",
     "gc/boehm",
     "other-licenses",
     
     # Copy of GPLed tool
     "tools/buildbot",
     
     # Other directories we want to exclude