[arch-commits] Commit in mutter-wayland/repos (14 files)
Jan Steffens
heftig at nymeria.archlinux.org
Sat Nov 16 12:17:37 UTC 2013
Date: Saturday, November 16, 2013 @ 13:17:37
Author: heftig
Revision: 199788
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mutter-wayland/repos/extra-i686/0001-monitor-expose-min-backlight-step.patch
(from rev 199787, mutter-wayland/trunk/0001-monitor-expose-min-backlight-step.patch)
mutter-wayland/repos/extra-i686/PKGBUILD
(from rev 199787, mutter-wayland/trunk/PKGBUILD)
mutter-wayland/repos/extra-i686/mutter-wayland-3.10.0.1-logfile.patch
(from rev 199787, mutter-wayland/trunk/mutter-wayland-3.10.0.1-logfile.patch)
mutter-wayland/repos/extra-i686/mutter-wayland.install
(from rev 199787, mutter-wayland/trunk/mutter-wayland.install)
mutter-wayland/repos/extra-x86_64/0001-monitor-expose-min-backlight-step.patch
(from rev 199787, mutter-wayland/trunk/0001-monitor-expose-min-backlight-step.patch)
mutter-wayland/repos/extra-x86_64/PKGBUILD
(from rev 199787, mutter-wayland/trunk/PKGBUILD)
mutter-wayland/repos/extra-x86_64/mutter-wayland-3.10.0.1-logfile.patch
(from rev 199787, mutter-wayland/trunk/mutter-wayland-3.10.0.1-logfile.patch)
mutter-wayland/repos/extra-x86_64/mutter-wayland.install
(from rev 199787, mutter-wayland/trunk/mutter-wayland.install)
Deleted:
mutter-wayland/repos/extra-i686/PKGBUILD
mutter-wayland/repos/extra-i686/mutter-wayland-3.10.0.1-logfile.patch
mutter-wayland/repos/extra-i686/mutter-wayland.install
mutter-wayland/repos/extra-x86_64/PKGBUILD
mutter-wayland/repos/extra-x86_64/mutter-wayland-3.10.0.1-logfile.patch
mutter-wayland/repos/extra-x86_64/mutter-wayland.install
-----------------------------------------------------------+
/PKGBUILD | 106 ++++++++++++
/mutter-wayland-3.10.0.1-logfile.patch | 34 +++
/mutter-wayland.install | 22 ++
extra-i686/0001-monitor-expose-min-backlight-step.patch | 29 +++
extra-i686/PKGBUILD | 48 -----
extra-i686/mutter-wayland-3.10.0.1-logfile.patch | 17 -
extra-i686/mutter-wayland.install | 11 -
extra-x86_64/0001-monitor-expose-min-backlight-step.patch | 29 +++
extra-x86_64/PKGBUILD | 48 -----
extra-x86_64/mutter-wayland-3.10.0.1-logfile.patch | 17 -
extra-x86_64/mutter-wayland.install | 11 -
11 files changed, 220 insertions(+), 152 deletions(-)
Copied: mutter-wayland/repos/extra-i686/0001-monitor-expose-min-backlight-step.patch (from rev 199787, mutter-wayland/trunk/0001-monitor-expose-min-backlight-step.patch)
===================================================================
--- extra-i686/0001-monitor-expose-min-backlight-step.patch (rev 0)
+++ extra-i686/0001-monitor-expose-min-backlight-step.patch 2013-11-16 12:17:37 UTC (rev 199788)
@@ -0,0 +1,29 @@
+From 6b150b3e9f1d16e6c374e178107ab490a18346dd Mon Sep 17 00:00:00 2001
+From: Asad Mehmood <asad78611 at googlemail.com>
+Date: Thu, 17 Oct 2013 16:05:59 +0100
+Subject: [PATCH] monitor: expose min-backlight-step
+
+Expose min-backlight-step so that gnome-settings-daemon can
+support backlights with less than 10 steps without mutter
+normalizing the brightness back to its original value
+---
+ src/core/monitor.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/core/monitor.c b/src/core/monitor.c
+index 9ec0c2a..6d65f9e 100644
+--- a/src/core/monitor.c
++++ b/src/core/monitor.c
+@@ -806,6 +806,9 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
+ g_variant_new_take_string (make_display_name (manager, output)));
+ g_variant_builder_add (&properties, "{sv}", "backlight",
+ g_variant_new_int32 (output->backlight));
++ g_variant_builder_add (&properties, "{sv}", "min-backlight-step",
++ g_variant_new_int32 ((output->backlight_max - output->backlight_min) ?
++ 100 / (output->backlight_max - output->backlight_min) : -1));
+ g_variant_builder_add (&properties, "{sv}", "primary",
+ g_variant_new_boolean (output->is_primary));
+ g_variant_builder_add (&properties, "{sv}", "presentation",
+--
+1.8.4.1
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-11-16 12:16:33 UTC (rev 199787)
+++ extra-i686/PKGBUILD 2013-11-16 12:17:37 UTC (rev 199788)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=mutter-wayland
-pkgver=3.10.1
-pkgrel=1
-pkgdesc="A Wayland compositor for GNOME"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(mutter)
-makedepends=(intltool gnome-doc-utils)
-url="http://www.gnome.org"
-options=('!emptydirs')
-install=mutter-wayland.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- mutter-wayland-3.10.0.1-logfile.patch)
-sha256sums=('bdb6bcc25791309256b09ec9aa7e0be311ef311778450aafccb86caf2753b6b4'
- 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644')
-
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- # From Fedora: Don't try to redirect the logfile. It won't work.
- patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch
-}
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/$pkgname \
- --localstatedir=/var --disable-static \
- --disable-schemas-compile --enable-compile-warnings=minimum
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- # Already in "mutter"
- rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center}
- rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml"
-}
Copied: mutter-wayland/repos/extra-i686/PKGBUILD (from rev 199787, mutter-wayland/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-11-16 12:17:37 UTC (rev 199788)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=mutter-wayland
+pkgver=3.10.1
+pkgrel=2
+pkgdesc="A Wayland compositor for GNOME"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(mutter)
+makedepends=(intltool gnome-doc-utils)
+url="http://www.gnome.org"
+options=('!emptydirs')
+install=mutter-wayland.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ mutter-wayland-3.10.0.1-logfile.patch
+ 0001-monitor-expose-min-backlight-step.patch)
+sha256sums=('bdb6bcc25791309256b09ec9aa7e0be311ef311778450aafccb86caf2753b6b4'
+ 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644'
+ 'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7')
+
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ # From Fedora: Don't try to redirect the logfile. It won't work.
+ patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch
+
+ # FS#37224
+ patch -Np1 -i ../0001-monitor-expose-min-backlight-step.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/$pkgname \
+ --localstatedir=/var --disable-static \
+ --disable-schemas-compile --enable-compile-warnings=minimum
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ # Already in "mutter"
+ rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center}
+ rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml"
+}
Deleted: extra-i686/mutter-wayland-3.10.0.1-logfile.patch
===================================================================
--- extra-i686/mutter-wayland-3.10.0.1-logfile.patch 2013-11-16 12:16:33 UTC (rev 199787)
+++ extra-i686/mutter-wayland-3.10.0.1-logfile.patch 2013-11-16 12:17:37 UTC (rev 199788)
@@ -1,17 +0,0 @@
---- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx 2013-09-16 16:40:46.000000000 -0400
-+++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c 2013-10-02 13:37:57.027318760 -0400
-@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit
- args[3] = "-rootless";
- args[4] = "-retro";
- args[5] = "-noreset";
-- args[6] = "-logfile";
-- args[7] = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL);
-- args[8] = "-nolisten";
-- args[9] = "all";
-- args[10] = NULL;
-+ args[6] = "-nolisten";
-+ args[7] = "all";
-+ args[8] = NULL;
-
- error = NULL;
- if (g_spawn_async (NULL, /* cwd */
Copied: mutter-wayland/repos/extra-i686/mutter-wayland-3.10.0.1-logfile.patch (from rev 199787, mutter-wayland/trunk/mutter-wayland-3.10.0.1-logfile.patch)
===================================================================
--- extra-i686/mutter-wayland-3.10.0.1-logfile.patch (rev 0)
+++ extra-i686/mutter-wayland-3.10.0.1-logfile.patch 2013-11-16 12:17:37 UTC (rev 199788)
@@ -0,0 +1,17 @@
+--- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx 2013-09-16 16:40:46.000000000 -0400
++++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c 2013-10-02 13:37:57.027318760 -0400
+@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit
+ args[3] = "-rootless";
+ args[4] = "-retro";
+ args[5] = "-noreset";
+- args[6] = "-logfile";
+- args[7] = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL);
+- args[8] = "-nolisten";
+- args[9] = "all";
+- args[10] = NULL;
++ args[6] = "-nolisten";
++ args[7] = "all";
++ args[8] = NULL;
+
+ error = NULL;
+ if (g_spawn_async (NULL, /* cwd */
Deleted: extra-i686/mutter-wayland.install
===================================================================
--- extra-i686/mutter-wayland.install 2013-11-16 12:16:33 UTC (rev 199787)
+++ extra-i686/mutter-wayland.install 2013-11-16 12:17:37 UTC (rev 199788)
@@ -1,11 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mutter-wayland/repos/extra-i686/mutter-wayland.install (from rev 199787, mutter-wayland/trunk/mutter-wayland.install)
===================================================================
--- extra-i686/mutter-wayland.install (rev 0)
+++ extra-i686/mutter-wayland.install 2013-11-16 12:17:37 UTC (rev 199788)
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: mutter-wayland/repos/extra-x86_64/0001-monitor-expose-min-backlight-step.patch (from rev 199787, mutter-wayland/trunk/0001-monitor-expose-min-backlight-step.patch)
===================================================================
--- extra-x86_64/0001-monitor-expose-min-backlight-step.patch (rev 0)
+++ extra-x86_64/0001-monitor-expose-min-backlight-step.patch 2013-11-16 12:17:37 UTC (rev 199788)
@@ -0,0 +1,29 @@
+From 6b150b3e9f1d16e6c374e178107ab490a18346dd Mon Sep 17 00:00:00 2001
+From: Asad Mehmood <asad78611 at googlemail.com>
+Date: Thu, 17 Oct 2013 16:05:59 +0100
+Subject: [PATCH] monitor: expose min-backlight-step
+
+Expose min-backlight-step so that gnome-settings-daemon can
+support backlights with less than 10 steps without mutter
+normalizing the brightness back to its original value
+---
+ src/core/monitor.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/core/monitor.c b/src/core/monitor.c
+index 9ec0c2a..6d65f9e 100644
+--- a/src/core/monitor.c
++++ b/src/core/monitor.c
+@@ -806,6 +806,9 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
+ g_variant_new_take_string (make_display_name (manager, output)));
+ g_variant_builder_add (&properties, "{sv}", "backlight",
+ g_variant_new_int32 (output->backlight));
++ g_variant_builder_add (&properties, "{sv}", "min-backlight-step",
++ g_variant_new_int32 ((output->backlight_max - output->backlight_min) ?
++ 100 / (output->backlight_max - output->backlight_min) : -1));
+ g_variant_builder_add (&properties, "{sv}", "primary",
+ g_variant_new_boolean (output->is_primary));
+ g_variant_builder_add (&properties, "{sv}", "presentation",
+--
+1.8.4.1
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-11-16 12:16:33 UTC (rev 199787)
+++ extra-x86_64/PKGBUILD 2013-11-16 12:17:37 UTC (rev 199788)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=mutter-wayland
-pkgver=3.10.1
-pkgrel=1
-pkgdesc="A Wayland compositor for GNOME"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(mutter)
-makedepends=(intltool gnome-doc-utils)
-url="http://www.gnome.org"
-options=('!emptydirs')
-install=mutter-wayland.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- mutter-wayland-3.10.0.1-logfile.patch)
-sha256sums=('bdb6bcc25791309256b09ec9aa7e0be311ef311778450aafccb86caf2753b6b4'
- 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644')
-
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- # From Fedora: Don't try to redirect the logfile. It won't work.
- patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch
-}
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/$pkgname \
- --localstatedir=/var --disable-static \
- --disable-schemas-compile --enable-compile-warnings=minimum
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- # Already in "mutter"
- rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center}
- rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml"
-}
Copied: mutter-wayland/repos/extra-x86_64/PKGBUILD (from rev 199787, mutter-wayland/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-11-16 12:17:37 UTC (rev 199788)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=mutter-wayland
+pkgver=3.10.1
+pkgrel=2
+pkgdesc="A Wayland compositor for GNOME"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(mutter)
+makedepends=(intltool gnome-doc-utils)
+url="http://www.gnome.org"
+options=('!emptydirs')
+install=mutter-wayland.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ mutter-wayland-3.10.0.1-logfile.patch
+ 0001-monitor-expose-min-backlight-step.patch)
+sha256sums=('bdb6bcc25791309256b09ec9aa7e0be311ef311778450aafccb86caf2753b6b4'
+ 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644'
+ 'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7')
+
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ # From Fedora: Don't try to redirect the logfile. It won't work.
+ patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch
+
+ # FS#37224
+ patch -Np1 -i ../0001-monitor-expose-min-backlight-step.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/$pkgname \
+ --localstatedir=/var --disable-static \
+ --disable-schemas-compile --enable-compile-warnings=minimum
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ # Already in "mutter"
+ rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center}
+ rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml"
+}
Deleted: extra-x86_64/mutter-wayland-3.10.0.1-logfile.patch
===================================================================
--- extra-x86_64/mutter-wayland-3.10.0.1-logfile.patch 2013-11-16 12:16:33 UTC (rev 199787)
+++ extra-x86_64/mutter-wayland-3.10.0.1-logfile.patch 2013-11-16 12:17:37 UTC (rev 199788)
@@ -1,17 +0,0 @@
---- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx 2013-09-16 16:40:46.000000000 -0400
-+++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c 2013-10-02 13:37:57.027318760 -0400
-@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit
- args[3] = "-rootless";
- args[4] = "-retro";
- args[5] = "-noreset";
-- args[6] = "-logfile";
-- args[7] = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL);
-- args[8] = "-nolisten";
-- args[9] = "all";
-- args[10] = NULL;
-+ args[6] = "-nolisten";
-+ args[7] = "all";
-+ args[8] = NULL;
-
- error = NULL;
- if (g_spawn_async (NULL, /* cwd */
Copied: mutter-wayland/repos/extra-x86_64/mutter-wayland-3.10.0.1-logfile.patch (from rev 199787, mutter-wayland/trunk/mutter-wayland-3.10.0.1-logfile.patch)
===================================================================
--- extra-x86_64/mutter-wayland-3.10.0.1-logfile.patch (rev 0)
+++ extra-x86_64/mutter-wayland-3.10.0.1-logfile.patch 2013-11-16 12:17:37 UTC (rev 199788)
@@ -0,0 +1,17 @@
+--- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx 2013-09-16 16:40:46.000000000 -0400
++++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c 2013-10-02 13:37:57.027318760 -0400
+@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit
+ args[3] = "-rootless";
+ args[4] = "-retro";
+ args[5] = "-noreset";
+- args[6] = "-logfile";
+- args[7] = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL);
+- args[8] = "-nolisten";
+- args[9] = "all";
+- args[10] = NULL;
++ args[6] = "-nolisten";
++ args[7] = "all";
++ args[8] = NULL;
+
+ error = NULL;
+ if (g_spawn_async (NULL, /* cwd */
Deleted: extra-x86_64/mutter-wayland.install
===================================================================
--- extra-x86_64/mutter-wayland.install 2013-11-16 12:16:33 UTC (rev 199787)
+++ extra-x86_64/mutter-wayland.install 2013-11-16 12:17:37 UTC (rev 199788)
@@ -1,11 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mutter-wayland/repos/extra-x86_64/mutter-wayland.install (from rev 199787, mutter-wayland/trunk/mutter-wayland.install)
===================================================================
--- extra-x86_64/mutter-wayland.install (rev 0)
+++ extra-x86_64/mutter-wayland.install 2013-11-16 12:17:37 UTC (rev 199788)
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list