Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (44e799d13ca9828d1f35a68f2f11dce8ad4bfaf3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (44e799d13ca9828d1f35a68f2f11dce8ad4bfaf3)
  • Date: Sun, 10 Oct 2010 14:49:36 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null |binary
xorg-driver/xf86-input-evdev/HISTORY | 3 +
xorg-xserver/xorg-server/BUILD | 2
xorg-xserver/xorg-server/CONFIGURE | 8 ---
xorg-xserver/xorg-server/DEPENDS | 35
+++++++++++++----
xorg-xserver/xorg-server/DETAILS | 2
xorg-xserver/xorg-server/HISTORY | 14 ++++++
xorg-xserver/xorg-server/xorg-server-1.7.7.tar.bz2.sig | 0
xorg-xserver/xorg-server/xorg-server-1.9.0.tar.bz2.sig |binary
9 files changed, 48 insertions(+), 16 deletions(-)

New commits:
commit 981a79ac889320b4bae41c0111e0253ce266a4f0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

virtuoso: Fails with multiple make jobs

commit 613d7afa99ebb4bc5e3cace062ae2e235e6698e6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

lame: Fails with multiple make jobs

commit aedd0f5c5a8bc0844f819ac3a9c00fd5b65d50d1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: Optionally depends on udev for configuration support
May only select udev xor (hal (preferred) or dbus)

May only select one:
configure: error: Hotplugging through both libudev and dbus/hal not
allowed

hal is preferred by upstream:
--enable-config-udev Build udev support (default: auto)
--enable-config-dbus Build D-BUS API support (default: no)
--disable-config-hal Build HAL support (default: auto)

commit 876c8362f723a69f0ca64dd0696faf0486b9ebd1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: -multibuffer no longer an option remove query
and from XORG_SERVER_OPTS

commit 8bf80daf9210b0665994cb81879dccb057e0f62c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: Updated to 1.9.0
SOURCE matches upstream posted SHA1
Untested

commit afbfb014c0bf41486af3519d08e068080fd76efd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: Updated to 1.8.1
SOURCE matches upstream posted SHA1
Requires DRI (mesalib) 7.8.0+ (currently development release)
fontdir -> fontrootdir

Fails to compile Xext and have not figured out why.

commit d4f9165bf1559f880a13f8e81541501142c22a73
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: Remove old 1.7.1 sig

commit 84f9a4c24d1ef3377d7306b50fa193194785939d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xcmsdb: Removed PKG
(cherry picked from commit 58b2d9e06a4f5ed6be15508ae65e5a8fb6bb277c)

commit 42ee4898d209d758d73cf6b09bc7cd3b68b6ef41
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xcmsdb: Updated to 1.0.2
SOURCE matches upstream posted MD5
SOURCE_URL now uses individual/app/
Removed XORG_VER, BUILD_API=2, and UPDATED
(cherry picked from commit 3385561258bd6203fb617fa8e4d44a456797ace0)

commit d466db54c087340ba3f20285cad172f02bfb548b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xdriinfo: Removed XORG_VER and PKG
(cherry picked from commit 81a315e98066adeed5384e159b77ccf503ef3bc9)

commit 7d82ff7555a675633d6edad45fef0759cc85dfb6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xdriinfo: Updated to 1.0.3
SOURCE matches upstream posted MD5
(cherry picked from commit 709e09a3c08af3b9a385deab7f28bc851d9b3010)

commit 3b66fb4e10d08565536bdd234c5337b9a2a2ceaf
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xman: Cleanup whitespace
(cherry picked from commit 082474e763d0c96848f7fe2b5542accc86a495fd)

commit fa3ab2859835ef1975197ff34f85c9b3e4043ac4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xman: Removed XORG_VER and PKG
(cherry picked from commit 777db64a48ac18e573dc50cbbb7f160e56e8c207)

commit 5315c89bfb687ae5d4e913215fc60edf2e88be1c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xman: Updated to 1.1.0
SOURCE matches upstream posted MD5
Removed PATCHLEVEL
(cherry picked from commit 9c020b9614e7a70fef51ec0e2601f2cc9ab50f37)

commit 6cbb631d02b345239c631b01b7688bc7c9b573c7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xdpyinfo: Removed PKG and XORG_VER

commit 2d10785d3151b44a4ca5e2e0ed672752eaad6e11
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xdpyinfo: Updated to 1.1.0
SOURCE matches upstream posted MD5
Removed PATCHLEVEL

commit 84000f4f4e7d030319af90cfcc045ab212229ac7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

x11perf: Cleanup whitespace

commit d93852d5234c8ef5ceb265ff2172e898dd3e3eb1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

x11perf: Removed XORG_VER and PKG

commit 9764470d45106dbbeff8cfafb5faffaeeaaad1e6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

x11perf: Updated to 1.5.1
SOURCE matches upstream posted MD5

commit cb22ce5fb4accd7ba452c5d3a7e23ef83f84a5f3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xcursorgen: Removed PKG and XORG_VER

commit 9a940a4328ca73d3fccd00472b6233f331094b8a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xcursorgen: Updated to 1.0.3
SOURCE matches upstream posted MD5

commit 800af4a762506e6003faff92258a61099d24adaf
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xkbevd: Removed PKG

commit f018b0bb64a0273dd6bba47e9162d16409aeb28d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xkbevd: Updated to 1.1.0
SOURCE matches upstream posted MD5
SOURCE_URL now uses individual/apps/
Removed XORG_VER, BUILD_API=2, and UPDATED

commit 1d4ffdc85245e0560b8eed15520357a795086a9e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xkbutils: Add listing of included utilities

commit 4b265956815bc52a015a147239d9e25e6e76d4d0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xkbutils: Removed PKG

commit 0bc76dc6f734258632dc6003bee1587a1314a28d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xkbutils: Updated to 1.0.2
SOURCE matches upstream posted MD5
Removed XORG_VER and PATCHLEVEL
SOURCE_URL now uses individual/apps/

commit 05ec7d4b632a93324c0e41635aba6377ff1da730
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xlsclients: Removed PKG

commit 08f00d43f294eaad8e6c78b80e703e5227a4651f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xlsclients: Updated to 1.0.2
SOURCE matches upstream posted MD5
SOURCE_URL now uses individual/apps/
Removed BUILD_API=2, XORG_VER, and UPDATED

commit 9977e1cfa66d93a99995f4a68c2412ea1b23450c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xrefresh: Fix typo UPSTREAM_ASH -> UPSTREAM_HASH

commit e2b34b09e2ccb1cb9feedb2978ed46faab8f7061
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xrefresh: Cleanup whitespace

commit 4bda7c05f3b59b525beca612f2dfa12a645c31b1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xrefresh: Removed BUILD_API=2 and PKG

commit 8ed7ef5a43b93b64df8af01280ecd63a66c236ce
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xrefresh: Updated to 1.0.3
SOURCE matches upstream posted MD5
Removed UPDATED and XORG_VER

commit bffb741ddaf1c101a3feb8b1b2b9ffb4ad5e4df6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xsetroot: Removed PKG and XORG_VER

commit 2495d2eb696710d354b15adc090d76060b7378ec
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xsetroot: Updated to 1.0.3
SOURCE matches upstream posted MD5

commit 014f7cf29dfd77e1b737f9597daf3f39b3578c6f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xclipboard: Removed PKG

commit 267356e1e7a7f2391d18815bdaf8a9bad1f05ea3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xclipboard: Updated to 1.1.0
SOURCE matches upstream posted MD5
Removed PATCHLEVEL and XORG_VER
SOURCE_URL now uses individual/app/

commit 8d20fa640ebec9b1f23a6132ac742dc8cdf6dd08
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-cf-files: Removed XORG_VER and PKG

commit 7709dbc71a8747de0c0fc74856b3730d636de825
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-cf-files: Updated to 1.0.3
SOURCE matches upstream posted MD5
Removed PATCHLEVEL
05_xaw_without_xp.diff synched against 1.0.3 and applies with -p1

commit e90e43cd753b63f7ff7ae56f181bc3fbbb03ad26
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: Updated to 1.7.1
SOURCE matches upstream posted MD5

commit 4b80bac9648d6adde3028f6cc3e438e6e9db47c1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-intel: Updated to 2.9.1
SOURCE matches upstream posted MD5

commit f5701c565819bf6830fa3df77840d05a1ee090af
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

font-misc-misc: => 1.1.0

commit ea8cbdc380405f842c962daf593a4ba771ab8bfc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

font-cursor-misc: => 1.0.1

commit 8e6f2db016bc7e94409d0f8a9671d0d55324e755
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

font-bh-ttf: => 1.0.1

commit c9f7fea44721217b262eb6bc37f418819eac6a64
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

font-alias: => 1.0.2

commit 5717ebdd7c5541dd358921de2a92c9654651f6b0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

font-adobe-utopia-type1: => 1.0.2

commit a7f3a6f314968ffb5293765b1794fb452bb81772
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

font-adobe-75dpi: => 1.0.1

commit 2afd3278896263f71013a8f4eba606812220b233
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libxext: => 1.1.1

commit 7f36348dd036e10f3dfd7fe6530fb263c537929d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-input-evdev: => 2.3.0

commit d243eb2e12fcdbd5d0380ad90f0699fc58745100
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libx11 - optional depends groff

commit 963b329c9a127069d77cb3c7eb7c2cc798eae5f9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libx11: => 1.3.1

commit 6db26d4e90b2fb0c6384a16b3c2d3c6203e77289
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xtrans: => 1.2.5

commit 04a62def5aca71ca39bd23ab841b8e8ca37fdd1b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libxaw: => 1.0.7

commit e0f9c8d3db62841b315dd1602aa4110db4bc8c09
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xproxymanagementprotocol: => 1.0.3

commit d144c2a8d81f99fff3c3e18da54db33220fe735c
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

xorg-server: added xf86-video-nouveau to the list

commit 2ccba0bde3bb6e4c4f8b15a354da966692e18e1a
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

xorg-server: removed some depends

commit d2ca140dfd35dbf58c1d46e3c4ea74003046ce49
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xinput: => 1.5.0

commit d7d51a554167e685d3174450b20b1e59ab6cf9e2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xbitmaps: => 1.1.0

commit 74b9ec5c4bca3e0d56e9ced696d3d5eecf9d352d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kbproto: => 1.0.4

commit 17c54b0b3de8fbd0e206ec44b752a23ee1e6611e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xrdb: Removed PKG and XORG_VER
(cherry picked from commit 11a1d95f99bb7b820987dce4d8d5e36a7676066b)

commit b0e23bd614585a7ecfbcbcb7f59c8e0a5eff9f13
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xrdb: Updated to 1.0.6
SOURCE matches upstream posted MD5
(cherry picked from commit 06b80331ea4f26adc6f4589f4e5437f98dbce739)

commit 806a2705422ed82e4bc30499bbe60f76cf54359e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xprop: Removed XORG_VER and PKG
(cherry picked from commit 64fb99ff4efcca814f110f5a527d5eedce2cb257)

commit 8c0473d3fc30107ce47dc8068abe0ce699dc63ed
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xprop: Updated to 1.1.0
SOURCE matches upstream posted MD5
(cherry picked from commit 405debe315eba4cb036346b1629e717cdee329a8)

commit a823a91ed3d58e69bfcab04731e9281be3a08c07
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sessreg: Removed PKG and XORG_VER
(cherry picked from commit 98e270fd4b1252e55b93dc449ad706d601a7e245)

commit 6d2b6335466c170229f8ed2f814475679b2e8725
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sessreg: Updated to 1.0.5
SOURCE matches upstream posted MD5
(cherry picked from commit 9a0a7bafb94516cd56c51779043451c2d930b223)

commit 11f199ef7eadcf849e8798e0cb340fcb31a85300
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

font-util: Updated to 1.1.1
SOURCE matches upstream posted MD5
Removed BUILD, mapdir install path fixed in 1.1.1
(cherry picked from commit aaf863d9d23844ce07e0819b251b7bad491e9ad0)

commit b63b2f25ad54ddf0b1b8fe6b1944f847994fe0b8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

Revert "Revert "xorg-server: update to 1.7.0""
bad merge
This reverts commit c39203bc0e1233ca24c70c0d099c59ae966e62ae.

commit c7f4835640bd4024f403fc7bffb5e0f87287e0db
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mkfontdir: => 1.0.5

commit 1765dfebfce7b2402f146ee965d6860529111d4d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mkfontscale: => 1.0.7

commit 4768ad5fc3a6f92b64c596d665fd3fb1c9f877ce
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

iceauth: => 1.0.3

commit b52890a498ad87e9ab708e8d0adc8efe5d8f56e4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

makedepend: => 1.0.2

commit 5e7175318a4f6970b992ab0fd7e826e1cb072e89
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86miscproto: => 0.9.3

commit 9f19410f910e7edbfc5536ce9fe52207e0849078
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-input-synaptics: Updated to 1.2.0 (Required for xorg-server 1.7)
SOURCE matches upstream posted MD5

diff --git a/xorg-driver/xf86-input-evdev/HISTORY
b/xorg-driver/xf86-input-evdev/HISTORY
index 6555ccb..d56704d 100644
--- a/xorg-driver/xf86-input-evdev/HISTORY
+++ b/xorg-driver/xf86-input-evdev/HISTORY
@@ -12,6 +12,9 @@
* DEPENDS: Depends on xkeyboard-config at runtime to find and
configure any keyboards.

+2009-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.3.0
+
2009-10-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.99.2

diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index e49a8d4..ce19cdf 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -15,7 +15,7 @@ fi
&&
OPTS="${XORG_SERVER_OPTS} \
--with-xkb-output=$TRACK_ROOT/var/lib/xkb \
--with-dri-driver-path=$TRACK_ROOT/usr/lib/dri \
- --with-fontdir=${TRACK_ROOT}/usr/share/fonts/X11 \
+ --with-fontrootdir=${TRACK_ROOT}/usr/share/fonts/X11 \
--disable-dmx \
--disable-xwin \
--enable-dbe \
diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index 166b4bc..4053ef4 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -1,3 +1,5 @@
+list_remove XORG_SERVER_OPTS "--enable-multibuffer" "--disable-multibuffer"
+
. $GRIMOIRE/config_query_multi.function
config_query_option XORG_SERVER_OPTS \
"Build documentation?" \
@@ -85,12 +87,6 @@ config_query_option XORG_SERVER_OPTS
\
"--disable-xcalibrate"
&&

config_query_option XORG_SERVER_OPTS \
- "Build Multibuffer extension?" \
- y \
- "--enable-multibuffer" \
- "--disable-multibuffer"
&&
-
-config_query_option XORG_SERVER_OPTS \
"Build Xorg server?" \
y \
"--enable-xorg" \
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index f53047f..a57d760 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -35,14 +35,33 @@ optional_depends libxvmc \
"--enable-xvmc" \
"--disable-xvmc" \
"Enable support for XvMC" &&
-optional_depends dbus \
- "--enable-config-dbus" \
- "--disable-config-dbus" \
- "Enable D-BUS API support" &&
-optional_depends hal \
- "--enable-config-hal" \
- "--disable-config-hal" \
- "Enable HAL support" &&
+
+#
+# May only select one:
+# configure: error: Hotplugging through both libudev and dbus/hal not allowed
+#
+# hal is preferred by upstream:
+# --enable-config-udev Build udev support (default: auto)
+# --enable-config-dbus Build D-BUS API support (default: no)
+# --disable-config-hal Build HAL support (default: auto)
+#
+optional_depends dbus \
+ "--enable-config-dbus --disable-config-udev" \
+ "--disable-config-dbus" \
+ "Enable D-BUS API support" &&
+
+optional_depends hal \
+ "--enable-config-hal --disable-config-udev" \
+ "--disable-config-hal" \
+ "Enable HAL support" &&
+
+if ! is_depends_enabled $SPELL hal &&
+ ! is_depends_enabled $SPELL dbus; then
+ optional_depends udev \
+ "--enable-config-udev" \
+ "--disable-config-udev" \
+ "enable udev kernel config support"
+fi &&

#optional_depends libdmx \
# "--enable-dmx" \
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 239d33f..a96d2b0 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,5 +1,5 @@
SPELL=xorg-server
- VERSION=1.7.7
+ VERSION=1.9.0
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
#
SOURCE_HASH=sha512:66dcc6b26ab7d1e24814c5e650cbb5942ec9d20642cebe82cb4a66e4d7a6cdd472573c17d769a490e0426b826e98774f98a61459ad078fedf4abe38f79e189fc
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 41ece94..f4bc487 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,17 @@
+2010-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.9.0
+ SOURCE matches upstream posted SHA1
+ * CONFIGURE: -multibuffer no longer an option remove query and from
+ XORG_SERVER_OPTS
+ * DEPENDS: Optionally depends on udev for configuration support
+ May only select udev xor (hal (preferred) or dbus)
+
+2010-06-26 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.8.1
+ SOURCE matches upstream posted SHA1
+ Requires DRI (mesalib) 7.8.0+ (currently development release)
+ * BUILD: fontdir -> fontrootdir
+
2010-05-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.7
SOURCE matches upstream posted SHA1
diff --git a/xorg-xserver/xorg-server/xorg-server-1.7.7.tar.bz2.sig
b/xorg-xserver/xorg-server/xorg-server-1.7.7.tar.bz2.sig
deleted file mode 100644
index a495462..0000000
Binary files a/xorg-xserver/xorg-server/xorg-server-1.7.7.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-xserver/xorg-server/xorg-server-1.9.0.tar.bz2.sig
b/xorg-xserver/xorg-server/xorg-server-1.9.0.tar.bz2.sig
new file mode 100644
index 0000000..8504f15
Binary files /dev/null and
b/xorg-xserver/xorg-server/xorg-server-1.9.0.tar.bz2.sig differ



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (44e799d13ca9828d1f35a68f2f11dce8ad4bfaf3), Eric Sandall, 10/10/2010

Archive powered by MHonArc 2.6.24.

Top of Page