Skip to content

Commit 3bac1ca

Browse files
committed
add too patches for png 1.6.2
1 parent bd953cc commit 3bac1ca

File tree

4 files changed

+28
-1
lines changed

4 files changed

+28
-1
lines changed

contrib/src/luajit/rules.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ifeq ($(LUAJIT_VERSION),2.0.1)
1414
$(APPLY) $(SRC)/luajit/v2.0.1_hotfix1.patch
1515
endif
1616
$(MOVE)
17-
17+
#FIXME: arm64 is not supported
1818
ifeq ($(IOS_ARCH),armv7)
1919
LUAJIT_TARGET_FLAGS="-arch armv7 -isysroot $(IOS_SDK)"
2020
LUAJIT_HOST_CC="gcc -m32 -arch i386"

contrib/src/png/1.6.2-bin.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/Makefile.am b/Makefile.am
2+
index a2cd2c1..fe569b2 100644
3+
--- a/Makefile.am
4+
+++ b/Makefile.am
5+
@@ -1,7 +1,7 @@
6+
# Makefile.am:
7+
# Source file for Makefile.in (and hence Makefile)
8+
#
9+
-
10+
+AUTOMAKE_OPTIONS=subdir-objects
11+
PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
12+
13+
ACLOCAL_AMFLAGS = -I scripts

contrib/src/png/1.6.2-configure.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/configure.ac b/configure.ac
2+
index f9bc4f6..d3bf477 100644
3+
--- a/configure.ac
4+
+++ b/configure.ac
5+
@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts])
6+
# dist-xz requires automake 1.11 or later
7+
# 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
8+
# 1.13 is required for parallel tests
9+
-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules])
10+
+AM_INIT_AUTOMAKE([1.11 foreign dist-xz color-tests silent-rules])
11+
# The following line causes --disable-maintainer-mode to be the default to
12+
# configure, this is necessary because libpng distributions cannot rely on the
13+
# time stamps of the autotools generated files being correct

contrib/src/png/rules.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ $(TARBALLS)/libpng-$(PNG_VERSION).tar.xz:
1414

1515
.sum-png: libpng-$(PNG_VERSION).tar.xz
1616

17+
1718
png: libpng-$(PNG_VERSION).tar.xz .sum-png
1819
$(UNPACK)
1920
$(MOVE)

0 commit comments

Comments
 (0)