aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-03Merge "Snap for 11400057 from 9d233ce04aa1b29163de818736fa27a5c2431114 to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release" into simpleperf-release
2024-02-02Snap for 11400057 from 9d233ce04aa1b29163de818736fa27a5c2431114 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I23955553749fd7f2435c42cc0d0c1ae23e91ff56
2023-10-16Merge "Snap for 10957012 from 15b4d3ddb9d500204c18743debebed3600c7d1cd to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-10-16Snap for 10957012 from 15b4d3ddb9d500204c18743debebed3600c7d1cd to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I259f484bf2d057b321fa37fc288c60311a7057c5
2023-07-20Merge "Snap for 10448490 from 27bd9cf3d0653c64c982150282197e339cb63b04 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-07-20Snap for 10448490 from 27bd9cf3d0653c64c982150282197e339cb63b04 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I248aa681cde0faeae328ad64ea79a877aa0f6b8c
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 15b4d3ddb9 -s ↵Xin Li
ours am: 70b8f1abad -s ours am: d676f0f607 -s ours am skip reason: Merged-In I78ad12417bd62fb4f64085149b28c515abd59172 with SHA-1 dfb0b6e960 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/24087865 Change-Id: I35e161775cc4c30c879bf6568aca54802c089eb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 15b4d3ddb9 -s ↵Xin Li
ours am: 70b8f1abad -s ours am skip reason: Merged-In I78ad12417bd62fb4f64085149b28c515abd59172 with SHA-1 dfb0b6e960 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/24087865 Change-Id: I4e0433e198a6aca7f8368cfaa945a82ce04c7f84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 15b4d3ddb9 -s oursXin Li
am skip reason: Merged-In I78ad12417bd62fb4f64085149b28c515abd59172 with SHA-1 dfb0b6e960 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpng/+/24087865 Change-Id: I370da8227350c70363a2ee678d52deee0b2c7bf5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I78ad12417bd62fb4f64085149b28c515abd59172 Change-Id: Ic882cfa960110ebeeb7478952ae010fa5a695fb0
2023-06-23Merge "Upgrade libpng to v1.6.40" am: 27bd9cf3d0 am: 6f2b0d3a5f am: ↵Elliott Hughes
edfff8897e am: b936c177bb am: af839e6640 Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2636112 Change-Id: I0f19b4ac51bb646a1a1d52f3ddd3851e51f93b99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23Merge "Upgrade libpng to v1.6.40" am: 27bd9cf3d0 am: 6f2b0d3a5f am: ↵Elliott Hughes
edfff8897e am: b936c177bb Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2636112 Change-Id: I07777ef3553a1014f75f4be9e93b634721117092 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge "Upgrade libpng to v1.6.40" am: 27bd9cf3d0 am: 6f2b0d3a5f am: edfff8897eElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2636112 Change-Id: I74118902eb9279d75d27bbac6c78f595b95ab3af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge "Upgrade libpng to v1.6.40" am: 27bd9cf3d0 am: 6f2b0d3a5fElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2636112 Change-Id: Ib8ebf64c5b03f8175fdcac5177a48b19423f093a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge "Upgrade libpng to v1.6.40" am: 27bd9cf3d0Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2636112 Change-Id: I6e3f06caa2b136ef06deedc85a54f3839f9cf155 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge "Upgrade libpng to v1.6.40"Elliott Hughes
2023-06-22Upgrade libpng to v1.6.40Elliott Hughes
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update libpng For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md Test: TreeHugger Change-Id: I742b3f5e3214503c610ab42913f472961ece8125
2023-06-21Release libpng version 1.6.40Cosmin Truta
2023-06-21Fix a build regression on SolarisCosmin Truta
Fix a regression introduced in commit aeb26da4cb64c0e75c8d. On an Illumos test machine, running the GCC compiler and the Solaris link editor, the CMake build failed with the following error: ld: fatal: unrecognized option '--version-script=/.../libpng.vers' The fix consists in avoiding the use of CMAKE_SHARED_LIBRARY_C_FLAGS in version script checks on Solaris. Also clean up the surrounding code, as follows: * Rename CMAKE_REQUIRED_FLAGS_SAVE to _SAVED_CMAKE_REQUIRED_FLAGS. (The name of an internal variable should not begin with "CMAKE_".) * Reformat the version script to optimize the vertical space.
2023-06-21Ensure that only one eXIf chunk is written in the entire datastreamCosmin Truta
EXIF data can be stored in an eXIf chunk before IDAT, or after IDAT, but the entire PNG datastream may contain one eXIf chunk at most. Introduce the private mode flag PNG_WROTE_eXIf, which is meant to be used like the PNG_WROTE_tIME flag. The eXIf chunk and the tIME chunk have the same ordering rules (i.e. no constraints are imposed), and the same multiplicity rules (i.e. no multiples are allowed), and they should be initialized and checked using the same algorithm. This fixes commit cd03aaf7bf0e0c748b8c6cb34a56b402b40d61d0, previously reverted in 3d57708c9166419b7f5e0bbda2f7a2149112c844. Reported-by: Ben Bullock <benkasminbullock@gmail.com>
2023-06-20Don't report a valid tRNS chunk if it was canceledWan-Teh Chang
Add special handling of the PNG_INFO_tRNS flag to png_get_valid() to not report a canceled tRNS chunk as valid. Fix https://github.com/glennrp/libpng/issues/482 Signed-off-by: Cosmin Truta <ctruta@gmail.com>
2023-06-20Avoid a memory leak when allocation of a pCAL buffer failsCosmin Truta
Set the PNG_FREE_PCAL flag immediately after the allocation of the first pCAL buffer, so that, if any one of the subsequent allocations fail, all pCAL buffers still get deallocated by png_free_data. Also reorder the initialization of other PNG_FREE_ flags (without altering the semantics) to improve the overall consistency inside the pngset.c module. Co-authored-by: Philippe Antoine <contact@catenacyber.fr> Signed-off-by: Cosmin Truta <ctruta@gmail.com>
2023-03-15Merge "Snap for 9751898 from c05ebac4402364fe0f5dd8472b087d4021313316 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-03-15Snap for 9751898 from c05ebac4402364fe0f5dd8472b087d4021313316 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: If96d2570f671ee1cc83405992d8e2d146b4bb624
2023-02-24Merge "Snap for 9652768 from cb9e209cabb804a07d0b8661306c11656775af57 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-02-24Snap for 9652768 from cb9e209cabb804a07d0b8661306c11656775af57 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Idcc8f0a51c0a695cf7cc900f748b1ebb65496b54
2023-02-16Fix a doc typo in pnglibconf.dfaJesús González
Signed-off-by: Cosmin Truta <ctruta@gmail.com>
2023-02-16Merge "Upgrade libpng to v1.6.39" am: cb9e209cab am: c05ebac440 am: 725d7d60eeandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2435872 Change-Id: I78ad12417bd62fb4f64085149b28c515abd59172 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15Merge "Upgrade libpng to v1.6.39" am: cb9e209cab am: c05ebac440Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2435872 Change-Id: I1f08558da6b79ca77bcc65ab0552010aec33166f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15Merge "Upgrade libpng to v1.6.39" am: cb9e209cabandroid-u-beta-1-gplSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2435872 Change-Id: I55f6baed19a6ba4cbb67fbd493e1615e9570cef9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15Merge "Upgrade libpng to v1.6.39"Sadaf Ebrahimi
2023-02-14Upgrade libpng to v1.6.39Sadaf Ebrahimi
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update libpng For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md Test: TreeHugger Change-Id: Iaf1e90d0dd15d9fb9e30c34eab3809a9991a997f
2023-02-12cmake: Allow overwriting the debug postfix of library filenamesCosmin Truta
Users may opt to change the debug suffix, e.g., from "d" to "_debug". Rather than making CMAKE_DEBUG_POSTFIX a cache variable (which is an antipattern in CMake), we introduce a new cache variable, named PNG_DEBUG_POSTFIX. Suggested-by: Diego Barrios Romero <eldruin@gmail.com>
2023-02-12cmake: Redo the fix for Clang support on WindowsCosmin Truta
Redo commit 70fda1837d5de802ce5f7e04be239192b6a74d92, with a redesign. Define the variables PNG_SHARED_OUTPUT_NAME and PNG_STATIC_OUTPUT_NAME for the benefit of the OUTPUT_NAME target properties of, respectively, the shared libpng build and the static libpng build. Fix and improve not only Clang, but also other Windows toolchains, such as Embarcadero. Rename the variable PNGLIB_SHARED_SOVERSION to PNG_ABI_VERSION. The applicability of this variable, which is much wider than the old name used to suggest, includes the definitions of PNG_*_OUTPUT_NAME. Delete the confusingly-named variables PNGLIB_NAME and PNG_LIB_NAME, and rename PNG_LIB_TARGETS to PNG_LIBRARY_TARGETS. Set the macros _CRT_SECURE_NO_DEPRECATE and _CRT_NONSTDC_NO_DEPRECATE, for all compilers that use MSVC run-time library headers. Currently, these compilers are MSVC and Clang/Windows. Add or improve the comments that accompany user-serviceable variables and options. Co-authored-by: B. Scott Michel <scooter.phd@gmail.com> Signed-off-by: Cosmin Truta <ctruta@gmail.com>
2023-02-08Clean up CMakeLists.txtCosmin Truta
* Rename the target `png` to `png_shared`. The main targets are now named `png_shared`, `png_static` and `png_framework`. * Rename the function symbol_prefix() to find_symbol_prefix(). * Rename the prefix `S` to `_SYM` in the function create_symlink(). * Rewrite the precondition checks in the function create_symlink(). * Add precondition checks to the function generate_copy(). * Delete the vestigial property CLEAN_DIRECT_OUTPUT. * Delete the variables PNG_LIB_NAME_STATIC and PNG_LIB_NAME_FRAMEWORK. * Initialize and use PNG_LIB_TARGETS consistently as a list. * Move all include() commands to the top of the file. * Acknowledge a former contributor. * Reformat.
2023-02-08cmake: Rename the custom targets to have the png_ prefixJeremy Maitin-Shepard
This avoids taget namespace pollution when including libpng as a sub-project. Signed-off-by: Cosmin Truta <ctruta@gmail.com>
2023-02-07Revert "cmake: Fix the Clang support on Windows"Cosmin Truta
This reverts commit 70fda1837d5de802ce5f7e04be239192b6a74d92. Fixing Clang on Windows is important. However, in the previous fix, the name of the compiled libpng library file was changed, incorrectly, on all platforms except Windows. A proper fix will follow up.
2023-02-05ci: Update the CI scriptsCosmin Truta
Apply the following changes: * Update CI_BUILDDIR and CI_INSTALLDIR to reflect the new script names. * Introduce CI_SRCDIR_FROM_BUILDDIR and CI_INSTALLDIR_FROM_BUILDDIR to the cmake build, to ensure that the Windows tools can handle native Windows paths correctly when executed via Bash-on-Windows. * Stop guessing and using CI_SRCDIR_NATIVE and CI_INSTALLDIR_NATIVE in the cmake build, since we now have a better solution. * Show the ninja program version in ninja-based cmake builds. * Move the cleanup of previous builds into separate functions, and do it in a cleaner manner. No pun intended.
2023-02-04ci: Add CMake+Ninja+Clang to the AppVeyor CI matrixCosmin Truta
2023-02-03cmake: Fix the Clang support on WindowsB. Scott Michel
Fix a build error that occurs with the Ninja code generator and the Clang compiler on Windows: ninja: error: build.ninja: multiple rules generate png16.lib Signed-off-by: Cosmin Truta <ctruta@gmail.com>
2023-01-31cmake: Use CMAKE_SHARED_LIBRARY_C_FLAGS in version script checksGunther Nikl
Building the version script test executable may fail in the link step with GNU ld as linker like this: ld: final link failed: Nonrepresentable section on output Building the test excutable with CMAKE_SHARED_LIBRARY_C_FLAGS makes the test succeed with GNU ld since this adds -fpic/-fPIC. Signed-off-by: Cosmin Truta <ctruta@gmail.com>
2023-01-09Fix for universal binaries on macOSJon Creighton
Fix the issue of a clang: error: no such file or directory: 'x86_64' error on building universal binaries on macOS. It is also necessary to specify: -DCMAKE_C_FLAGS="-DPNG_ARM_NEON_OPT=0" Example CMake command: cmake -S libpng \ -B build_libpng \ -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ -DCMAKE_C_FLAGS="-DPNG_ARM_NEON_OPT=0" Signed-off-by: Cosmin Truta <ctruta@gmail.com>
2023-01-09Update the copyright yearCosmin Truta
2022-12-02Merge "Snap for 9363649 from 1640fa9077b59f1c49397e95810940ad8e782cb1 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2022-12-02Snap for 9363649 from 1640fa9077b59f1c49397e95810940ad8e782cb1 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: If930bae95f39f411b88c652ae5b013aabc97d4aa
2022-11-29Update the configuration for Travis CI and AppVeyor CICosmin Truta
Simplify the test matrix on Travis CI to reduce the testing time. Use CI_CMAKE_TOOLCHAIN_FILE on AppVeyor CI.
2022-11-27ci: Fix verification under Cygwin Bash + CMake + Visual Studio; updateCosmin Truta
Fix autodetection and use of the cygpath executable on Windows. Add a new variable CI_CMAKE_TOOLCHAIN_FILE to ci_verify_cmake.sh. This should help in future cross-platform testing. Remove the implicit initialization of CI_CC, CI_LD and CI_LIBS from ci_verify_makefiles.sh. This should help the testing of default values of their respective make variables (CC, LD and LIBS).
2022-11-27ci: Rename the ci_* scriptsCosmin Truta
Give the CI scripts new names that better reflect what they do, and make room for activities such as linting or dependency installation: * Rename ci_autotools.sh to ci_verify_configure.sh. * Rename ci_cmake.sh to ci_verify_cmake.sh. * Rename ci_legacy.sh to ci_verify_makefiles.sh. Also rename CI_LEGACY_MAKEFILES to CI_MAKEFILES. Update the config files for Travis CI and AppVeyor CI accordingly.
2022-11-27Fix typosmusvaage
Signed-off-by: Cosmin Truta <ctruta@gmail.com>
2022-11-27manuals: Remove references to libpngpf(3); update linksCosmin Truta
From libpng-1.5.0 onwards, the private libpng functions are no longer accessible to the libpng users, and the content of libpngpf(3) is no longer relevant. Update links, introducing the new canonical location of the libpng source repository: https://github.com/pnggroup/libpng
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 13:13:14 +0000