diff options
| author | Robert Noland <rnoland@FreeBSD.org> | 2009-04-08 06:55:30 +0000 |
|---|---|---|
| committer | Robert Noland <rnoland@FreeBSD.org> | 2009-04-08 06:55:30 +0000 |
| commit | e9977a3693429ba638d509a9870a1878b0109c38 (patch) | |
| tree | 36b07ab44a0c95c58be06a15c21e7c7a2373d7fe /x11-wm | |
| parent | 2bd40ab5bf65d7e1d5a32ce314eeec222218c733 (diff) | |
| download | ports-e9977a3693429ba638d509a9870a1878b0109c38.tar.gz ports-e9977a3693429ba638d509a9870a1878b0109c38.zip | |
Notes
Diffstat (limited to 'x11-wm')
43 files changed, 640 insertions, 669 deletions
diff --git a/x11-wm/Makefile b/x11-wm/Makefile index a17eda799e8d..5acbbca99d4b 100644 --- a/x11-wm/Makefile +++ b/x11-wm/Makefile @@ -24,9 +24,9 @@ SUBDIR += clementine SUBDIR += compiz SUBDIR += compiz-fusion - SUBDIR += compiz-fusion-plugins-extra - SUBDIR += compiz-fusion-plugins-main - SUBDIR += compiz-fusion-plugins-unsupported + SUBDIR += compiz-plugins-extra + SUBDIR += compiz-plugins-main + SUBDIR += compiz-plugins-unsupported SUBDIR += compizconfig-backend-gconf SUBDIR += compizconfig-python SUBDIR += ctwm diff --git a/x11-wm/ccsm/Makefile b/x11-wm/ccsm/Makefile index 60ad1108f398..a67719f3293d 100644 --- a/x11-wm/ccsm/Makefile +++ b/x11-wm/ccsm/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ccsm -PORTVERSION= 0.7.8 +PORTVERSION= 0.8.2 #PORTREVISION= 0 CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ +MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= A Python/GTK based settings manager for CompizConfig diff --git a/x11-wm/ccsm/distinfo b/x11-wm/ccsm/distinfo index cf51b2888f89..b4c0373c4e29 100644 --- a/x11-wm/ccsm/distinfo +++ b/x11-wm/ccsm/distinfo @@ -1,3 +1,3 @@ -MD5 (ccsm-0.7.8.tar.bz2) = 0e87bf89382217e264b89dd9d8b4d116 -SHA256 (ccsm-0.7.8.tar.bz2) = ecb99673b94a4019f2120c00e867d990428cae83b1cb5e1862f001c9bd8b0d69 -SIZE (ccsm-0.7.8.tar.bz2) = 464393 +MD5 (ccsm-0.8.2.tar.bz2) = c9773ec2e6ab9184c39756a365a9cd00 +SHA256 (ccsm-0.8.2.tar.bz2) = 82ad62fc29327151503a15ebf73a51aebf7ac2464037a697d530d915c73a52bd +SIZE (ccsm-0.8.2.tar.bz2) = 471887 diff --git a/x11-wm/ccsm/pkg-plist b/x11-wm/ccsm/pkg-plist index 444169bd19ac..5c7aa7044bd3 100644 --- a/x11-wm/ccsm/pkg-plist +++ b/x11-wm/ccsm/pkg-plist @@ -62,11 +62,9 @@ share/ccsm/icons/hicolor/scalable/apps/plugin-schemep.svg share/ccsm/icons/hicolor/scalable/apps/plugin-crashhandler.svg share/ccsm/icons/hicolor/scalable/apps/plugin-mblur.svg share/ccsm/icons/hicolor/scalable/apps/plugin-maximumize.svg -share/ccsm/icons/hicolor/scalable/apps/plugin-screencasting.svg share/ccsm/icons/hicolor/scalable/apps/plugin-ezoom.svg share/ccsm/icons/hicolor/scalable/apps/plugin-scale.svg share/ccsm/icons/hicolor/scalable/apps/plugin-glib.svg -share/ccsm/icons/hicolor/scalable/apps/plugin-state.svg share/ccsm/icons/hicolor/scalable/apps/plugin-notification.svg share/ccsm/icons/hicolor/scalable/apps/plugin-expo.svg share/ccsm/icons/hicolor/scalable/apps/plugin-tile.svg @@ -89,7 +87,6 @@ share/ccsm/icons/hicolor/scalable/apps/plugin-wallpaper.svg share/ccsm/icons/hicolor/scalable/apps/plugin-png.svg share/ccsm/icons/hicolor/scalable/apps/plugin-video.svg share/ccsm/icons/hicolor/scalable/apps/plugin-extrawm.svg -share/ccsm/icons/hicolor/scalable/apps/plugin-plane.svg share/ccsm/icons/hicolor/scalable/apps/plugin-place.svg share/ccsm/icons/hicolor/scalable/apps/plugin-move.svg share/ccsm/icons/hicolor/scalable/apps/plugin-trailfocus.svg @@ -103,7 +100,6 @@ share/ccsm/icons/hicolor/scalable/apps/plugin-3d.svg share/ccsm/icons/hicolor/scalable/apps/plugin-atlantis.svg share/ccsm/icons/hicolor/scalable/apps/plugin-screenshot.svg share/ccsm/icons/hicolor/scalable/apps/plugin-scaleaddon.svg -share/ccsm/icons/hicolor/scalable/apps/plugin-capture.svg share/ccsm/icons/hicolor/scalable/apps/plugin-shelf.svg share/ccsm/icons/hicolor/scalable/apps/plugin-loginout.svg share/ccsm/icons/hicolor/scalable/apps/plugin-switcher.svg @@ -124,6 +120,7 @@ share/ccsm/icons/hicolor/scalable/apps/plugin-addhelper.svg share/ccsm/icons/hicolor/scalable/apps/plugin-imgjpeg.svg share/ccsm/icons/hicolor/scalable/apps/plugin-session.svg share/ccsm/icons/hicolor/scalable/apps/plugin-colorfilter.svg +share/ccsm/icons/hicolor/scalable/apps/plugin-commands.svg share/ccsm/icons/hicolor/scalable/apps/plugin-cube.svg share/ccsm/icons/hicolor/scalable/apps/plugin-core.svg share/ccsm/icons/hicolor/scalable/apps/plugin-fade.svg @@ -133,6 +130,7 @@ share/ccsm/icons/hicolor/scalable/apps/plugin-neg.svg share/ccsm/icons/hicolor/scalable/apps/plugin-ring.svg share/ccsm/icons/hicolor/scalable/apps/plugin-regex.svg share/ccsm/icons/hicolor/scalable/apps/plugin-group.svg +share/ccsm/icons/hicolor/scalable/apps/plugin-gnomecompat.svg share/ccsm/icons/hicolor/scalable/apps/plugin-animationaddon.svg share/ccsm/icons/hicolor/scalable/apps/plugin-cubeaddon.svg share/ccsm/icons/hicolor/scalable/apps/plugin-stackswitch.svg @@ -177,6 +175,7 @@ share/locale/pa/LC_MESSAGES/ccsm.mo share/locale/ru/LC_MESSAGES/ccsm.mo share/locale/md/LC_MESSAGES/ccsm.mo share/locale/bn_IN/LC_MESSAGES/ccsm.mo +share/locale/zh_CN/LC_MESSAGES/ccsm.mo @dirrm share/ccsm/icons/hicolor/scalable/categories @dirrm share/ccsm/icons/hicolor/scalable/apps @dirrm share/ccsm/icons/hicolor/scalable diff --git a/x11-wm/compiz-fusion-plugins-extra/Makefile b/x11-wm/compiz-fusion-plugins-extra/Makefile deleted file mode 100644 index 399b1a47e188..000000000000 --- a/x11-wm/compiz-fusion-plugins-extra/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# New ports collection makefile for: compiz-fusion-plugins-extra -# Date created: 2007-08-17 -# Whom: Robert Noland <rnoland@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= compiz-fusion-plugins-extra -PORTVERSION= 0.7.8 -#PORTREVISION= 1 -CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ - -MAINTAINER= rnoland@FreeBSD.org -COMMENT= Plugins for Compiz Composite Window Manager - -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \ - ${LOCALBASE}/libdata/pkgconfig/bcop.pc:${PORTSDIR}/devel/compiz-bcop \ - ${LOCALBASE}/libdata/pkgconfig/compiz-text.pc:${PORTSDIR}/x11-wm/compiz-fusion-plugins-main -RUN_DEPENDS= ${BUILD_DEPENDS} - -GNU_CONFIGURE= yes -USE_GL= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= gnomehack intltool -USE_XORG= glproto -USE_GETTEXT= yes -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 - -GCONF_SCHEMAS= compiz-3d.schemas \ - compiz-addhelper.schemas \ - compiz-animationaddon.schemas \ - compiz-bench.schemas \ - compiz-bicubic.schemas \ - compiz-crashhandler.schemas \ - compiz-cubeaddon.schemas \ - compiz-extrawm.schemas \ - compiz-fadedesktop.schemas \ - compiz-firepaint.schemas \ - compiz-gears.schemas \ - compiz-group.schemas \ - compiz-loginout.schemas \ - compiz-maximumize.schemas \ - compiz-mblur.schemas \ - compiz-notification.schemas \ - compiz-reflex.schemas \ - compiz-shelf.schemas \ - compiz-showdesktop.schemas \ - compiz-showmouse.schemas \ - compiz-splash.schemas \ - compiz-trailfocus.schemas \ - compiz-wallpaper.schemas \ - compiz-widget.schemas - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --enable-schemas - -post-patch: - @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ - ${WRKSRC}/src/group/group-internal.h \ - -.include <bsd.port.mk> diff --git a/x11-wm/compiz-fusion-plugins-extra/distinfo b/x11-wm/compiz-fusion-plugins-extra/distinfo deleted file mode 100644 index 5b08877aa483..000000000000 --- a/x11-wm/compiz-fusion-plugins-extra/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (compiz-fusion-plugins-extra-0.7.8.tar.bz2) = 02e53740cab9a7e72d0cfc86e2505544 -SHA256 (compiz-fusion-plugins-extra-0.7.8.tar.bz2) = c9ff8e03880065c75f68650dea27870b17f97514a3a4691c2b96f615f052b641 -SIZE (compiz-fusion-plugins-extra-0.7.8.tar.bz2) = 2540112 diff --git a/x11-wm/compiz-fusion-plugins-extra/pkg-descr b/x11-wm/compiz-fusion-plugins-extra/pkg-descr deleted file mode 100644 index 4aeb80684347..000000000000 --- a/x11-wm/compiz-fusion-plugins-extra/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is the extra set of plugins for Compiz fusion. - -WWW: http://forums.compiz-fusion.org/ diff --git a/x11-wm/compiz-fusion-plugins-extra/pkg-plist b/x11-wm/compiz-fusion-plugins-extra/pkg-plist deleted file mode 100644 index 07cad286e405..000000000000 --- a/x11-wm/compiz-fusion-plugins-extra/pkg-plist +++ /dev/null @@ -1,131 +0,0 @@ -@comment $FreeBSD$ -include/compiz/compiz-animationaddon.h -lib/compiz/lib3d.so -lib/compiz/lib3d.la -lib/compiz/lib3d.a -lib/compiz/libaddhelper.so -lib/compiz/libaddhelper.la -lib/compiz/libaddhelper.a -lib/compiz/libanimationaddon.so -lib/compiz/libanimationaddon.la -lib/compiz/libanimationaddon.a -lib/compiz/libbench.so -lib/compiz/libbench.la -lib/compiz/libbench.a -lib/compiz/libbicubic.so -lib/compiz/libbicubic.la -lib/compiz/libbicubic.a -lib/compiz/libcrashhandler.so -lib/compiz/libcrashhandler.la -lib/compiz/libcrashhandler.a -lib/compiz/libcubeaddon.so -lib/compiz/libcubeaddon.la -lib/compiz/libcubeaddon.a -lib/compiz/libextrawm.so -lib/compiz/libextrawm.la -lib/compiz/libextrawm.a -lib/compiz/libfadedesktop.so -lib/compiz/libgears.so -lib/compiz/libfadedesktop.la -lib/compiz/libfadedesktop.a -lib/compiz/libfirepaint.so -lib/compiz/libfirepaint.la -lib/compiz/libfirepaint.a -lib/compiz/libgears.la -lib/compiz/libgears.a -lib/compiz/libgroup.so -lib/compiz/libgroup.la -lib/compiz/libgroup.a -lib/compiz/libloginout.so -lib/compiz/libloginout.la -lib/compiz/libloginout.a -lib/compiz/libmaximumize.so -lib/compiz/libmaximumize.la -lib/compiz/libmaximumize.a -lib/compiz/libmblur.so -lib/compiz/libmblur.la -lib/compiz/libmblur.a -lib/compiz/libnotification.so -lib/compiz/libnotification.la -lib/compiz/libnotification.a -lib/compiz/libreflex.so -lib/compiz/libreflex.la -lib/compiz/libreflex.a -lib/compiz/libshelf.so -lib/compiz/libshelf.la -lib/compiz/libshelf.a -lib/compiz/libshowdesktop.so -lib/compiz/libshowdesktop.la -lib/compiz/libshowdesktop.a -lib/compiz/libshowmouse.so -lib/compiz/libshowmouse.la -lib/compiz/libshowmouse.a -lib/compiz/libsplash.so -lib/compiz/libsplash.la -lib/compiz/libsplash.a -lib/compiz/libtrailfocus.so -lib/compiz/libtrailfocus.la -lib/compiz/libtrailfocus.a -lib/compiz/libwallpaper.so -lib/compiz/libwallpaper.la -lib/compiz/libwallpaper.a -lib/compiz/libwidget.so -lib/compiz/libwidget.la -lib/compiz/libwidget.a -libdata/pkgconfig/compiz-animationaddon.pc -share/locale/ar/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/bn/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/cs/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/de/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/el/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/en_GB/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/es/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/eu/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/fa/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/fi/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/gu/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/he/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/hi/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/it/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/ca/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/gl/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/nb/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/nl/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/pl/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/pt/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/pt_BR/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/ru/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/sv/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/tr/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/compiz/3d.xml -share/compiz/addhelper.xml -share/compiz/animationaddon.xml -share/compiz/bench.xml -share/compiz/bicubic.xml -share/compiz/crashhandler.xml -share/compiz/cubeaddon.xml -share/compiz/extrawm.xml -share/compiz/fadedesktop.xml -share/compiz/firepaint.xml -share/compiz/gears.xml -share/compiz/group.xml -share/compiz/loginout.xml -share/compiz/maximumize.xml -share/compiz/mblur.xml -share/compiz/notification.xml -share/compiz/reflex.xml -share/compiz/shelf.xml -share/compiz/showdesktop.xml -share/compiz/showmouse.xml -share/compiz/splash.xml -share/compiz/trailfocus.xml -share/compiz/wallpaper.xml -share/compiz/widget.xml -share/compiz/reflection.png -share/compiz/fusioncap.png -share/compiz/compizcap.png -share/compiz/splash_background.png -share/compiz/splash_logo.png diff --git a/x11-wm/compiz-fusion-plugins-main/Makefile b/x11-wm/compiz-fusion-plugins-main/Makefile deleted file mode 100644 index a0c34c9d9741..000000000000 --- a/x11-wm/compiz-fusion-plugins-main/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# New ports collection makefile for: compiz-fusion-plugins-main -# Date created: 2007-08-15 -# Whom: Robert Noland <rnoland@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= compiz-fusion-plugins-main -PORTVERSION= 0.7.8 -#PORTREVISION= 1 -CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ - -MAINTAINER= rnoland@FreeBSD.org -COMMENT= Plugins for Compiz Composite Window Manager - -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ - pangocairo-1.0:${PORTSDIR}/x11-toolkits/pango -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \ - ${LOCALBASE}/libdata/pkgconfig/bcop.pc:${PORTSDIR}/devel/compiz-bcop -RUN_DEPENDS= ${BUILD_DEPENDS} - -GNU_CONFIGURE= yes -USE_GL= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= gnomehack intltool -USE_XORG= glproto -USE_GETTEXT= yes -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 - -GCONF_SCHEMAS= compiz-animation.schemas \ - compiz-colorfilter.schemas \ - compiz-expo.schemas \ - compiz-ezoom.schemas \ - compiz-imgjpeg.schemas \ - compiz-mag.schemas \ - compiz-mousepoll.schemas \ - compiz-neg.schemas \ - compiz-opacify.schemas \ - compiz-put.schemas \ - compiz-resizeinfo.schemas \ - compiz-ring.schemas \ - compiz-staticswitcher.schemas \ - compiz-session.schemas \ - compiz-snap.schemas \ - compiz-text.schemas \ - compiz-thumbnail.schemas \ - compiz-wall.schemas \ - compiz-winrules.schemas \ - compiz-workarounds.schemas \ - compiz-scaleaddon.schemas \ - compiz-vpswitch.schemas \ - compiz-shift.schemas - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --enable-schemas - -.include <bsd.port.mk> diff --git a/x11-wm/compiz-fusion-plugins-main/distinfo b/x11-wm/compiz-fusion-plugins-main/distinfo deleted file mode 100644 index 32a1201d5d93..000000000000 --- a/x11-wm/compiz-fusion-plugins-main/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (compiz-fusion-plugins-main-0.7.8.tar.bz2) = 00cd94289669acc8f2174d7d517f4102 -SHA256 (compiz-fusion-plugins-main-0.7.8.tar.bz2) = 2720a714e46cfb2b1046648e9bc71e6d323d39786de18baef2a6223651c43b53 -SIZE (compiz-fusion-plugins-main-0.7.8.tar.bz2) = 1083013 diff --git a/x11-wm/compiz-fusion-plugins-main/pkg-descr b/x11-wm/compiz-fusion-plugins-main/pkg-descr deleted file mode 100644 index 2207fcd2e9b0..000000000000 --- a/x11-wm/compiz-fusion-plugins-main/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is the main set of plugins for Compiz. - -WWW: http://forums.compiz-fusion.org/ diff --git a/x11-wm/compiz-fusion-plugins-main/pkg-plist b/x11-wm/compiz-fusion-plugins-main/pkg-plist deleted file mode 100644 index ff3f289fc500..000000000000 --- a/x11-wm/compiz-fusion-plugins-main/pkg-plist +++ /dev/null @@ -1,145 +0,0 @@ -@comment $FreeBSD$ -include/compiz/compiz-animation.h -include/compiz/compiz-mousepoll.h -include/compiz/compiz-text.h -lib/compiz/libanimation.so -lib/compiz/libanimation.la -lib/compiz/libanimation.a -lib/compiz/libcolorfilter.so -lib/compiz/libcolorfilter.la -lib/compiz/libcolorfilter.a -lib/compiz/libexpo.so -lib/compiz/libexpo.la -lib/compiz/libexpo.a -lib/compiz/libezoom.so -lib/compiz/libezoom.la -lib/compiz/libezoom.a -lib/compiz/libimgjpeg.so -lib/compiz/libimgjpeg.la -lib/compiz/libimgjpeg.a -lib/compiz/libmag.so -lib/compiz/libmag.la -lib/compiz/libmag.a -lib/compiz/libmousepoll.so -lib/compiz/libmousepoll.la -lib/compiz/libmousepoll.a -lib/compiz/libneg.so -lib/compiz/libneg.la -lib/compiz/libneg.a -lib/compiz/libopacify.so -lib/compiz/libopacify.la -lib/compiz/libopacify.a -lib/compiz/libput.so -lib/compiz/libput.la -lib/compiz/libput.a -lib/compiz/libresizeinfo.so -lib/compiz/libresizeinfo.la -lib/compiz/libresizeinfo.a -lib/compiz/libring.so -lib/compiz/libring.la -lib/compiz/libring.a -lib/compiz/libscaleaddon.so -lib/compiz/libscaleaddon.la -lib/compiz/libscaleaddon.a -lib/compiz/libsession.so -lib/compiz/libsession.la -lib/compiz/libsession.a -lib/compiz/libsnap.so -lib/compiz/libsnap.la -lib/compiz/libsnap.a -lib/compiz/libstaticswitcher.so -lib/compiz/libstaticswitcher.la -lib/compiz/libstaticswitcher.a -lib/compiz/libtext.so -lib/compiz/libtext.la -lib/compiz/libtext.a -lib/compiz/libthumbnail.so -lib/compiz/libthumbnail.la -lib/compiz/libthumbnail.a -lib/compiz/libwall.so -lib/compiz/libwall.la -lib/compiz/libwall.a -lib/compiz/libwinrules.so -lib/compiz/libwinrules.la -lib/compiz/libwinrules.a -lib/compiz/libworkarounds.so -lib/compiz/libworkarounds.la -lib/compiz/libworkarounds.a -lib/compiz/libvpswitch.so -lib/compiz/libvpswitch.la -lib/compiz/libvpswitch.a -lib/compiz/libshift.so -lib/compiz/libshift.la -lib/compiz/libshift.a -libdata/pkgconfig/compiz-animation.pc -libdata/pkgconfig/compiz-mousepoll.pc -libdata/pkgconfig/compiz-text.pc -share/locale/ar/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/bn/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/cs/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/de/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/el/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/en_GB/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/es/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/eu/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/fa/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/fi/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/gu/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/he/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/hi/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/it/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/ca/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/gl/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/nb/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/nl/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/pl/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/pt/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/pt_BR/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/ru/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/sv/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/tr/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/compiz/animation.xml -share/compiz/colorfilter.xml -share/compiz/expo.xml -share/compiz/ezoom.xml -share/compiz/imgjpeg.xml -share/compiz/mag.xml -share/compiz/mousepoll.xml -share/compiz/neg.xml -share/compiz/opacify.xml -share/compiz/put.xml -share/compiz/resizeinfo.xml -share/compiz/ring.xml -share/compiz/session.xml -share/compiz/snap.xml -share/compiz/staticswitcher.xml -share/compiz/text.xml -share/compiz/thumbnail.xml -share/compiz/wall.xml -share/compiz/winrules.xml -share/compiz/workarounds.xml -share/compiz/scaleaddon.xml -share/compiz/vpswitch.xml -share/compiz/shift.xml -share/compiz/filters/blackandwhite -share/compiz/filters/blueish-filter -share/compiz/filters/contrast -share/compiz/filters/deuteranopia -share/compiz/filters/grayscale -share/compiz/filters/negative -share/compiz/filters/negative-green -share/compiz/filters/protanopia -share/compiz/filters/sepia -share/compiz/filters/swap-green-blue -share/compiz/filters/swap-red-blue -share/compiz/filters/swap-red-green -share/compiz/Oxygen/overlay.png -share/compiz/Oxygen/mask.png -share/compiz/Gnome/overlay.png -share/compiz/Gnome/mask.png -@dirrmtry share/compiz/filters -@dirrmtry share/compiz/Oxygen -@dirrmtry share/compiz/Gnome diff --git a/x11-wm/compiz-fusion-plugins-unsupported/Makefile b/x11-wm/compiz-fusion-plugins-unsupported/Makefile deleted file mode 100644 index 02be8f309d9d..000000000000 --- a/x11-wm/compiz-fusion-plugins-unsupported/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# New ports collection makefile for: compiz-fusion-plugins-unsupported -# Date created: 2007-08-17 -# Whom: Robert Noland <rnoland@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= compiz-fusion-plugins-unsupported -PORTVERSION= 0.7.8 -#PORTREVISION= 1 -CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ - -MAINTAINER= rnoland@FreeBSD.org -COMMENT= Plugins for Compiz Composite Window Manager - -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \ - ${LOCALBASE}/libdata/pkgconfig/bcop.pc:${PORTSDIR}/devel/compiz-bcop -RUN_DEPENDS= ${BUILD_DEPENDS} - -GNU_CONFIGURE= yes -USE_GL= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= gnomehack intltool -USE_XORG= glproto -USE_GETTEXT= yes -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 - -GCONF_SCHEMAS= compiz-atlantis.schemas \ - compiz-fakeargb.schemas \ - compiz-mswitch.schemas \ - compiz-snow.schemas \ - compiz-tile.schemas - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --enable-schemas - -.include <bsd.port.mk> diff --git a/x11-wm/compiz-fusion-plugins-unsupported/distinfo b/x11-wm/compiz-fusion-plugins-unsupported/distinfo deleted file mode 100644 index 116be5c8d2c0..000000000000 --- a/x11-wm/compiz-fusion-plugins-unsupported/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (compiz-fusion-plugins-unsupported-0.7.8.tar.bz2) = 54938f9b4b42a8a29468429cd05a421c -SHA256 (compiz-fusion-plugins-unsupported-0.7.8.tar.bz2) = e578721ab4fd594132c445565243f3bd22ccfd08c1af3d3a439d1a56b20195ef -SIZE (compiz-fusion-plugins-unsupported-0.7.8.tar.bz2) = 781410 diff --git a/x11-wm/compiz-fusion-plugins-unsupported/pkg-descr b/x11-wm/compiz-fusion-plugins-unsupported/pkg-descr deleted file mode 100644 index b5b524b92e9e..000000000000 --- a/x11-wm/compiz-fusion-plugins-unsupported/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is the unsupported set of plugins for Compiz. - -WWW: http://forums.compiz-fusion.org/ diff --git a/x11-wm/compiz-fusion-plugins-unsupported/pkg-plist b/x11-wm/compiz-fusion-plugins-unsupported/pkg-plist deleted file mode 100644 index 41d4dc809e84..000000000000 --- a/x11-wm/compiz-fusion-plugins-unsupported/pkg-plist +++ /dev/null @@ -1,51 +0,0 @@ -@comment $FreeBSD$ -lib/compiz/libatlantis.so -lib/compiz/libatlantis.la -lib/compiz/libatlantis.a -lib/compiz/libfakeargb.so -lib/compiz/libfakeargb.la -lib/compiz/libfakeargb.a -lib/compiz/libmswitch.so -lib/compiz/libmswitch.la -lib/compiz/libmswitch.a -lib/compiz/libsnow.so -lib/compiz/libsnow.la -lib/compiz/libsnow.a -lib/compiz/libtile.so -lib/compiz/libtile.la -lib/compiz/libtile.a -share/locale/cs/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/de/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/el/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/he/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/it/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/ar/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/bn/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/ca/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/en_GB/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/es/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/eu/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/fa/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/fi/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/gl/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/gu/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/hi/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/nb/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/nl/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/pl/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/pt/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/pt_BR/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/ru/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/sv/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/tr/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/compiz/atlantis.xml -share/compiz/fakeargb.xml -share/compiz/mswitch.xml -share/compiz/snow.xml -share/compiz/tile.xml -share/compiz/snowflake.png -@dirrmtry share/locale/pl_PL/LC_MESSAGES -@dirrmtry share/locale/pl_PL diff --git a/x11-wm/compiz-fusion/Makefile b/x11-wm/compiz-fusion/Makefile index 3ccc4af3901a..e94c3c107df7 100644 --- a/x11-wm/compiz-fusion/Makefile +++ b/x11-wm/compiz-fusion/Makefile @@ -6,7 +6,7 @@ # PORTNAME= compiz-fusion -PORTVERSION= 0.7.8 +PORTVERSION= 0.8.2 #PORTREVISION= 0 CATEGORIES= x11-wm MASTER_SITES= # none @@ -18,7 +18,7 @@ COMMENT= Metaport of compiz-fusion LIB_DEPENDS= compizconfig:${PORTSDIR}/x11-wm/libcompizconfig RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \ - ${LOCALBASE}/lib/compiz/libanimation.so:${PORTSDIR}/x11-wm/compiz-fusion-plugins-main \ + ${LOCALBASE}/lib/compiz/libanimation.so:${PORTSDIR}/x11-wm/compiz-plugins-main \ ${LOCALBASE}/bin/ccsm:${PORTSDIR}/x11-wm/ccsm NO_BUILD= yes @@ -35,11 +35,11 @@ do-install: # empty .include <bsd.port.pre.mk> .if !defined(WITHOUT_EXTRA) -RUN_DEPENDS+= ${LOCALBASE}/lib/compiz/libaddhelper.so:${PORTSDIR}/x11-wm/compiz-fusion-plugins-extra +RUN_DEPENDS+= ${LOCALBASE}/lib/compiz/libaddhelper.so:${PORTSDIR}/x11-wm/compiz-plugins-extra .endif .if defined(WITH_UNSUP) -RUN_DEPENDS+= ${LOCALBASE}/lib/compiz/libfakeargb.so:${PORTSDIR}/x11-wm/compiz-fusion-plugins-unsupported +RUN_DEPENDS+= ${LOCALBASE}/lib/compiz/libfakeargb.so:${PORTSDIR}/x11-wm/compiz-plugins-unsupported .endif .if !defined(WITHOUT_EMERALD) diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile index 399b1a47e188..b4d122460629 100644 --- a/x11-wm/compiz-plugins-extra/Makefile +++ b/x11-wm/compiz-plugins-extra/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: compiz-fusion-plugins-extra +# New ports collection makefile for: compiz-plugins-extra # Date created: 2007-08-17 # Whom: Robert Noland <rnoland@FreeBSD.org> # # $FreeBSD$ # -PORTNAME= compiz-fusion-plugins-extra -PORTVERSION= 0.7.8 +PORTNAME= compiz-plugins-extra +PORTVERSION= 0.8.2 #PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ +MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= Plugins for Compiz Composite Window Manager @@ -17,7 +17,7 @@ COMMENT= Plugins for Compiz Composite Window Manager LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \ ${LOCALBASE}/libdata/pkgconfig/bcop.pc:${PORTSDIR}/devel/compiz-bcop \ - ${LOCALBASE}/libdata/pkgconfig/compiz-text.pc:${PORTSDIR}/x11-wm/compiz-fusion-plugins-main + ${LOCALBASE}/libdata/pkgconfig/compiz-text.pc:${PORTSDIR}/x11-wm/compiz-plugins-main RUN_DEPENDS= ${BUILD_DEPENDS} GNU_CONFIGURE= yes @@ -41,12 +41,14 @@ GCONF_SCHEMAS= compiz-3d.schemas \ compiz-fadedesktop.schemas \ compiz-firepaint.schemas \ compiz-gears.schemas \ + compiz-grid.schemas \ compiz-group.schemas \ compiz-loginout.schemas \ compiz-maximumize.schemas \ compiz-mblur.schemas \ compiz-notification.schemas \ compiz-reflex.schemas \ + compiz-scalefilter.schemas \ compiz-shelf.schemas \ compiz-showdesktop.schemas \ compiz-showmouse.schemas \ diff --git a/x11-wm/compiz-plugins-extra/distinfo b/x11-wm/compiz-plugins-extra/distinfo index 5b08877aa483..4063cdbc3e1f 100644 --- a/x11-wm/compiz-plugins-extra/distinfo +++ b/x11-wm/compiz-plugins-extra/distinfo @@ -1,3 +1,3 @@ -MD5 (compiz-fusion-plugins-extra-0.7.8.tar.bz2) = 02e53740cab9a7e72d0cfc86e2505544 -SHA256 (compiz-fusion-plugins-extra-0.7.8.tar.bz2) = c9ff8e03880065c75f68650dea27870b17f97514a3a4691c2b96f615f052b641 -SIZE (compiz-fusion-plugins-extra-0.7.8.tar.bz2) = 2540112 +MD5 (compiz-plugins-extra-0.8.2.tar.bz2) = 5ac96f1a0e32ccf4dd378454089fa347 +SHA256 (compiz-plugins-extra-0.8.2.tar.bz2) = 4f99f6b6a1abd5bd480b9e9f025ef8f75270fa46dd80a03e902bc297d61e0ab2 +SIZE (compiz-plugins-extra-0.8.2.tar.bz2) = 2624166 diff --git a/x11-wm/compiz-plugins-extra/pkg-plist b/x11-wm/compiz-plugins-extra/pkg-plist index 07cad286e405..a71e5b66de2a 100644 --- a/x11-wm/compiz-plugins-extra/pkg-plist +++ b/x11-wm/compiz-plugins-extra/pkg-plist @@ -25,14 +25,17 @@ lib/compiz/libextrawm.so lib/compiz/libextrawm.la lib/compiz/libextrawm.a lib/compiz/libfadedesktop.so -lib/compiz/libgears.so lib/compiz/libfadedesktop.la lib/compiz/libfadedesktop.a lib/compiz/libfirepaint.so lib/compiz/libfirepaint.la lib/compiz/libfirepaint.a +lib/compiz/libgears.so lib/compiz/libgears.la lib/compiz/libgears.a +lib/compiz/libgrid.so +lib/compiz/libgrid.la +lib/compiz/libgrid.a lib/compiz/libgroup.so lib/compiz/libgroup.la lib/compiz/libgroup.a @@ -51,6 +54,9 @@ lib/compiz/libnotification.a lib/compiz/libreflex.so lib/compiz/libreflex.la lib/compiz/libreflex.a +lib/compiz/libscalefilter.so +lib/compiz/libscalefilter.la +lib/compiz/libscalefilter.a lib/compiz/libshelf.so lib/compiz/libshelf.la lib/compiz/libshelf.a @@ -73,33 +79,35 @@ lib/compiz/libwidget.so lib/compiz/libwidget.la lib/compiz/libwidget.a libdata/pkgconfig/compiz-animationaddon.pc -share/locale/ar/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/bn/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/cs/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/de/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/el/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/en_GB/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/es/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/eu/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/fa/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/fi/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/gu/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/he/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/hi/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/it/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/ca/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/gl/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/nb/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/nl/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/pl/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/pt/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/pt_BR/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/ru/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/sv/LC_MESSAGES/compiz-fusion-plugins-extra.mo -share/locale/tr/LC_MESSAGES/compiz-fusion-plugins-extra.mo +share/locale/ar/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/bn/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/cs/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/de/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/el/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/en_GB/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/es/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/eu/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/fa/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/fi/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/fr/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/gu/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/he/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/hi/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/hu/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/it/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/ja/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/ko/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/zh_CN/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/ca/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/gl/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/nb/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/nl/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/pl/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/pt/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/pt_BR/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/ru/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/sv/LC_MESSAGES/compiz-plugins-extra.mo +share/locale/tr/LC_MESSAGES/compiz-plugins-extra.mo share/compiz/3d.xml share/compiz/addhelper.xml share/compiz/animationaddon.xml @@ -111,12 +119,14 @@ share/compiz/extrawm.xml share/compiz/fadedesktop.xml share/compiz/firepaint.xml share/compiz/gears.xml +share/compiz/grid.xml share/compiz/group.xml share/compiz/loginout.xml share/compiz/maximumize.xml share/compiz/mblur.xml share/compiz/notification.xml share/compiz/reflex.xml +share/compiz/scalefilter.xml share/compiz/shelf.xml share/compiz/showdesktop.xml share/compiz/showmouse.xml diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile index a0c34c9d9741..a594ab004d2a 100644 --- a/x11-wm/compiz-plugins-main/Makefile +++ b/x11-wm/compiz-plugins-main/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: compiz-fusion-plugins-main +# New ports collection makefile for: compiz-plugins-main # Date created: 2007-08-15 # Whom: Robert Noland <rnoland@FreeBSD.org> # # $FreeBSD$ # -PORTNAME= compiz-fusion-plugins-main -PORTVERSION= 0.7.8 +PORTNAME= compiz-plugins-main +PORTVERSION= 0.8.2 #PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ +MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= Plugins for Compiz Composite Window Manager diff --git a/x11-wm/compiz-plugins-main/distinfo b/x11-wm/compiz-plugins-main/distinfo index 32a1201d5d93..ca07659fe47a 100644 --- a/x11-wm/compiz-plugins-main/distinfo +++ b/x11-wm/compiz-plugins-main/distinfo @@ -1,3 +1,3 @@ -MD5 (compiz-fusion-plugins-main-0.7.8.tar.bz2) = 00cd94289669acc8f2174d7d517f4102 -SHA256 (compiz-fusion-plugins-main-0.7.8.tar.bz2) = 2720a714e46cfb2b1046648e9bc71e6d323d39786de18baef2a6223651c43b53 -SIZE (compiz-fusion-plugins-main-0.7.8.tar.bz2) = 1083013 +MD5 (compiz-plugins-main-0.8.2.tar.bz2) = 089402b0b933ba96e8ad7138d957c470 +SHA256 (compiz-plugins-main-0.8.2.tar.bz2) = d1c71500d4b84ac3a3767f0eb498bbfe22b8abcac8bc71dac6c7696de493ff1e +SIZE (compiz-plugins-main-0.8.2.tar.bz2) = 1169127 diff --git a/x11-wm/compiz-plugins-main/pkg-plist b/x11-wm/compiz-plugins-main/pkg-plist index ff3f289fc500..2e9a00cbd96e 100644 --- a/x11-wm/compiz-plugins-main/pkg-plist +++ b/x11-wm/compiz-plugins-main/pkg-plist @@ -74,33 +74,35 @@ lib/compiz/libshift.a libdata/pkgconfig/compiz-animation.pc libdata/pkgconfig/compiz-mousepoll.pc libdata/pkgconfig/compiz-text.pc -share/locale/ar/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/bn/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/cs/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/de/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/el/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/en_GB/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/es/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/eu/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/fa/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/fi/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/gu/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/he/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/hi/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/it/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/ca/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/gl/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/nb/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/nl/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/pl/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/pt/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/pt_BR/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/ru/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/sv/LC_MESSAGES/compiz-fusion-plugins-main.mo -share/locale/tr/LC_MESSAGES/compiz-fusion-plugins-main.mo +share/locale/ar/LC_MESSAGES/compiz-plugins-main.mo +share/locale/bn/LC_MESSAGES/compiz-plugins-main.mo +share/locale/cs/LC_MESSAGES/compiz-plugins-main.mo +share/locale/de/LC_MESSAGES/compiz-plugins-main.mo +share/locale/el/LC_MESSAGES/compiz-plugins-main.mo +share/locale/en_GB/LC_MESSAGES/compiz-plugins-main.mo +share/locale/es/LC_MESSAGES/compiz-plugins-main.mo +share/locale/eu/LC_MESSAGES/compiz-plugins-main.mo +share/locale/fa/LC_MESSAGES/compiz-plugins-main.mo +share/locale/fi/LC_MESSAGES/compiz-plugins-main.mo +share/locale/fr/LC_MESSAGES/compiz-plugins-main.mo +share/locale/gu/LC_MESSAGES/compiz-plugins-main.mo +share/locale/he/LC_MESSAGES/compiz-plugins-main.mo +share/locale/hi/LC_MESSAGES/compiz-plugins-main.mo +share/locale/hu/LC_MESSAGES/compiz-plugins-main.mo +share/locale/it/LC_MESSAGES/compiz-plugins-main.mo +share/locale/ja/LC_MESSAGES/compiz-plugins-main.mo +share/locale/ko/LC_MESSAGES/compiz-plugins-main.mo +share/locale/zh_CN/LC_MESSAGES/compiz-plugins-main.mo +share/locale/ca/LC_MESSAGES/compiz-plugins-main.mo +share/locale/gl/LC_MESSAGES/compiz-plugins-main.mo +share/locale/nb/LC_MESSAGES/compiz-plugins-main.mo +share/locale/nl/LC_MESSAGES/compiz-plugins-main.mo +share/locale/pl/LC_MESSAGES/compiz-plugins-main.mo +share/locale/pt/LC_MESSAGES/compiz-plugins-main.mo +share/locale/pt_BR/LC_MESSAGES/compiz-plugins-main.mo +share/locale/ru/LC_MESSAGES/compiz-plugins-main.mo +share/locale/sv/LC_MESSAGES/compiz-plugins-main.mo +share/locale/tr/LC_MESSAGES/compiz-plugins-main.mo share/compiz/animation.xml share/compiz/colorfilter.xml share/compiz/expo.xml diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile index 02be8f309d9d..20d91a72c6fe 100644 --- a/x11-wm/compiz-plugins-unsupported/Makefile +++ b/x11-wm/compiz-plugins-unsupported/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: compiz-fusion-plugins-unsupported +# New ports collection makefile for: compiz-plugins-unsupported # Date created: 2007-08-17 # Whom: Robert Noland <rnoland@FreeBSD.org> # # $FreeBSD$ # -PORTNAME= compiz-fusion-plugins-unsupported -PORTVERSION= 0.7.8 +PORTNAME= compiz-plugins-unsupported +PORTVERSION= 0.8.2 #PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ +MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= Plugins for Compiz Composite Window Manager @@ -30,6 +30,8 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 GCONF_SCHEMAS= compiz-atlantis.schemas \ + compiz-cubemodel.schemas \ + compiz-elements.schemas \ compiz-fakeargb.schemas \ compiz-mswitch.schemas \ compiz-snow.schemas \ diff --git a/x11-wm/compiz-plugins-unsupported/distinfo b/x11-wm/compiz-plugins-unsupported/distinfo index 116be5c8d2c0..7dca61e08aa7 100644 --- a/x11-wm/compiz-plugins-unsupported/distinfo +++ b/x11-wm/compiz-plugins-unsupported/distinfo @@ -1,3 +1,3 @@ -MD5 (compiz-fusion-plugins-unsupported-0.7.8.tar.bz2) = 54938f9b4b42a8a29468429cd05a421c -SHA256 (compiz-fusion-plugins-unsupported-0.7.8.tar.bz2) = e578721ab4fd594132c445565243f3bd22ccfd08c1af3d3a439d1a56b20195ef -SIZE (compiz-fusion-plugins-unsupported-0.7.8.tar.bz2) = 781410 +MD5 (compiz-plugins-unsupported-0.8.2.tar.bz2) = 3f824a0eee6ea1907337bdddb55f0228 +SHA256 (compiz-plugins-unsupported-0.8.2.tar.bz2) = 943d1ad6a1e4a92a518087c4b5ba44e91c5e2b9bc254dbfcc4adefe3dc42157b +SIZE (compiz-plugins-unsupported-0.8.2.tar.bz2) = 1051912 diff --git a/x11-wm/compiz-plugins-unsupported/pkg-plist b/x11-wm/compiz-plugins-unsupported/pkg-plist index 41d4dc809e84..422d854bfce5 100644 --- a/x11-wm/compiz-plugins-unsupported/pkg-plist +++ b/x11-wm/compiz-plugins-unsupported/pkg-plist @@ -1,7 +1,14 @@ @comment $FreeBSD$ +include/compiz/compiz-elements.h lib/compiz/libatlantis.so lib/compiz/libatlantis.la lib/compiz/libatlantis.a +lib/compiz/libcubemodel.so +lib/compiz/libcubemodel.la +lib/compiz/libcubemodel.a +lib/compiz/libelements.so +lib/compiz/libelements.la +lib/compiz/libelements.a lib/compiz/libfakeargb.so lib/compiz/libfakeargb.la lib/compiz/libfakeargb.a @@ -14,34 +21,38 @@ lib/compiz/libsnow.a lib/compiz/libtile.so lib/compiz/libtile.la lib/compiz/libtile.a -share/locale/cs/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/de/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/el/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/he/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/it/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/ar/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/bn/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/ca/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/en_GB/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/es/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/eu/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/fa/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/fi/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/gl/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/gu/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/hi/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/nb/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/nl/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/pl/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/pt/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/pt_BR/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/ru/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/sv/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo -share/locale/tr/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo +share/locale/cs/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/de/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/el/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/fr/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/he/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/it/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/ja/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/zh_CN/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/ar/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/bn/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/ca/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/en_GB/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/es/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/eu/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/fa/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/fi/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/gl/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/gu/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/hi/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/hu/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/ko/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/nb/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/nl/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/pl/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/pt/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/pt_BR/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/ru/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/sv/LC_MESSAGES/compiz-plugins-unsupported.mo +share/locale/tr/LC_MESSAGES/compiz-plugins-unsupported.mo share/compiz/atlantis.xml +share/compiz/cubemodel.xml +share/compiz/elements.xml share/compiz/fakeargb.xml share/compiz/mswitch.xml share/compiz/snow.xml @@ -49,3 +60,4 @@ share/compiz/tile.xml share/compiz/snowflake.png @dirrmtry share/locale/pl_PL/LC_MESSAGES @dirrmtry share/locale/pl_PL +@dirrmtry include/compiz diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index a199dcfb4312..1e18be47f843 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -6,9 +6,9 @@ # PORTNAME= compiz -PORTVERSION= 0.7.8 -PORTREVISION= 1 +PORTVERSION= 0.8.2 CATEGORIES= x11-wm +MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= Compiz Composite/Window Manager @@ -18,8 +18,8 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ XORG_CAT= app GNU_CONFIGURE= yes -#USE_BZIP2= yes -USE_TGZ= yes +USE_BZIP2= yes +#USE_TGZ= yes USE_GMAKE= yes USE_GETTEXT= yes USE_GL= glu @@ -32,6 +32,7 @@ GCONF_SCHEMAS= gwd.schemas \ compiz-annotate.schemas \ compiz-blur.schemas \ compiz-clone.schemas \ + compiz-commands.schemas \ compiz-core.schemas \ compiz-cube.schemas \ compiz-dbus.schemas \ @@ -40,6 +41,7 @@ GCONF_SCHEMAS= gwd.schemas \ compiz-fs.schemas \ compiz-gconf.schemas \ compiz-glib.schemas \ + compiz-gnomecompat.schemas \ compiz-ini.schemas \ compiz-inotify.schemas \ compiz-kconfig.schemas \ @@ -71,9 +73,19 @@ OPTIONS= RSVG "Enable librsvg2 support" on \ FUSEFS "Enable fusefs support" off \ KDE "Enable KDE support" off +SUB_FILES= compiz-manager +DESKTOP_ENTRIES= "Compiz Manager" \ + "A wrapper script for starting compiz" \ + "" \ + "compiz-manager" \ + "Application;Core;" \ + false + post-patch: @${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure +post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${PREFIX}/bin/compiz-manager .include <bsd.port.pre.mk> .if !defined(WITHOUT_RSVG) diff --git a/x11-wm/compiz/distinfo b/x11-wm/compiz/distinfo index 92cf2e918e27..39f18386df8b 100644 --- a/x11-wm/compiz/distinfo +++ b/x11-wm/compiz/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/compiz-0.7.8.tar.gz) = e99977d9170a7bd5d571004eed038428 -SHA256 (xorg/app/compiz-0.7.8.tar.gz) = b46f52b776cc78e85357a07688d04b36ec19c65eadeaf6f6cfcca7b8515e6503 -SIZE (xorg/app/compiz-0.7.8.tar.gz) = 1463748 +MD5 (xorg/app/compiz-0.8.2.tar.bz2) = c161975eb0fe8deac7be8d99408a80fc +SHA256 (xorg/app/compiz-0.8.2.tar.bz2) = f526050f0e0b81dda5a7fc5f28c0b7fd879a77a2676f7303b10dbdda9dc3b0a8 +SIZE (xorg/app/compiz-0.8.2.tar.bz2) = 1086003 diff --git a/x11-wm/compiz/files/compiz-manager.in b/x11-wm/compiz/files/compiz-manager.in new file mode 100644 index 000000000000..adfd309d3830 --- /dev/null +++ b/x11-wm/compiz/files/compiz-manager.in @@ -0,0 +1,407 @@ +#!/bin/sh +# Compiz Manager wrapper script +# +# Copyright (c) 2007 Kristian Lyngstøl <kristian@bohemians.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# +# Contributions by: Treviño (3v1n0) <trevi55@gmail.com>, Ubuntu Packages +# +# Much of this code is based on Beryl code, also licensed under the GPL. +# This script will detect what options we need to pass to compiz to get it +# started, and start a default plugin and possibly window decorator. +# + + +COMPIZ_BIN_PATH="%%LOCALBASE%%/bin/" # For window decorators and compiz +PLUGIN_PATH="%%LOCALBASE%%/lib/compiz/" +GLXINFO="%%LOCALBASE%%/bin/glxinfo" +KWIN="%%LOCALBASE%%/bin/kwin" +METACITY="%%LOCALBASE%%/bin/metacity" +XFWM="%%LOCALBASE%%/bin/xfwm" +COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) + +# For Xgl LD_PRELOAD +LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa" +LIBGL_FGLRX="/usr/lib/fglrx/libGL.so.1.2.xlibmesa" + +# Minimum amount of memory (in kilo bytes) that nVidia cards need +# to be allowed to start +# Set to 262144 to require 256MB +NVIDIA_MEMORY="65536" # 64MB +NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default + +# For detecting what driver is in use, the + is for one or more /'s +XORG_DRIVER_PATH="%%LOCALBASE%%/lib/xorg/modules/drivers/+" +FALLBACKWM="xterm" +if [ x"$KDE_FULL_SESSION" = x"true" ]; then + FALLBACKWM="${KWIN}"; +elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then + FALLBACKWM="${METACITY}" +elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then + FALLBACKWM="${XFWM}" +fi + +FALLBACKWM_OPTIONS="--replace $@" + +# Driver whitelist +WHITELIST="nvidia intel ati radeon i810" + +# blacklist based on the pci ids +# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details +T=" 1002:5954 1002:5854 1002:5955" # ati rs480 +T="$T 1002:4153" # ATI Rv350 +T="$T 8086:2982 8086:2992 8086:29a2 8086:2a02 8086:2a12" # intel 965 +BLACKLIST_PCIIDS="$T" +unset T + +COMPIZ_OPTIONS="--ignore-desktop-hints --replace" +COMPIZ_PLUGINS="" +ENV="" + +# Use emerald by default if it exist +USE_EMERALD="yes" + +# No indirect by default +INDIRECT="no" + +# Default X.org log if xset q doesn't reveal it +XORG_DEFAULT_LOG="/var/log/Xorg.0.log" + +# Set to yes to enable verbose +VERBOSE="yes" + +# Echos the arguments if verbose +verbose() +{ + if [ "x$VERBOSE" = "xyes" ]; then + printf "$*" + fi +} + +# abort script and run fallback windowmanager +abort_with_fallback_wm() +{ + if [ "x$SKIP_CHECKS" = "xyes" ]; then + verbose "SKIP_CHECKS is yes, so continuing despite problems.\n" + return 0; + fi + + if [ "x$CM_DRY" = "xyes" ]; then + verbose "Dry run failed: Problems detected with 3D support.'n" + exit 1; + fi + + verbose "aborting and using fallback: $FALLBACKWM \n" + + if [ -x $FALLBACKWM ]; then + exec $FALLBACKWM $FALLBACKWM_OPTIONS + else + printf "no $FALLBACKWM found, exiting\n" + exit 1 + fi +} + +# Check for non power of two texture support +check_npot_texture() +{ + verbose "Checking for non power of two support: " + if glxinfo 2> /dev/null | egrep -q '(GL_ARB_texture_non_power_of_two|GL_NV_texture_rectangle|GL_EXT_texture_rectangle|GL_ARB_texture_rectangle)' ; then + verbose "present. \n"; + return 0; + else + verbose "Not present. \n" + return 1; + fi + +} + +# Check for presence of FBConfig +check_fbconfig() +{ + verbose "Checking for FBConfig: " + if [ "$INDIRECT" = "yes" ]; then + $GLXINFO -i | grep -q GLX.*fbconfig + FB=$? + else + $GLXINFO | grep -q GLX.*fbconfig + FB=$? + fi + + if [ $FB = "0" ]; then + unset FB + verbose "present. \n" + return 0; + else + unset FB + verbose "not present. \n" + return 1; + fi +} + + +# Check for TFP +check_tfp() +{ + verbose "Checking for texture_from_pixmap: " + if [ $($GLXINFO 2>/dev/null | grep -c GLX_EXT_texture_from_pixmap) -gt 2 ] ; then + verbose "present. \n" + return 0; + else + verbose "not present. \n" + if [ "$INDIRECT" = "yes" ]; then + unset LIBGL_ALWAYS_INDIRECT + INDIRECT="no" + return 1; + else + verbose "Trying again with indirect rendering:\n"; + INDIRECT="yes" + export LIBGL_ALWAYS_INDIRECT=1 + check_tfp; + return $? + fi + fi +} + +# Check wether the composite extension is present +check_composite() +{ + verbose "Checking for Composite extension: " + if xdpyinfo -queryExtensions | grep -q Composite ; then + verbose "present. \n"; + return 0; + else + verbose "not present. \n"; + return 1; + fi +} + +# Detects if Xgl is running +check_xgl() +{ + verbose "Checking for Xgl: " + if xvinfo | grep -q Xgl ; then + verbose "present. \n" + return 0; + else + verbose "not present. \n" + return 1; + fi +} + +# Check if the nVidia card has enough video ram to make sense +check_nvidia_memory() +{ + MEM=$(${NVIDIA_SETTINGS} -q VideoRam | egrep Attribute\ \'VideoRam\'\ .*: | cut -d: -f3 | sed 's/[^0-9]//g') + if [ $MEM -lt $NVIDIA_MEMORY ]; then + verbose "Less than ${NVIDIA_MEMORY}kb of memory and nVidia"; + return 1; + fi + return 0; +} + +# Check for existence if NV-GLX +check_nvidia() +{ + if [ ! -z $NVIDIA_INTERNAL_TEST ]; then + return $NVIDIA_INTERNAL_TEST; + fi + verbose "Checking for nVidia: " + if xdpyinfo | grep -q NV-GLX ; then + verbose "present. \n" + NVIDIA_INTERNAL_TEST=0 + return 0; + else + verbose "not present. \n" + NVIDIA_INTERNAL_TEST=1 + return 1; + fi +} + +# Check if the max texture size is large enough compared to the resolution +check_texture_size() +{ + TEXTURE_LIMIT=$(glxinfo -l | grep GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g') + RESOLUTION=$(xdpyinfo | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//') + VRES=$(echo $RESOLUTION | sed 's/.*x//') + HRES=$(echo $RESOLUTION | sed 's/x.*//') + verbose "Comparing resolution ($RESOLUTION) to maximum 3D texture size ($TEXTURE_LIMIT): "; + if [ $VRES -gt $TEXTURE_LIMIT ] || [ $HRES -gt $TEXTURE_LIMIT ]; then + verbose "Failed.\n" + return 1; + fi + verbose "Passed.\n" + return 0 +} + +# check driver whitelist +running_under_whitelisted_driver() +{ + LOG=$(xset q|grep "Log file"|awk '{print $3}') + if [ "$LOG" = "" ]; then + verbose "xset q doesn't reveal the location of the log file. Using fallback $XORG_DEFAULT_LOG \n" + LOG=$XORG_DEFAULT_LOG; + fi + if [ -z "$LOG" ];then + verbose "AIEEEEH, no Log file found \n" + verbose "$(xset q) \n" + return 0 + fi + for DRV in ${WHITELIST}; do + if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG && + ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; + then + return 0 + fi + done + verbose "No whitelisted driver found\n" + return 1 +} + +# check pciid blacklist +have_blacklisted_pciid() +{ +# OUTPUT=$(lspci -n) +# for ID in ${BLACKLIST_PCIIDS}; do +# if echo "$OUTPUT" | egrep -q "$ID"; then +# verbose "Blacklisted PCIID '$ID' found \n" +# return 0 +# fi +# done +# OUTPUT=$(lspci -vn | grep -i VGA) +# verbose "Detected PCI ID for VGA: $OUTPUT\n" + return 1 +} + +build_env() +{ + if check_nvidia; then + ENV="__GL_YIELD=NOTHING " + fi + if [ "$INDIRECT" = "yes" ]; then + ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 " + fi + if check_xgl; then + if [ -f ${LIBGL_NVIDIA} ]; then + ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}" + verbose "Enabling Xgl with nVidia drivers...\n" + fi + if [ -f ${LIBGL_FGLRX} ]; then + ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}" + verbose "Enabling Xgl with fglrx ATi drivers...\n" + fi + fi + + ENV="$ENV FROM_WRAPPER=yes" + + if [ -n "$ENV" ]; then + export $ENV + fi +} + +build_args() +{ + if [ "x$INDIRECT" = "xyes" ]; then + COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering " + fi + if [ ! -z "$DESKTOP_AUTOSTART_ID" ]; then + COMPIZ_OPTIONS="$COMPIZ_OPTIONS --sm-client-id $DESKTOP_AUTOSTART_ID" + fi + if check_nvidia; then + if [ "x$INDIRECT" != "xyes" ]; then + COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding" + fi + fi +} + +#################### +# Execution begins here. + +# Read configuration from XDG paths +if [ -z "$XDG_CONFIG_DIRS" ]; then + test -f %%LOCALBASE%%/etc/xdg/compiz/compiz-manager && . %%LOCALBASE%%/etc/xdg/compiz/compiz-manager +else + test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager +fi + +if [ -z "$XDG_CONFIG_HOME" ]; then + test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager +else + test -f $XDG_CONFIG_HOME/compiz/compiz-manager && . $XDG_CONFIG_HOME/compiz/compiz-manager +fi + +# Don't use compiz when running the failsafe session +if [ "x$GNOME_DESKTOP_SESSION_ID" = "xFailsafe" ]; then + abort_with_fallback_wm +fi + +if [ "x$LIBGL_ALWAYS_INDIRECT" = "x1" ]; then + INDIRECT="yes"; +fi + +# if we run under Xgl, we can skip some tests here +if ! check_xgl; then + # if vesa or vga are in use, do not even try glxinfo (LP#119341) + if ! running_under_whitelisted_driver || have_blacklisted_pciid; then + abort_with_fallback_wm + fi + # check if we have the required bits to run compiz and if not, + # fallback + if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then + abort_with_fallback_wm + fi + + if check_nvidia && ! check_nvidia_memory; then + abort_with_fallback_wm + fi + + if ! check_fbconfig; then + abort_with_fallback_wm + fi +fi + +# load the ccp plugin if present and fallback to plain gconf if not +if [ -f ${PLUGIN_PATH}libccp.so ]; then + COMPIZ_PLUGINS="$COMPIZ_PLUGINS ccp" +elif [ -f ${PLUGIN_PATH}libgconf.so ]; then + COMPIZ_PLUGINS="$COMPIZ_PLUGINS glib gconf" +fi + +# get environment +build_env +build_args + +if [ "x$CM_DRY" = "xyes" ]; then + verbose "Dry run finished: everything should work with regards to Compiz and 3D.\n" + verbose "Execute: ${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS \n" + exit 0; +fi +# start the gtk-window-decorator if present +if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then + verbose "Starting emerald\n" + ${COMPIZ_BIN_PATH}emerald --replace & +elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then + verbose "Starting gtk-window-decorator\n" + ${COMPIZ_BIN_PATH}gtk-window-decorator --replace & +elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then + verbose "Starting kde-window-decorator\n" + ${COMPIZ_BIN_PATH}kde-window-decorator --replace & + FALLBACKWM="${KWIN}" +fi + +${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS + diff --git a/x11-wm/compiz/pkg-message b/x11-wm/compiz/pkg-message new file mode 100644 index 000000000000..fb8bce93719d --- /dev/null +++ b/x11-wm/compiz/pkg-message @@ -0,0 +1,10 @@ +This port has installed compiz-manager which is a wrapper to start +compiz. + +If you are using gnome, you can use the configuration editor to set the +value of: + +desktop->gnome->session->required_components->windowmanager = compiz-manager + +This will enable compiz as your default window manager. + diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist index 5e53703c1dd0..0a0e7cf0e353 100644 --- a/x11-wm/compiz/pkg-plist +++ b/x11-wm/compiz/pkg-plist @@ -1,5 +1,6 @@ @comment $FreeBSD$ bin/compiz +bin/compiz-manager %%GTK%%bin/gtk-window-decorator %%KDE%%bin/kde-window-decorator include/compiz/compiz.h @@ -18,6 +19,9 @@ lib/compiz/libblur.so lib/compiz/libclone.a lib/compiz/libclone.la lib/compiz/libclone.so +lib/compiz/libcommands.a +lib/compiz/libcommands.la +lib/compiz/libcommands.so lib/compiz/libcube.a lib/compiz/libcube.la lib/compiz/libcube.so @@ -39,6 +43,9 @@ lib/compiz/libgconf.so lib/compiz/libglib.a lib/compiz/libglib.la lib/compiz/libglib.so +lib/compiz/libgnomecompat.a +lib/compiz/libgnomecompat.la +lib/compiz/libgnomecompat.so lib/compiz/libini.a lib/compiz/libini.la lib/compiz/libini.so @@ -102,6 +109,7 @@ libdata/pkgconfig/libdecoration.pc %%DATADIR%%/annotate.xml %%DATADIR%%/blur.xml %%DATADIR%%/clone.xml +%%DATADIR%%/commands.xml %%DATADIR%%/core.xml %%DATADIR%%/cube.xml %%DATADIR%%/dbus.xml @@ -111,6 +119,7 @@ libdata/pkgconfig/libdecoration.pc %%DATADIR%%/fs.xml %%DATADIR%%/gconf.xml %%DATADIR%%/glib.xml +%%DATADIR%%/gnomecompat.xml %%DATADIR%%/icon.png %%DATADIR%%/ini.xml %%DATADIR%%/inotify.xml @@ -133,7 +142,7 @@ libdata/pkgconfig/libdecoration.pc %%DATADIR%%/wobbly.xml %%DATADIR%%/zoom.xml %%GNOME%%@cwd %%WINDOWSETTINGSDATADIR%% -%%GNOME%%share/gnome/wm-properties/compiz.desktop +%%GNOME%%share/gnome/wm-properties/compiz-wm.desktop %%GNOME%%share/gnome-control-center/keybindings/50-compiz-desktop-key.xml %%GNOME%%share/gnome-control-center/keybindings/50-compiz-key.xml %%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%% @@ -141,6 +150,7 @@ libdata/pkgconfig/libdecoration.pc %%GNOME%%window-manager-settings/libcompiz.la %%GNOME%%window-manager-settings/libcompiz.so %%GNOME%%@cwd +share/applications/compiz.desktop share/locale/af/LC_MESSAGES/compiz.mo share/locale/ar/LC_MESSAGES/compiz.mo share/locale/bg/LC_MESSAGES/compiz.mo @@ -197,6 +207,7 @@ share/locale/xh/LC_MESSAGES/compiz.mo share/locale/zh_CN/LC_MESSAGES/compiz.mo share/locale/zh_TW/LC_MESSAGES/compiz.mo share/locale/zu/LC_MESSAGES/compiz.mo +@dirrmtry share/applications @dirrmtry share/locale/en_US/LC_MESSAGES @dirrmtry share/locale/en_US @dirrmtry share/locale/lo/LC_MESSAGES diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile index 0db414aa5faf..2bdb84468f01 100644 --- a/x11-wm/compizconfig-backend-gconf/Makefile +++ b/x11-wm/compizconfig-backend-gconf/Makefile @@ -6,10 +6,10 @@ # PORTNAME= compizconfig-backend-gconf -PORTVERSION= 0.7.8 +PORTVERSION= 0.8.2 #PORTREVISION= 0 CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ +MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= The gconf backend for CompizConfig diff --git a/x11-wm/compizconfig-backend-gconf/distinfo b/x11-wm/compizconfig-backend-gconf/distinfo index 6213334a015f..4fb9773a5eaa 100644 --- a/x11-wm/compizconfig-backend-gconf/distinfo +++ b/x11-wm/compizconfig-backend-gconf/distinfo @@ -1,3 +1,3 @@ -MD5 (compizconfig-backend-gconf-0.7.8.tar.bz2) = e6c05543b52e7bcd8e32e58f2c4ba00c -SHA256 (compizconfig-backend-gconf-0.7.8.tar.bz2) = 0527254d76ae3427ace1217124a03c875f94e001afa1ecae1ef246c146776ca1 -SIZE (compizconfig-backend-gconf-0.7.8.tar.bz2) = 238145 +MD5 (compizconfig-backend-gconf-0.8.2.tar.bz2) = 4be4ef08e811713277077ba89934c332 +SHA256 (compizconfig-backend-gconf-0.8.2.tar.bz2) = e57f4e6cf467b348ce68f3c3b92553788e4d0db97b078dd94052c3e0a941ae5d +SIZE (compizconfig-backend-gconf-0.8.2.tar.bz2) = 244444 diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile index 48987ef8774a..80d38dd94b08 100644 --- a/x11-wm/compizconfig-python/Makefile +++ b/x11-wm/compizconfig-python/Makefile @@ -6,10 +6,10 @@ # PORTNAME= compizconfig-python -PORTVERSION= 0.7.8 +PORTVERSION= 0.8.2 #PORTREVISION= 0 CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ +MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= Python bindings for the compizconfig library diff --git a/x11-wm/compizconfig-python/distinfo b/x11-wm/compizconfig-python/distinfo index 56bacf429bde..97d1c576e60a 100644 --- a/x11-wm/compizconfig-python/distinfo +++ b/x11-wm/compizconfig-python/distinfo @@ -1,3 +1,3 @@ -MD5 (compizconfig-python-0.7.8.tar.bz2) = f75c3a5a3ef770280e46c3a762d456e3 -SHA256 (compizconfig-python-0.7.8.tar.bz2) = 563a39c1c2ca8743cd30087f0b6cfca3e3c5a38ce5907653b82bd738dfdde88d -SIZE (compizconfig-python-0.7.8.tar.bz2) = 264190 +MD5 (compizconfig-python-0.8.2.tar.bz2) = 7c6e8cbbbf629fb99ff7570d117355fb +SHA256 (compizconfig-python-0.8.2.tar.bz2) = 600360cd1303517052510fe51876abdeae872247d24e045a08719258bad7e82c +SIZE (compizconfig-python-0.8.2.tar.bz2) = 269566 diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile index 3df3dea42de2..7387ea7394ec 100644 --- a/x11-wm/emerald/Makefile +++ b/x11-wm/emerald/Makefile @@ -6,10 +6,10 @@ # PORTNAME= emerald -PORTVERSION= 0.7.8 +PORTVERSION= 0.8.2 #PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ +MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= Emerald Window Decorator diff --git a/x11-wm/emerald/distinfo b/x11-wm/emerald/distinfo index c76199f30634..f10b7a8fbc96 100644 --- a/x11-wm/emerald/distinfo +++ b/x11-wm/emerald/distinfo @@ -1,3 +1,3 @@ -MD5 (emerald-0.7.8.tar.bz2) = c7d90c1ca0c91503d474c7e1422edcd5 -SHA256 (emerald-0.7.8.tar.bz2) = 5e7a52cd2a019fb20a6a2c2b89c9b648798788babb95b7b5c33537a7a449e94f -SIZE (emerald-0.7.8.tar.bz2) = 516307 +MD5 (emerald-0.8.2.tar.bz2) = d25bd51f7b7bca075c84fe3a00cbc88a +SHA256 (emerald-0.8.2.tar.bz2) = 1b17308fe1708a3d1a5d2b379ec8fe1c3d8bfd3fd87cffdcc4a0298e27e50f39 +SIZE (emerald-0.8.2.tar.bz2) = 524512 diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile index 9a090810bc85..462ebc2c91a7 100644 --- a/x11-wm/libcompizconfig/Makefile +++ b/x11-wm/libcompizconfig/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libcompizconfig -PORTVERSION= 0.7.8 +PORTVERSION= 0.8.2 #PORTREVISION= 0 CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ +MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= An alternative configuration system for Compiz @@ -31,7 +31,6 @@ post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ ${WRKSRC}/src/main.c \ ${WRKSRC}/src/lists.c \ - ${WRKSRC}/src/compiz.c \ ${WRKSRC}/src/filewatch.c \ ${WRKSRC}/src/ini.c \ ${WRKSRC}/backend/ini.c diff --git a/x11-wm/libcompizconfig/distinfo b/x11-wm/libcompizconfig/distinfo index a1d0d686531a..a3082b33ec6e 100644 --- a/x11-wm/libcompizconfig/distinfo +++ b/x11-wm/libcompizconfig/distinfo @@ -1,3 +1,3 @@ -MD5 (libcompizconfig-0.7.8.tar.bz2) = 6716315a850f72bd7479c224697006c0 -SHA256 (libcompizconfig-0.7.8.tar.bz2) = 59d6066dc023e58aefc6b80138d8e2b45f74932da8cdf590b1b64bff1f8b4680 -SIZE (libcompizconfig-0.7.8.tar.bz2) = 292166 +MD5 (libcompizconfig-0.8.2.tar.bz2) = 551ab49ab7f542f4a969e54bcfb7a485 +SHA256 (libcompizconfig-0.8.2.tar.bz2) = a373432c6bb80df4ef086b9ef82ac7cd70078a3040f6d06992980189b1bcc87b +SIZE (libcompizconfig-0.8.2.tar.bz2) = 316234 diff --git a/x11-wm/libcompizconfig/files/patch-src-compiz.cpp b/x11-wm/libcompizconfig/files/patch-src-compiz.cpp new file mode 100644 index 000000000000..e9a8e39aa3c3 --- /dev/null +++ b/x11-wm/libcompizconfig/files/patch-src-compiz.cpp @@ -0,0 +1,20 @@ +--- src/compiz.cpp.orig 2009-03-04 21:22:22.000000000 -0600 ++++ src/compiz.cpp 2009-04-06 01:58:35.000000000 -0500 +@@ -957,7 +957,7 @@ + + + static int +-pluginNameFilter (const struct dirent *name) ++pluginNameFilter (struct dirent *name) + { + int length = strlen (name->d_name); + +@@ -972,7 +972,7 @@ + } + + static int +-pluginXMLFilter (const struct dirent *name) ++pluginXMLFilter (struct dirent *name) + { + int length = strlen (name->d_name); + diff --git a/x11-wm/libcompizconfig/pkg-plist b/x11-wm/libcompizconfig/pkg-plist index ffb73b6b61dc..e09207a61b16 100644 --- a/x11-wm/libcompizconfig/pkg-plist +++ b/x11-wm/libcompizconfig/pkg-plist @@ -13,7 +13,6 @@ lib/compiz/libccp.la lib/compiz/libccp.a libdata/pkgconfig/libcompizconfig.pc share/compiz/ccp.xml -share/compizconfig/global.xml etc/compizconfig/config @dirrmtry etc/compizconfig @dirrmtry share/compizconfig diff --git a/x11-wm/simple-ccsm/Makefile b/x11-wm/simple-ccsm/Makefile index 9620042d50ef..f26e2fabef07 100644 --- a/x11-wm/simple-ccsm/Makefile +++ b/x11-wm/simple-ccsm/Makefile @@ -6,10 +6,10 @@ # PORTNAME= simple-ccsm -PORTVERSION= 0.7.8 +PORTVERSION= 0.8.2 #PORTREVISION= 0 CATEGORIES= x11-wm -MASTER_SITES= http://releases.compiz-fusion.org/${PORTVERSION}/ +MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= A Python/GTK based settings manager for CompizConfig diff --git a/x11-wm/simple-ccsm/distinfo b/x11-wm/simple-ccsm/distinfo index 363cc1342570..8cdc03c4797f 100644 --- a/x11-wm/simple-ccsm/distinfo +++ b/x11-wm/simple-ccsm/distinfo @@ -1,3 +1,3 @@ -MD5 (simple-ccsm-0.7.8.tar.bz2) = 6b77c166654d393f54e44fbfcea1c6d4 -SHA256 (simple-ccsm-0.7.8.tar.bz2) = 898e67f5854591341071d6bbe5c58bd604141748b571af5cff7cdb54c3ff4d36 -SIZE (simple-ccsm-0.7.8.tar.bz2) = 54324 +MD5 (simple-ccsm-0.8.2.tar.bz2) = 974b04deec62242744cc389a4c97acb3 +SHA256 (simple-ccsm-0.8.2.tar.bz2) = 60955f5fa841669e2ee7b0cef20156f600582e86f6cb70c1395b023f5d7ba282 +SIZE (simple-ccsm-0.8.2.tar.bz2) = 56555 |