sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (b6a1fa956b3ef39befb4245c7cc20638e44394ce)

From: Treeve Jelbert <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (b6a1fa956b3ef39befb4245c7cc20638e44394ce)
Date: Sat, 28 Dec 2013 03:39:52 -0600

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

xorg-proto/xextproto/DETAILS | 4 +-
xorg-proto/xextproto/HISTORY | 3 ++
xorg-xserver/xorg-server/BUILD | 1
xorg-xserver/xorg-server/CONFIGURE | 10 +------
xorg-xserver/xorg-server/DEPENDS | 51
+++++++------------------------------
xorg-xserver/xorg-server/DETAILS | 4 +-
xorg-xserver/xorg-server/HISTORY | 6 ++++
7 files changed, 26 insertions(+), 53 deletions(-)

New commits:
commit b6a1fa956b3ef39befb4245c7cc20638e44394ce
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xorg-server: => 1.15.0

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

xextproto: => 7.3.0

diff --git a/xorg-proto/xextproto/DETAILS b/xorg-proto/xextproto/DETAILS
index 68f3a9c..acf6892 100755
--- a/xorg-proto/xextproto/DETAILS
+++ b/xorg-proto/xextproto/DETAILS
@@ -1,6 +1,6 @@
SPELL=xextproto
- VERSION=7.2.1
-
SOURCE_HASH=sha512:c2b60f07c16f850c5fce2aeec071654d34d88f9c775a4386286f597bcce437a124ed3f8c9f7ddc58427c1413f5326a26ee15866fd6725c6315e6da32b323cf33
+ VERSION=7.3.0
+
SOURCE_HASH=sha512:238beed85fcf6fe5b0809e52814dd44fa45fe6868239990086cb8dd2c446292dd4794698abd07ed10bd146a7096c1679f7160da226f9e861dfaf6c8e22315d61
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
diff --git a/xorg-proto/xextproto/HISTORY b/xorg-proto/xextproto/HISTORY
index 0e5f061..86325b5 100644
--- a/xorg-proto/xextproto/HISTORY
+++ b/xorg-proto/xextproto/HISTORY
@@ -1,3 +1,6 @@
+2012-12-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.3.0
+
2012-05-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.2.1

diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index c58b530..e8f28bc 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -20,7 +20,6 @@ fi &&
message CFLAGS=$CFLAGS
OPTS="${XORG_SERVER_OPTS} \
--with-xkb-output=$TRACK_ROOT/var/lib/xkb \
- --with-dri-driver-path=$TRACK_ROOT/usr/lib/dri \
--with-fontrootdir=${TRACK_ROOT}/usr/share/fonts/X11 \
--disable-secure-rpc \
--disable-xwin \
diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index b298eda..39d3584 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -8,8 +8,8 @@ config_query XORG_XINITRC_XSESSION
\
config_query_option XORG_SERVER_OPTS \
"Build documentation?" \
n \
- "--enable-builddocs" \
- "--disable-builddocs"
&&
+ "--enable-docs" \
+ "--disable-docs" &&

config_query_option XORG_SERVER_OPTS \
"Install libxf86config?" \
@@ -85,12 +85,6 @@ config_query_option XORG_SERVER_OPTS
\
"--disable-xace"
&&

config_query_option XORG_SERVER_OPTS \
- "Build XCalibrate extension?" \
- n \
- "--enable-xcalibrate" \
- "--disable-xcalibrate"
&&
-
-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 62fe785..4a90e82 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -24,9 +24,10 @@ optional_depends dri2proto \
"--enable-dri2" \
"--disable-dri2" \
"Enable DRI2 extension" &&
-if is_depends_enabled $SPELL dri2proto ; then
-force_depends dri2proto
-fi &&
+optional_depends dri3proto \
+ "--enable-dri3" \
+ "--disable-dri3" \
+ "Enable DRI3 extension" &&
optional_depends libxscrnsaver \
"--enable-screensaver" \
"--disable-screensaver" \
@@ -36,32 +37,10 @@ optional_depends libxvmc \
"--disable-xvmc" \
"Enable support for XvMC" &&

-#
-# May only select one:
-# configure: error: Hotplugging through both libudev and dbus/hal not allowed
-#
-# NOTE: as hal depends on dbus, we can safely enable/disable dbus's configure
-# options with hal
-#
-# 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)
-#
-
-message "You can either use hal+dbus OR udev for hotplugging" &&
-message "but NOT both" &&
-optional_depends hal \
- "--enable-config-hal --enable-config-dbus --disable-config-udev" \
- "--disable-config-hal --disable-config-dbus" \
- "Enable HAL support" &&
-
-if ! is_depends_enabled $SPELL hal; then
optional_depends UDEV \
"--enable-config-udev --disable-config-dbus --disable-config-hal" \
"--disable-config-udev" \
- "enable udev kernel config support"
-fi &&
+ "enable udev kernel config support" &&

optional_depends dmxproto \
"--enable-dmx" \
@@ -85,9 +64,7 @@ depends xinit &&
depends xhost &&
depends xauth &&
depends bigreqsproto &&
-simple_version_check_force_depends bigreqsproto 103 3 &&
depends pixman &&
-simple_version_check_force_depends pixman 160 3 &&
depends compositeproto &&
depends damageproto &&
depends evieext &&
@@ -96,34 +73,28 @@ depends fontcacheproto &&
depends fontsproto &&
depends glproto &&
depends inputproto &&
-simple_version_check_force_depends inputproto 20 2 &&
depends kbproto &&
depends randrproto &&
+optional_depends presentproto \
+ '' \
+ '--disable-present' \
+ 'build Present extension' &&
+depends libxshmfence &&

if list_find "$XORG_SERVER_OPTS" "--enable-record"; then
- depends recordproto &&
- simple_version_check_force_depends recordproto 113 3
+ depends recordproto
fi &&

depends renderproto &&
-# to complicated to figure out atm since it goes from 0.9.3 -> 0.11
-if spell_ok renderproto
- then
- force_depends renderproto
-fi &&
depends resourceproto &&
depends scrnsaverproto &&
depends videoproto &&
depends xcmiscproto &&
-simple_version_check_force_depends xcmiscproto 11 2 &&
depends xextproto &&
depends xf86bigfontproto &&
depends xf86dgaproto &&
-simple_version_check_force_depends xf86dgaproto 21 2 &&
depends xf86driproto &&
-simple_version_check_force_depends xf86driproto 205 3 &&
depends xf86vidmodeproto &&
-simple_version_check_force_depends xf86vidmodeproto 23 2 &&
depends xineramaproto &&
depends xproto &&
depends xproxymanagementprotocol &&
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 568d9ef..db476b4 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
SPELL=xorg-server
- VERSION=1.14.5
-
SOURCE_HASH=sha512:7b737631fb9a7a6e305c2281b854cde0e1cc62ba546adf008582e2e8a54089df519ad4b79705d0f08f40255e4c607b726299ee4e50e2281efaa871c071e7771b
+ VERSION=1.15.0
+
SOURCE_HASH=sha512:7bf6a9eff9cc606defbaa46600a4d7b41896f4304e06af745a2717687853c7e92b191481f1f4d6d98ef0adfe5f404c9e3997ebd98553c60b626cd1bb53c58d9d
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index c1698be..f92d25b 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,9 @@
+2013-12-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 1.15.0
+ * DEPENDS: add presentproto, dri3proto, libxshmfence
+ remove -force_depends usage
+ * BUILD, CONFIGURE: remove obsolete options
+
2013-12-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: 1.14.5

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (b6a1fa956b3ef39befb4245c7cc20638e44394ce), Treeve Jelbert, 12/28/2013