pkgsrc-WIP-changes archive

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

wine: Add option for gphoto2



Module Name:	pkgsrc-wip
Committed By:	Frédéric Fauberteau <triaxx%NetBSD.org@localhost>
Pushed By:	frederic
Date:		Fri Jan 28 12:41:40 2022 +0100
Changeset:	09bfb7854f1892d3ca8d44d5bc2c0c2590b38293

Modified Files:
	wine/Makefile
	wine/PLIST
	wine/options.mk

Log Message:
wine: Add option for gphoto2

This option is not enable by default since gphoto2 support was disabled.

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

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

diffstat:
 wine/Makefile   |  1 -
 wine/PLIST      |  3 +++
 wine/options.mk | 10 +++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diffs:
diff --git a/wine/Makefile b/wine/Makefile
index e0e44fff10..7452e12ab9 100644
--- a/wine/Makefile
+++ b/wine/Makefile
@@ -28,7 +28,6 @@ UNLIMIT_RESOURCES=	datasize
 
 CONFIGURE_ARGS+=	--disable-tests
 CONFIGURE_ARGS+=	--without-capi
-CONFIGURE_ARGS+=	--without-gphoto
 CONFIGURE_ARGS+=	--without-gssapi
 CONFIGURE_ARGS+=	--without-krb5
 CONFIGURE_ARGS+=	--without-opencl
diff --git a/wine/PLIST b/wine/PLIST
index d65f2782ee..b32deddc9a 100644
--- a/wine/PLIST
+++ b/wine/PLIST
@@ -1634,6 +1634,8 @@ lib/wine/x86_64-unix/gamingtcui.dll.so
 lib/wine/x86_64-unix/gdi32.dll.so
 lib/wine/x86_64-unix/gdiplus.dll.so
 lib/wine/x86_64-unix/glu32.dll.so
+${PLIST.gphoto2}lib/wine/x86_64-unix/gphoto2.ds.so
+${PLIST.gphoto2}lib/wine/x86_64-unix/gphoto2.so
 lib/wine/x86_64-unix/gpkcsp.dll.so
 lib/wine/x86_64-unix/hal.dll.so
 lib/wine/x86_64-unix/hh.exe.so
@@ -2854,6 +2856,7 @@ lib/wine/x86_64-windows/gdi32.dll
 lib/wine/x86_64-windows/gdiplus.dll
 lib/wine/x86_64-windows/glu32.dll
 lib/wine/x86_64-windows/gpkcsp.dll
+${PLIST.gphoto2}lib/wine/x86_64-windows/gphoto2.ds
 lib/wine/x86_64-windows/hal.dll
 lib/wine/x86_64-windows/hh.exe
 lib/wine/x86_64-windows/hhctrl.ocx
diff --git a/wine/options.mk b/wine/options.mk
index 2f2bc4a733..0954c5c13d 100644
--- a/wine/options.mk
+++ b/wine/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.21 2021/06/01 05:05:54 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.wine
-PKG_SUPPORTED_OPTIONS=		alsa cups dbus pulseaudio sane x11
+PKG_SUPPORTED_OPTIONS=		alsa cups dbus gphoto2 pulseaudio sane x11
 PKG_SUGGESTED_OPTIONS=		cups dbus sane x11
 PKG_SUGGESTED_OPTIONS.Linux=	alsa
 
@@ -27,6 +27,14 @@ CONFIGURE_ARGS+=	--without-cups
 CONFIGURE_ARGS+=	--without-dbus
 .endif
 
+PLIST_VARS+=	gphoto2
+.if !empty(PKG_OPTIONS:Mgphoto2)
+PLIST.gphoto2=		yes
+.  include "../../devel/libgphoto2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-gphoto
+.endif
+
 PLIST_VARS+=	pulse
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 PLIST.pulse=		yes


Home | Main Index | Thread Index | Old Index