Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (f4a92ef86e6c6bd6e18fb16a5fbef7cf55c618d6)
  • Date: Thu, 17 Jul 2014 08:10:09 -0500

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

xorg-app/weston/DEPENDS | 1 +
xorg-app/weston/HISTORY | 3 +++
xorg-driver/xf86-video-ati/DEPENDS | 10 +++-------
xorg-driver/xf86-video-ati/HISTORY | 3 +++
xorg-proto/fontsproto/DETAILS | 4 ++--
xorg-proto/fontsproto/HISTORY | 3 +++
xorg-xserver/xorg-server/CONFIGURE | 6 ++++++
xorg-xserver/xorg-server/DEPENDS | 15 ++++++++++++++-
xorg-xserver/xorg-server/DETAILS | 4 ++--
xorg-xserver/xorg-server/HISTORY | 7 +++++++
xorg-xserver/xorg-server/PRE_SUB_DEPENDS | 3 ++-
xorg-xserver/xorg-server/SUB_DEPENDS | 3 +++
12 files changed, 49 insertions(+), 13 deletions(-)

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

weston - add optional libinput

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

xf86-video-ati - glamor now comes from xorg-serve

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

fontsproto: => 2.1.3

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

xorg-xserver: => 1.16.0

diff --git a/xorg-app/weston/DEPENDS b/xorg-app/weston/DEPENDS
index 9819a76..bd15514 100755
--- a/xorg-app/weston/DEPENDS
+++ b/xorg-app/weston/DEPENDS
@@ -14,6 +14,7 @@ optional_depends libxkbcommon '' '--disable-xkbcommon'
'keyboard support' &&
optional_depends lcms2 '' '' 'colour management' &&
optional_depends colord '' '' 'colour management daemon' &&
optional_depends libunwind '' '--disable-libunwind' 'for backtraces'&&
+optional_depends libinput '--enable-libinput-backend' '' 'use libinput' &&
optional_depends libxcb '--enable-x11-compositor' \
'--disable-x11-compositor' \
'Build the X11 compositor' &&
diff --git a/xorg-app/weston/HISTORY b/xorg-app/weston/HISTORY
index 3f32c0d..4805444 100644
--- a/xorg-app/weston/HISTORY
+++ b/xorg-app/weston/HISTORY
@@ -1,3 +1,6 @@
+2014-06-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add optional libinput
+
2014-05-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.0
* DEPENDS: mesalib => MESALIB
diff --git a/xorg-driver/xf86-video-ati/DEPENDS
b/xorg-driver/xf86-video-ati/DEPENDS
index 5ca54b2..787192f 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -2,18 +2,14 @@ depends -sub "RADEON" libdrm &&
depends util-macros &&
depends xineramaproto &&
depends xproto &&
-depends xorg-server &&
-depends glamor &&
-
-depends MESALIB
-if is_depends_enabled $SPELL mesalib;then
- sub_depends mesalib DRI
-fi &&

if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then
depends git
fi &&

+depends -sub GLAMOR xorg-server &&
+depends -sub DRI OPENGL &&
+
optional_depends UDEV \
'--enable-udev' \
'--disable-udev' \
diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index a8cca3e..3b1a3e4 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,6 @@
+2014-07-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: glamor now comes from xorg-server
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/xorg-proto/fontsproto/DETAILS b/xorg-proto/fontsproto/DETAILS
index ab05a38..f9edda1 100755
--- a/xorg-proto/fontsproto/DETAILS
+++ b/xorg-proto/fontsproto/DETAILS
@@ -1,6 +1,6 @@
SPELL=fontsproto
- VERSION=2.1.2
-
SOURCE_HASH=sha512:728d4df6d65b811cc2516cddcd1ba53aadf75521450baaad27ae10448e8eda66c4898369b4cff13874c26b5541cbac231190f7f32f873939aa6d4a72ee720050
+ VERSION=2.1.3
+ SOURCE_HASH=sha512:
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/proto/${SOURCE}
diff --git a/xorg-proto/fontsproto/HISTORY b/xorg-proto/fontsproto/HISTORY
index 0538198..1d773dc 100644
--- a/xorg-proto/fontsproto/HISTORY
+++ b/xorg-proto/fontsproto/HISTORY
@@ -1,3 +1,6 @@
+2014-06-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.1.3
+
2012-04-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.1.2

diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index 39d3584..af959dc 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -12,6 +12,12 @@ config_query_option XORG_SERVER_OPTS
\
"--disable-docs" &&

config_query_option XORG_SERVER_OPTS \
+ "Build Glamor, for radeon?" \
+ n \
+ "--enable-glamor" \
+ "--disble-glamor" &&
+
+config_query_option XORG_SERVER_OPTS \
"Install libxf86config?" \
n \
"--enable-install-libxf86config" \
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index eefd2b3..20e4d47 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -38,7 +38,7 @@ optional_depends libxvmc \
"Enable support for XvMC" &&

optional_depends UDEV \
- "--enable-config-udev --disable-config-dbus --disable-config-hal" \
+ "--enable-config-udev --disable-config-hal" \
"--disable-config-udev" \
"enable udev kernel config support" &&

@@ -53,6 +53,19 @@ if is_depends_enabled $SPELL dmxproto;then
depends libxpm &&
depends libxmu
fi &&
+
+
+if list_find "$XORG_SERVER_OPTS" "--enable-glamor"; then
+ depends libepoxy
+fi &&
+
+optional_depends nettle '--with-sha1=libnettle' '' 'SHA1 crypto support' &&
+optional_depends wayland '--enable-xwayland' \
+ '--disable-xwayland' \
+ 'build Xwayland DDX' &&
+
+optional_depends libunwind '' '' 'debugging support' &&
+
depends freetype2 &&
depends libxfontcache &&
depends libxxf86dga "--enable-dga" &&
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 8d520ed..e17bea4 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
SPELL=xorg-server
- VERSION=1.15.1
-
SOURCE_HASH=sha512:93c9831d354f926243d047bc05a057484e69914410914193d7e8e8b4724ee7b74f57476f1ba59cae5a845e69565ff5529ec25e45322200de9aa38cdf6394257f
+ VERSION=1.16.0
+
SOURCE_HASH=sha512:eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662
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 bec464c..5f8b00b 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,10 @@
+2014-07-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 1.16.0
+ * CONFLICTS: added, for glamor
+ * CONFIGURE: query for glamor support
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: add glamor support
+ * DEPENDS: add libepoxy, optional wayland, nettle
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB

diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
index 472c897..4b27104 100755
--- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -2,7 +2,8 @@ case $THIS_SUB_DEPENDS in
XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;;
DPMS) list_find "$XORG_SERVER_OPTS" "--enable-dpms" && return 0 ;;
DRI) list_find "$XORG_SERVER_OPTS" "--enable-dri" && return 0 ;;
- KDRIVE) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" && return 0 ;;
+ GLAMOR) list_find "$XORG_SERVER_OPTS" "--enable-dri" && return 0 ;;
+ KDRIVE) list_find "$XORG_SERVER_OPTS" "--enable-glamor" && return 0 ;;
# Xephyr requires Kdrive and list_find returns true if at least one matches
XEPHYR) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" &&
list_find "$XORG_SERVER_OPTS" "--enable-xephyr" && return 0 ;;
diff --git a/xorg-xserver/xorg-server/SUB_DEPENDS
b/xorg-xserver/xorg-server/SUB_DEPENDS
index c4a4d1f..8300bcd 100755
--- a/xorg-xserver/xorg-server/SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/SUB_DEPENDS
@@ -7,6 +7,9 @@ case "$THIS_SUB_DEPENDS" in
DRI) message "${MESSAGE_COLOR}DRI extension required, forcing
it.${DEFAULT_COLOR}" &&
list_remove XORG_SERVER_OPTS "--disable-dri" &&
list_add XORG_SERVER_OPTS "--enable-dri" ;;
+ GLAMOR) message "${MESSAGE_COLOR}Glamor required, forcing
it.${DEFAULT_COLOR}" &&
+ list_remove XORG_SERVER_OPTS "--disable-glamor" &&
+ list_add XORG_SERVER_OPTS "--enable-glamor" ;;
KDRIVE) message "${MESSAGE_COLOR}Forcing Kdrive...${DEFAULT_COLOR}" &&
list_remove XORG_SERVER_OPTS "--disable-kdrive" &&
list_add XORG_SERVER_OPTS "--enable-kdrive" ;;



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (f4a92ef86e6c6bd6e18fb16a5fbef7cf55c618d6), Treeve Jelbert, 07/17/2014

Archive powered by MHonArc 2.6.24.

Top of Page