{"id":809066,"url":"http://patchwork.ozlabs.org/api/patches/809066/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/patch/20170902142956.22181-2-bernd.kuhls@t-online.de/","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170902142956.22181-2-bernd.kuhls@t-online.de>","list_archive_url":null,"date":"2017-09-02T14:29:56","name":"[2/2] package/libpng: switch to cmake","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"c10e2ea6220c3c61e8876d269ed9b0a48e4abc46","submitter":{"id":62613,"url":"http://patchwork.ozlabs.org/api/people/62613/?format=json","name":"Bernd Kuhls","email":"bernd.kuhls@t-online.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/20170902142956.22181-2-bernd.kuhls@t-online.de/mbox/","series":[{"id":1154,"url":"http://patchwork.ozlabs.org/api/series/1154/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/list/?series=1154","date":"2017-09-02T14:29:56","name":"[1/2] package/libpng: bump version to 1.6.32","version":1,"mbox":"http://patchwork.ozlabs.org/series/1154/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809066/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809066/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","buildroot@lists.busybox.net"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","buildroot@osuosl.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=busybox.net\n\t(client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=)","Received":["from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkz6D67qYz9sNr\n\tfor ;\n\tSun, 3 Sep 2017 00:30:12 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id BA5D586988;\n\tSat, 2 Sep 2017 14:30:10 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id O4PzqlfSjP9E; Sat, 2 Sep 2017 14:30:08 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3E1D387D86;\n\tSat, 2 Sep 2017 14:30:08 +0000 (UTC)","from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 398591C0306\n\tfor ;\n\tSat, 2 Sep 2017 14:30:06 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3342C867B5\n\tfor ;\n\tSat, 2 Sep 2017 14:30:06 +0000 (UTC)","from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id q35R3J9eoreM for ;\n\tSat, 2 Sep 2017 14:30:04 +0000 (UTC)","from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 1E22E87BFB\n\tfor ; Sat, 2 Sep 2017 14:30:04 +0000 (UTC)","from fwd03.aul.t-online.de (fwd03.aul.t-online.de [172.20.27.148])\n\tby mailout07.t-online.de (Postfix) with SMTP id D013E423D370\n\tfor ; Sat, 2 Sep 2017 16:30:01 +0200 (CEST)","from fli4l.lan.fli4l\n\t(r3SW2UZa8hCX2EsovkxkABJQf6wPlUGTSvqFAvsxz0x+tGkWuQLUhqLZw44NGYsZ4m@[79.222.100.78])\n\tby fwd03.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted)\n\tesmtp id 1do9Qv-2V0dJQ0; Sat, 2 Sep 2017 16:30:01 +0200","from mahler.lan.fli4l ([192.168.1.1]:44836 helo=kuhls.lan.fli4l)\n\tby fli4l.lan.fli4l with esmtp (Exim 4.89)\n\t(envelope-from ) id 1do9Qs-00054a-NT\n\tfor buildroot@buildroot.org; Sat, 02 Sep 2017 16:30:00 +0200"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","From":"Bernd Kuhls ","To":"buildroot@buildroot.org","Date":"Sat, 2 Sep 2017 16:29:56 +0200","Message-Id":"<20170902142956.22181-2-bernd.kuhls@t-online.de>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170902142956.22181-1-bernd.kuhls@t-online.de>","References":"<20170902142956.22181-1-bernd.kuhls@t-online.de>","X-ID":"r3SW2UZa8hCX2EsovkxkABJQf6wPlUGTSvqFAvsxz0x+tGkWuQLUhqLZw44NGYsZ4m","X-TOI-MSGID":"7ed31e81-25bd-4e33-ad51-1f843648e8ae","Subject":"[Buildroot] [PATCH 2/2] package/libpng: switch to cmake","X-BeenThere":"buildroot@busybox.net","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Discussion and development of buildroot ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"buildroot-bounces@busybox.net","Sender":"\"buildroot\" "},"content":"We have no arch-specific options to control mips msa and powerpc vsx\nsupport so we disable these options atm to prevent build errors.\n\nTested using this defconfig:\n\nBR2_PACKAGE_LIBPNG=y\n\n armv5-ctng-linux-gnueabi [ 1/47]: OK\n armv7-ctng-linux-gnueabihf [ 2/47]: OK\n br-aarch64-glibc [ 3/47]: OK\n br-arcle-hs38 [ 4/47]: OK\n br-arm-basic [ 5/47]: OK\n br-arm-cortex-a9-glibc [ 6/47]: OK\n br-arm-cortex-a9-musl [ 7/47]: OK\n br-arm-cortex-m4-full [ 8/47]: OK\n br-arm-full [ 9/47]: OK\n br-arm-full-nothread [10/47]: OK\n br-arm-full-static [11/47]: OK\n br-bfin-full [12/47]: OK\n br-i386-pentium4-full [13/47]: OK\n br-i386-pentium-mmx-musl [14/47]: OK\n br-m68k-5208-full [15/47]: OK\n br-m68k-68040-full [16/47]: OK\n br-microblazeel-full [17/47]: OK\n br-mips32r6-el-hf-glibc [18/47]: OK\n br-mips64-n64-full [19/47]: OK\n br-mips64r6-el-hf-glibc [20/47]: OK\n br-mipsel-o32-full [21/47]: OK\n br-nios2-glibc [22/47]: OK\n br-openrisc-uclibc [23/47]: OK\n br-powerpc-603e-basic-cpp [24/47]: OK\n br-powerpc64le-power8-glibc [25/47]: OK\n br-powerpc64-power7-glibc [26/47]: OK\n br-powerpc-e500mc-full [27/47]: OK\n br-sh4-full [28/47]: OK\n br-sparc64-glibc [29/47]: OK\n br-sparc-uclibc [30/47]: OK\n br-x86-64-core2-full [31/47]: OK\n br-x86-64-musl [32/47]: OK\n br-xtensa-full [33/47]: OK\n i686-ctng-linux-gnu [34/47]: OK\n linaro-aarch64 [35/47]: OK\n linaro-arm [36/47]: OK\n mips64el-ctng_n32-linux-gnu [37/47]: OK\n mips64el-ctng_n64-linux-gnu [38/47]: OK\n powerpc-ctng_e500v2-linux-gnuspe [39/47]: OK\n sourcery-arm-armv4t [40/47]: OK\n sourcery-arm [41/47]: OK\n sourcery-arm-thumb2 [42/47]: OK\n sourcery-mips64 [43/47]: OK\n sourcery-mips [44/47]: OK\n sourcery-nios2 [45/47]: OK\n sourcery-x86-64 [46/47]: OK\n x86_64-ctng_locales-linux-gnu [47/47]: OK\n47 builds, 0 skipped, 0 build failed, 0 legal-info failed\n\nSigned-off-by: Bernd Kuhls \n---\n ...3-CMakeLists.txt-Enable-building-asm-code.patch | 40 ++++++++++++++++++++++\n package/libpng/libpng.mk | 22 ++++++++----\n 2 files changed, 56 insertions(+), 6 deletions(-)\n create mode 100644 package/libpng/0003-CMakeLists.txt-Enable-building-asm-code.patch","diff":"diff --git a/package/libpng/0003-CMakeLists.txt-Enable-building-asm-code.patch b/package/libpng/0003-CMakeLists.txt-Enable-building-asm-code.patch\nnew file mode 100644\nindex 000000000..4bc5345fe\n--- /dev/null\n+++ b/package/libpng/0003-CMakeLists.txt-Enable-building-asm-code.patch\n@@ -0,0 +1,40 @@\n+From b47e0f5ceb525796dd98900613f3744d45331216 Mon Sep 17 00:00:00 2001\n+From: Bernd Kuhls \n+Date: Sat, 2 Sep 2017 15:09:30 +0200\n+Subject: [PATCH] CMakeLists.txt: Enable building asm code\n+\n+NEON support is provided by filter_neon.S which is currently not build\n+by cmake causing an error when linking with libpng16.so.16.32.0:\n+\n+[ 97%] Linking C executable pngstest\n+libpng16.so.16.32.0: undefined reference to `png_read_filter_row_avg4_neon'\n+libpng16.so.16.32.0: undefined reference to `png_read_filter_row_paeth3_neon'\n+libpng16.so.16.32.0: undefined reference to `png_read_filter_row_up_neon'\n+libpng16.so.16.32.0: undefined reference to `png_read_filter_row_avg3_neon'\n+libpng16.so.16.32.0: undefined reference to `png_read_filter_row_paeth4_neon'\n+libpng16.so.16.32.0: undefined reference to `png_read_filter_row_sub4_neon'\n+libpng16.so.16.32.0: undefined reference to `png_read_filter_row_sub3_neon'\n+\n+Patch sent upstream: https://github.com/glennrp/libpng/pull/174\n+\n+Signed-off-by: Bernd Kuhls \n+---\n+ CMakeLists.txt | 2 +-\n+ 1 file changed, 1 insertion(+), 1 deletion(-)\n+\n+diff --git a/CMakeLists.txt b/CMakeLists.txt\n+index 4803a720d..153d6caf6 100644\n+--- a/CMakeLists.txt\n++++ b/CMakeLists.txt\n+@@ -31,7 +31,7 @@ endif(POLICY CMP0054)\n+ \n+ set(CMAKE_CONFIGURATION_TYPES \"Release;Debug;MinSizeRel;RelWithDebInfo\")\n+ \n+-project(libpng C)\n++project(libpng ASM C)\n+ enable_testing()\n+ \n+ set(PNGLIB_MAJOR 1)\n+-- \n+2.11.0\n+\ndiff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk\nindex 2aa021712..6e915a47f 100644\n--- a/package/libpng/libpng.mk\n+++ b/package/libpng/libpng.mk\n@@ -15,17 +15,27 @@ LIBPNG_DEPENDENCIES = host-pkgconf zlib\n HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib\n LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config\n \n+LIBPNG_CONF_OPTS += -DPNG_MIPS_MSA=off -DPNG_POWERPC_VSX=off\n+\n+ifeq ($(BR2_STATIC_LIBS),y)\n+LIBPNG_CONF_OPTS += -DPNG_SHARED=OFF -DPNG_STATIC=ON\n+else ifeq ($(BR2_SHARED_LIBS),y)\n+LIBPNG_CONF_OPTS += -DPNG_SHARED=ON -DPNG_STATIC=OFF\n+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)\n+LIBPNG_CONF_OPTS += -DPNG_SHARED=ON -DPNG_STATIC=ON\n+endif\n+\n ifeq ($(BR2_ARM_CPU_HAS_NEON),y)\n-LIBPNG_CONF_OPTS += --enable-arm-neon\n+LIBPNG_CONF_OPTS += -DPNG_ARM_NEON=on\n else\n-LIBPNG_CONF_OPTS += --disable-arm-neon\n+LIBPNG_CONF_OPTS += -DPNG_ARM_NEON=off\n endif\n \n ifeq ($(BR2_X86_CPU_HAS_SSE2),y)\n-LIBPNG_CONF_OPTS += --enable-intel-sse\n+LIBPNG_CONF_OPTS += -DPNG_INTEL_SSE=on\n else\n-LIBPNG_CONF_OPTS += --disable-intel-sse\n+LIBPNG_CONF_OPTS += -DPNG_INTEL_SSE=off\n endif\n \n-$(eval $(autotools-package))\n-$(eval $(host-autotools-package))\n+$(eval $(cmake-package))\n+$(eval $(host-cmake-package))\n","prefixes":["2/2"]}