diff options
author | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-10-20 20:23:30 +0800 |
---|---|---|
committer | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-10-20 20:23:30 +0800 |
commit | 0ec734ae626b13b56bf02acd39b7b1039360bdd5 (patch) | |
tree | 277a59fd58e6ec8f8a98f8b57e52ca01cd2c0bd0 | |
parent | 1c9df7eb30cd5d9c7af70bbe7f00cfb335454ff3 (diff) | |
download | marcuscom-ports-0ec734ae626b13b56bf02acd39b7b1039360bdd5.tar marcuscom-ports-0ec734ae626b13b56bf02acd39b7b1039360bdd5.tar.gz marcuscom-ports-0ec734ae626b13b56bf02acd39b7b1039360bdd5.tar.bz2 marcuscom-ports-0ec734ae626b13b56bf02acd39b7b1039360bdd5.tar.lz marcuscom-ports-0ec734ae626b13b56bf02acd39b7b1039360bdd5.tar.xz marcuscom-ports-0ec734ae626b13b56bf02acd39b7b1039360bdd5.tar.zst marcuscom-ports-0ec734ae626b13b56bf02acd39b7b1039360bdd5.zip |
Update mutter to 3.14.1. It uses the gbm gl component.
Whiel here remove an unneeded patch.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@20003 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | x11-wm/mutter/Makefile | 8 | ||||
-rw-r--r-- | x11-wm/mutter/distinfo | 4 | ||||
-rw-r--r-- | x11-wm/mutter/files/patch-src_Makefile.in | 12 | ||||
-rw-r--r-- | x11-wm/mutter/pkg-plist | 61 |
4 files changed, 18 insertions, 67 deletions
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile index 48a629dcc..a77099fdb 100644 --- a/x11-wm/mutter/Makefile +++ b/x11-wm/mutter/Makefile @@ -3,8 +3,7 @@ # $MCom$ PORTNAME= mutter -PORTVERSION= 3.12.2 -PORTREVISION= 2 +PORTVERSION= 3.14.1 CATEGORIES= x11-wm MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -16,6 +15,7 @@ BUILD_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity \ gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-desktop-schemas LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ libclutter-1.0.so:${PORTSDIR}/graphics/clutter \ + libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon \ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libupower-glib.so:${PORTSDIR}/sysutils/upower RUN_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity \ @@ -26,13 +26,15 @@ USE_GNOME= gnomedesktop3 gnomehier gnomeprefix gtk30 intlhack \ introspection:build USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm xfixes \ xrender xdamage +USE_GL= gbm GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-compile-warnings=maximum INSTALL_TARGET= install-strip -GLIB_SCHEMAS= org.gnome.mutter.gschema.xml +GLIB_SCHEMAS= org.gnome.mutter.gschema.xml \ + org.gnome.mutter.wayland.gschema.xml PLIST_SUB= VERSION=${PORTVERSION:R} diff --git a/x11-wm/mutter/distinfo b/x11-wm/mutter/distinfo index 42396b0a5..f6a262386 100644 --- a/x11-wm/mutter/distinfo +++ b/x11-wm/mutter/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/mutter-3.12.2.tar.xz) = e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173 -SIZE (gnome3/mutter-3.12.2.tar.xz) = 1695316 +SHA256 (gnome3/mutter-3.14.1.tar.xz) = 6010d816327ebad1a0e81f0f9ea294517397a5c46128abc0a13d5156fdbfc0bf +SIZE (gnome3/mutter-3.14.1.tar.xz) = 1607980 diff --git a/x11-wm/mutter/files/patch-src_Makefile.in b/x11-wm/mutter/files/patch-src_Makefile.in index e2ccd7f86..ccc06b093 100644 --- a/x11-wm/mutter/files/patch-src_Makefile.in +++ b/x11-wm/mutter/files/patch-src_Makefile.in @@ -1,11 +1,11 @@ ---- src/Makefile.in.orig 2014-03-10 23:46:42.731979257 +0000 -+++ src/Makefile.in 2014-03-10 23:48:02.536972483 +0000 -@@ -722,7 +722,7 @@ +--- src/Makefile.in.orig 2014-09-29 20:29:47.729666937 +0200 ++++ src/Makefile.in 2014-09-29 20:31:17.504662747 +0200 +@@ -951,7 +951,7 @@ @HAVE_INTROSPECTION_TRUE@ $(libmutterinclude_base_headers) \ @HAVE_INTROSPECTION_TRUE@ $(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES)) -@HAVE_INTROSPECTION_TRUE@@META_GIR@_SCANNERFLAGS = --warn-all --warn-error +@HAVE_INTROSPECTION_TRUE@@META_GIR@_SCANNERFLAGS = --warn-all - testboxes_SOURCES = core/testboxes.c - testgradient_SOURCES = ui/testgradient.c - testasyncgetprop_SOURCES = core/testasyncgetprop.c + dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h + CLEANFILES = $(mutter_built_sources) $(typelib_DATA) $(gir_DATA) \ + $(MUTTER_STAMP_FILES) diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist index 38e69ea6b..ba4e46428 100644 --- a/x11-wm/mutter/pkg-plist +++ b/x11-wm/mutter/pkg-plist @@ -11,14 +11,17 @@ include/mutter/meta/gradient.h include/mutter/meta/group.h include/mutter/meta/keybindings.h include/mutter/meta/main.h +include/mutter/meta/meta-backend.h include/mutter/meta/meta-background-actor.h include/mutter/meta/meta-background-group.h +include/mutter/meta/meta-background-image.h include/mutter/meta/meta-background.h include/mutter/meta/meta-cursor-tracker.h include/mutter/meta/meta-idle-monitor.h include/mutter/meta/meta-plugin.h include/mutter/meta/meta-shadow-factory.h include/mutter/meta/meta-shaped-texture.h +include/mutter/meta/meta-version.h include/mutter/meta/meta-window-actor.h include/mutter/meta/prefs.h include/mutter/meta/screen.h @@ -27,7 +30,6 @@ include/mutter/meta/types.h include/mutter/meta/util.h include/mutter/meta/window.h include/mutter/meta/workspace.h -lib/libmutter.a lib/libmutter.so lib/libmutter.so.0 lib/libmutter.so.0.0.0 @@ -35,10 +37,11 @@ lib/mutter/Meta-3.0.gir lib/mutter/Meta-3.0.typelib lib/mutter/plugins/default.so libdata/pkgconfig/libmutter.pc -libdata/pkgconfig/mutter-plugins.pc +libexec/mutter-restart-helper man/man1/mutter.1.gz share/GConf/gsettings/mutter-schemas.convert share/applications/mutter.desktop +share/applications/mutter-wayland.desktop share/doc/meta/MetaBackgroundActor.html share/doc/meta/MetaBarrier.html share/doc/meta/MetaDisplay.html @@ -77,7 +80,6 @@ share/doc/meta/running-mutter.html share/doc/meta/style.css share/doc/meta/up-insensitive.png share/doc/meta/up.png -share/gnome/wm-properties/mutter-wm.desktop share/gnome-control-center/keybindings/50-mutter-navigation.xml share/gnome-control-center/keybindings/50-mutter-windows.xml share/gnome-control-center/keybindings/50-mutter-system.xml @@ -175,56 +177,3 @@ share/locale/yo/LC_MESSAGES/mutter.mo share/locale/zh_CN/LC_MESSAGES/mutter.mo share/locale/zh_HK/LC_MESSAGES/mutter.mo share/locale/zh_TW/LC_MESSAGES/mutter.mo -@dirrm lib/mutter/plugins -@dirrm lib/mutter -@dirrm include/mutter/meta -@dirrm include/mutter -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/yo/LC_MESSAGES -@dirrmtry share/locale/yo -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/ug/LC_MESSAGES -@dirrmtry share/locale/ug -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/nds/LC_MESSAGES -@dirrmtry share/locale/nds -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@dirrmtry share/locale/mai/LC_MESSAGES -@dirrmtry share/locale/mai -@dirrmtry share/locale/la/LC_MESSAGES -@dirrmtry share/locale/la -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/ig/LC_MESSAGES -@dirrmtry share/locale/ig -@dirrmtry share/locale/hy/LC_MESSAGES -@dirrmtry share/locale/hy -@dirrmtry share/locale/ha/LC_MESSAGES -@dirrmtry share/locale/ha -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/ca@valencia/LC_MESSAGES -@dirrmtry share/locale/ca@valencia -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin -@dirrmtry share/locale/ast/LC_MESSAGES -@dirrmtry share/locale/ast -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as -@dirrmtry share/doc/meta |