diff options
Diffstat (limited to 'package')
22 files changed, 609 insertions, 428 deletions
diff --git a/package/alsa-lib/patches/patch-libtool b/package/alsa-lib/patches/patch-libtool new file mode 100644 index 000000000..7879d575a --- /dev/null +++ b/package/alsa-lib/patches/patch-libtool @@ -0,0 +1,177 @@ +--- alsa-lib-1.0.27.2.orig/libtool 2013-07-08 14:32:53.000000000 +0200 ++++ alsa-lib-1.0.27.2/libtool 2013-12-30 17:42:30.000000000 +0100 +@@ -1,8 +1,8 @@ +-#! /bin/sh ++#! /bin/bash + + # libtool - Provide generalized library-building support services. + # Generated automatically by config.status (alsa-lib) 1.0.27.2 +-# Libtool was configured on host alsa.alsa-project.org: ++# Libtool was configured on host helium: + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +@@ -40,7 +40,7 @@ available_tags="" + # ### BEGIN LIBTOOL CONFIG + + # Whether or not to build static libraries. +-build_old_libs=no ++build_old_libs=yes + + # Which release of libtool.m4 was used? + macro_version=2.4.2 +@@ -56,7 +56,7 @@ pic_mode=default + fast_install=yes + + # Shell to use when invoking shell scripts. +-SHELL="/bin/sh" ++SHELL="/bin/bash" + + # An echo program that protects backslashes. + ECHO="printf %s\\n" +@@ -65,38 +65,38 @@ ECHO="printf %s\\n" + PATH_SEPARATOR=":" + + # The host system. +-host_alias= +-host=x86_64-unknown-linux-gnu ++host_alias=i686-openadk-linux ++host=i686-openadk-linux-gnu + host_os=linux-gnu + + # The build system. +-build_alias= +-build=x86_64-unknown-linux-gnu ++build_alias=x86_64-linux-gnu ++build=x86_64-pc-linux-gnu + build_os=linux-gnu + + # A sed program that does not truncate output. +-SED="/usr/bin/sed" ++SED="/home/wbx/ibmx40/scripts/sed" + + # Sed that helps us avoid accidentally triggering echo(1) options like -n. + Xsed="$SED -e 1s/^X//" + + # A grep program that handles long lines. +-GREP="/usr/bin/grep" ++GREP="/bin/grep" + + # An ERE matcher. +-EGREP="/usr/bin/grep -E" ++EGREP="/bin/grep -E" + + # A literal string matcher. +-FGREP="/usr/bin/grep -F" ++FGREP="/bin/grep -F" + + # A BSD- or MS-compatible name lister. +-NM="/usr/bin/nm -B" ++NM="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-nm" + + # Whether we need soft or hard links. + LN_S="ln -s" + + # What is the maximum length of a command? +-max_cmd_len=1572864 ++max_cmd_len=3458764513820540925 + + # Object file suffix (normally "o"). + objext=o +@@ -120,7 +120,7 @@ to_host_file_cmd=func_convert_file_noop + to_tool_file_cmd=func_convert_file_noop + + # An object symbol dumper. +-OBJDUMP="objdump" ++OBJDUMP="i686-openadk-linux-objdump" + + # Method to check whether dependent libraries are shared objects. + deplibs_check_method="pass_all" +@@ -141,7 +141,7 @@ DLLTOOL="false" + sharedlib_from_linklib_cmd="printf %s\\n" + + # The archiver. +-AR="ar" ++AR="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ar" + + # Flags to create an archive. + AR_FLAGS="cru" +@@ -150,10 +150,10 @@ AR_FLAGS="cru" + archiver_list_spec="@" + + # A symbol stripping program. +-STRIP="strip" ++STRIP="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip" + + # Commands used to install an old-style archive. +-RANLIB="ranlib" ++RANLIB="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ranlib" + old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib" + old_postuninstall_cmds="" + +@@ -161,10 +161,10 @@ old_postuninstall_cmds="" + lock_old_archive_extraction=no + + # A C compiler. +-LTCC="gcc" ++LTCC="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-gcc" + + # LTCC compiler flags. +-LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe -D_GNU_SOURCE" ++LTCFLAGS="-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -fno-unwind-tables -fno-asynchronous-unwind-tables -g3 -D_GNU_SOURCE" + + # Take the output of nm and produce a listing of raw symbols and C names. + global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'" +@@ -272,27 +272,27 @@ finish_eval="" + hardcode_into_libs=yes + + # Compile-time system search path for libraries. +-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.7.2 /usr/lib64 /lib64 " ++sys_lib_search_path_spec="/home/wbx/ibmx40/host_i686_musl_musl/lib/gcc/i686-openadk-linux-musl/4.7.3 /home/wbx/ibmx40/host_i686_musl_musl/i686-openadk-linux-musl/lib /home/wbx/ibmx40/target_i686_musl_musl/lib /home/wbx/ibmx40/target_i686_musl_musl/usr/lib " + + # Run-time system search path for libraries. +-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/mysql /usr/lib64/qt-3.3/lib " ++sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu " + + # Whether dlopen is supported. + dlopen_support=yes + + # Whether dlopen of programs is supported. +-dlopen_self=yes ++dlopen_self=unknown + + # Whether dlopen of statically linked programs is supported. +-dlopen_self_static=yes ++dlopen_self_static=unknown + + # Commands to strip libraries. +-old_striplib="strip --strip-debug" +-striplib="strip --strip-unneeded" ++old_striplib="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip --strip-debug" ++striplib="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip --strip-unneeded" + + + # The linker used to build libraries. +-LD="/usr/bin/ld -m elf_x86_64" ++LD="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ld" + + # How to create reloadable object files. + reload_flag=" -r" +@@ -302,7 +302,7 @@ reload_cmds="\$LD\$reload_flag -o \$outp + old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib" + + # A language specific compiler. +-CC="gcc" ++CC="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-gcc" + + # Is the compiler the GNU compiler? + with_gcc=yes +@@ -317,7 +317,7 @@ pic_flag=" -fPIC -DPIC" + wl="-Wl," + + # Compiler flag to prevent dynamic linking. +-link_static_flag="" ++link_static_flag="-static" + + # Does compiler simultaneously support -c and -o options? + compiler_c_o="yes" diff --git a/package/alsa-lib/patches/patch-utils_alsa_pc_in b/package/alsa-lib/patches/patch-utils_alsa_pc_in new file mode 100644 index 000000000..d04f80248 --- /dev/null +++ b/package/alsa-lib/patches/patch-utils_alsa_pc_in @@ -0,0 +1,12 @@ +--- alsa-lib-1.0.27.2.orig/utils/alsa.pc.in 2013-07-08 14:31:36.000000000 +0200 ++++ alsa-lib-1.0.27.2/utils/alsa.pc.in 2014-01-01 17:07:29.000000000 +0100 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=${prefix}/lib ++includedir=${prefix}/include + + Name: alsa + Description: Advanced Linux Sound Architecture (ALSA) - Library diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 69df75db1..f1764e14f 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 24.0 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 06a4c0fe8d3a979aea2fce8d0fdbf328 +PKG_VERSION:= 26.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 91ce51cc6474f1269484e5327643a59c PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h index 137efacd8..5f7e30a10 100644 --- a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h +++ b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h @@ -1,23 +1,10 @@ ---- mozilla-release.orig/ipc/chromium/src/base/file_util.h 2013-09-11 01:15:04.000000000 +0200 -+++ mozilla-release/ipc/chromium/src/base/file_util.h 2013-10-23 16:28:38.000000000 +0200 -@@ -16,7 +16,11 @@ +--- mozilla-release.orig/ipc/chromium/src/base/file_util.h 2013-12-05 17:07:35.000000000 +0100 ++++ mozilla-release/ipc/chromium/src/base/file_util.h 2014-01-02 15:01:42.000000000 +0100 +@@ -16,7 +16,6 @@ #include <sys/stat.h> #elif defined(OS_POSIX) #include <sys/types.h> -+#ifndef __GLIBC__ -+#define NO_FTS -+#else - #include <fts.h> -+#endif +-#include <fts.h> #include <sys/stat.h> #endif -@@ -466,7 +470,7 @@ class FileEnumerator { - #if defined(OS_WIN) - WIN32_FIND_DATA find_data_; - HANDLE find_handle_; --#elif defined(ANDROID) -+#elif defined(NO_FTS) - void *fts_; - #elif defined(OS_POSIX) - FTS* fts_; diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc index 6721e44f8..7680a29c4 100644 --- a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc +++ b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc @@ -1,5 +1,5 @@ ---- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc 2013-09-11 01:15:04.000000000 +0200 -+++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc 2013-10-23 16:28:38.000000000 +0200 +--- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc 2013-12-05 17:07:35.000000000 +0100 ++++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc 2014-01-02 14:53:44.000000000 +0100 @@ -8,13 +8,16 @@ #include <errno.h> #include <fcntl.h> @@ -19,7 +19,7 @@ #include <sys/mman.h> #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures #include <sys/stat.h> -@@ -121,7 +124,7 @@ bool Delete(const FilePath& path, bool r +@@ -67,7 +70,7 @@ bool Delete(const FilePath& path, bool r if (!recursive) return (rmdir(path_str) == 0); @@ -28,7 +28,7 @@ // XXX Need ftsless impl for bionic return false; #else -@@ -194,7 +197,7 @@ bool CopyDirectory(const FilePath& from_ +@@ -140,7 +143,7 @@ bool CopyDirectory(const FilePath& from_ return false; } @@ -37,7 +37,7 @@ // XXX Need ftsless impl for bionic return false; #else -@@ -415,7 +418,7 @@ bool CreateNewTempDirectory(const FilePa +@@ -333,7 +336,7 @@ bool CreateNewTempDirectory(const FilePa return false; tmpdir = tmpdir.Append(kTempFileName); std::string tmpdir_string = tmpdir.value(); @@ -46,30 +46,3 @@ char* dtemp = NULL; #else // this should be OK since mkdtemp just replaces characters in place -@@ -613,7 +616,7 @@ FileEnumerator::FileEnumerator(const Fil - } - - FileEnumerator::~FileEnumerator() { --#ifndef ANDROID -+#ifndef NO_FTS - if (fts_) - fts_close(fts_); - #endif -@@ -625,7 +628,7 @@ void FileEnumerator::GetFindInfo(FindInf - if (!is_in_find_op_) - return; - --#ifndef ANDROID -+#ifndef NO_FTS - memcpy(&(info->stat), fts_ent_->fts_statp, sizeof(info->stat)); - info->filename.assign(fts_ent_->fts_name); - #endif -@@ -636,7 +639,7 @@ void FileEnumerator::GetFindInfo(FindInf - // large directories with many files this can be quite deep. - // TODO(erikkay) - get rid of this recursive pattern - FilePath FileEnumerator::Next() { --#ifdef ANDROID -+#ifdef NO_FTS - return FilePath(); - #else - if (!is_in_find_op_) { diff --git a/package/firefox/patches/patch-js_src_Makefile_in b/package/firefox/patches/patch-js_src_Makefile_in index cb1b863f9..d4acee98c 100644 --- a/package/firefox/patches/patch-js_src_Makefile_in +++ b/package/firefox/patches/patch-js_src_Makefile_in @@ -1,6 +1,6 @@ ---- mozilla-release.orig/js/src/Makefile.in 2013-09-11 01:15:04.000000000 +0200 -+++ mozilla-release/js/src/Makefile.in 2013-10-14 12:36:25.000000000 +0200 -@@ -112,7 +112,7 @@ ifdef JS_HAS_CTYPES +--- mozilla-release.orig/js/src/Makefile.in 2013-12-05 17:07:35.000000000 +0100 ++++ mozilla-release/js/src/Makefile.in 2014-01-02 14:53:44.000000000 +0100 +@@ -103,7 +103,7 @@ ifdef JS_HAS_CTYPES VPATH += $(srcdir)/ctypes ifdef MOZ_NATIVE_FFI diff --git a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c index be14ca662..bf6c335de 100644 --- a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c +++ b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c @@ -1,11 +1,33 @@ ---- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c 2013-09-11 01:15:16.000000000 +0200 -+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c 2013-12-10 13:18:17.000000000 +0100 -@@ -59,7 +59,7 @@ static char *RCSSTRING __UNUSED__="$Id: +--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c 2013-12-05 17:07:48.000000000 +0100 ++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c 2014-01-03 13:06:22.000000000 +0100 +@@ -53,7 +53,9 @@ static char *RCSSTRING __UNUSED__="$Id: + #undef __unused + #include <linux/sysctl.h> + #endif ++#if defined(__GLIBC__) + #include <net/if.h> ++#endif + #ifndef LINUX + #if !defined(__OpenBSD__) && !defined(__NetBSD__) + #include <net/if_var.h> +@@ -61,14 +63,17 @@ static char *RCSSTRING __UNUSED__="$Id: #include <net/if_dl.h> #include <net/if_types.h> #include <sys/sockio.h> -#else -+#elif __GLIBC__ ++#elif defined(__GLIBC__) + #include <linux/sockios.h> #include <linux/if.h> + #include <linux/kernel.h> + #include <linux/wireless.h> +-#ifndef ANDROID + #include <linux/ethtool.h> +-#endif ++#else ++#include <linux/sockios.h> ++#include <linux/kernel.h> ++#include <linux/wireless.h> ++#include <linux/ethtool.h> #endif #include <net/route.h> + diff --git a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_stun_h b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_stun_h new file mode 100644 index 000000000..7877d65cc --- /dev/null +++ b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_stun_h @@ -0,0 +1,12 @@ +--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/stun.h 2013-12-05 17:07:48.000000000 +0100 ++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h 2014-01-03 17:19:05.000000000 +0100 +@@ -39,7 +39,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + #else + #include <sys/param.h> + #include <sys/socket.h> ++#if defined(__GLIBC__) + #include <net/if.h> ++#endif + #ifndef LINUX + #if !defined(__OpenBSD__) && !defined(__NetBSD__) + #include <net/if_var.h> diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc index 6083460c5..3ee2e0fdc 100644 --- a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc +++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc @@ -1,23 +1,23 @@ ---- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2013-09-11 01:15:18.000000000 +0200 -+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2013-10-15 12:21:59.000000000 +0200 -@@ -38,11 +38,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo +--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2013-12-05 17:07:50.000000000 +0100 ++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2014-01-02 14:58:37.000000000 +0100 +@@ -36,11 +36,6 @@ uint32_t CpuInfo::DetectNumberOfCores() WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, "Available number of cores:%d", number_of_cores_); -#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) -- number_of_cores_ = get_nprocs(); +- number_of_cores_ = static_cast<uint32_t>(sysconf(_SC_NPROCESSORS_ONLN)); - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Available number of cores:%d", number_of_cores_); - #elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC) int name[] = { CTL_HW, -@@ -63,8 +58,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo +@@ -61,8 +56,6 @@ uint32_t CpuInfo::DetectNumberOfCores() "Failed to get number of cores"); number_of_cores_ = 1; } -#elif defined(_SC_NPROCESSORS_ONLN) -- _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN); +- number_of_cores_ = sysconf(_SC_NPROCESSORS_ONLN); #else WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1, "No function to get number of cores"); diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp index 7c262e5ff..ac1d23267 100644 --- a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp +++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp @@ -1,8 +1,8 @@ ---- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp 2013-09-11 01:15:18.000000000 +0200 -+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp 2013-10-15 16:05:38.000000000 +0200 +--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp 2013-12-05 17:07:50.000000000 +0100 ++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp 2014-01-02 14:53:44.000000000 +0100 @@ -21,6 +21,11 @@ Scott McMurray - #include "constants.hpp"
- #include <cstring>
+ #include <vector>
+ #include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"
+#include <features.h>
+#if defined(__UCLIBC__)
diff --git a/package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py b/package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py new file mode 100644 index 000000000..30f5edd57 --- /dev/null +++ b/package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py @@ -0,0 +1,11 @@ +--- mozilla-release.orig/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-05 17:07:53.000000000 +0100 ++++ mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py 2014-01-04 17:58:26.000000000 +0100 +@@ -421,7 +421,7 @@ class RecursiveMakeBackend(CommonBackend + def _handle_idl_manager(self, manager): + build_files = self._purge_manifests['xpidl'] + +- for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done', ++ for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done', + 'xpt/.mkdir.done'): + build_files.add(p) + diff --git a/package/firefox/patches/patch-tools_profiler_platform-linux_cc b/package/firefox/patches/patch-tools_profiler_platform-linux_cc index 7e9a44eba..a331e87fe 100644 --- a/package/firefox/patches/patch-tools_profiler_platform-linux_cc +++ b/package/firefox/patches/patch-tools_profiler_platform-linux_cc @@ -1,15 +1,15 @@ ---- mozilla-release.orig/tools/profiler/platform-linux.cc 2013-09-11 01:15:26.000000000 +0200 -+++ mozilla-release/tools/profiler/platform-linux.cc 2013-10-23 16:28:38.000000000 +0200 -@@ -53,7 +53,7 @@ - #include <sys/stat.h> // open +--- mozilla-release.orig/tools/profiler/platform-linux.cc 2013-12-05 17:07:58.000000000 +0100 ++++ mozilla-release/tools/profiler/platform-linux.cc 2014-01-02 14:59:20.000000000 +0100 +@@ -58,7 +58,7 @@ #include <fcntl.h> // open #include <unistd.h> // sysconf + #include <semaphore.h> -#ifdef __GLIBC__ +#if defined(__GLIBC__) && ! defined(__UCLIBC__) #include <execinfo.h> // backtrace, backtrace_symbols #endif // def __GLIBC__ #include <strings.h> // index -@@ -73,14 +73,12 @@ +@@ -84,14 +84,12 @@ #define SIGNAL_SAVE_PROFILE SIGUSR2 diff --git a/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc b/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc index 8ffa06228..40b8b594d 100644 --- a/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc +++ b/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc @@ -1,11 +1,11 @@ ---- mozilla-release.orig/tools/profiler/shared-libraries-linux.cc 2013-09-11 01:15:26.000000000 +0200 -+++ mozilla-release/tools/profiler/shared-libraries-linux.cc 2013-10-23 16:28:38.000000000 +0200 +--- mozilla-release.orig/tools/profiler/shared-libraries-linux.cc 2013-12-05 17:07:58.000000000 +0100 ++++ mozilla-release/tools/profiler/shared-libraries-linux.cc 2014-01-02 15:00:00.000000000 +0100 @@ -14,7 +14,7 @@ #include "platform.h" #include "shared-libraries.h" --#ifndef __GLIBC__ +-#if !defined(__GLIBC__) && ANDROID_VERSION < 18 +#if 0 - /* a crapy version of getline, because it's not included in bionic */ + /* a crapy version of getline, because it's not included in old bionics */ static ssize_t getline(char **lineptr, size_t *n, FILE *stream) { diff --git a/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp b/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp index e9c2a28ad..868ad69d4 100644 --- a/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp +++ b/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp @@ -1,6 +1,6 @@ ---- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp 2013-09-11 01:15:27.000000000 +0200 -+++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp 2013-10-14 14:33:08.000000000 +0200 -@@ -1256,8 +1256,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64 +--- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp 2013-12-05 17:08:00.000000000 +0100 ++++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp 2014-01-02 14:53:47.000000000 +0100 +@@ -1234,8 +1234,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64 && dq.dqb_bhardlimit) { int64_t QuotaSpaceAvailable = 0; diff --git a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp index eb7d1f21a..0f40d736a 100644 --- a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp +++ b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp @@ -1,6 +1,6 @@ ---- mozilla-release.orig/xpcom/threads/nsThread.cpp 2013-09-11 01:15:27.000000000 +0200 -+++ mozilla-release/xpcom/threads/nsThread.cpp 2013-10-14 15:49:25.000000000 +0200 -@@ -20,11 +20,13 @@ +--- mozilla-release.orig/xpcom/threads/nsThread.cpp 2013-12-05 17:08:00.000000000 +0100 ++++ mozilla-release/xpcom/threads/nsThread.cpp 2014-01-02 14:53:47.000000000 +0100 +@@ -23,11 +23,13 @@ _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \ !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700) diff --git a/package/libXft/patches/patch-src_xftglyphs_c b/package/libXft/patches/patch-src_xftglyphs_c index 54457857f..c8da32ca4 100644 --- a/package/libXft/patches/patch-src_xftglyphs_c +++ b/package/libXft/patches/patch-src_xftglyphs_c @@ -1,16 +1,17 @@ --- libXft-2.3.1.orig/src/xftglyphs.c 2012-06-02 18:36:35.000000000 +0200 -+++ libXft-2.3.1/src/xftglyphs.c 2013-12-07 12:17:23.000000000 +0100 ++++ libXft-2.3.1/src/xftglyphs.c 2014-01-02 14:41:02.000000000 +0100 @@ -21,10 +21,10 @@ */ #include "xftint.h" -#include <freetype/ftoutln.h> -#include <freetype/ftlcdfil.h> -+#include <ftoutln.h> -+#include <ftlcdfil.h> - +- -#include <freetype/ftsynth.h> -+#include <ftsynth.h> ++#include <ft2build.h> ++#include FT_OUTLINE_H ++#include FT_LCD_FILTER_H ++#include FT_SYNTHESIS_H /* * Validate the memory info for a font diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 1d43a4998..ea4c3a1f8 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libpng -PKG_VERSION:= 1.5.15 -PKG_RELEASE:= 2 -PKG_MD5SUM:= ea24254980fd820964a710e4d2a947c7 +PKG_VERSION:= 1.6.8 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 29b7065906e2551508a0d7eacd19174e PKG_DESCR:= A library for reading/writing PNG images PKG_SECTION:= libs PKG_DEPENDS:= zlib diff --git a/package/libpng/patches/libpng-1.5.15-apng.patch b/package/libpng/patches/libpng-1.6.8-apng.patch index b169303e9..02cf32620 100644 --- a/package/libpng/patches/libpng-1.5.15-apng.patch +++ b/package/libpng/patches/libpng-1.6.8-apng.patch @@ -1,7 +1,7 @@ -diff -Naru libpng-1.5.15.org/png.h libpng-1.5.15/png.h ---- libpng-1.5.15.org/png.h 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/png.h 2013-04-02 20:39:30.000000000 +0900 -@@ -448,6 +448,10 @@ +diff -Naru libpng-1.6.8.org/png.h libpng-1.6.8/png.h +--- libpng-1.6.8.org/png.h 2013-12-22 17:03:17.220988502 +0900 ++++ libpng-1.6.8/png.h 2013-12-22 17:03:17.287990651 +0900 +@@ -451,6 +451,10 @@ # include "pnglibconf.h" #endif @@ -10,9 +10,9 @@ diff -Naru libpng-1.5.15.org/png.h libpng-1.5.15/png.h +#define PNG_WRITE_APNG_SUPPORTED + #ifndef PNG_VERSION_INFO_ONLY - # ifndef PNG_BUILDING_SYMBOL_TABLE - /* -@@ -555,6 +559,17 @@ + /* Machine specific configuration. */ + # include "pngconf.h" +@@ -541,6 +545,17 @@ * See pngconf.h for base types that vary by machine/system */ @@ -30,7 +30,7 @@ diff -Naru libpng-1.5.15.org/png.h libpng-1.5.15/png.h /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -@@ -838,6 +853,10 @@ +@@ -861,6 +876,10 @@ #define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */ #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */ #define PNG_INFO_IDAT 0x8000 /* ESR, 1.0.6 */ @@ -41,7 +41,7 @@ diff -Naru libpng-1.5.15.org/png.h libpng-1.5.15/png.h /* This is used for the transformation routines, as some of them * change these values for the row. It also should enable using -@@ -883,6 +902,10 @@ +@@ -898,6 +917,10 @@ #ifdef PNG_PROGRESSIVE_READ_SUPPORTED typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop)); typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop)); @@ -52,97 +52,97 @@ diff -Naru libpng-1.5.15.org/png.h libpng-1.5.15/png.h /* The following callback receives png_uint_32 row_number, int pass for the * png_bytep data of the row. When transforming an interlaced image the -@@ -2702,6 +2725,74 @@ +@@ -3300,6 +3323,74 @@ /******************************************************************************* * END OF HARDWARE OPTIONS ******************************************************************************/ +#ifdef PNG_APNG_SUPPORTED -+PNG_EXPORT(237, png_uint_32, png_get_acTL, (png_structp png_ptr, ++PNG_EXPORT(245, png_uint_32, png_get_acTL, (png_structp png_ptr, + png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays)); + -+PNG_EXPORT(238, png_uint_32, png_set_acTL, (png_structp png_ptr, ++PNG_EXPORT(246, png_uint_32, png_set_acTL, (png_structp png_ptr, + png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays)); + -+PNG_EXPORT(239, png_uint_32, png_get_num_frames, (png_structp png_ptr, ++PNG_EXPORT(247, png_uint_32, png_get_num_frames, (png_structp png_ptr, + png_infop info_ptr)); + -+PNG_EXPORT(240, png_uint_32, png_get_num_plays, (png_structp png_ptr, ++PNG_EXPORT(248, png_uint_32, png_get_num_plays, (png_structp png_ptr, + png_infop info_ptr)); + -+PNG_EXPORT(241, png_uint_32, png_get_next_frame_fcTL, ++PNG_EXPORT(249, png_uint_32, png_get_next_frame_fcTL, + (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, + png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset, + png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op, + png_byte *blend_op)); + -+PNG_EXPORT(242, png_uint_32, png_set_next_frame_fcTL, ++PNG_EXPORT(250, png_uint_32, png_set_next_frame_fcTL, + (png_structp png_ptr, png_infop info_ptr, png_uint_32 width, + png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset, + png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, + png_byte blend_op)); + -+PNG_EXPORT(243, png_uint_32, png_get_next_frame_width, ++PNG_EXPORT(251, png_uint_32, png_get_next_frame_width, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(244, png_uint_32, png_get_next_frame_height, ++PNG_EXPORT(252, png_uint_32, png_get_next_frame_height, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(245, png_uint_32, png_get_next_frame_x_offset, ++PNG_EXPORT(253, png_uint_32, png_get_next_frame_x_offset, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(246, png_uint_32, png_get_next_frame_y_offset, ++PNG_EXPORT(254, png_uint_32, png_get_next_frame_y_offset, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(247, png_uint_16, png_get_next_frame_delay_num, ++PNG_EXPORT(255, png_uint_16, png_get_next_frame_delay_num, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(248, png_uint_16, png_get_next_frame_delay_den, ++PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_den, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(249, png_byte, png_get_next_frame_dispose_op, ++PNG_EXPORT(257, png_byte, png_get_next_frame_dispose_op, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(250, png_byte, png_get_next_frame_blend_op, ++PNG_EXPORT(258, png_byte, png_get_next_frame_blend_op, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(251, png_byte, png_get_first_frame_is_hidden, ++PNG_EXPORT(259, png_byte, png_get_first_frame_is_hidden, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(252, png_uint_32, png_set_first_frame_is_hidden, ++PNG_EXPORT(260, png_uint_32, png_set_first_frame_is_hidden, + (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden)); + +#ifdef PNG_READ_APNG_SUPPORTED -+PNG_EXPORT(253, void, png_read_frame_head, (png_structp png_ptr, ++PNG_EXPORT(261, void, png_read_frame_head, (png_structp png_ptr, + png_infop info_ptr)); +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED -+PNG_EXPORT(254, void, png_set_progressive_frame_fn, (png_structp png_ptr, ++PNG_EXPORT(262, void, png_set_progressive_frame_fn, (png_structp png_ptr, + png_progressive_frame_ptr frame_info_fn, + png_progressive_frame_ptr frame_end_fn)); +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ + +#ifdef PNG_WRITE_APNG_SUPPORTED -+PNG_EXPORT(255, void, png_write_frame_head, (png_structp png_ptr, ++PNG_EXPORT(263, void, png_write_frame_head, (png_structp png_ptr, + png_infop info_ptr, png_bytepp row_pointers, + png_uint_32 width, png_uint_32 height, + png_uint_32 x_offset, png_uint_32 y_offset, + png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, + png_byte blend_op)); + -+PNG_EXPORT(256, void, png_write_frame_tail, (png_structp png_ptr, ++PNG_EXPORT(264, void, png_write_frame_tail, (png_structp png_ptr, + png_infop info_ptr)); +#endif /* PNG_WRITE_APNG_SUPPORTED */ +#endif /* PNG_APNG_SUPPORTED */ /* Maintainer: Put new public prototypes here ^, in libpng.3, and project - * defs -@@ -2712,7 +2803,11 @@ + * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt +@@ -3310,7 +3401,11 @@ * scripts/symbols.def as well. */ #ifdef PNG_EXPORT_LAST_ORDINAL +#ifdef PNG_APNG_SUPPORTED -+ PNG_EXPORT_LAST_ORDINAL(256); ++ PNG_EXPORT_LAST_ORDINAL(264); +#else - PNG_EXPORT_LAST_ORDINAL(236); + PNG_EXPORT_LAST_ORDINAL(244); +#endif /* PNG_APNG_SUPPORTED */ #endif #ifdef __cplusplus -diff -Naru libpng-1.5.15.org/pngget.c libpng-1.5.15/pngget.c ---- libpng-1.5.15.org/pngget.c 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pngget.c 2013-04-02 20:39:30.000000000 +0900 -@@ -1140,4 +1140,166 @@ +diff -Naru libpng-1.6.8.org/pngget.c libpng-1.6.8/pngget.c +--- libpng-1.6.8.org/pngget.c 2013-12-22 17:03:17.220988502 +0900 ++++ libpng-1.6.8/pngget.c 2013-12-22 17:03:17.288990684 +0900 +@@ -1174,4 +1174,166 @@ # endif #endif @@ -309,10 +309,10 @@ diff -Naru libpng-1.5.15.org/pngget.c libpng-1.5.15/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.5.15.org/pnginfo.h libpng-1.5.15/pnginfo.h ---- libpng-1.5.15.org/pnginfo.h 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pnginfo.h 2013-04-02 20:39:30.000000000 +0900 -@@ -265,5 +265,18 @@ +diff -Naru libpng-1.6.8.org/pnginfo.h libpng-1.6.8/pnginfo.h +--- libpng-1.6.8.org/pnginfo.h 2013-12-22 17:03:17.220988502 +0900 ++++ libpng-1.6.8/pnginfo.h 2013-12-22 17:03:17.288990684 +0900 +@@ -256,5 +256,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,10 +331,10 @@ diff -Naru libpng-1.5.15.org/pnginfo.h libpng-1.5.15/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.5.15.org/pngpread.c libpng-1.5.15/pngpread.c ---- libpng-1.5.15.org/pngpread.c 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pngpread.c 2013-04-02 20:39:30.000000000 +0900 -@@ -215,6 +215,109 @@ +diff -Naru libpng-1.6.8.org/pngpread.c libpng-1.6.8/pngpread.c +--- libpng-1.6.8.org/pngpread.c 2013-12-22 17:03:17.221988534 +0900 ++++ libpng-1.6.8/pngpread.c 2013-12-22 17:03:17.288990684 +0900 +@@ -217,6 +217,109 @@ chunk_name = png_ptr->chunk_name; @@ -443,22 +443,21 @@ diff -Naru libpng-1.5.15.org/pngpread.c libpng-1.5.15/pngpread.c + if (chunk_name == png_IDAT) { - /* This is here above the if/else case statement below because if the -@@ -318,6 +421,10 @@ - png_benign_error(png_ptr, "Too many IDATs found"); - } + if (png_ptr->mode & PNG_AFTER_IDAT) +@@ -299,6 +402,9 @@ + else if (chunk_name == png_IDAT) + { +#ifdef PNG_READ_APNG_SUPPORTED + png_have_info(png_ptr, info_ptr); +#endif -+ png_ptr->idat_size = png_ptr->push_length; - png_ptr->mode |= PNG_HAVE_IDAT; png_ptr->process_mode = PNG_READ_IDAT_MODE; -@@ -551,6 +658,28 @@ - + png_push_have_info(png_ptr, info_ptr); +@@ -529,6 +635,30 @@ + png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length); + } #endif - +#ifdef PNG_READ_APNG_SUPPORTED + else if (chunk_name == png_acTL) + { @@ -467,6 +466,7 @@ diff -Naru libpng-1.5.15.org/pngpread.c libpng-1.5.15/pngpread.c + png_push_save_buffer(png_ptr); + return; + } ++ + png_handle_acTL(png_ptr, info_ptr, png_ptr->push_length); + } + @@ -477,14 +477,15 @@ diff -Naru libpng-1.5.15.org/pngpread.c libpng-1.5.15/pngpread.c + png_push_save_buffer(png_ptr); + return; + } ++ + png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length); + } -+#endif /* PNG_READ_APNG_SUPPORTED */ + ++#endif /* PNG_READ_APNG_SUPPORTED */ + else { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) -@@ -758,7 +887,11 @@ +@@ -731,7 +861,11 @@ png_byte chunk_tag[4]; /* TODO: this code can be commoned up with the same code in push_read */ @@ -496,14 +497,14 @@ diff -Naru libpng-1.5.15.org/pngpread.c libpng-1.5.15/pngpread.c { png_push_save_buffer(png_ptr); return; -@@ -771,17 +904,64 @@ +@@ -744,17 +878,64 @@ png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag); png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; +#ifdef PNG_READ_APNG_SUPPORTED + if (png_ptr->chunk_name != png_fdAT && png_ptr->num_frames_read > 0) + { -+ if (png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) ++ if (png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) + { + png_ptr->process_mode = PNG_READ_CHUNK_MODE; + if (png_ptr->frame_end_fn != NULL) @@ -537,7 +538,7 @@ diff -Naru libpng-1.5.15.org/pngpread.c libpng-1.5.15/pngpread.c { png_ptr->process_mode = PNG_READ_CHUNK_MODE; - if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED)) + if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED)) png_error(png_ptr, "Not enough compressed data"); +#ifdef PNG_READ_APNG_SUPPORTED @@ -561,7 +562,7 @@ diff -Naru libpng-1.5.15.org/pngpread.c libpng-1.5.15/pngpread.c } if (png_ptr->idat_size && png_ptr->save_buffer_size) -@@ -859,6 +1039,15 @@ +@@ -832,6 +1013,15 @@ if (!(buffer_length > 0) || buffer == NULL) png_error(png_ptr, "No IDAT data (internal error)"); @@ -569,7 +570,7 @@ diff -Naru libpng-1.5.15.org/pngpread.c libpng-1.5.15/pngpread.c + /* If the app is not APNG-aware, decode only the first frame */ + if (!(png_ptr->apng_flags & PNG_APNG_APP) && png_ptr->num_frames_read > 0) + { -+ png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED; ++ png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; + return; + } +#endif @@ -577,7 +578,7 @@ diff -Naru libpng-1.5.15.org/pngpread.c libpng-1.5.15/pngpread.c /* This routine must process all the data it has been given * before returning, calling the row callback as required to * handle the uncompressed results. -@@ -1304,6 +1493,18 @@ +@@ -1280,6 +1470,18 @@ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); } @@ -594,30 +595,30 @@ diff -Naru libpng-1.5.15.org/pngpread.c libpng-1.5.15/pngpread.c +#endif + png_voidp PNGAPI - png_get_progressive_ptr(png_const_structp png_ptr) + png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.5.15.org/pngpriv.h libpng-1.5.15/pngpriv.h ---- libpng-1.5.15.org/pngpriv.h 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pngpriv.h 2013-04-02 20:39:30.000000000 +0900 -@@ -461,6 +461,10 @@ - #define PNG_HAVE_PNG_SIGNATURE 0x1000 +diff -Naru libpng-1.6.8.org/pngpriv.h libpng-1.6.8/pngpriv.h +--- libpng-1.6.8.org/pngpriv.h 2013-12-22 17:03:17.221988534 +0900 ++++ libpng-1.6.8/pngpriv.h 2013-12-22 17:03:17.289990716 +0900 +@@ -550,6 +550,10 @@ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ - #define PNG_HAVE_iCCP 0x4000 + /* 0x4000 (unused) */ + #define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */ +#ifdef PNG_APNG_SUPPORTED -+#define PNG_HAVE_acTL 0x8000 -+#define PNG_HAVE_fcTL 0x10000 ++#define PNG_HAVE_acTL 0x10000 ++#define PNG_HAVE_fcTL 0x20000 +#endif /* Flags for the transformations the PNG library does on the image data */ #define PNG_BGR 0x0001 -@@ -658,6 +662,16 @@ - #define png_tRNS PNG_CHUNK(116, 82, 78, 83) - #define png_zTXt PNG_CHUNK(122, 84, 88, 116) +@@ -771,6 +775,16 @@ + #define png_tRNS PNG_U32(116, 82, 78, 83) + #define png_zTXt PNG_U32(122, 84, 88, 116) +#ifdef PNG_APNG_SUPPORTED -+#define png_acTL PNG_CHUNK( 97, 99, 84, 76) -+#define png_fcTL PNG_CHUNK(102, 99, 84, 76) -+#define png_fdAT PNG_CHUNK(102, 100, 65, 84) ++#define png_acTL PNG_U32( 97, 99, 84, 76) ++#define png_fcTL PNG_U32(102, 99, 84, 76) ++#define png_fdAT PNG_U32(102, 100, 65, 84) + +/* For png_struct.apng_flags: */ +#define PNG_FIRST_FRAME_HIDDEN 0x0001 @@ -627,66 +628,68 @@ diff -Naru libpng-1.5.15.org/pngpriv.h libpng-1.5.15/pngpriv.h /* The following will work on (signed char*) strings, whereas the get_uint_32 * macro will fail on top-bit-set values because of the sign extension. */ -@@ -1349,6 +1363,45 @@ - png_bytep row)); +@@ -1583,6 +1597,47 @@ + */ #endif +#ifdef PNG_APNG_SUPPORTED -+PNG_EXTERN void png_ensure_fcTL_is_valid PNGARG((png_structp png_ptr, ++PNG_INTERNAL_FUNCTION(void,png_ensure_fcTL_is_valid,(png_structp png_ptr, + png_uint_32 width, png_uint_32 height, + png_uint_32 x_offset, png_uint_32 y_offset, + png_uint_16 delay_num, png_uint_16 delay_den, -+ png_byte dispose_op, png_byte blend_op)); ++ png_byte dispose_op, png_byte blend_op), PNG_EMPTY); + +#ifdef PNG_READ_APNG_SUPPORTED -+PNG_EXTERN void png_handle_acTL PNGARG((png_structp png_ptr, png_infop info_ptr, -+ png_uint_32 length)); -+PNG_EXTERN void png_handle_fcTL PNGARG((png_structp png_ptr, png_infop info_ptr, -+ png_uint_32 length)); -+PNG_EXTERN void png_handle_fdAT PNGARG((png_structp png_ptr, png_infop info_ptr, -+ png_uint_32 length)); -+PNG_EXTERN void png_have_info PNGARG((png_structp png_ptr, png_infop info_ptr)); -+PNG_EXTERN void png_ensure_sequence_number PNGARG((png_structp png_ptr, -+ png_uint_32 length)); -+PNG_EXTERN void png_read_reset PNGARG((png_structp png_ptr)); -+PNG_EXTERN void png_read_reinit PNGARG((png_structp png_ptr, -+ png_infop info_ptr)); ++PNG_INTERNAL_FUNCTION(void,png_handle_acTL,(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_handle_fcTL,(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_handle_fdAT,(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_have_info,(png_structp png_ptr, png_infop info_ptr),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_ensure_sequence_number,(png_structp png_ptr, ++ png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_read_reset,(png_structp png_ptr),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_read_reinit,(png_structp png_ptr, ++ png_infop info_ptr),PNG_EMPTY); +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED -+PNG_EXTERN void png_progressive_read_reset PNGARG((png_structp png_ptr)); ++PNG_INTERNAL_FUNCTION(void,png_progressive_read_reset,(png_structp png_ptr),PNG_EMPTY); +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ + +#ifdef PNG_WRITE_APNG_SUPPORTED -+PNG_EXTERN void png_write_acTL PNGARG((png_structp png_ptr, -+ png_uint_32 num_frames, png_uint_32 num_plays)); -+PNG_EXTERN void png_write_fcTL PNGARG((png_structp png_ptr, ++PNG_INTERNAL_FUNCTION(void,png_write_acTL,(png_structp png_ptr, ++ png_uint_32 num_frames, png_uint_32 num_plays),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_write_fcTL,(png_structp png_ptr, + png_uint_32 width, png_uint_32 height, + png_uint_32 x_offset, png_uint_32 y_offset, + png_uint_16 delay_num, png_uint_16 delay_den, -+ png_byte dispose_op, png_byte blend_op)); -+PNG_EXTERN void png_write_reset PNGARG((png_structp png_ptr)); -+PNG_EXTERN void png_write_reinit PNGARG((png_structp png_ptr, -+ png_infop info_ptr, png_uint_32 width, png_uint_32 height)); ++ png_byte dispose_op, png_byte blend_op),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_write_fdAT,(png_structp png_ptr, ++ png_const_bytep data, png_size_t length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_write_reset,(png_structp png_ptr),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_write_reinit,(png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 width, png_uint_32 height),PNG_EMPTY); +#endif /* PNG_WRITE_APNG_SUPPORTED */ +#endif /* PNG_APNG_SUPPORTED */ + /* Added at libpng version 1.4.0 */ - #ifdef PNG_CHECK_cHRM_SUPPORTED - PNG_EXTERN int png_check_cHRM_fixed PNGARG((png_structp png_ptr, -diff -Naru libpng-1.5.15.org/pngread.c libpng-1.5.15/pngread.c ---- libpng-1.5.15.org/pngread.c 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pngread.c 2013-04-02 20:39:30.000000000 +0900 -@@ -240,6 +240,9 @@ - !(png_ptr->mode & PNG_HAVE_PLTE)) - png_error(png_ptr, "Missing PLTE before IDAT"); + #ifdef PNG_COLORSPACE_SUPPORTED + /* These internal functions are for maintaining the colorspace structure within +diff -Naru libpng-1.6.8.org/pngread.c libpng-1.6.8/pngread.c +--- libpng-1.6.8.org/pngread.c 2013-12-22 17:03:17.222988566 +0900 ++++ libpng-1.6.8/pngread.c 2013-12-22 17:03:17.290990748 +0900 +@@ -158,6 +158,9 @@ + else if (chunk_name == png_IDAT) + { +#ifdef PNG_READ_APNG_SUPPORTED + png_have_info(png_ptr, info_ptr); +#endif png_ptr->idat_size = length; - png_ptr->mode |= PNG_HAVE_IDAT; break; -@@ -330,12 +333,90 @@ + } +@@ -247,6 +250,17 @@ png_handle_iTXt(png_ptr, info_ptr, length); #endif @@ -702,8 +705,9 @@ diff -Naru libpng-1.5.15.org/pngread.c libpng-1.5.15/pngread.c +#endif + else - png_handle_unknown(png_ptr, info_ptr, length); - } + png_handle_unknown(png_ptr, info_ptr, length, + PNG_HANDLE_CHUNK_AS_DEFAULT); +@@ -254,6 +268,72 @@ } #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ @@ -723,9 +727,8 @@ diff -Naru libpng-1.5.15.org/pngread.c libpng-1.5.15/pngread.c + if (png_ptr->num_frames_read == 0) + return; + -+ png_crc_finish(png_ptr, 0); /* CRC from last IDAT or fdAT chunk */ -+ + png_read_reset(png_ptr); ++ png_ptr->flags &= ~PNG_FLAG_ROW_INIT; + png_ptr->mode &= ~PNG_HAVE_fcTL; + + have_chunk_after_DAT = 0; @@ -776,68 +779,11 @@ diff -Naru libpng-1.5.15.org/pngread.c libpng-1.5.15/pngread.c + /* Optional call to update the users info_ptr structure */ void PNGAPI - png_read_update_info(png_structp png_ptr, png_infop info_ptr) -@@ -537,6 +618,38 @@ - { - if (!(png_ptr->zstream.avail_in)) - { -+#ifdef PNG_READ_APNG_SUPPORTED -+ png_uint_32 bytes_to_skip = 0; -+ -+ while (!png_ptr->idat_size || bytes_to_skip != 0) -+ { -+ png_crc_finish(png_ptr, bytes_to_skip); -+ bytes_to_skip = 0; -+ -+ png_ptr->idat_size = png_read_chunk_header(png_ptr); -+ if (png_ptr->num_frames_read == 0) -+ { -+ if (png_ptr->chunk_name != png_IDAT) -+ png_error(png_ptr, "Not enough image data"); -+ } -+ else -+ { -+ if (png_ptr->chunk_name == png_IEND) -+ png_error(png_ptr, "Not enough image data"); -+ if (png_ptr->chunk_name != png_fdAT) -+ { -+ png_warning(png_ptr, "Skipped (ignored) a chunk " -+ "between APNG chunks"); -+ bytes_to_skip = png_ptr->idat_size; -+ continue; -+ } -+ -+ png_ensure_sequence_number(png_ptr, png_ptr->idat_size); -+ -+ png_ptr->idat_size -= 4; -+ } -+ } -+#else - while (!png_ptr->idat_size) - { - png_crc_finish(png_ptr, 0); -@@ -545,6 +658,7 @@ - if (png_ptr->chunk_name != png_IDAT) - png_error(png_ptr, "Not enough image data"); - } -+#endif - png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size; - png_ptr->zstream.next_in = png_ptr->zbuf; - if (png_ptr->zbuf_size > png_ptr->idat_size) -@@ -563,6 +677,9 @@ - png_benign_error(png_ptr, "Extra compressed data"); - png_ptr->mode |= PNG_AFTER_IDAT; - png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED; -+#ifdef PNG_READ_APNG_SUPPORTED -+ png_ptr->num_frames_read++; -+#endif - break; - } - -diff -Naru libpng-1.5.15.org/pngrutil.c libpng-1.5.15/pngrutil.c ---- libpng-1.5.15.org/pngrutil.c 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pngrutil.c 2013-04-02 20:39:30.000000000 +0900 -@@ -547,6 +547,11 @@ + png_read_update_info(png_structrp png_ptr, png_inforp info_ptr) +diff -Naru libpng-1.6.8.org/pngrutil.c libpng-1.6.8/pngrutil.c +--- libpng-1.6.8.org/pngrutil.c 2013-12-22 17:03:17.224988631 +0900 ++++ libpng-1.6.8/pngrutil.c 2013-12-22 17:03:17.291990780 +0900 +@@ -826,6 +826,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -849,7 +795,7 @@ diff -Naru libpng-1.5.15.org/pngrutil.c libpng-1.5.15/pngrutil.c /* Set internal variables */ png_ptr->width = width; png_ptr->height = height; -@@ -2624,6 +2629,179 @@ +@@ -2700,6 +2705,179 @@ } #endif @@ -1026,10 +972,68 @@ diff -Naru libpng-1.5.15.org/pngrutil.c libpng-1.5.15/pngrutil.c +} +#endif /* PNG_READ_APNG_SUPPORTED */ + - /* This function is called when we haven't found a handler for a - * chunk. If there isn't a problem with the chunk itself (ie bad - * chunk name, CRC, or a critical chunk), the chunk is silently ignored -@@ -4114,4 +4292,81 @@ + #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED + /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ + static int +@@ -3956,7 +4134,38 @@ + { + uInt avail_in; + png_bytep buffer; ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_uint_32 bytes_to_skip = 0; ++ ++ while (png_ptr->idat_size == 0 || bytes_to_skip != 0) ++ { ++ png_crc_finish(png_ptr, bytes_to_skip); ++ bytes_to_skip = 0; + ++ png_ptr->idat_size = png_read_chunk_header(png_ptr); ++ if (png_ptr->num_frames_read == 0) ++ { ++ if (png_ptr->chunk_name != png_IDAT) ++ png_error(png_ptr, "Not enough image data"); ++ } ++ else ++ { ++ if (png_ptr->chunk_name == png_IEND) ++ png_error(png_ptr, "Not enough image data"); ++ if (png_ptr->chunk_name != png_fdAT) ++ { ++ png_warning(png_ptr, "Skipped (ignored) a chunk " ++ "between APNG chunks"); ++ bytes_to_skip = png_ptr->idat_size; ++ continue; ++ } ++ ++ png_ensure_sequence_number(png_ptr, png_ptr->idat_size); ++ ++ png_ptr->idat_size -= 4; ++ } ++ } ++#else + while (png_ptr->idat_size == 0) + { + png_crc_finish(png_ptr, 0); +@@ -3968,7 +4177,7 @@ + if (png_ptr->chunk_name != png_IDAT) + png_error(png_ptr, "Not enough image data"); + } +- ++#endif /* PNG_READ_APNG_SUPPORTED */ + avail_in = png_ptr->IDAT_read_size; + + if (avail_in > png_ptr->idat_size) +@@ -4031,6 +4240,9 @@ + + png_ptr->mode |= PNG_AFTER_IDAT; + png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_ptr->num_frames_read++; ++#endif + + if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) + png_chunk_benign_error(png_ptr, "Extra compressed data"); +@@ -4476,4 +4688,80 @@ png_ptr->flags |= PNG_FLAG_ROW_INIT; } @@ -1045,7 +1049,6 @@ diff -Naru libpng-1.5.15.org/pngrutil.c libpng-1.5.15/pngrutil.c + png_ptr->mode &= ~PNG_AFTER_IDAT; + png_ptr->row_number = 0; + png_ptr->pass = 0; -+ png_ptr->flags &= ~PNG_FLAG_ROW_INIT; +} + +void /* PRIVATE */ @@ -1057,7 +1060,7 @@ diff -Naru libpng-1.5.15.org/pngrutil.c libpng-1.5.15/pngrutil.c + png_ptr->info_rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, + png_ptr->width); + if (png_ptr->prev_row) -+ png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1); ++ memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1); +} + +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED @@ -1069,16 +1072,16 @@ diff -Naru libpng-1.5.15.org/pngrutil.c libpng-1.5.15/pngrutil.c + /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ + + /* Start of interlace block */ -+ const int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; ++ const int png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; + + /* Offset to next interlace block */ -+ const int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; ++ const int png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; + + /* Start of interlace block in the y direction */ -+ const int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1}; ++ const int png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1}; + + /* Offset to next interlace block in the y direction */ -+ const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; ++ const int png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; + + if (png_ptr->interlaced) + { @@ -1099,7 +1102,7 @@ diff -Naru libpng-1.5.15.org/pngrutil.c libpng-1.5.15/pngrutil.c + png_ptr->num_rows = png_ptr->height; + png_ptr->iwidth = png_ptr->width; + } -+ png_ptr->flags &= ~PNG_FLAG_ZLIB_FINISHED; ++ png_ptr->flags &= ~PNG_FLAG_ZSTREAM_ENDED; + if (inflateReset(&(png_ptr->zstream)) != Z_OK) + png_error(png_ptr, "inflateReset failed"); + png_ptr->zstream.avail_in = 0; @@ -1111,13 +1114,13 @@ diff -Naru libpng-1.5.15.org/pngrutil.c libpng-1.5.15/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED */ -diff -Naru libpng-1.5.15.org/pngset.c libpng-1.5.15/pngset.c ---- libpng-1.5.15.org/pngset.c 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pngset.c 2013-04-02 20:39:30.000000000 +0900 -@@ -262,6 +262,11 @@ - info_ptr->rowbytes = 0; - else - info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width); +diff -Naru libpng-1.6.8.org/pngset.c libpng-1.6.8/pngset.c +--- libpng-1.6.8.org/pngset.c 2013-12-22 17:03:17.224988631 +0900 ++++ libpng-1.6.8/pngset.c 2013-12-22 17:03:17.292990812 +0900 +@@ -239,6 +239,11 @@ + info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); + + info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width); + +#ifdef PNG_APNG_SUPPORTED + /* for non-animated png. this may be overwritten from an acTL chunk later */ @@ -1126,7 +1129,7 @@ diff -Naru libpng-1.5.15.org/pngset.c libpng-1.5.15/pngset.c } #ifdef PNG_oFFs_SUPPORTED -@@ -1048,6 +1053,147 @@ +@@ -1065,6 +1070,147 @@ } #endif /* PNG_sPLT_SUPPORTED */ @@ -1225,10 +1228,6 @@ diff -Naru libpng-1.5.15.org/pngset.c libpng-1.5.15/pngset.c + png_uint_16 delay_num, png_uint_16 delay_den, + png_byte dispose_op, png_byte blend_op) +{ -+ if (width + x_offset > png_ptr->first_frame_width || -+ height + y_offset > png_ptr->first_frame_height) -+ png_error(png_ptr, "dimensions of a frame are greater than" -+ "the ones in IHDR"); + if (width > PNG_UINT_31_MAX) + png_error(png_ptr, "invalid width in fcTL (> 2^31-1)"); + if (height > PNG_UINT_31_MAX) @@ -1237,6 +1236,10 @@ diff -Naru libpng-1.5.15.org/pngset.c libpng-1.5.15/pngset.c + png_error(png_ptr, "invalid x_offset in fcTL (> 2^31-1)"); + if (y_offset > PNG_UINT_31_MAX) + png_error(png_ptr, "invalid y_offset in fcTL (> 2^31-1)"); ++ if (width + x_offset > png_ptr->first_frame_width || ++ height + y_offset > png_ptr->first_frame_height) ++ png_error(png_ptr, "dimensions of a frame are greater than" ++ "the ones in IHDR"); + + if (dispose_op != PNG_DISPOSE_OP_NONE && + dispose_op != PNG_DISPOSE_OP_BACKGROUND && @@ -1271,13 +1274,13 @@ diff -Naru libpng-1.5.15.org/pngset.c libpng-1.5.15/pngset.c +} +#endif /* PNG_APNG_SUPPORTED */ + - #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED - void PNGAPI - png_set_unknown_chunks(png_structp png_ptr, -diff -Naru libpng-1.5.15.org/pngstruct.h libpng-1.5.15/pngstruct.h ---- libpng-1.5.15.org/pngstruct.h 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pngstruct.h 2013-04-02 20:39:30.000000000 +0900 -@@ -293,6 +293,27 @@ + #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED + static png_byte + check_location(png_const_structrp png_ptr, int location) +diff -Naru libpng-1.6.8.org/pngstruct.h libpng-1.6.8/pngstruct.h +--- libpng-1.6.8.org/pngstruct.h 2013-12-22 17:03:17.224988631 +0900 ++++ libpng-1.6.8/pngstruct.h 2013-12-22 17:03:17.292990812 +0900 +@@ -409,6 +409,27 @@ png_byte filter_type; #endif @@ -1305,10 +1308,10 @@ diff -Naru libpng-1.5.15.org/pngstruct.h libpng-1.5.15/pngstruct.h /* New members added in libpng-1.2.0 */ /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */ -diff -Naru libpng-1.5.15.org/pngtest.c libpng-1.5.15/pngtest.c ---- libpng-1.5.15.org/pngtest.c 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pngtest.c 2013-04-02 20:39:30.000000000 +0900 -@@ -822,6 +822,10 @@ +diff -Naru libpng-1.6.8.org/pngtest.c libpng-1.6.8/pngtest.c +--- libpng-1.6.8.org/pngtest.c 2013-12-22 17:03:17.224988631 +0900 ++++ libpng-1.6.8/pngtest.c 2013-12-22 17:03:17.292990812 +0900 +@@ -840,6 +840,10 @@ png_uint_32 width, height; int num_pass, pass; int bit_depth, color_type; @@ -1319,7 +1322,7 @@ diff -Naru libpng-1.5.15.org/pngtest.c libpng-1.5.15/pngtest.c row_buf = NULL; error_parameters.file_name = inname; -@@ -1271,6 +1275,20 @@ +@@ -1290,6 +1294,20 @@ } } #endif @@ -1340,7 +1343,7 @@ diff -Naru libpng-1.5.15.org/pngtest.c libpng-1.5.15/pngtest.c #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED { png_unknown_chunkp unknowns; -@@ -1336,6 +1354,89 @@ +@@ -1355,6 +1373,89 @@ t_misc += (t_stop - t_start); t_start = t_stop; #endif @@ -1430,21 +1433,21 @@ diff -Naru libpng-1.5.15.org/pngtest.c libpng-1.5.15/pngtest.c for (pass = 0; pass < num_pass; pass++) { pngtest_debug1("Writing row data for pass %d", pass); -diff -Naru libpng-1.5.15.org/pngwrite.c libpng-1.5.15/pngwrite.c ---- libpng-1.5.15.org/pngwrite.c 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pngwrite.c 2013-04-02 20:39:30.000000000 +0900 -@@ -58,6 +58,10 @@ - /* The rest of these check to see if the valid field has the appropriate - * flag set, and if it does, writes the chunk. +diff -Naru libpng-1.6.8.org/pngwrite.c libpng-1.6.8/pngwrite.c +--- libpng-1.6.8.org/pngwrite.c 2013-12-22 17:03:17.225988663 +0900 ++++ libpng-1.6.8/pngwrite.c 2013-12-22 17:03:17.310991389 +0900 +@@ -127,6 +127,10 @@ + * application continues writing the PNG. So check the 'invalid' flag here + * too. */ +#ifdef PNG_WRITE_APNG_SUPPORTED + if (info_ptr->valid & PNG_INFO_acTL) + png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays); +#endif - #ifdef PNG_WRITE_gAMA_SUPPORTED - if (info_ptr->valid & PNG_INFO_gAMA) - png_write_gAMA_fixed(png_ptr, info_ptr->gamma); -@@ -310,6 +314,11 @@ + #ifdef PNG_GAMMA_SUPPORTED + # ifdef PNG_WRITE_gAMA_SUPPORTED + if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) && +@@ -357,6 +361,11 @@ png_benign_error(png_ptr, "Wrote palette index exceeding num_palette"); #endif @@ -1456,11 +1459,10 @@ diff -Naru libpng-1.5.15.org/pngwrite.c libpng-1.5.15/pngwrite.c /* See if user wants us to write information chunks */ if (info_ptr != NULL) { -@@ -1667,4 +1676,42 @@ - PNG_UNUSED(params) +@@ -1560,6 +1569,43 @@ } #endif -+ + +#ifdef PNG_WRITE_APNG_SUPPORTED +void PNGAPI +png_write_frame_head(png_structp png_ptr, png_infop info_ptr, @@ -1498,11 +1500,13 @@ diff -Naru libpng-1.5.15.org/pngwrite.c libpng-1.5.15/pngwrite.c + PNG_UNUSED(info_ptr) +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ - #endif /* PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.5.15.org/pngwutil.c libpng-1.5.15/pngwutil.c ---- libpng-1.5.15.org/pngwutil.c 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/pngwutil.c 2013-04-02 20:39:30.000000000 +0900 -@@ -818,6 +818,11 @@ + + #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED + #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */ +diff -Naru libpng-1.6.8.org/pngwutil.c libpng-1.6.8/pngwutil.c +--- libpng-1.6.8.org/pngwutil.c 2013-12-22 17:03:17.226988695 +0900 ++++ libpng-1.6.8/pngwutil.c 2013-12-22 17:03:17.311991421 +0900 +@@ -898,6 +898,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1511,39 +1515,41 @@ diff -Naru libpng-1.5.15.org/pngwutil.c libpng-1.5.15/pngwutil.c + png_ptr->first_frame_height = height; +#endif + - /* Initialize zlib with PNG info */ - png_ptr->zstream.zalloc = png_zalloc; - png_ptr->zstream.zfree = png_zfree; -@@ -1032,7 +1037,28 @@ - } - #endif /* PNG_WRITE_OPTIMIZE_CMF_SUPPORTED */ + if (!(png_ptr->do_filter)) + { + if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE || +@@ -1076,7 +1081,14 @@ + optimize_cmf(data, png_image_size(png_ptr)); + # endif -+#ifdef PNG_WRITE_APNG_SUPPORTED -+ if (png_ptr->num_frames_written == 0) -+#endif - png_write_complete_chunk(png_ptr, png_IDAT, data, length); -+#ifdef PNG_WRITE_APNG_SUPPORTED -+ else -+ { -+ png_byte buf[4]; -+ -+ png_write_chunk_header(png_ptr, png_fdAT, 4 + length); -+ -+ png_save_uint_32(buf, png_ptr->next_seq_num); -+ png_write_chunk_data(png_ptr, buf, 4); -+ -+ png_write_chunk_data(png_ptr, data, length); -+ -+ png_write_chunk_end(png_ptr); -+ -+ png_ptr->next_seq_num++; -+ } -+#endif /* PNG_WRITE_APNG_SUPPORTED */ -+ - png_ptr->mode |= PNG_HAVE_IDAT; ++# ifdef PNG_WRITE_APNG_SUPPORTED ++ if (png_ptr->num_frames_written == 0) ++# endif + png_write_complete_chunk(png_ptr, png_IDAT, data, size); ++# ifdef PNG_WRITE_APNG_SUPPORTED ++ else ++ png_write_fdAT(png_ptr, data, size); ++# endif /* PNG_WRITE_APNG_SUPPORTED */ + png_ptr->mode |= PNG_HAVE_IDAT; - /* Prior to 1.5.4 this code was replicated in every caller (except at the -@@ -1995,6 +2021,64 @@ + png_ptr->zstream.next_out = data; +@@ -1122,7 +1134,15 @@ + optimize_cmf(data, png_image_size(png_ptr)); + # endif + ++# ifdef PNG_WRITE_APNG_SUPPORTED ++ if (png_ptr->num_frames_written == 0) ++# endif + png_write_complete_chunk(png_ptr, png_IDAT, data, size); ++# ifdef PNG_WRITE_APNG_SUPPORTED ++ else ++ png_write_fdAT(png_ptr, data, size); ++# endif /* PNG_WRITE_APNG_SUPPORTED */ ++ + png_ptr->zstream.avail_out = 0; + png_ptr->zstream.next_out = NULL; + png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT; +@@ -1934,6 +1954,82 @@ } #endif @@ -1603,12 +1609,30 @@ diff -Naru libpng-1.5.15.org/pngwutil.c libpng-1.5.15/pngwutil.c + + png_ptr->next_seq_num++; +} ++ ++void /* PRIVATE */ ++png_write_fdAT(png_structp png_ptr, ++ png_const_bytep data, png_size_t length) ++{ ++ png_byte buf[4]; ++ ++ png_write_chunk_header(png_ptr, png_fdAT, (png_uint_32)(4 + length)); ++ ++ png_save_uint_32(buf, png_ptr->next_seq_num); ++ png_write_chunk_data(png_ptr, buf, 4); ++ ++ png_write_chunk_data(png_ptr, data, length); ++ ++ png_write_chunk_end(png_ptr); ++ ++ png_ptr->next_seq_num++; ++} +#endif /* PNG_WRITE_APNG_SUPPORTED */ + /* Initializes the row writing capability of libpng */ void /* PRIVATE */ - png_write_start_row(png_structp png_ptr) -@@ -3174,4 +3258,39 @@ + png_write_start_row(png_structrp png_ptr) +@@ -3020,4 +3116,39 @@ } #endif } @@ -1648,30 +1672,30 @@ diff -Naru libpng-1.5.15.org/pngwutil.c libpng-1.5.15/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.5.15.org/scripts/symbols.def libpng-1.5.15/scripts/symbols.def ---- libpng-1.5.15.org/scripts/symbols.def 2013-04-02 20:39:30.000000000 +0900 -+++ libpng-1.5.15/scripts/symbols.def 2013-04-02 20:39:30.000000000 +0900 -@@ -242,3 +242,23 @@ - png_set_check_for_invalid_index @234 - png_get_palette_max @235 - png_set_option @236 -+ png_get_acTL @237 -+ png_set_acTL @238 -+ png_get_num_frames @239 -+ png_get_num_plays @240 -+ png_get_next_frame_fcTL @241 -+ png_set_next_frame_fcTL @242 -+ png_get_next_frame_width @243 -+ png_get_next_frame_height @244 -+ png_get_next_frame_x_offset @245 -+ png_get_next_frame_y_offset @246 -+ png_get_next_frame_delay_num @247 -+ png_get_next_frame_delay_den @248 -+ png_get_next_frame_dispose_op @249 -+ png_get_next_frame_blend_op @250 -+ png_get_first_frame_is_hidden @251 -+ png_set_first_frame_is_hidden @252 -+ png_read_frame_head @253 -+ png_set_progressive_frame_fn @254 -+ png_write_frame_head @255 -+ png_write_frame_tail @256 +diff -Naru libpng-1.6.8.org/scripts/symbols.def libpng-1.6.8/scripts/symbols.def +--- libpng-1.6.8.org/scripts/symbols.def 2013-12-22 17:03:17.232988887 +0900 ++++ libpng-1.6.8/scripts/symbols.def 2013-12-22 17:03:17.317991614 +0900 +@@ -249,3 +249,23 @@ + png_set_check_for_invalid_index @242 + png_get_palette_max @243 + png_set_option @244 ++ png_get_acTL @245 ++ png_set_acTL @246 ++ png_get_num_frames @247 ++ png_get_num_plays @248 ++ png_get_next_frame_fcTL @249 ++ png_set_next_frame_fcTL @250 ++ png_get_next_frame_width @251 ++ png_get_next_frame_height @252 ++ png_get_next_frame_x_offset @253 ++ png_get_next_frame_y_offset @254 ++ png_get_next_frame_delay_num @255 ++ png_get_next_frame_delay_den @256 ++ png_get_next_frame_dispose_op @257 ++ png_get_next_frame_blend_op @258 ++ png_get_first_frame_is_hidden @259 ++ png_set_first_frame_is_hidden @260 ++ png_read_frame_head @261 ++ png_set_progressive_frame_fn @262 ++ png_write_frame_head @263 ++ png_write_frame_tail @264 diff --git a/package/nspr/Makefile b/package/nspr/Makefile index eaa679d95..33063d67f 100644 --- a/package/nspr/Makefile +++ b/package/nspr/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= nspr -PKG_VERSION:= 4.9.6 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 62b1e9d376d503d972f90c3c0031d879 +PKG_VERSION:= 4.10.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f0d254da0b2b870d9a5fa094e879d4b8 PKG_DESCR:= Netscape Portable Runtime library PKG_SECTION:= libs PKG_URL:= http://www.mozilla.org/projects/nspr/ @@ -15,7 +15,7 @@ PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !cris -WRKSRC= ${WRKDIST}/mozilla/nsprpub +WRKSRC= ${WRKDIST}/nspr include $(TOPDIR)/mk/package.mk diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in deleted file mode 100644 index 9e925158b..000000000 --- a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- nspr-4.9.5.orig/mozilla/nsprpub/config/Makefile.in 2012-11-14 00:17:57.000000000 +0100 -+++ nspr-4.9.5/mozilla/nsprpub/config/Makefile.in 2013-02-27 16:29:38.000000000 +0100 -@@ -113,7 +113,7 @@ endif - - $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) - @$(MAKE_OBJDIR) -- $(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ -+ $(CC_FOR_BUILD) $(HOSTCFLAGS) $< $(HOSTLDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ - - install:: nspr.m4 - $(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure deleted file mode 100644 index cfaa795ed..000000000 --- a/package/nspr/patches/patch-mozilla_nsprpub_configure +++ /dev/null @@ -1,11 +0,0 @@ ---- nspr-4.9.6.orig/mozilla/nsprpub/configure 2013-03-14 18:34:31.000000000 +0100 -+++ nspr-4.9.6/mozilla/nsprpub/configure 2013-10-21 15:29:36.000000000 +0200 -@@ -2855,7 +2855,7 @@ esac - if test "$cross_compiling" = "yes"; then - CROSS_COMPILE=1 - else -- CROSS_COMPILE= -+ CROSS_COMPILE=1 - fi - - echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 diff --git a/package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c b/package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c deleted file mode 100644 index 99ecc22dc..000000000 --- a/package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c +++ /dev/null @@ -1,16 +0,0 @@ -* patch from alpinelinux - ---- nspr-4.9.6.orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2012-09-28 16:33:48.000000000 +0200 -+++ nspr-4.9.6/mozilla/nsprpub/pr/src/misc/prnetdb.c 2013-10-21 18:07:57.000000000 +0200 -@@ -61,10 +61,7 @@ PRLock *_pr_dnsLock = NULL; - #define _PR_HAVE_GETPROTO_R_POINTER - #endif - --#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \ -- || (defined(LINUX) && defined(_REENTRANT) \ -- && !(defined(__GLIBC__) && __GLIBC__ >= 2) \ -- && !defined(ANDROID)) -+#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_GETPROTO_R_POINTER - #endif |