cutter: remove gstreamer option Does not compile.diff -r1.82 -r1.83 pkgsrc/devel/cutter/Makefile
(wiz)
@@ -1,15 +1,14 @@ | @@ -1,15 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.82 2023/04/19 08:09:39 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.83 2023/06/26 12:17:40 wiz Exp $ | |
2 | # | |||
3 | 2 | |||
4 | DISTNAME= cutter-1.2.4 | 3 | DISTNAME= cutter-1.2.4 | |
5 | PKGREVISION= 38 | 4 | PKGREVISION= 38 | |
6 | CATEGORIES= devel | 5 | CATEGORIES= devel | |
7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cutter/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cutter/} | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://cutter.sourceforge.net/ | 9 | HOMEPAGE= http://cutter.sourceforge.net/ | |
11 | COMMENT= Unit Testing Framework for C and C++ | 10 | COMMENT= Unit Testing Framework for C and C++ | |
12 | LICENSE= gnu-lgpl-v3 | 11 | LICENSE= gnu-lgpl-v3 | |
13 | 12 | |||
14 | GNU_CONFIGURE= yes | 13 | GNU_CONFIGURE= yes | |
15 | USE_LIBTOOL= yes | 14 | USE_LIBTOOL= yes | |
@@ -20,20 +19,20 @@ USE_PKGLOCALEDIR= yes | @@ -20,20 +19,20 @@ USE_PKGLOCALEDIR= yes | |||
20 | PKGCONFIG_OVERRIDE+= cppcutter.pc.in | 19 | PKGCONFIG_OVERRIDE+= cppcutter.pc.in | |
21 | PKGCONFIG_OVERRIDE+= cutter.pc.in | 20 | PKGCONFIG_OVERRIDE+= cutter.pc.in | |
22 | PKGCONFIG_OVERRIDE+= gcutter.pc.in | 21 | PKGCONFIG_OVERRIDE+= gcutter.pc.in | |
23 | PKGCONFIG_OVERRIDE+= gdkcutter-pixbuf.pc.in | 22 | PKGCONFIG_OVERRIDE+= gdkcutter-pixbuf.pc.in | |
24 | PKGCONFIG_OVERRIDE+= libcutter.pc.in | 23 | PKGCONFIG_OVERRIDE+= libcutter.pc.in | |
25 | PKGCONFIG_OVERRIDE+= soupcutter.pc.in | 24 | PKGCONFIG_OVERRIDE+= soupcutter.pc.in | |
26 | 25 | |||
27 | TEST_TARGET= check | 26 | TEST_TARGET= check | |
28 | 27 | |||
29 | .include "options.mk" | 28 | .include "options.mk" | |
30 | 29 | |||
31 | .include "../../mk/compiler.mk" | 30 | .include "../../mk/compiler.mk" | |
32 | # PR#lib/39986 | 31 | # PR#lib/39986 | |
33 | .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 060000 && !empty(CC_VERSION:Mgcc*) | 32 | .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 060000 && ${CC_VERSION:Mgcc*} | |
34 | LDFLAGS.NetBSD+= -lgcc_s | 33 | LDFLAGS.NetBSD+= -lgcc_s | |
35 | .endif | 34 | .endif | |
36 | 35 | |||
37 | BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 | 36 | BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 | |
38 | .include "../../devel/glib2/buildlink3.mk" | 37 | .include "../../devel/glib2/buildlink3.mk" | |
39 | .include "../../mk/bsd.pkg.mk" | 38 | .include "../../mk/bsd.pkg.mk" |
@@ -1,56 +1,44 @@ | @@ -1,56 +1,44 @@ | |||
1 | # $NetBSD: options.mk,v 1.6 2022/12/04 23:06:49 wiz Exp $ | 1 | # $NetBSD: options.mk,v 1.7 2023/06/26 12:17:40 wiz Exp $ | |
2 | # | |||
3 | 2 | |||
4 | PKG_OPTIONS_VAR= PKG_OPTIONS.cutter | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.cutter | |
5 | PKG_SUPPORTED_OPTIONS= gstreamer gtk2 libsoup pdf | 4 | PKG_SUPPORTED_OPTIONS= gtk2 libsoup pdf | |
6 | PKG_SUGGESTED_OPTIONS= # | 5 | PKG_SUGGESTED_OPTIONS= # | |
7 | 6 | |||
8 | .include "../../mk/bsd.options.mk" | 7 | .include "../../mk/bsd.options.mk" | |
9 | 8 | |||
10 | PLIST_VARS+= goffice gst gtk pdf soup | 9 | PLIST_VARS+= gtk pdf soup | |
11 | 10 | |||
12 | ### | 11 | ### | |
13 | ### PDF support | 12 | ### PDF support | |
14 | ### | 13 | ### | |
15 | .if !empty(PKG_OPTIONS:Mpdf) | 14 | .if !empty(PKG_OPTIONS:Mpdf) | |
16 | .include "../../devel/pango/buildlink3.mk" | 15 | .include "../../devel/pango/buildlink3.mk" | |
17 | PLIST.pdf= yes | 16 | PLIST.pdf= yes | |
18 | .endif | 17 | .endif | |
19 | 18 | |||
20 | ### | 19 | ### | |
21 | ### goffice support | 20 | ### goffice support | |
22 | ### | 21 | ### | |
23 | #.if !empty(PKG_OPTIONS:Mgoffice) | 22 | #.if !empty(PKG_OPTIONS:Mgoffice) | |
24 | #.include "../../misc/goffice0.8/buildlink3.mk" | 23 | #.include "../../misc/goffice0.8/buildlink3.mk" | |
25 | #CONFIGURE_ARGS+= --enable-goffice | 24 | #CONFIGURE_ARGS+= --enable-goffice | |
26 | #PLIST.gtk= yes | 25 | #PLIST.gtk= yes | |
27 | #PLIST.pdf= yes | 26 | #PLIST.pdf= yes | |
28 | #.else | 27 | #.else | |
29 | #CONFIGURE_ARGS+= --disable-goffice | 28 | #CONFIGURE_ARGS+= --disable-goffice | |
30 | #.endif | 29 | #.endif | |
31 | 30 | |||
32 | ### | 31 | ### | |
33 | ### gstreamer support | |||
34 | ### | |||
35 | .if !empty(PKG_OPTIONS:Mgstreamer) | |||
36 | .include "../../multimedia/gstreamer1/buildlink3.mk" | |||
37 | CONFIGURE_ARGS+= --enable-gstreamer | |||
38 | PLIST.gst= yes | |||
39 | .else | |||
40 | CONFIGURE_ARGS+= --disable-gstreamer | |||
41 | .endif | |||
42 | ||||
43 | ### | |||
44 | ### gtk2 support | 32 | ### gtk2 support | |
45 | ### | 33 | ### | |
46 | .if !empty(PKG_OPTIONS:Mgtk2) | 34 | .if !empty(PKG_OPTIONS:Mgtk2) | |
47 | .include "../../x11/gtk2/buildlink3.mk" | 35 | .include "../../x11/gtk2/buildlink3.mk" | |
48 | CONFIGURE_ARGS+= --enable-gtktest | 36 | CONFIGURE_ARGS+= --enable-gtktest | |
49 | PLIST.gtk= yes | 37 | PLIST.gtk= yes | |
50 | PLIST.pdf= yes | 38 | PLIST.pdf= yes | |
51 | .else | 39 | .else | |
52 | CONFIGURE_ARGS+= --disable-gtktest | 40 | CONFIGURE_ARGS+= --disable-gtktest | |
53 | .endif | 41 | .endif | |
54 | 42 | |||
55 | ### | 43 | ### | |
56 | ### | 44 | ### |