pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

add gimp-jxl version 0.6 to pkgsrc-wip



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Thu Oct 14 21:07:37 2021 +0000
Changeset:	87d6597e0a2baffaf93182e62f95b283d00da37c

Modified Files:
	Makefile
	libjxl/Makefile.common
	libjxl/distinfo
Added Files:
	gimp-jxl/DESCR
	gimp-jxl/Makefile
	gimp-jxl/PLIST
	libjxl/patches/patch-plugins_gimp_CMakeLists.txt

Log Message:
add gimp-jxl version 0.6 to pkgsrc-wip

Gimp plugin for reading and writing JPEG XL images.
JPEG XL (.jxl) is the next generation , general-purpose
image compression codec by the JPEG committee.

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

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

diffstat:
 Makefile                                         |  1 +
 gimp-jxl/DESCR                                   |  3 +++
 gimp-jxl/Makefile                                | 19 ++++++++++++++
 gimp-jxl/PLIST                                   |  2 ++
 libjxl/Makefile.common                           |  1 +
 libjxl/distinfo                                  |  1 +
 libjxl/patches/patch-plugins_gimp_CMakeLists.txt | 32 ++++++++++++++++++++++++
 7 files changed, 59 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 8468d0895b..f0e8269984 100644
--- a/Makefile
+++ b/Makefile
@@ -1119,6 +1119,7 @@ SUBDIR+=	ghmm
 SUBDIR+=	ghostpcl-urwfonts-ttf
 SUBDIR+=	ghostscript-cidfonts-ryumin
 SUBDIR+=	giggle
+SUBDIR+=	gimp-jxl
 SUBDIR+=	gin
 SUBDIR+=	git-crypt
 SUBDIR+=	git-docs-html
diff --git a/gimp-jxl/DESCR b/gimp-jxl/DESCR
new file mode 100644
index 0000000000..0877848b19
--- /dev/null
+++ b/gimp-jxl/DESCR
@@ -0,0 +1,3 @@
+Gimp plugin for reading and writing JPEG XL images.
+JPEG XL (.jxl) is the next generation , general-purpose
+image compression codec by the JPEG committee.
diff --git a/gimp-jxl/Makefile b/gimp-jxl/Makefile
new file mode 100644
index 0000000000..cbe7972cc9
--- /dev/null
+++ b/gimp-jxl/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD$
+
+.include "../../wip/libjxl/Makefile.common"
+
+PKGNAME=	${DISTNAME:S/lib/gimp-/g}
+COMMENT=	JpegXL Gimp plugin
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
+USE_TOOLS+=	pkg-config
+USE_LANGUAGES=	c c++
+USE_CMAKE=	yes
+
+CONFIGURE_DIRS=	plugins/gimp
+BUILD_DIRS=	plugins/gimp
+
+.include "../../graphics/gimp/buildlink3.mk"
+.include "../../wip/libjxl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/gimp-jxl/PLIST b/gimp-jxl/PLIST
new file mode 100644
index 0000000000..fc0254f712
--- /dev/null
+++ b/gimp-jxl/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+lib/gimp/2.0/plug-ins/file-jxl/file-jxl
diff --git a/libjxl/Makefile.common b/libjxl/Makefile.common
index e7ad50404d..b08ae1eff5 100644
--- a/libjxl/Makefile.common
+++ b/libjxl/Makefile.common
@@ -1,4 +1,5 @@
 # $NetBSD$
+# used by wip/gimp-jxl/Makefile
 
 DISTNAME=	libjxl-0.6
 CATEGORIES=	graphics
diff --git a/libjxl/distinfo b/libjxl/distinfo
index dfb4e0ee51..bb89fff384 100644
--- a/libjxl/distinfo
+++ b/libjxl/distinfo
@@ -6,4 +6,5 @@ Size (libjxl-0.6.tar.gz) = 16953410 bytes
 SHA1 (patch-CMakeLists.txt) = 037a77f2c258424fcc75f7eff2b75ae4cc150b19
 SHA1 (patch-deps.sh) = 7886018fe8f79f692865c852b2755e4b16a3ee72
 SHA1 (patch-lib_jxl_base_os__macros.h) = 083d97beeec362271fa1ce515204332f1d8938e6
+SHA1 (patch-plugins_gimp_CMakeLists.txt) = fda9e3f42bf71848bb7348219ae06839f0f1c93c
 SHA1 (patch-tools_cpu_os__specific.cc) = 8cdd77ae04ad80e09c4e46ef1de29ba71cebc0b7
diff --git a/libjxl/patches/patch-plugins_gimp_CMakeLists.txt b/libjxl/patches/patch-plugins_gimp_CMakeLists.txt
new file mode 100644
index 0000000000..872d6fd587
--- /dev/null
+++ b/libjxl/patches/patch-plugins_gimp_CMakeLists.txt
@@ -0,0 +1,32 @@
+$NetBSD$
+
+* adapt to make gimp plugin a separate package
+
+--- plugins/gimp/CMakeLists.txt.orig	2021-10-04 18:02:44.000000000 +0000
++++ plugins/gimp/CMakeLists.txt
+@@ -2,9 +2,12 @@
+ #
+ # Use of this source code is governed by a BSD-style
+ # license that can be found in the LICENSE file.
++cmake_minimum_required(VERSION 3.10)
++project(gimp-jxl LANGUAGES C CXX)
+ 
+ find_package(PkgConfig)
+ pkg_check_modules(Gimp IMPORTED_TARGET gimp-2.0>=2.10 gimpui-2.0>=2.10)
++pkg_check_modules(JXL IMPORTED_TARGET libjxl libjxl_threads)
+ 
+ if (NOT Gimp_FOUND)
+   message(WARNING "Gimp development libraries not found, the Gimp plugin will not be built")
+@@ -19,10 +22,10 @@ add_executable(file-jxl WIN32
+   file-jxl-save.cc
+   file-jxl-save.h
+   file-jxl.cc)
+-target_link_libraries(file-jxl jxl jxl_threads PkgConfig::Gimp)
++target_link_libraries(file-jxl PkgConfig::JXL PkgConfig::Gimp)
+ 
+ target_include_directories(file-jxl PUBLIC
+-    ${PROJECT_SOURCE_DIR})  # for plugins/gimp absolute paths.
++    ${PROJECT_SOURCE_DIR}/../..)  # for plugins/gimp absolute paths.
+ 
+ pkg_get_variable(GIMP_LIB_DIR gimp-2.0 gimplibdir)
+ install(TARGETS file-jxl RUNTIME DESTINATION "${GIMP_LIB_DIR}/plug-ins/file-jxl/")


Home | Main Index | Thread Index | Old Index