Skip to Content.
Sympa Menu

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

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 (f02fada025d14d812b48b70f18acdcff1f8d9f55)
  • Date: Sun, 2 Aug 2009 13:20:00 -0500

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

xorg-app/rstart/DETAILS | 14 ++++++--------
xorg-app/rstart/HISTORY | 8 ++++++++
xorg-app/rstart/rstart-1.0.3.tar.bz2.sig |binary
xorg-driver/xf86-video-ati/DEPENDS | 2 +-
xorg-driver/xf86-video-ati/HISTORY | 3 ---
xorg-driver/xf86-video-nv/DEPENDS | 2 +-
xorg-driver/xf86-video-nv/HISTORY | 3 ---
xorg-lib/xtrans/DETAILS | 6 ++----
xorg-lib/xtrans/HISTORY | 3 +++
xorg-xserver/xorg-server/HISTORY | 4 ----
xorg-xserver/xorg-server/PRE_SUB_DEPENDS | 1 -
xorg-xserver/xorg-server/SUB_DEPENDS | 1 -
12 files changed, 21 insertions(+), 26 deletions(-)

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

Revert "xorg-server: Allow forcing libxf86config (Bug #15299)"

This reverts commit 04437dd55fc3c190a812ba682bd5f35341e93541.

This was fixed in xorg-server 1.6.3 RC release a.k.a. 1.6.2.901,
See http://lists.freedesktop.org/archives/xorg-devel/2009-July/001338.html

Conflicts:

xorg-xserver/xorg-server/HISTORY
(cherry picked from commit b552f539f8a2b25507735bf7af9587f2043a36cc)

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

Revert "xf86-video-nv: Requires libxf86config in xorg-server (Bug #15299)"

This reverts commit b2c56880b22d5e26759a5a48f35401dece98c99d.

This was fixed in xorg-server 1.6.3 RC release a.k.a. 1.6.2.901,
See http://lists.freedesktop.org/archives/xorg-devel/2009-July/001338.html
(cherry picked from commit 3ad4d71a1488215207461765131cda7689c967c7)

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

Revert "xf86-video-ati: Requires libxf86config in xorg-server (Bug
#15299)"

This reverts commit 2d85eadadd71e156c2f6a97ce6b5cfd4d8ddbe77.

This was fixed in xorg-server 1.6.3 RC release a.k.a. 1.6.2.901,
See http://lists.freedesktop.org/archives/xorg-devel/2009-July/001338.html
(cherry picked from commit c4339f7f7a6b99c4e37074005693c2c0853c8d31)

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

xtrans: Removed XORG_VER and PKG
(cherry picked from commit f1702721ead781dae8721689f14bf3a3a3d27bfc)

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

rstart: Removed BUILD_API=2, it is the default
(cherry picked from commit 3a2089ce11731b4f8c86e6fa5becba54d39c76ee)

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

rstart: Updated to 1.0.3
SOURCE matches upstream posted MD5
No longer uses XORG_VER or PKG
SOURCE_URL changed to use
http://xorg.freedesktop.org/releases/individual/app/
(cherry picked from commit 0fbdfa37144979701b5d6ce24786aca5fedf775c)

diff --git a/xorg-app/rstart/DETAILS b/xorg-app/rstart/DETAILS
index 5e9b5d5..2cbfec0 100755
--- a/xorg-app/rstart/DETAILS
+++ b/xorg-app/rstart/DETAILS
@@ -1,16 +1,14 @@
SPELL=rstart
- PKG=rstart
- VERSION=1.0.2
- XORG_VER=X11R7.1
- SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/app/${SOURCE}
-
SOURCE_HASH=sha512:68f8efcb4f966cceb4152bcbf19021d18a0da5b053f2485b228892c62b2fd5009f1d1c75d456d1cb91d5b0d6bb1d7566bf72a180014f2df640d304d40131a995
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+ VERSION=1.0.3
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/$SOURCE
+#
SOURCE_HASH=sha512:68f8efcb4f966cceb4152bcbf19021d18a0da5b053f2485b228892c62b2fd5009f1d1c75d456d1cb91d5b0d6bb1d7566bf72a180014f2df640d304d40131a995
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
SHORT="the X.Org remote start application"
cat << EOF
rstart is a simple implementation of a Remote Start client as defined
diff --git a/xorg-app/rstart/HISTORY b/xorg-app/rstart/HISTORY
index 3828935..fbd9418 100644
--- a/xorg-app/rstart/HISTORY
+++ b/xorg-app/rstart/HISTORY
@@ -1,3 +1,11 @@
+2009-08-02 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.0.3
+ SOURCE matches upstream posted MD5
+ No longer uses XORG_VER or PKG
+ SOURCE_URL changed to use
+ http://xorg.freedesktop.org/releases/individual/app/
+ Removed BUILD_API=2, it is the default
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/rstart/rstart-1.0.3.tar.bz2.sig
b/xorg-app/rstart/rstart-1.0.3.tar.bz2.sig
new file mode 100644
index 0000000..3f667cd
Binary files /dev/null and b/xorg-app/rstart/rstart-1.0.3.tar.bz2.sig differ
diff --git a/xorg-driver/xf86-video-ati/DEPENDS
b/xorg-driver/xf86-video-ati/DEPENDS
index 919d342..b644994 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -1,6 +1,6 @@
depends util-macros &&
depends xproto &&
-depends -sub "XF86CONFIG" xorg-server &&
+depends xorg-server &&
optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index e7db6fe..f2ad9eb 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,6 +1,3 @@
-2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Depends on libxf86config in xorg-server (Bug #15299)
-
2009-04-19 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: improve the overall SCM version

diff --git a/xorg-driver/xf86-video-nv/DEPENDS
b/xorg-driver/xf86-video-nv/DEPENDS
index d3a2067..3decf7f 100755
--- a/xorg-driver/xf86-video-nv/DEPENDS
+++ b/xorg-driver/xf86-video-nv/DEPENDS
@@ -1,3 +1,3 @@
depends util-macros &&
depends xproto &&
-depends -sub "XF86CONFIG" xorg-server
+depends xorg-server
diff --git a/xorg-driver/xf86-video-nv/HISTORY
b/xorg-driver/xf86-video-nv/HISTORY
index 5187104..7c25856 100644
--- a/xorg-driver/xf86-video-nv/HISTORY
+++ b/xorg-driver/xf86-video-nv/HISTORY
@@ -1,6 +1,3 @@
-2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Depends on libxf86config in xorg-server (Bug #15299)
-
2009-07-02 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.1.14
SOURCE matches upstream posted MD5
diff --git a/xorg-lib/xtrans/DETAILS b/xorg-lib/xtrans/DETAILS
index bd443ba..e938d33 100755
--- a/xorg-lib/xtrans/DETAILS
+++ b/xorg-lib/xtrans/DETAILS
@@ -1,12 +1,10 @@
SPELL=xtrans
- PKG=xtrans
VERSION=1.2.4
- XORG_VER=X11R7.0
- SOURCE=${PKG}-${VERSION}.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
#
SOURCE_HASH=sha512:1c6f84ed2f8cd3dec7bcfff71e15d93edaa7e25c22cf67ac9e48cf158b5867f90e6ce39355b8fc1e8b8699c46c7f5ecf428bcc0c58b44edb66843c9047e85002
SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20051125
SECURITY_PATCH=1
diff --git a/xorg-lib/xtrans/HISTORY b/xorg-lib/xtrans/HISTORY
index 0d422c0..eadc0db 100644
--- a/xorg-lib/xtrans/HISTORY
+++ b/xorg-lib/xtrans/HISTORY
@@ -1,3 +1,6 @@
+2009-08-02 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Removed PKG and XORG_VER
+
2009-07-31 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.2.4
SOURCE matches upstream posted MD5
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index dd0761e..bde1de2 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -2,10 +2,6 @@
* DETAILS: Updated to 1.6.3
SOURCE matches upstream posted MD5

-2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
- * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing libxf86config if
- required (Bug #15299)
-
2009-07-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 1.6.2
* BUILD: updated
diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
index 9d29ca3..5de1740 100755
--- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -1,5 +1,4 @@
case $THIS_SUB_DEPENDS in
- XF86CONFIG) list_find XORG_SERVER_OPTS "--enable-install-libxf86config" ;;
XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;;
DPMS) list_find XORG_SERVER_OPTS "--enable-dpms" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
diff --git a/xorg-xserver/xorg-server/SUB_DEPENDS
b/xorg-xserver/xorg-server/SUB_DEPENDS
index c27c0c4..8125f11 100755
--- a/xorg-xserver/xorg-server/SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/SUB_DEPENDS
@@ -1,5 +1,4 @@
case "$THIS_SUB_DEPENDS" in
- XF86CONFIG) list_add XORG_SERVER_OPTS "--enable-install-libxf86config" ;;
XCOMPOSITE) depends libxcomposite "--enable-composite" ;;
DPMS) list_add XORG_SERVER_OPTS "--enable-dpms" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (f02fada025d14d812b48b70f18acdcff1f8d9f55), Eric Sandall, 08/02/2009

Archive powered by MHonArc 2.6.24.

Top of Page