CVS commit: pkgsrc/graphics/gimp-devel

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Sep 10 13:47:01 UTC 2022

Modified Files:
        pkgsrc/graphics/gimp-devel: Makefile distinfo
        pkgsrc/graphics/gimp-devel/patches: patch-meson.build

Log Message:
gimp-devel: use upstream patch for linux input detection issue


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/gimp-devel/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gimp-devel/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gimp-devel/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/graphics/gimp-devel/Makefile
diff -u pkgsrc/graphics/gimp-devel/Makefile:1.6 pkgsrc/graphics/gimp-devel/Makefile:1.7
--- pkgsrc/graphics/gimp-devel/Makefile:1.6     Sat Sep 10 09:32:33 2022
+++ pkgsrc/graphics/gimp-devel/Makefile Sat Sep 10 13:47:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/09/10 09:32:33 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/09/10 13:47:01 wiz Exp $
 
 DISTNAME=      gimp-2.99.12
 PKGNAME=       ${DISTNAME:S/gimp/gimp-devel/}
@@ -55,11 +55,6 @@ _TOOLS_USE_PKGSRC.xgettext=  yes
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} != "Linux"
-# https://gitlab.gnome.org/GNOME/gimp/-/issues/8604
-MESON_ARGS+=   -Dlinux-input=disabled
-.endif
-
 # msgfmt: unknown option -- desktop
 .if ${OPSYS} == "NetBSD"
 TOOLS_PLATFORM.msgfmt=

Index: pkgsrc/graphics/gimp-devel/distinfo
diff -u pkgsrc/graphics/gimp-devel/distinfo:1.2 pkgsrc/graphics/gimp-devel/distinfo:1.3
--- pkgsrc/graphics/gimp-devel/distinfo:1.2     Sat Sep 10 09:24:48 2022
+++ pkgsrc/graphics/gimp-devel/distinfo Sat Sep 10 13:47:01 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2022/09/10 09:24:48 wiz Exp $
+$NetBSD: distinfo,v 1.3 2022/09/10 13:47:01 wiz Exp $
 
 BLAKE2s (gimp-2.99.12.tar.xz) = 6ecf4138713bf0c514463a644a54a7a39c69c9d99931cf9af991ef78d4b6809a
 SHA512 (gimp-2.99.12.tar.xz) = 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
 Size (gimp-2.99.12.tar.xz) = 24282140 bytes
-SHA1 (patch-meson.build) = 810951c12a848b5b304552445d2130650c818a5f
+SHA1 (patch-meson.build) = 40744c94dff37f190539992f80b2c9597fe1cd5f
 SHA1 (patch-plug-ins_common_file-heif.c) = cf4beb68136aefe460c7cabf53a2c40d602ec682
 SHA1 (patch-tools_extract-vector-icon.sh) = e460c42656bf2611a3735e2f7b4fe1d927a47044

Index: pkgsrc/graphics/gimp-devel/patches/patch-meson.build
diff -u pkgsrc/graphics/gimp-devel/patches/patch-meson.build:1.1 pkgsrc/graphics/gimp-devel/patches/patch-meson.build:1.2
--- pkgsrc/graphics/gimp-devel/patches/patch-meson.build:1.1    Sat Sep 10 09:24:48 2022
+++ pkgsrc/graphics/gimp-devel/patches/patch-meson.build        Sat Sep 10 13:47:01 2022
@@ -1,8 +1,11 @@
-$NetBSD: patch-meson.build,v 1.1 2022/09/10 09:24:48 wiz Exp $
+$NetBSD: patch-meson.build,v 1.2 2022/09/10 13:47:01 wiz Exp $
 
 Avoid libdl dependency on NetBSD.
 https://gitlab.gnome.org/GNOME/gimp/-/issues/8604
 
+Fix Linux Input detection, using patch from upstream.
+https://gitlab.gnome.org/GNOME/gimp/-/issues/8605
+
 --- meson.build.orig   2022-08-21 19:21:38.000000000 +0000
 +++ meson.build
 @@ -127,6 +127,10 @@ platform_linux = (
@@ -25,3 +28,40 @@ https://gitlab.gnome.org/GNOME/gimp/-/is
  rpc               = platform_windows ? cc.find_library('rpcrt4') : no_dep
  dbghelp           = platform_windows ? cc.find_library('dbghelp') : no_dep
  winsock           = platform_windows ? cc.find_library('ws2_32') : no_dep
+@@ -845,15 +849,23 @@ endif
+ alsa = dependency('alsa', version: '>=1.0.0', required: get_option('alsa'))
+ conf.set('HAVE_ALSA', alsa.found())
+ 
++# Linux Input
+ 
+ if get_option('linux-input').disabled()
+   have_linuxinput = false
+-elif get_option('linux-input').enabled() and not cc.has_header('linux/input.h')
+-  error('linux/input.h header not found.')
+ else
+-  have_linuxinput = x11_target
++  have_linuxinput = cc.has_header('linux/input.h',
++                                  required: get_option('linux-input'))
+ endif
+ 
++if have_linuxinput
++  gudev = dependency('gudev-1.0', version: '>=167', required: get_option('gudev'))
++else
++  gudev = no_dep
++endif
++conf.set('HAVE_LIBGUDEV', gudev.found())
++
++
+ # DirectX DirectInput
+ directx = no_dep
+ directx_sdk_path = get_option('directx-sdk-dir')
+@@ -874,9 +886,6 @@ if directx_sdk_path != '' and platform_w
+ endif
+ conf.set('HAVE_DX_DINPUT', directx.found())
+ 
+-gudev = dependency('gudev-1.0', version: '>=167', required: get_option('gudev'))
+-conf.set('HAVE_LIBGUDEV', gudev.found())
+-
+ 
+ ################################################################################
+ # Email sending