Attachment #202312 for bug #230894





PORTNAME=	compiz
PORTVERSION=	0.8.8
PORTREVISION=	8
CATEGORIES=	x11-wm
MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/


MAINTAINER=	freebsd-ports@dan.me.uk
COMMENT=	Compiz Composite/Window Manager

LICENSE=		GPLv2+ LGPL21+ MIT
LICENSE_COMB=		multi
LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING.GPL
LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LGPL
LICENSE_FILE_MIT=	${WRKSRC}/COPYING.MIT

LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libgtop-2.0.so:devel/libgtop \
		libpng.so:graphics/png \
		libstartup-notification-1.so:x11/startup-notification
RUN_DEPENDS=	glxinfo:graphics/mesa-demos \
		nvidia-settings:x11/nvidia-settings

USES=		gettext-runtime gettext-tools gl gmake gnome libtool pathfix tar:bzip2
USE_GL=		gl glu
USE_GNOME=	cairo gconf2 intltool libxslt
USE_LDCONFIG=	yes
XORG_CAT=	app
USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xinerama \
		xorgproto xrandr xrender

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-kde4 --disable-kde \
		--disable-gnome --disable-gnome-keybindings
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib
INSTALL_TARGET=	install-strip
USES=		gettext gmake libtool pathfix tar:bzip2
USE_GL=		glu
USE_GNOME=	gconf2 libxslt intltool
USE_XORG=	xorgproto ice sm x11 xcomposite xdamage xext xfixes xinerama \
		xrandr xrender
USE_LDCONFIG=	yes

GCONF_SCHEMAS=	gwd.schemas \
		compiz-annotate.schemas \

		compiz-wobbly.schemas \
		compiz-zoom.schemas

OPTIONS_DEFINE=	DBUS FUSE GTK2 METACITY SVG
OPTIONS_DEFAULT=DBUS      GTK2          SVG
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib

METACITY_DESC=		Enable Metacity support [broken since Metacity migrated to GTK+ 3]
METACITY_BROKEN=	Metacity support is broken.   Deselect the option METACITY to build

METACITY_DESC=	Enable Metacity support

SUB_FILES=		compiz-manager
DESKTOP_ENTRIES=	"Compiz Manager" \
			"Wrapper script for starting compiz" \

FUSE_CONFIGURE_ENABLE=	fuse
FUSE_USES=		fuse

DBUS_CONFIGURE_ENABLE=	dbus
DBUS_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
DBUS_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus

.include <bsd.port.options.mk>

.if !empty(PORT_OPTIONS:MMETACITY) && !empty(PORT_OPTIONS:MGTK2)
CONFIGURE_ARGS+=	--enable-metacity
USE_GNOME+=	metacity
.else

CONFIGURE_ARGS+=	--disable-metacity
.endif

.if !empty(PORT_OPTIONS:MDBUS) && !empty(PORT_OPTIONS:MGTK2)
CONFIGURE_ARGS+=	--enable-dbus
BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
.if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MGNOME}
CONFIGURE_ARGS+=	--enable-dbus-glib
BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
.endif
.else
CONFIGURE_ARGS+=	--disable-dbus-glib
.endif

post-install:

Lines 32-38 Link Here

(-)files/compiz-manager.in (-2 / +2 lines)
32	GLXINFO="%%LOCALBASE%%/bin/glxinfo"	32	GLXINFO="%%LOCALBASE%%/bin/glxinfo"
33	KWIN="%%LOCALBASE%%/bin/kwin"	33	KWIN="%%LOCALBASE%%/bin/kwin"
34	METACITY="%%LOCALBASE%%/bin/metacity"	34	METACITY="%%LOCALBASE%%/bin/metacity"
35	XFWM="%%LOCALBASE%%/bin/xfwm"	35	XFWM="%%LOCALBASE%%/bin/xfwm4"
36	COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)	36	COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
37		37
38	# For Xgl LD_PRELOAD	38	# For Xgl LD_PRELOAD
Lines 59-65 Link Here
59	FALLBACKWM_OPTIONS="--replace $@"	59	FALLBACKWM_OPTIONS="--replace $@"
60		60
61	# Driver whitelist	61	# Driver whitelist
62	WHITELIST="nvidia intel ati radeon i810"	62	WHITELIST="nvidia intel ati radeon i810 modesetting"
63		63
64	# blacklist based on the pci ids	64	# blacklist based on the pci ids
65	# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details	65	# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details

Lines 1-5 Link Here

(-)files/patch-plugins_fuse.c (-2 / +2 lines)
1	--- plugins/fuse.c.orig Mon Apr 2 14:15:28 2007	1	--- plugins/fuse.c.orig 2010-05-21 11:18:14 UTC
2	+++ plugins/fuse.c Mon May 7 20:07:09 2007	2	+++ plugins/fuse.c
3	@@ -28,6 +28,8 @@	3	@@ -28,6 +28,8 @@
4	#include <errno.h>	4	#include <errno.h>
5	#include <poll.h>	5	#include <poll.h>

Lines 1-6 Link Here

(-)files/patch-src-Makefile.in (-3 / +3 lines)
1	--- src/Makefile.in.orig 2014-06-02 19:14:25.669435783 +0100	1	--- src/Makefile.in.orig 2018-08-24 22:46:14 UTC
2	+++ src/Makefile.in 2014-06-02 19:14:34.064435780 +0100	2	+++ src/Makefile.in
3	@@ -292,7 +292,7 @@	3	@@ -292,7 +292,7 @@ INCLUDES = \
4	-DIMAGEDIR=\"$(imagedir)\" \	4	-DIMAGEDIR=\"$(imagedir)\" \
5	-DMETADATADIR=\"$(metadatadir)\"	5	-DMETADATADIR=\"$(metadatadir)\"
6		6

Return to bug 230894

Lines 2-8 Link Here

(-)Makefile (-24 / +32 lines)
2		2
3	PORTNAME= compiz	3	PORTNAME= compiz
4	PORTVERSION= 0.8.8	4	PORTVERSION= 0.8.8
5	PORTREVISION= 7	5	PORTREVISION= 8
6	CATEGORIES= x11-wm	6	CATEGORIES= x11-wm
7	MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/	7	MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
8		8
Lines 9-29 Link Here
9	MAINTAINER= freebsd-ports@dan.me.uk	9	MAINTAINER= freebsd-ports@dan.me.uk
10	COMMENT= Compiz Composite/Window Manager	10	COMMENT= Compiz Composite/Window Manager
11		11
12	LIB_DEPENDS= libpng.so:graphics/png \	12	LICENSE= GPLv2+ LGPL21+ MIT
		13	LICENSE_COMB= multi
		14	LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING.GPL
		15	LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LGPL
		16	LICENSE_FILE_MIT= ${WRKSRC}/COPYING.MIT
		17
		18	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
		19	libfreetype.so:print/freetype2 \
13	libgtop-2.0.so:devel/libgtop \	20	libgtop-2.0.so:devel/libgtop \
		21	libpng.so:graphics/png \
14	libstartup-notification-1.so:x11/startup-notification	22	libstartup-notification-1.so:x11/startup-notification
15	RUN_DEPENDS= glxinfo:graphics/mesa-demos \	23	RUN_DEPENDS= glxinfo:graphics/mesa-demos \
16	nvidia-settings:x11/nvidia-settings	24	nvidia-settings:x11/nvidia-settings
17		25
		26	USES= gettext-runtime gettext-tools gl gmake gnome libtool pathfix tar:bzip2
		27	USE_GL= gl glu
		28	USE_GNOME= cairo gconf2 intltool libxslt
		29	USE_LDCONFIG= yes
18	XORG_CAT= app	30	XORG_CAT= app
		31	USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama \
		32	xorgproto xrandr xrender
		33
19	GNU_CONFIGURE= yes	34	GNU_CONFIGURE= yes
		35	CONFIGURE_ARGS= --disable-kde4 --disable-kde \
		36	--disable-gnome --disable-gnome-keybindings
		37	CPPFLAGS+= -I${LOCALBASE}/include
		38	LIBS+= -L${LOCALBASE}/lib
20	INSTALL_TARGET= install-strip	39	INSTALL_TARGET= install-strip
21	USES= gettext gmake libtool pathfix tar:bzip2
22	USE_GL= glu
23	USE_GNOME= gconf2 libxslt intltool
24	USE_XORG= xorgproto ice sm x11 xcomposite xdamage xext xfixes xinerama \
25	xrandr xrender
26	USE_LDCONFIG= yes
27		40
28	GCONF_SCHEMAS= gwd.schemas \	41	GCONF_SCHEMAS= gwd.schemas \
29	compiz-annotate.schemas \	42	compiz-annotate.schemas \
Lines 59-74 Link Here
59	compiz-wobbly.schemas \	72	compiz-wobbly.schemas \
60	compiz-zoom.schemas	73	compiz-zoom.schemas
61		74
62	CONFIGURE_ARGS= --disable-kde4 --disable-kde \	75	OPTIONS_DEFINE= DBUS FUSE GTK2 METACITY SVG
63	--disable-gnome --disable-gnome-keybindings	76	OPTIONS_DEFAULT=DBUS GTK2 SVG
64	CPPFLAGS+= -I${LOCALBASE}/include
65	LIBS+= -L${LOCALBASE}/lib
66		77
67	OPTIONS_DEFINE= SVG GTK2 METACITY DBUS FUSE	78	METACITY_DESC= Enable Metacity support [broken since Metacity migrated to GTK+ 3]
68	OPTIONS_DEFAULT= SVG GTK2 METACITY DBUS	79	METACITY_BROKEN= Metacity support is broken. Deselect the option METACITY to build
69		80
70	METACITY_DESC= Enable Metacity support
71
72	SUB_FILES= compiz-manager	81	SUB_FILES= compiz-manager
73	DESKTOP_ENTRIES= "Compiz Manager" \	82	DESKTOP_ENTRIES= "Compiz Manager" \
74	"Wrapper script for starting compiz" \	83	"Wrapper script for starting compiz" \
Lines 87-95 Link Here
87	FUSE_CONFIGURE_ENABLE= fuse	96	FUSE_CONFIGURE_ENABLE= fuse
88	FUSE_USES= fuse	97	FUSE_USES= fuse
89		98
		99	DBUS_CONFIGURE_ENABLE= dbus
		100	DBUS_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
		101	DBUS_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
		102
90	.include <bsd.port.options.mk>	103	.include <bsd.port.options.mk>
91		104
92	.if !empty(PORT_OPTIONS:MMETACITY) && !empty(PORT_OPTIONS:MGNOME) && !empty(PORT_OPTIONS:MGTK2)	105	.if !empty(PORT_OPTIONS:MMETACITY) && !empty(PORT_OPTIONS:MGTK2)
93	CONFIGURE_ARGS+= --enable-metacity	106	CONFIGURE_ARGS+= --enable-metacity
94	USE_GNOME+= metacity	107	USE_GNOME+= metacity
95	.else	108	.else
Lines 96-112 Link Here
96	CONFIGURE_ARGS+= --disable-metacity	109	CONFIGURE_ARGS+= --disable-metacity
97	.endif	110	.endif
98		111
99	.if ${PORT_OPTIONS:MDBUS}	112	.if !empty(PORT_OPTIONS:MDBUS) && !empty(PORT_OPTIONS:MGTK2)
100	CONFIGURE_ARGS+= --enable-dbus
101	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
102	RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
103	.if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MGNOME}
104	CONFIGURE_ARGS+= --enable-dbus-glib	113	CONFIGURE_ARGS+= --enable-dbus-glib
105	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib	114	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
106	RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib	115	RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
107	.endif
108	.else	116	.else
109	CONFIGURE_ARGS+= --disable-dbus --disable-dbus-glib	117	CONFIGURE_ARGS+= --disable-dbus-glib
110	.endif	118	.endif
111		119
112	post-install:	120	post-install: