From 9db50753f151cc43a2654b373c8fdfb9cedfd553 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Thu, 23 Jan 2020 14:33:07 +0100
Subject: [PATCH] libports: add ARMv8 support for libpng

Fix #3617
---
 repos/libports/lib/mk/libpng.inc             | 17 +++++++++++++++++
 repos/libports/lib/mk/libpng.mk              | 18 +-----------------
 repos/libports/lib/mk/spec/arm_v8/libpng.mk  |  9 +++++++++
 repos/libports/recipes/src/libpng/content.mk |  4 ++--
 4 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 repos/libports/lib/mk/libpng.inc
 create mode 100644 repos/libports/lib/mk/spec/arm_v8/libpng.mk

diff --git a/repos/libports/lib/mk/libpng.inc b/repos/libports/lib/mk/libpng.inc
new file mode 100644
index 000000000..37a614547
--- /dev/null
+++ b/repos/libports/lib/mk/libpng.inc
@@ -0,0 +1,17 @@
+LIBPNG_DIR := $(call select_from_ports,libpng)/src/lib/libpng
+LIBS       += libc libm zlib
+
+# find 'config.h'
+INC_DIR += $(REP_DIR)/src/lib/libpng
+
+INC_DIR += $(call select_from_ports,libpng)/include/libpng
+
+CC_DEF += -DHAVE_CONFIG_H
+
+SRC_C = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
+        pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c pngwtran.c \
+        pngmem.c pngerror.c pngpread.c 
+
+vpath %.c $(LIBPNG_DIR)
+
+SHARED_LIB = yes
diff --git a/repos/libports/lib/mk/libpng.mk b/repos/libports/lib/mk/libpng.mk
index 37a614547..ed5ebbde9 100644
--- a/repos/libports/lib/mk/libpng.mk
+++ b/repos/libports/lib/mk/libpng.mk
@@ -1,17 +1 @@
-LIBPNG_DIR := $(call select_from_ports,libpng)/src/lib/libpng
-LIBS       += libc libm zlib
-
-# find 'config.h'
-INC_DIR += $(REP_DIR)/src/lib/libpng
-
-INC_DIR += $(call select_from_ports,libpng)/include/libpng
-
-CC_DEF += -DHAVE_CONFIG_H
-
-SRC_C = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
-        pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c pngwtran.c \
-        pngmem.c pngerror.c pngpread.c 
-
-vpath %.c $(LIBPNG_DIR)
-
-SHARED_LIB = yes
+include $(REP_DIR)/lib/mk/libpng.inc
diff --git a/repos/libports/lib/mk/spec/arm_v8/libpng.mk b/repos/libports/lib/mk/spec/arm_v8/libpng.mk
new file mode 100644
index 000000000..81450df80
--- /dev/null
+++ b/repos/libports/lib/mk/spec/arm_v8/libpng.mk
@@ -0,0 +1,9 @@
+include $(REP_DIR)/lib/mk/libpng.inc
+
+SRC_C += arm/arm_init.c
+SRC_C += arm/filter_neon_intrinsics.c
+SRC_C += arm/palette_neon_intrinsics.c
+
+SRC_S += arm/filter_neon.S
+
+vpath %.S $(LIBPNG_DIR)
diff --git a/repos/libports/recipes/src/libpng/content.mk b/repos/libports/recipes/src/libpng/content.mk
index b924ac71f..57bba3ed7 100644
--- a/repos/libports/recipes/src/libpng/content.mk
+++ b/repos/libports/recipes/src/libpng/content.mk
@@ -1,4 +1,4 @@
-content: src/lib/libpng lib/mk/libpng.mk LICENSE
+content: src/lib/libpng lib/mk/libpng.mk lib/mk/libpng.inc lib/mk/spec/arm_v8/libpng.mk LICENSE
 
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libpng)
 
@@ -7,7 +7,7 @@ src/lib/libpng:
 	cp -r $(PORT_DIR)/src/lib/libpng/* $@
 	echo "LIBS = libpng" > $@/target.mk
 
-lib/mk/libpng.mk:
+lib/mk/libpng.mk lib/mk/libpng.inc lib/mk/spec/arm_v8/libpng.mk:
 	$(mirror_from_rep_dir)
 
 LICENSE: