Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (9ff3adbcd0b9980681cb38c0ed68dfd6046c0342)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (9ff3adbcd0b9980681cb38c0ed68dfd6046c0342)
  • Date: Wed, 13 Jul 2011 14:41:26 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

audio-drivers/pulseaudio/DEPENDS | 2 +-
audio-drivers/pulseaudio/HISTORY | 3 +++
disk/udev/BUILD | 20 +++++++++++++++++++-
disk/udev/CONFIGURE | 21 +++++++++------------
disk/udev/DEPENDS | 14 ++++++++------
disk/udev/DETAILS | 2 +-
disk/udev/HISTORY | 11 +++++++++++
disk/udev/PRE_SUB_DEPENDS | 10 +++++++---
disk/udev/SUB_DEPENDS | 12 +++++-------
gnome2-libs/devicekit-power/DEPENDS | 2 +-
gnome2-libs/devicekit-power/HISTORY | 3 +++
gnome2-libs/gvfs/DEPENDS | 2 +-
gnome2-libs/gvfs/HISTORY | 3 +++
libs/upower/DEPENDS | 2 +-
libs/upower/HISTORY | 3 +++
net/network-manager/DEPENDS | 2 +-
net/network-manager/HISTORY | 3 +++
xfce-plugins/thunar-volman/DEPENDS | 2 +-
xfce-plugins/thunar-volman/HISTORY | 3 +++
xfce/thunar/DEPENDS | 2 +-
xfce/thunar/HISTORY | 3 +++
21 files changed, 88 insertions(+), 37 deletions(-)

New commits:
commit 94d584835039b80aeee077dc822206a3b1400989
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

thunar: switched from EXTRAS to GUDEV for udev

commit 2ac29f37f9b5706d140159235464e07c8b84a1e0
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

thunar-volman: switched from EXTRAS to GUDEV for udev.

commit b942fcdf8f596cf5e6d90075c7f01d139cade994
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

network-manager: switched from extras to gudev for udev.
*untested* as I don't use nm myself, a quick search turned up gentoo
using gudev as well instead of extras

commit 588245a2dc7e8f1b3d4d0dbc8d81c4ec56fcfcbd
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

gvfs: switched from EXTRA to GUDEV for udev

commit 4b7f39143d856716fa75f6f28112cc72e32fcb22
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

devicekit-power: switched udev's sub dep from extras to gudev

commit 8c84da76fbc83939787ad5b16e6f2f96ebc172f4
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

upower: switched udev's sub dep from extras to gudev

commit 477580ab0819e669fd116aecab26c40b48166616
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

udev: corrected PRE_SUB_DEPENDS to check for dependencies instead of in
a list.

commit e66c024cca43920d5ef2e9b33ffa674d43081624
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

pulseaudio: switched udev sub dep from EXTRAS to HWDB

commit 09e3a37ff28cf9bf5ac0f5985a04cdf88b828c5c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

udev: added HWDB sub_depends option for other spells to use

commit d28e12d931f4587be4de23172bddcfdfa3fe6419
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

udev: finished the splitting of EXTRAS in hwdb, udev_acl and gudev
support. Added support for floppy, made USBIDS and PCIIDS optional, fix
support for pciutils, usbutils and hwdata.

Spells depending on udev will need their sub_depends checked because
EXTRAS is on it's way out.

diff --git a/audio-drivers/pulseaudio/DEPENDS
b/audio-drivers/pulseaudio/DEPENDS
index 91d7044..b44f12a 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -4,7 +4,7 @@ depends libsndfile &&
depends libatomic_ops &&
depends gdbm &&
depends speex &&
-optional_depends -sub EXTRAS udev \
+optional_depends -sub HWDB udev \
"--enable-udev" \
"--disable-udev" \
"for device hotplug support" &&
diff --git a/audio-drivers/pulseaudio/HISTORY
b/audio-drivers/pulseaudio/HISTORY
index 71ebcb3..a0a4425 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,6 @@
+2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: switched the udev sub_depends from extras to hwdb.
+
2011-06-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.23, SOURCE_URL updated

diff --git a/disk/udev/BUILD b/disk/udev/BUILD
index 792561e..6119ad6 100755
--- a/disk/udev/BUILD
+++ b/disk/udev/BUILD
@@ -2,7 +2,25 @@ OPTS="--prefix=$INSTALL_ROOT/usr \
--sbindir=$INSTALL_ROOT/sbin \
--libexecdir=$INSTALL_ROOT/lib/udev \
--with-rootlibdir=$INSTALL_ROOT/lib \
- $UDEV_OPTS \
+ $UDEV_OPTS $UDEV_HWDB \
$OPTS" &&

+if [[ "${UDEV_HWDB}" = '--enable-hwdb' ]]; then
+ if [[ "$(get_spell_provider ${SPELL} USBIDS)" == 'hwdata' ]]; then
+ OPTS="$OPTS --with-usb-ids-path=/usr/share/hwdata/usb.ids"
+ elif [[ "$(get_spell_provider ${SPELL} USBIDS)" == 'usbids' ]]; then
+ OPTS="$OPTS --with-usb-ids-path=/usr/share/usb.ids"
+ else
+ message "${PROBLEM_COLOR}"unknown USBIDS provider, you are on your
own.${DEFAULT_COLOR}"
+ fi &&
+
+ if [[ "$(get_spell_provider ${SPELL} PCIIDS)" == 'hwdata' ]]; then
+ OPTS="$OPTS --with-pci-ids-path=/usr/share/hwdata/pci.ids"
+ elif [[ "$(get_spell_provider ${SPELL} PCIIDS)" == 'pciutils' ]]; then
+ OPTS="$OPTS --with-pci-ids-path=/usr/share/pci.ids"
+ else
+ message "${PROBLEM_COLOR}"unknown PCIIDS provider, you are on your
own.${DEFAULT_COLOR}"
+ fi
+fi &&
+
default_build
diff --git a/disk/udev/CONFIGURE b/disk/udev/CONFIGURE
index 83005ed..8df1427 100755
--- a/disk/udev/CONFIGURE
+++ b/disk/udev/CONFIGURE
@@ -3,18 +3,15 @@ config_query_option UDEV_OPTS \
"--enable-debug" \
"--disable-debug" &&

-#
-# Remove this after stable-0.58 is released.
-# Bug #15994
-#
-if list_find "$UDEV_OPTS" '--enable-extras'; then
- list_remove UDEV_OPTS '--enable-extras'
-elif list_find "$UDEV_OPTS" '--disable-extras'; then
- list_remove UDEV_OPTS '--disable-extras'
-fi &&
-#
-# End Bug #15994
-#
+config_query_option UDEV_OPTS \
+ "Enable legacy floppy support?" n \
+ "--enable-floppy" "--disable-floppy" &&
+
+message "HWDB support can be disabled, but you probably should\n" \
+ "only do that when you mount /usr over a network." &&
+config_query_option UDEV_HWDB \
+ "Enable {pci,usb}.ids hardware database support?" y \
+ "--enable-hwdb" "--disable-hwdb" &&

if spell_ok hotplug; then
message "You seem to have hotplug installed. Hotplug has been" \
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index 666e274..453c84d 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -1,10 +1,13 @@
depends gnupg &&
depends smgl-fhs &&
depends gperf &&
-depends usbutils &&
-depends PCIIDS &&
+depends pkgconfig &&
+if [[ "${UDEV_HWDB}" == '--enable-hwdb' ]]; then
+ depends USBIDS &&
+ depends PCIIDS
+fi &&

-if [[ "$(get_spell_provider ${SPELL} PCIIDS)" = 'pciutils' ]]; then
+if [[ "$(get_spell_provider ${SPELL} PCIIDS)" == 'pciutils' ]]; then
depends -sub NO_ZLIB pciutils
fi &&

@@ -14,11 +17,10 @@ optional_depends acl \
"for local user acl permissions support" &&

if is_depends_enabled $SPELL acl; then
- depends pkgconfig &&
- depends libusb &&
- optional_depends consolekit '' '' 'seesion/seat support'
+ optional_depends consolekit '' '' 'session/seat support'
fi &&

+message "having glib2/gudev enabled means udevd will break for separate or
networked /usr" &&
optional_depends glib2 \
'--enable-gudev' \
'--disable-gudev' \
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 80fa5ee..4fe284e 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,6 +1,6 @@
SPELL=udev
VERSION=172
- PATCHLEVEL=0
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 94941c7..f88e214 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,14 @@
+2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: use USBIDS instead of usbutils and make USBIDS and PCIIDS
optional.
+ corrected spelling of 'session', added /usr warning for gudev.
+ removed libusb (usbutils already depends on it), always depend on
pkgconfig.
+ * CONFIGURE: made hwdb usage optional, added floppy support
+ removed obsolete --enable-extras bugfix
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: split the leftovers from the old
sub_depends,
+ removed unused fake VOLUME_ID line.
+ added hwdb option.
+ * BUILD: add the missing options for pci and usb IDs based on the
selected provider.
+
2011-07-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 172

diff --git a/disk/udev/PRE_SUB_DEPENDS b/disk/udev/PRE_SUB_DEPENDS
index 34515c6..5922183 100755
--- a/disk/udev/PRE_SUB_DEPENDS
+++ b/disk/udev/PRE_SUB_DEPENDS
@@ -1,5 +1,9 @@
case $THIS_SUB_DEPENDS in
- EXTRAS) list_find "$UDEV_OPTS" --enable-extras;;
-*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
+ EXTRAS) message "the spell you are trying to cast is broken."
+ message "Udev's sub_depends have changed, contact the maintainer."
;;
+ GUDEV) is_depends_enabled $SPELL glib2 && return 0 ;;
+ ACL) is_depends_enabled $SPELL acl && return 0 ;;
+ HWDB) list_find "$UDEV_HWDB" --enable-hwdb ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
esac
diff --git a/disk/udev/SUB_DEPENDS b/disk/udev/SUB_DEPENDS
index be4a453..f078172 100755
--- a/disk/udev/SUB_DEPENDS
+++ b/disk/udev/SUB_DEPENDS
@@ -1,11 +1,9 @@
case "$THIS_SUB_DEPENDS" in
- VOLUME_ID) true;;
- EXTRAS) message "${MESSAGE_COLOR}Forcing building of hash function" \
- "generator and access control lists${DEFAULT_COLOR}" &&
- depends acl '--enable-udev_acl' &&
- depends glib2 '--enable-gudev' &&
- depends pkgconfig &&
- depends libusb ;;
+ EXTRAS) message "${PROBLEM_COLOR}EXTRAS is obsolete, please fix the
spell using it${DEFAULT_COLOR}" ;;
+ GUDEV) depends glib2 '--enable-gudev' ;;
+ ACL) depends acl '--enable-udev_acl' ;;
+ HWDB) list_remove UDEV_HWDB '--disable-hwdb'
+ list_add UDEV_HWDB '--enable-hwdb' ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
return 1;;
esac
diff --git a/gnome2-libs/devicekit-power/DEPENDS
b/gnome2-libs/devicekit-power/DEPENDS
index dba90e6..5633d55 100755
--- a/gnome2-libs/devicekit-power/DEPENDS
+++ b/gnome2-libs/devicekit-power/DEPENDS
@@ -1,7 +1,7 @@
depends devicekit &&
depends libusb &&
depends policykit &&
-depends -sub EXTRAS udev &&
+depends -sub GUDEV udev &&

if [[ $DEVKIT_POWER_MAN == y ]]; then
depends libxslt &&
diff --git a/gnome2-libs/devicekit-power/HISTORY
b/gnome2-libs/devicekit-power/HISTORY
index 3e3fbdc..9526ada 100644
--- a/gnome2-libs/devicekit-power/HISTORY
+++ b/gnome2-libs/devicekit-power/HISTORY
@@ -1,3 +1,6 @@
+2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: switched udev's sub dep from EXTRAS to GUDEV
+
2010-10-31 Robin Cook <rcook AT wyrms.net>
* CONFLICTS: added

diff --git a/gnome2-libs/gvfs/DEPENDS b/gnome2-libs/gvfs/DEPENDS
index 8975ff0..80ede76 100755
--- a/gnome2-libs/gvfs/DEPENDS
+++ b/gnome2-libs/gvfs/DEPENDS
@@ -25,7 +25,7 @@ optional_depends udev \
"build with udev support" &&

if is_depends_enabled $SPELL udev; then
- optional_depends -sub EXTRAS udev \
+ optional_depends -sub GUDEV udev \
"--enable-gudev" \
"--disable-gudev" \
"build with gudev support"
diff --git a/gnome2-libs/gvfs/HISTORY b/gnome2-libs/gvfs/HISTORY
index 1dacb42..719a870 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,3 +1,6 @@
+2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: switched from EXTRAS to GUDEV for udev
+
2011-03-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.7
* PRE_BUILD, gvfs-gconf-fix.patch: removed
diff --git a/libs/upower/DEPENDS b/libs/upower/DEPENDS
index ec16b0e..7b66772 100755
--- a/libs/upower/DEPENDS
+++ b/libs/upower/DEPENDS
@@ -2,7 +2,7 @@ depends glib2 &&
depends dbus &&
depends dbus-glib &&
depends policykit &&
-depends -sub EXTRAS udev &&
+depends -sub GUDEV udev &&

optional_depends gobject-introspection \
"--enable-introspection=yes" \
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index 7dcdb16..eb57c59 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: switched the sub depends for udev from EXTRAS to GUDEV
+
2011-05-28 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: added optional depends on docbook-xsl
needed to build man pages
diff --git a/net/network-manager/DEPENDS b/net/network-manager/DEPENDS
index b8218c7..803bfe0 100755
--- a/net/network-manager/DEPENDS
+++ b/net/network-manager/DEPENDS
@@ -9,7 +9,7 @@ depends libnl &&
depends nss &&
depends policykit &&
depends ppp &&
-depends -sub EXTRAS udev &&
+depends -sub GUDEV udev &&
depends wpa_supplicant &&

optional_depends gtk-doc \
diff --git a/net/network-manager/HISTORY b/net/network-manager/HISTORY
index e7578fb..f8e5ba1 100644
--- a/net/network-manager/HISTORY
+++ b/net/network-manager/HISTORY
@@ -1,3 +1,6 @@
+2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: switched from EXTRAS to GUDEV for udev
+
2010-09-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 0.8.1.997

diff --git a/xfce-plugins/thunar-volman/DEPENDS
b/xfce-plugins/thunar-volman/DEPENDS
index a4679b0..77420f1 100755
--- a/xfce-plugins/thunar-volman/DEPENDS
+++ b/xfce-plugins/thunar-volman/DEPENDS
@@ -3,7 +3,7 @@ depends gtk+2 &&
depends libxfce4ui &&
depends libxfce4util &&
depends xfconf &&
-depends -sub EXTRAS udev &&
+depends -sub GUDEV udev &&

optional_depends libnotify \
"--enable-notifications" \
diff --git a/xfce-plugins/thunar-volman/HISTORY
b/xfce-plugins/thunar-volman/HISTORY
index 69ef794..522ccd8 100644
--- a/xfce-plugins/thunar-volman/HISTORY
+++ b/xfce-plugins/thunar-volman/HISTORY
@@ -1,3 +1,6 @@
+2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: switched from EXTRAS to GUDEV for udev
+
2011-01-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6.0
* DEPENDS: renewed dependencies
diff --git a/xfce/thunar/DEPENDS b/xfce/thunar/DEPENDS
index 7177a9d..3b699b0 100755
--- a/xfce/thunar/DEPENDS
+++ b/xfce/thunar/DEPENDS
@@ -19,7 +19,7 @@ else
"for D-Bus support"
fi &&

-optional_depends -sub EXTRAS udev \
+optional_depends -sub GUDEV udev \
"--enable-gudev" \
"--disable-gudev" \
"for volume management via GUDev" &&
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index a4654d2..dc8be69 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,6 @@
+2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: switched from EXTRAS to GUDEV for udev
+
2011-05-16 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.3.0




  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (9ff3adbcd0b9980681cb38c0ed68dfd6046c0342), Arjan Bouter, 07/13/2011

Archive powered by MHonArc 2.6.24.

Top of Page