Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (569ae227589f2e89190318fec5e31331930745bc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (569ae227589f2e89190318fec5e31331930745bc)
  • Date: Sun, 18 Dec 2016 11:01:47 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

dev/null
|binary
xorg-app/xdm/0001-do-not-start-xconsole.patch |
20 ++++++++
xorg-app/xdm/DEPENDS |
4 +
xorg-app/xdm/HISTORY |
4 +
xorg-app/xdm/PREPARE |
1
xorg-app/xdm/PRE_BUILD |
11 +++-
xorg-driver/xf86-input-joystick/DETAILS |
5 --
xorg-driver/xf86-input-joystick/HISTORY |
3 +
xorg-driver/xf86-video-dummy/DETAILS |
4 -
xorg-driver/xf86-video-dummy/HISTORY |
3 +
xorg-driver/xf86-video-geode/DETAILS |
4 -
xorg-driver/xf86-video-geode/HISTORY |
3 +
xorg-driver/xf86-video-nouveau/0001-remove-obsolete-dri1-include.patch |
23 ++++++++++
xorg-driver/xf86-video-nouveau/DETAILS |
4 -
xorg-driver/xf86-video-nouveau/HISTORY |
4 +
xorg-driver/xf86-video-nouveau/PRE_BUILD |
5 ++
16 files changed, 86 insertions(+), 12 deletions(-)

New commits:
commit 569ae227589f2e89190318fec5e31331930745bc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-driver/xf86-video-nouveau: version 1.0.13

commit 7add1d31000bd4f572c096ddc559ecad3156652c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-driver/xf86-video-geode: version 2.11.19

commit efe5fd343abe85faf0b582bccdf23ef8d903a7e3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-driver/xf86-video-dummy: version 0.3.8

commit fa1d0ac4e643dd31a30e94e7e5da5d0d44cbf0cc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-driver/xf86-input-joystick: version 1.6.3

commit fb9edc495f6869617521d4500e3f36fbc6149ba9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-app/xdm: optionally do not start an xconsole when xdm starts

diff --git a/xorg-app/xdm/0001-do-not-start-xconsole.patch
b/xorg-app/xdm/0001-do-not-start-xconsole.patch
new file mode 100644
index 0000000..6ceb863
--- /dev/null
+++ b/xorg-app/xdm/0001-do-not-start-xconsole.patch
@@ -0,0 +1,20 @@
+From cf831a5bcaeeda65cb0f162b998fd3055274886c Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sun, 18 Dec 2016 11:18:03 +0100
+Subject: [PATCH] do not start xconsole
+
+---
+ config/Xsetup_0 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/Xsetup_0 b/config/Xsetup_0
+index 29d7aa4..13f4793 100644
+--- a/config/Xsetup_0
++++ b/config/Xsetup_0
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed
-exitOnFail
++
+--
+2.11.0
+
diff --git a/xorg-app/xdm/DEPENDS b/xorg-app/xdm/DEPENDS
index 8590226..ee9d200 100755
--- a/xorg-app/xdm/DEPENDS
+++ b/xorg-app/xdm/DEPENDS
@@ -12,6 +12,10 @@ depends libxt &&
depends util-macros &&
depends xproto &&

+if [[ $XDM_XCONSOLE == "y" ]]; then
+ depends xconsole
+fi &&
+
optional_depends libxft \
'--with-xft' \
'--without-xft' \
diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY
index b4e70e9..72373f7 100644
--- a/xorg-app/xdm/HISTORY
+++ b/xorg-app/xdm/HISTORY
@@ -1,3 +1,7 @@
+2016-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, PREPARE, PRE_BUILD, 0001-do-not-start-xconsole.patch:
+ add option to not start an xconsole when xdm starts
+
2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: added missing dependencies
* DEPENDS: proper optional dependency descriptions
diff --git a/xorg-app/xdm/PREPARE b/xorg-app/xdm/PREPARE
new file mode 100755
index 0000000..0d8b39d
--- /dev/null
+++ b/xorg-app/xdm/PREPARE
@@ -0,0 +1 @@
+config_query XDM_XCONSOLE "Start an xconsole when xdm starts?" y
diff --git a/xorg-app/xdm/PRE_BUILD b/xorg-app/xdm/PRE_BUILD
index a58c41f..2680a14 100755
--- a/xorg-app/xdm/PRE_BUILD
+++ b/xorg-app/xdm/PRE_BUILD
@@ -1,3 +1,8 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 <
${SPELL_DIRECTORY}/0001-use-X-s-default-authentication-mechanism-instead-of-.patch
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p1 <
"${SPELL_DIRECTORY}/0001-use-X-s-default-authentication-mechanism-instead-of-.patch"
&&
+
+if [[ $XDM_XCONSOLE == "n" ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/0001-do-not-start-xconsole.patch"
+fi
diff --git a/xorg-driver/xf86-input-joystick/DETAILS
b/xorg-driver/xf86-input-joystick/DETAILS
index 9d848c5..c66297b 100755
--- a/xorg-driver/xf86-input-joystick/DETAILS
+++ b/xorg-driver/xf86-input-joystick/DETAILS
@@ -1,9 +1,8 @@
SPELL=xf86-input-joystick
- VERSION=1.6.1
+ VERSION=1.6.3
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-#
SOURCE_HASH=sha512:50c625261863223f81d3b0fa3edc0b6eda4d99e4073d76be0530963f20d771a9f2e654c5d8438f9a461d479af2f20b8ec6a2df3a54cd320328df36f564c2f22b
+
SOURCE_HASH=sha512:541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-driver/xf86-input-joystick/HISTORY
b/xorg-driver/xf86-input-joystick/HISTORY
index cad90f1..9539fd6 100644
--- a/xorg-driver/xf86-input-joystick/HISTORY
+++ b/xorg-driver/xf86-input-joystick/HISTORY
@@ -1,3 +1,6 @@
+2016-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.3
+
2012-06-08 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 1.6.1

diff --git
a/xorg-driver/xf86-input-joystick/xf86-input-joystick-1.6.1.tar.bz2.sig
b/xorg-driver/xf86-input-joystick/xf86-input-joystick-1.6.1.tar.bz2.sig
deleted file mode 100644
index 916cff2..0000000
Binary files
a/xorg-driver/xf86-input-joystick/xf86-input-joystick-1.6.1.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-driver/xf86-video-dummy/DETAILS
b/xorg-driver/xf86-video-dummy/DETAILS
index 4ff4199..0561ce7 100755
--- a/xorg-driver/xf86-video-dummy/DETAILS
+++ b/xorg-driver/xf86-video-dummy/DETAILS
@@ -1,7 +1,7 @@
SPELL=xf86-video-dummy
- VERSION=0.3.7
+ VERSION=0.3.8
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:2893964f19901af0b18417a271a3418c5adfaa311cd1688c159b86a7bdf68517d53d98a9b2c1a9942c7d2cde8ccb742832fd78c2ab0aa29844d261b9334548ec
+
SOURCE_HASH=sha512:f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org/wiki
diff --git a/xorg-driver/xf86-video-dummy/HISTORY
b/xorg-driver/xf86-video-dummy/HISTORY
index 968047e..16d4973 100644
--- a/xorg-driver/xf86-video-dummy/HISTORY
+++ b/xorg-driver/xf86-video-dummy/HISTORY
@@ -1,3 +1,6 @@
+2016-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.8
+
2015-07-25 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.3.7

diff --git a/xorg-driver/xf86-video-geode/DETAILS
b/xorg-driver/xf86-video-geode/DETAILS
index de0cb2c..24eac77 100755
--- a/xorg-driver/xf86-video-geode/DETAILS
+++ b/xorg-driver/xf86-video-geode/DETAILS
@@ -1,6 +1,6 @@
SPELL=xf86-video-geode
- VERSION=2.11.17
-#
SOURCE_HASH=sha512:d9252ee877c50a18dfb35fc138b1d58dc470c341b8464e2e112c36153a8c1405c7f7bdedfc60453b3dccac422948664a28964485577066f7563eb62f2eb0f202
+ VERSION=2.11.19
+#
SOURCE_HASH=sha512:f0b1c5edf1c226a4379aa9a4983e69cbaced0618868a7902de41a7754c148324c2a4ea73704aefd96f48d36f035fb2c8063604c26e21e986e4f90c3716578d41
SOURCE="${SPELL}-${VERSION}.tar.bz2"

SOURCE_URL[0]=http://xorg.freedesktop.org/archive/individual/driver/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/xorg-driver/xf86-video-geode/HISTORY
b/xorg-driver/xf86-video-geode/HISTORY
index 31f74d0..b2f53bf 100644
--- a/xorg-driver/xf86-video-geode/HISTORY
+++ b/xorg-driver/xf86-video-geode/HISTORY
@@ -1,3 +1,6 @@
+2016-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.11.19
+
2015-06-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.11.17

diff --git
a/xorg-driver/xf86-video-nouveau/0001-remove-obsolete-dri1-include.patch
b/xorg-driver/xf86-video-nouveau/0001-remove-obsolete-dri1-include.patch
new file mode 100644
index 0000000..222c146
--- /dev/null
+++ b/xorg-driver/xf86-video-nouveau/0001-remove-obsolete-dri1-include.patch
@@ -0,0 +1,23 @@
+From 316c66eda8d60618c61a4684f00f7f8a91c10124 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sun, 18 Dec 2016 11:51:15 +0100
+Subject: [PATCH] remove obsolete dri1 include
+
+---
+ src/nv_include.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/nv_include.h b/src/nv_include.h
+index de55570..eee8c5d 100644
+--- a/src/nv_include.h
++++ b/src/nv_include.h
+@@ -69,6 +69,5 @@
+ #include "nv_type.h"
+ #include "nv_proto.h"
+ #include "nv_dma.h"
+-#include "sarea.h"
+
+ #endif /* __NV_INCLUDE_H__ */
+--
+2.11.0
+
diff --git a/xorg-driver/xf86-video-nouveau/DETAILS
b/xorg-driver/xf86-video-nouveau/DETAILS
index 9578a09..adc9fb1 100755
--- a/xorg-driver/xf86-video-nouveau/DETAILS
+++ b/xorg-driver/xf86-video-nouveau/DETAILS
@@ -1,6 +1,6 @@
SPELL=xf86-video-nouveau
- VERSION=1.0.12
-
SOURCE_HASH=sha512:dd3be4b89d4b39f02b7cbf058be90e6777adc61a580c0987e737056ff85ed2685e7d6a7848b2c7ab8957810e057d7693c5dd2c425f88609670e02ea8368d77e9
+ VERSION=1.0.13
+
SOURCE_HASH=sha512:f78230baea71ace9ca7f84c1ff6c2ef3a3844b7c12423499ff8098c66638ddbff9c06ab86069eebe92ab729259c007bdce43e0f82956a4aa369eafe65f07ee10
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/archive/individual/driver/$SOURCE
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
diff --git a/xorg-driver/xf86-video-nouveau/HISTORY
b/xorg-driver/xf86-video-nouveau/HISTORY
index 3dbdc48..f0b1af7 100644
--- a/xorg-driver/xf86-video-nouveau/HISTORY
+++ b/xorg-driver/xf86-video-nouveau/HISTORY
@@ -1,3 +1,7 @@
+2016-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.13
+ * PRE_BUILD, 0001-remove-obsolete-dri1-include.patch
+
2015-12-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.12
* DEPENDS: lots more
diff --git a/xorg-driver/xf86-video-nouveau/PRE_BUILD
b/xorg-driver/xf86-video-nouveau/PRE_BUILD
new file mode 100755
index 0000000..f70d5e3
--- /dev/null
+++ b/xorg-driver/xf86-video-nouveau/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-remove-obsolete-dri1-include.patch"
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (569ae227589f2e89190318fec5e31331930745bc), Florian Franzmann, 12/18/2016

Archive powered by MHonArc 2.6.24.

Top of Page