Hi, This updates compiz to 0.8.8 and adds Makefile.inc that soon will be used by other compiz ports.
bcop, ccsm, compizconfig-python, libcompizconfig and plugins-main are done and I will be submitting them over the following days. I think only emerald and plugins-extra are missing in case you want to help ;-) Anyhow, comments, OK? f.- Index: Makefile.inc =================================================================== RCS file: Makefile.inc diff -N Makefile.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile.inc 9 Mar 2013 06:59:48 -0000 @@ -0,0 +1,12 @@ +# $OpenBSD$ + +SHARED_ONLY = Yes + +CATEGORIES = x11 + +HOMEPAGE = http://www.compiz.org/ + +# MIT, GPL and LGPL +PERMIT_PACKAGE_CDROM = Yes + +DIST_SUBDIR = compiz Index: core/Makefile =================================================================== RCS file: /cvs/ports/x11/compiz/core/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- core/Makefile 6 Feb 2013 14:23:06 -0000 1.21 +++ core/Makefile 9 Mar 2013 06:59:50 -0000 @@ -1,37 +1,24 @@ # $OpenBSD: Makefile,v 1.21 2013/02/06 14:23:06 ajacoutot Exp $ -SHARED_ONLY = Yes - COMMENT = OpenGL window and compositing manager -V = 0.8.2 +V = 0.8.8 DISTNAME = compiz-${V} -REVISION= 15 - -SHARED_LIBS = decoration 0.0 - -CATEGORIES = x11 -HOMEPAGE = http://www.compiz.org/ - -# MIT, GPL and LGPL -PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes - -WANTLIB += GL GLU ICE SM X11 X11-xcb XRes Xau Xcomposite -WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr -WANTLIB += Xrender Xxf86vm atk-1.0 c cairo dbus-1 dbus-glib-1 -WANTLIB += drm expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 -WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pixman-1 png pthread pthread-stubs startup-notification-1 -WANTLIB += wnck-1 xcb xcb-aux xcb-render xcb-shm xml2 xslt z -WANTLIB += harfbuzz icudata icule icuuc stdc++ +SHARED_LIBS = decoration 1.0 MASTER_SITES = http://releases.compiz.org/${V}/ +WANTLIB = GL GLU ICE SM X11 X11-xcb XRes Xcomposite Xcursor Xdamage \ + Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 \ + c cairo dbus-1 dbus-glib-1 drm expat ffi fontconfig \ + freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \ + gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 harfbuzz \ + icudata icule icuuc m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ + pcre pixman-1 png pthread pthread-stubs \ + startup-notification-1 stdc++ wnck-1 xcb xcb-aux xcb-render \ + xcb-shm xml2 xslt z + MODULES = devel/gconf2 \ devel/gettext \ textproc/intltool @@ -47,11 +34,10 @@ LIB_DEPENDS = devel/startup-notification USE_GMAKE = Yes USE_LIBTOOL = Yes -LIBTOOL_FLAGS= --tag=disable-static +LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --disable-static \ +CONFIGURE_ARGS = --disable-static \ --disable-inotify \ --disable-fuse \ --disable-librsvg \ @@ -63,5 +49,8 @@ CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ --disable-kconfig CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" + +post-install: + @rm -f ${PREFIX}/lib/compiz/*.la .include <bsd.port.mk> Index: core/distinfo =================================================================== RCS file: /cvs/ports/x11/compiz/core/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- core/distinfo 1 Sep 2009 01:49:14 -0000 1.1.1.1 +++ core/distinfo 9 Mar 2013 06:59:50 -0000 @@ -1,5 +1,2 @@ -MD5 (compiz-0.8.2.tar.gz) = WBXah6DPwBTQY3jLOi781Q== -RMD160 (compiz-0.8.2.tar.gz) = 6L1uas1h1YVFHx7PyfuWWOP6zOw= -SHA1 (compiz-0.8.2.tar.gz) = 4+gCL0iKsDnXoNQkALZ+utBjwbk= -SHA256 (compiz-0.8.2.tar.gz) = jvGeIoLE3wSPgKTAz2Hc0ukrF7LiQ293NyzME3Rd1cc= -SIZE (compiz-0.8.2.tar.gz) = 1751448 +SHA256 (compiz/compiz-0.8.8.tar.gz) = HCr4VT6hY3k5NjDRbzzN1Eh8QdCZ5PVDWOcVQ98TrAA= +SIZE (compiz/compiz-0.8.8.tar.gz) = 1758943 Index: core/patches/patch-configure =================================================================== RCS file: core/patches/patch-configure diff -N core/patches/patch-configure --- core/patches/patch-configure 1 Sep 2009 01:49:14 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,48 +0,0 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2009/09/01 01:49:14 fgsch Exp $ ---- configure.orig Mon Aug 3 20:42:58 2009 -+++ configure Mon Aug 3 20:44:46 2009 -@@ -22627,7 +22627,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" -+LIBS="-lintl -liconv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22693,7 +22693,7 @@ if test "${ac_cv_lib_intl_ngettext+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" -+LIBS="-lintl -liconv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22759,7 +22759,7 @@ if test "${ac_cv_lib_intl_dgettext+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" -+LIBS="-lintl -liconv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22983,7 +22983,7 @@ fi - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" -- LIBS="$LIBS -lintl $libintl_extra_libs" -+ LIBS="$LIBS -lintl -liconv $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - - for ac_func in bind_textdomain_codeset -@@ -23105,7 +23105,7 @@ done - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then -- INTLLIBS="-lintl $libintl_extra_libs" -+ INTLLIBS="-lintl -liconv $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then Index: core/patches/patch-gtk_window-decorator_gtk-window-decorator_c =================================================================== RCS file: core/patches/patch-gtk_window-decorator_gtk-window-decorator_c diff -N core/patches/patch-gtk_window-decorator_gtk-window-decorator_c --- core/patches/patch-gtk_window-decorator_gtk-window-decorator_c 30 Sep 2010 07:23:47 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-gtk_window-decorator_gtk-window-decorator_c,v 1.2 2010/09/30 07:23:47 ajacoutot Exp $ - -XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED) -gtk-window-decorator.c:5626: error: 'gdk_display' undeclared (first use in this function) - ---- gtk/window-decorator/gtk-window-decorator.c.orig Sun Mar 1 13:07:14 2009 -+++ gtk/window-decorator/gtk-window-decorator.c Wed Sep 29 21:11:16 2010 -@@ -31,10 +31,6 @@ - #include <X11/extensions/Xrender.h> - #include <X11/Xregion.h> - --#ifndef GDK_DISABLE_DEPRECATED --#define GDK_DISABLE_DEPRECATED --#endif -- - #ifndef GTK_DISABLE_DEPRECATED - #define GTK_DISABLE_DEPRECATED - #endif -@@ -4233,7 +4229,7 @@ show_tooltip (const char *text) - static void - hide_tooltip (void) - { -- if (GTK_WIDGET_VISIBLE (tip_window)) -+ if (gtk_widget_get_visible (tip_window)) - g_get_current_time (&tooltip_last_popdown); - - gtk_widget_hide (tip_window); Index: core/patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/x11/compiz/core/patches/patch-src_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_Makefile_in --- core/patches/patch-src_Makefile_in 1 Sep 2009 01:49:14 -0000 1.1.1.1 +++ core/patches/patch-src_Makefile_in 9 Mar 2013 06:59:51 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2009/09/01 01:49:14 fgsch Exp $ ---- src/Makefile.in.orig Sun Aug 2 19:48:24 2009 -+++ src/Makefile.in Sun Aug 2 19:48:32 2009 -@@ -300,7 +300,7 @@ INCLUDES = \ +$OpenBSD$ +--- src/Makefile.in.orig Sat Feb 23 22:00:56 2013 ++++ src/Makefile.in Sat Feb 23 22:00:59 2013 +@@ -292,7 +292,7 @@ INCLUDES = \ -DIMAGEDIR=\"$(imagedir)\" \ -DMETADATADIR=\"$(metadatadir)\" --compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm -+compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm -pthread - compiz_LDFLAGS = -export-dynamic +-compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm -ldl ++compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm + compiz_LDFLAGS = -export-dynamic -pthread compiz_SOURCES = \ main.c \ Index: core/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/compiz/core/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- core/pkg/PLIST 6 Feb 2013 14:23:06 -0000 1.5 +++ core/pkg/PLIST 9 Mar 2013 06:59:52 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2013/02/06 14:23:06 ajacoutot Exp $ +@comment $OpenBSD$ @bin bin/compiz @bin bin/gtk-window-decorator include/compiz/ @@ -10,59 +10,32 @@ include/compiz/compiz-scale.h include/compiz/compiz.h include/compiz/decoration.h lib/compiz/ -@comment lib/compiz/libannotate.la lib/compiz/libannotate.so -@comment lib/compiz/libblur.la lib/compiz/libblur.so -@comment lib/compiz/libclone.la lib/compiz/libclone.so -@comment lib/compiz/libcommands.la lib/compiz/libcommands.so -@comment lib/compiz/libcube.la lib/compiz/libcube.so -@comment lib/compiz/libdbus.la lib/compiz/libdbus.so -@comment lib/compiz/libdecoration.la lib/compiz/libdecoration.so -@comment lib/compiz/libfade.la lib/compiz/libfade.so -@comment lib/compiz/libgconf.la lib/compiz/libgconf.so -@comment lib/compiz/libglib.la lib/compiz/libglib.so -@comment lib/compiz/libgnomecompat.la lib/compiz/libgnomecompat.so -@comment lib/compiz/libini.la lib/compiz/libini.so -@comment lib/compiz/libminimize.la lib/compiz/libminimize.so -@comment lib/compiz/libmove.la lib/compiz/libmove.so -@comment lib/compiz/libobs.la lib/compiz/libobs.so -@comment lib/compiz/libplace.la lib/compiz/libplace.so -@comment lib/compiz/libpng.la lib/compiz/libpng.so -@comment lib/compiz/libregex.la lib/compiz/libregex.so -@comment lib/compiz/libresize.la lib/compiz/libresize.so -@comment lib/compiz/librotate.la lib/compiz/librotate.so -@comment lib/compiz/libscale.la lib/compiz/libscale.so -@comment lib/compiz/libscreenshot.la lib/compiz/libscreenshot.so -@comment lib/compiz/libswitcher.la lib/compiz/libswitcher.so -@comment lib/compiz/libvideo.la lib/compiz/libvideo.so -@comment lib/compiz/libwater.la lib/compiz/libwater.so -@comment lib/compiz/libwobbly.la lib/compiz/libwobbly.so -@comment lib/compiz/libzoom.la lib/compiz/libzoom.so lib/libdecoration.la @lib lib/libdecoration.so.${LIBdecoration_VERSION} @@ -139,8 +112,6 @@ share/locale/id/LC_MESSAGES/compiz.mo share/locale/it/LC_MESSAGES/compiz.mo share/locale/ja/LC_MESSAGES/compiz.mo share/locale/ka/LC_MESSAGES/compiz.mo -share/locale/km/ -share/locale/km/LC_MESSAGES/ share/locale/km/LC_MESSAGES/compiz.mo share/locale/ko/LC_MESSAGES/compiz.mo share/locale/lo/ @@ -169,8 +140,6 @@ share/locale/vi/LC_MESSAGES/compiz.mo 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/ -share/locale/zu/LC_MESSAGES/ share/locale/zu/LC_MESSAGES/compiz.mo @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas >/dev/null 2>&1 ${SCHEMAS_INSTDIR}/
