Aseprite: avoid building included libwebp

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Jan 8 21:39:11 2020 +0100
Changeset:	bb5464804e51e5a979b1154bf8e13edb66b374dc

Modified Files:
	Aseprite/Makefile
	Aseprite/distinfo
Added Files:
	Aseprite/patches/patch-CMakeLists.txt
	Aseprite/patches/patch-third__party_CMakeLists.txt

Log Message:
Aseprite: avoid building included libwebp

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bb5464804e51e5a979b1154bf8e13edb66b374dc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Aseprite/Makefile                                  | 13 +++++++------
 Aseprite/distinfo                                  |  2 ++
 Aseprite/patches/patch-CMakeLists.txt              | 17 +++++++++++++++++
 Aseprite/patches/patch-third__party_CMakeLists.txt | 17 +++++++++++++++++
 4 files changed, 43 insertions(+), 6 deletions(-)

diffs:
diff --git a/Aseprite/Makefile b/Aseprite/Makefile
index eb31b7d7f6..102cce94b5 100644
--- a/Aseprite/Makefile
+++ b/Aseprite/Makefile
@@ -59,20 +59,21 @@ CMAKE_ARGS+=	-DUSE_SHARED_FREETYPE=ON
 CMAKE_ARGS+=	-DUSE_SHARED_HARFBUZZ=ON
 
 post-install:
-.for i in bin/bsd* bin/img2webp include lib share/WebP share/man
+.for i in bin/bsd* include lib share/man
 	${RM} -rf ${DESTDIR}${PREFIX}/${i}
 .endfor
 
-.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../archivers/lz4/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../textproc/cmark/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../archivers/lz4/buildlink3.mk"
-.include "../../archivers/zstd/buildlink3.mk"
 .include "../../textproc/tinyxml/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/Aseprite/distinfo b/Aseprite/distinfo
index 20edda9517..18f6b04cb3 100644
--- a/Aseprite/distinfo
+++ b/Aseprite/distinfo
@@ -4,3 +4,5 @@ SHA1 (Aseprite-v1.2.16.2-Source.zip) = 7a66bd67f6a8b78c4a898b8fb3eeb0c6fda963e2
 RMD160 (Aseprite-v1.2.16.2-Source.zip) = b5dc86159515cb83d0f6c72b0e91347c8c9a4a2d
 SHA512 (Aseprite-v1.2.16.2-Source.zip) = 88416796dfa0b3ea68bf98410e209a6f80a2649314f7558e54f295eb3db7f6c5c97027fac8845768a7c41b49890314af7c4e31b475b3b7332993908a34e02258
 Size (Aseprite-v1.2.16.2-Source.zip) = 24180655 bytes
+SHA1 (patch-CMakeLists.txt) = 51dde78d5566785d3457406dcf25a0054cd96132
+SHA1 (patch-third__party_CMakeLists.txt) = 24de2b311de5e46577f5bb3c355a849975406565
diff --git a/Aseprite/patches/patch-CMakeLists.txt b/Aseprite/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..5c06d7fda9
--- /dev/null
+++ b/Aseprite/patches/patch-CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Do not build included libwebp, use system one.
+
+--- CMakeLists.txt.orig	2019-09-24 03:40:00.000000000 +0000
++++ CMakeLists.txt
+@@ -223,8 +223,8 @@ add_definitions(-DPNG_NO_MMX_CODE) # Do 
+ # libwebp
+ if(WITH_WEBP_SUPPORT)
+   set(WEBP_LIBRARIES webp webpdemux webpmux)
+-  set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
+-  include_directories(${WEBP_INCLUDE_DIR})
++#  set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
++#  include_directories(${WEBP_INCLUDE_DIR})
+ endif()
+ 
+ # tinyxml
diff --git a/Aseprite/patches/patch-third__party_CMakeLists.txt b/Aseprite/patches/patch-third__party_CMakeLists.txt
new file mode 100644
index 0000000000..e31408bd34
--- /dev/null
+++ b/Aseprite/patches/patch-third__party_CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Do not build included libwebp, use system one.
+
+--- third_party/CMakeLists.txt.orig	2019-10-23 23:54:06.000000000 +0000
++++ third_party/CMakeLists.txt
+@@ -34,8 +34,8 @@ endif()
+ 
+ if(WITH_WEBP_SUPPORT)
+   # Enable img2webp so "webpmux" library is built
+-  set(WEBP_BUILD_IMG2WEBP ON CACHE BOOL "Build the img2webp animation tool.")
+-  add_subdirectory(libwebp)
++  #set(WEBP_BUILD_IMG2WEBP ON CACHE BOOL "Build the img2webp animation tool.")
++  #add_subdirectory(libwebp)
+ endif()
+ 
+ if(NOT USE_SHARED_TINYXML)