sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (77c00988efc71e933ba78310844f1fc4b579353c)

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 (77c00988efc71e933ba78310844f1fc4b579353c)
Date: Fri, 24 Apr 2009 22:44:37 -0500

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

xorg-xserver/xorg-server/BUILD | 1
xorg-xserver/xorg-server/CONFIGURE | 58
++++++++++++++++---------------
xorg-xserver/xorg-server/DEPENDS | 25 ++++++++-----
xorg-xserver/xorg-server/DETAILS | 1
xorg-xserver/xorg-server/HISTORY | 9 ++++
xorg-xserver/xorg-server/gl_select.patch | 0
6 files changed, 57 insertions(+), 37 deletions(-)

New commits:
commit 77c00988efc71e933ba78310844f1fc4b579353c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: MesaLib source is no longer required during build
(cherry picked from commit bff9cf9376515e2149b8ab5522eabec6ee12b666)

commit c2c4d967c02f5365cce2eced5777ee97b4df74aa
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: updated to 1.6.1

Cherry-picked commit 6eaaad23a5f81b323107c9d7101538c04c303e6b from
devel-xorg-modular

commit 605babfb7e18fdfb4320dc71cb46be5b505decdc
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: version update to 1.6

Cherry-picked commit 4dbcfcc5e25750584c4649084371823868d1f431 from
devel-xorg-modular

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

Revert "xorg-server: updated to 1.6.1"

This reverts commit a374fd404c0e409139b99075d1667a4bba9ce5b2.

Undoing 1.6.1 cherry-pick to start from 1.6.0 properly

Conflicts:

xorg-xserver/xorg-server/DETAILS
xorg-xserver/xorg-server/HISTORY
xorg-xserver/xorg-server/PRE_BUILD

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

Revert "xorg-server: Remove evdev-flush.patch, missed in 1.6.1
integration"

This reverts commit 4761525dfe762484bda1ca0ea0c63797f7128ee0.

Going to re-cherry-pick starting from 1.6.0, apparently I missed some
changes

diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index 1808f36..e978772 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -18,5 +18,6 @@ OPTS="${XORG_SERVER_OPTS}
\
--disable-dmx \
--disable-xwin \
--enable-dbe \
+ --enable-shm \
${OPTS}" &&
default_build
diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index 033414f..d9a3a18 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -18,6 +18,13 @@ config_query_option XORG_SERVER_OPTS
\
"--disable-xres"
&&

config_query_option XORG_SERVER_OPTS \
+ "Build DPMS extension?" \
+ y \
+ "--enable-dpms" \
+ "--disable-dpms"
&&
+
+
+config_query_option XORG_SERVER_OPTS \
"Build Record extension?" \
y \
"--enable-record" \
@@ -60,6 +67,12 @@ config_query_option XORG_SERVER_OPTS
\
"--disable-dri"
&&

config_query_option XORG_SERVER_OPTS \
+ "Build DRI2 extension?" \
+ y \
+ "--enable-dri2" \
+ "--disable-dri2"
&&
+
+config_query_option XORG_SERVER_OPTS \
"Build Security extension?" \
y \
"--enable-xcsecurity" \
@@ -72,30 +85,12 @@ config_query_option XORG_SERVER_OPTS
\
"--disable-xace"
&&

config_query_option XORG_SERVER_OPTS \
- "Build XC_APPGROUP extension?" \
- y \
- "--enable-appgroup" \
- "--disable-appgroup"
&&
-
-config_query_option XORG_SERVER_OPTS \
"Build XCalibrate extension?" \
n \
"--enable-xcalibrate" \
"--disable-xcalibrate"
&&

config_query_option XORG_SERVER_OPTS \
- "Build TOG_CUP extension?" \
- y \
- "--enable-cup" \
- "--disable-cup"
&&
-
-config_query_option XORG_SERVER_OPTS \
- "Build Extended-Visual-Information extension?" \
- y \
- "--enable-evi" \
- "--disable-evi"
&&
-
-config_query_option XORG_SERVER_OPTS \
"Build Multibuffer extension?" \
y \
"--enable-multibuffer" \
@@ -162,6 +157,18 @@ config_query_option XORG_SERVER_OPTS
\
n \
"--enable-xsdl" \
"--disable-xsdl"
&&
+
+config_query_option XORG_SERVER_OPTS \
+ "Build the kdrive Xfbdev server (EXPERIMENTAL)?" \
+ n \
+ "--enable-xfbdev" \
+ "--disable-xfbdev"
&&
+
+config_query_option XORG_SERVER_OPTS \
+ "Build the kdrive Xfake server (EXPERIMENTAL)?" \
+ n \
+ "--enable-xfake" \
+ "--disable-xfake"
&&
# this tends to break stuff badly
config_query_option XORG_SERVER_OPTS \
"Install Xorg server as owned by root with setuid bit
(EXPERIMENTAL)?" \
@@ -177,20 +184,17 @@ config_query_option XORG_SERVER_OPTS
\
"--enable-secure-rpc" \
"--disable-secure-rpc"
&&

-#
-## Broken at the moment (20061021)
-#
config_query_option XORG_SERVER_OPTS \
- "Build xorgcfg GUI configuration utility?" \
+ "Build the xfree86 DDX utils?" \
n \
- "--enable-xorgcfg" \
- "--disable-xorgcfg"
&&
+ "--enable-xfree86-utils" \
+ "--disable-xfree86-utils"
&&

config_query_option XORG_SERVER_OPTS \
- "Build kbd_mode utility?" \
+ "Build string registry module?" \
y \
- "--enable-kbd_mode" \
- "--disable-kbd_mode"
&&
+ "--enable-registry" \
+ "--disable-registry"
&&

config_query_option XORG_SERVER_OPTS \
"Enable builtin bitmap fonts?" \
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 60db9c9..e3b71af 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -4,7 +4,7 @@
##Check this on updates
depends libxv "--enable-xv" &&
# workaround until: https://bugs.freedesktop.org/show_bug.cgi?id=6009
-# get's fixed
+# get's fixed, bug still on hold 2009-02-28
if list_find "$XORG_SERVER_OPTS" "--enable-dri"; then
depends libxinerama '--enable-xinerama'
else
@@ -14,6 +14,10 @@ else
"Build Xinerama extension"
fi &&
##
+optional_depends libselinux \
+ "--enable-xselinux" \
+ "--disable-xselinux" \
+ "Enable SELinux support" &&
optional_depends libxevie \
"--enable-xevie" \
"--disable-xevie" \
@@ -26,6 +30,10 @@ optional_depends libxscrnsaver \
"--enable-screensaver" \
"--disable-screensaver" \
"Build ScreenSaver extension" &&
+optional_depends libxvmc \
+ "--enable-xvmc" \
+ "--disable-xvmc" \
+ "Enable support for XvMC" &&
optional_depends dbus \
"--enable-config-dbus" \
"--disable-config-dbus" \
@@ -35,16 +43,16 @@ optional_depends hal \
"--disable-config-hal" \
"Enable HAL support" &&

-#optional_depends libdmx \
-# "--enable-dmx" \
-# "--disable-dmx" \
-# "Build DMX server" &&
+#optional_depends libdmx \
+# "--enable-dmx" \
+# "--disable-dmx" \
+# "Build DMX server" &&
# apparently now needed forcing/or breaks way to much
depends freetype2 "--enable-freetype" &&
depends libxfontcache "--enable-fontcache" &&
depends libxxf86dga "--enable-dga" &&
depends libxcomposite "--enable-composite" &&
-depends libxxf86misc "--enable-xf86misc" &&
+#depends libxxf86misc "--enable-xf86misc" &&
depends libxxf86vm "--enable-xf86vidmode" &&
depends libxi &&
depends util-macros &&
@@ -76,7 +84,7 @@ depends xextproto &&
depends xf86bigfontproto &&
depends xf86dgaproto &&
depends xf86driproto &&
-depends xf86miscproto &&
+#depends xf86miscproto &&
depends xf86rushproto &&
depends xf86vidmodeproto &&
depends xineramaproto &&
@@ -89,8 +97,7 @@ depends xtrans &&
depends libxau &&
depends libxkbfile &&
depends libxdmcp &&
-depends libxxf86misc &&
-depends libxxf86vm &&
+#depends libxxf86misc &&
depends libdrm &&
depends liblbxutil &&
depends libxres &&
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index bacc64e..81a0227 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -8,7 +8,6 @@
ENTERED=20051125
LICENSE[0]=XCL
SECURITY_PATCH=4
- PATCHLEVEL=2
SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx)"
cat << EOF
X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx), the core of the X
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 1076deb..5da65ab 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -13,6 +13,15 @@
* CONFIGURE: Moved xf86-video-vga from common to uncommon (doesn't
even build)
* DEPENDS: Moved xf86-video-vga from common to uncommon (doesn't even
build)

+2009-02-28 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.6.0
+ * BUILD: updated
+ * CONFIGURE: updated
+ * DEPENDS: updated
+ * PRE_BUILD: removed evdev patch, updated gl_select
+ * evdev-flush.patch: removed
+ * gl_select.patch: updated
+
2009-02-20 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* FINAL: left this one out

diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
old mode 100644
new mode 100755

[SM-Commit] GIT changes to master grimoire by Eric Sandall (77c00988efc71e933ba78310844f1fc4b579353c), Eric Sandall, 04/24/2009