sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.39 grimoire by Arwed von Merkatz (16ef02470b1e32e0bd2e5e079cf028f3aaf4f79f)

From: Arwed von Merkatz <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to stable-0.39 grimoire by Arwed von Merkatz (16ef02470b1e32e0bd2e5e079cf028f3aaf4f79f)
Date: Sat, 2 Jan 2010 08:03:12 -0600

GIT changes to stable-0.39 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

audio-drivers/alsa-utils/DEPENDS | 1 +
audio-drivers/alsa-utils/HISTORY | 3 +++
xorg-driver/xf86-input-evdev/DEPENDS | 4 +++-
xorg-driver/xf86-input-evdev/HISTORY | 4 ++++
xorg-xserver/xorg-server/CONFIGURE | 4 ++--
xorg-xserver/xorg-server/DEPENDS | 12 ++++++++----
xorg-xserver/xorg-server/HISTORY | 6 ++++++
7 files changed, 27 insertions(+), 7 deletions(-)

New commits:
commit 16ef02470b1e32e0bd2e5e079cf028f3aaf4f79f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

xf86-input-evdev: Depends on xkeyboard-config at runtime
(cherry picked from commit 9352b1bbd4da3d0d459485e1c599b9f72f6734ab)

commit 279e94fb67cd169bef9ff3d386da279d076a0019
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

alsa-utils: Depend on ncurses and specify it as the curses library

Otherwise we somehow get this on new installs:
checking form.h presence... yes
checking for form.h... yes
checking for new_panel in -lpanelw... no
configure: error: panelw library not found
(cherry picked from commit 6615ba33926ee523e00dce042d1106cc9e26b09d)

commit 04f57081410221ae58cb0a7055c0863a40596beb
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

xorg-server: fixed a few issues wrt z-rejected drivers
(cherry picked from commit 7992075ec0fa5ff318b5c9110a93c7df810d9a4b)

diff --git a/audio-drivers/alsa-utils/DEPENDS
b/audio-drivers/alsa-utils/DEPENDS
index 4adacd5..8176157 100755
--- a/audio-drivers/alsa-utils/DEPENDS
+++ b/audio-drivers/alsa-utils/DEPENDS
@@ -1,5 +1,6 @@
depends coreutils &&
depends alsa-lib &&
+depends ncurses '--with-curses=ncurses' &&

optional_depends xmlto \
"--enable-xmlto" \
diff --git a/audio-drivers/alsa-utils/HISTORY
b/audio-drivers/alsa-utils/HISTORY
index 4a43d68..1f39b39 100644
--- a/audio-drivers/alsa-utils/HISTORY
+++ b/audio-drivers/alsa-utils/HISTORY
@@ -1,3 +1,6 @@
+2009-12-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Specify which curses library and depend on ncurses
+
2009-09-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.21

diff --git a/xorg-driver/xf86-input-evdev/DEPENDS
b/xorg-driver/xf86-input-evdev/DEPENDS
index 3decf7f..02acffd 100755
--- a/xorg-driver/xf86-input-evdev/DEPENDS
+++ b/xorg-driver/xf86-input-evdev/DEPENDS
@@ -1,3 +1,5 @@
depends util-macros &&
depends xproto &&
-depends xorg-server
+depends xorg-server &&
+
+runtime_depends xkeyboard-config
diff --git a/xorg-driver/xf86-input-evdev/HISTORY
b/xorg-driver/xf86-input-evdev/HISTORY
index f6e7058..1e06a0d 100644
--- a/xorg-driver/xf86-input-evdev/HISTORY
+++ b/xorg-driver/xf86-input-evdev/HISTORY
@@ -1,3 +1,7 @@
+2009-12-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on xkeyboard-config at runtime to find and
+ configure any keyboards.
+
2009-10-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.99.2

diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index 9bbff6d..166b4bc 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -303,8 +303,8 @@ config_query_multi XORG_SERVER_VIDEO_DRIVER_COMMON
\
xf86-video-vesa \
xf86-video-fbdev \
xf86-video-neomagic \
- ati_driver \
- nvidia_driver
&&
+ ati-fglrx \
+ NVIDIA
&&

config_query_multi XORG_SERVER_VIDEO_DRIVER_UNCOMMON \
"What uncommon video drivers do you want" \
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index bded028..f53047f 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -326,10 +326,14 @@ elif list_find "$XORG_SERVER_VIDEO_DRIVER_COMMON" "none"
then
true
else
-for video_common in $XORG_SERVER_VIDEO_DRIVER_COMMON
-do
-runtime_depends_2 $video_common
-done
+ for video_common in $XORG_SERVER_VIDEO_DRIVER_COMMON
+ do
+ if [[ $video_common == ati-fglrx || $video_common == NVIDIA ]]; then
+ runtime_depends_2 $video_common "" "" z-rejected
+ else
+ runtime_depends_2 $video_common
+ fi || return 1 # break the chain on any error
+ done
fi &&

if list_find "$XORG_SERVER_VIDEO_DRIVER_UNCOMMON" "all"
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 31a16cc..9f47de4 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,9 @@
+2009-12-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: fixed the ati driver name and changed the nvidia one to
+ the provider - NVIDIA
+ * DEPENDS: specify the grimoire for dependencies on z-rejected spells;
+ handle errors for the selective video driver choice
+
2009-12-16 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: Changed default font prefix to /usr/share/fonts/X11 .
* CONFIGURE: Added note about font paths.

[SM-Commit] GIT changes to stable-0.39 grimoire by Arwed von Merkatz (16ef02470b1e32e0bd2e5e079cf028f3aaf4f79f), Arwed von Merkatz, 01/02/2010