[SM-Commit] GIT changes to master xorg-modular grimoire by Eric Sandall (394ed5ed20d734330c38d4d66862a6024cea147a)

Eric Sandall scm at mail.sourcemage.org
Wed Nov 15 01:52:32 EST 2006


GIT changes to master xorg-modular grimoire by Eric Sandall <sandalle at sourcemage.org>:

 dev/null                                    |binary
 xorg-app/xdm/CONFIGURE                      |   14 ---------
 xorg-app/xdm/DEPENDS                        |   43 ++++++++++++++++++++++------
 xorg-app/xdm/DETAILS                        |    7 ++--
 xorg-app/xdm/HISTORY                        |    9 +++++
 xorg-app/xdm/xdm-1.1.1.tar.bz2.sig          |binary
 xorg-lib/libxmu/DETAILS                     |    7 ++--
 xorg-lib/libxmu/HISTORY                     |    8 +++--
 xorg-lib/libxmu/libXmu-1.0.3.tar.bz2.sig    |binary
 xorg-proto/xtrans/DEPENDS                   |    1 
 xorg-proto/xtrans/DETAILS                   |   26 ----------------
 xorg-proto/xtrans/HISTORY                   |    6 ---
 xorg-proto/xtrans/WIP                       |    1 
 xorg-proto/xtrans/xtrans-0.99.2.tar.bz2.sig |    0 
 14 files changed, 58 insertions(+), 64 deletions(-)

New commits:
commit 394ed5ed20d734330c38d4d66862a6024cea147a
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "Updated xf86-input-keyboard to 1.2.0"
    
    This reverts commit bf55a6a8a93aa4bfc139ca525a0c39d3d22ed8e7.
    
    Requires xorg-server 1.2.99.0, which requires mesalib cvs, so not ready yet.

commit f7cf52550e94af98514f8fc427e03cbd79fddf90
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Removed queries for PAM and XPrint and added optional dependencies on libxp, linux-pam, and libxft for xdm

commit 86db524b81382eb86e71a97d91641bb03a60b28f
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Updated xdm to 1.1.1

commit 5c6c1678150c8390dd9c7719d7f01535d2512f37
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "Updated xorg-server to 1.2.99.0"
    
    This reverts commit 0dc720a8cdf765e1bf704b835a3e8fd66de9c12e.
    
    According to ruskie, this requires mesalib cvs

commit fb2998f913b7b5d5ea8c38ede090ed0e36c6f4f5
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Remove xtrans from xorg-proto, already exists in proper place at xorg-libs

commit 0dc720a8cdf765e1bf704b835a3e8fd66de9c12e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Updated xorg-server to 1.2.99.0

commit bf55a6a8a93aa4bfc139ca525a0c39d3d22ed8e7
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Updated xf86-input-keyboard to 1.2.0

commit 2a4207f5f6db899a1e98f9fea1733f9e61ae34e4
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Updated libxmu to 1.0.3

diff --git a/xorg-app/xdm/CONFIGURE b/xorg-app/xdm/CONFIGURE
index 290ea53..8b8ac0f 100755
--- a/xorg-app/xdm/CONFIGURE
+++ b/xorg-app/xdm/CONFIGURE
@@ -1,9 +1,3 @@
-config_query_option XDM_OPTS       \
-          'Enable XPrint support?'    \
-          y                           \
-          '--enable-xprint'           \
-          '--disable-xprint'          &&
-
 config_query_option XDM_OPTS             \
           'Enable UNIX domain socket transport?'    \
           y                                         \
@@ -32,10 +26,4 @@ config_query_option XDM_OPTS           \
           'Display xpm logos in greeter?'   \
           y                                  \
           '--enable-xpm-logos'               \
-          '--disable-xpm-logos'              &&
-
-config_query_option XDM_OPTS              \
-          'Use PAM for authentication?'   \
-          y                               \
-          '--with-pam'                    \
-          '--without-pam'                 
+          '--disable-xpm-logos'
diff --git a/xorg-app/xdm/DEPENDS b/xorg-app/xdm/DEPENDS
index 807f4e3..6d8c2cf 100755
--- a/xorg-app/xdm/DEPENDS
+++ b/xorg-app/xdm/DEPENDS
@@ -1,8 +1,35 @@
-depends util-macros &&
-depends libxaw &&
-depends libxdmcp &&
-depends xproto &&
-depends libxau &&
-depends libxt &&
-optional_depends libxinerama "" "" "Someone needs to describe this nicely." "xorg-modular" &&
-optional_depends libxpm "" "" "Someone needs to describe this nicely." "xorg-modular"
+depends  libxau       &&
+depends  libxaw       &&
+depends  libxdmcp     &&
+depends  libxt        &&
+depends  util-macros  &&
+depends  xproto       &&
+
+optional_depends  libxft                    \
+                  '--with-xft'              \
+                  '--without-xft'           \
+                  'for Xft font rendering'  \
+                  "xorg-modular"            &&
+
+optional_depends  libxinerama                               \
+                  ""                                        \
+                  ""                                        \
+                  "Someone needs to describe this nicely."  \
+                  "xorg-modular"                            &&
+
+optional_depends  libxp                 \
+                  '--enable-xprint'     \
+                  '--disable-xprint'    \
+                  'for XPrint support'  \
+                  "xorg-modular"        &&
+
+optional_depends  libxpm                                    \
+                  ""                                        \
+                  ""                                        \
+                  "Someone needs to describe this nicely."  \
+                  "xorg-modular"                            &&
+
+optional_depends  linux-pam                                      \
+                  '--with-pam'                                   \
+                  '--without-pam'                                \
+                  'for Pluggable Authentication Module support'
diff --git a/xorg-app/xdm/DETAILS b/xorg-app/xdm/DETAILS
index 3455f18..6da8678 100755
--- a/xorg-app/xdm/DETAILS
+++ b/xorg-app/xdm/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xdm
              PKG=xdm
-         VERSION=1.1.0
+         VERSION=1.1.1
         XORG_VER=X11R7.1
           SOURCE=${PKG}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-     SOURCE_HASH=sha512:fbdc99c83e03821ca9e89acfdb0d3ffe10c6405ecddbd87612b66d6ee53d40de774814ff09cefaf8c8ff3fcc6a4ccb0dd918c110cc27ba205c19511d39550f36
+#     SOURCE_HASH=sha512:fbdc99c83e03821ca9e89acfdb0d3ffe10c6405ecddbd87612b66d6ee53d40de774814ff09cefaf8c8ff3fcc6a4ccb0dd918c110cc27ba205c19511d39550f36
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+      LICENSE[0]=XCL
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
-      LICENSE[0]=XCL
            SHORT="Module xdm for xorg"
 cat << EOF
 The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY
index 2f92e22..8610db9 100644
--- a/xorg-app/xdm/HISTORY
+++ b/xorg-app/xdm/HISTORY
@@ -1,3 +1,9 @@
+2006-11-14 Eric Sandall <eric at sandall.us>
+	* DETAILS: Updated to 1.1.1
+	* DEPENDS: Added optional dependencies on linux-pam, libxp, and libxft
+	* CONFIGURE: Removed queries for xpring and PAM support (taken care of
+	  in DEPENDS now)
+
 2006-10-23 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: DOH forgot to update the hash
 
@@ -28,7 +34,7 @@
 	  updated SOURCE, SOURCE_URL, and SOURCE_DIRECTORY
 
 2005-12-18 Robin Cook <rcook at wyrms.net>
-        * DEPENDS: removed all the --fixme & --dontfixme
+	* DEPENDS: removed all the --fixme & --dontfixme
 
 2005-12-15 Robin Cook <rcook at wyrms.net>
 	* DETAILS: Updated VERSION to 1.0.0
@@ -55,3 +61,4 @@
 
 2005-11-25 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS, HISTORY: created spell
+
diff --git a/xorg-app/xdm/xdm-1.1.1.tar.bz2.sig b/xorg-app/xdm/xdm-1.1.1.tar.bz2.sig
new file mode 100644
index 0000000..4b21d58
Binary files /dev/null and b/xorg-app/xdm/xdm-1.1.1.tar.bz2.sig differ
diff --git a/xorg-lib/libxmu/DETAILS b/xorg-lib/libxmu/DETAILS
index 208fa62..1c7a1b7 100755
--- a/xorg-lib/libxmu/DETAILS
+++ b/xorg-lib/libxmu/DETAILS
@@ -1,14 +1,15 @@
            SPELL=libxmu
              PKG=libXmu
-         VERSION=1.0.2
+         VERSION=1.0.3
         XORG_VER=X11R7.1
           SOURCE=${PKG}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
-     SOURCE_HASH=sha512:54722d972403ca76568e4c225a6b12457728f0a0701b1da5d6bf92d03c25c04c57d0bd0eda11c5a74dbbd3f1446a5aafe06734d1ef07e3dce3ce9a101267c390
+#     SOURCE_HASH=sha512:54722d972403ca76568e4c225a6b12457728f0a0701b1da5d6bf92d03c25c04c57d0bd0eda11c5a74dbbd3f1446a5aafe06734d1ef07e3dce3ce9a101267c390
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+      LICENSE[0]=XCL
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
-      LICENSE[0]=XCL
            SHORT="Module libxmu for xorg"
 cat << EOF
 The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-lib/libxmu/HISTORY b/xorg-lib/libxmu/HISTORY
index 6bcb5fd..8aabcf1 100644
--- a/xorg-lib/libxmu/HISTORY
+++ b/xorg-lib/libxmu/HISTORY
@@ -1,3 +1,6 @@
+2006-11-14 Eric Sandall <eric at sandall.us>
+	* DETAILS: Updated to 1.0.3
+
 2006-10-22 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: version 1.0.2
 
@@ -29,8 +32,8 @@
 	* DETAILS: Updated SOURCE_URL
 
 2005-11-27 Robin Cook <rcook at wyrms.net>
-       * DEPENDS: added gawk, pkgconfig, libtool
-       * CONFIGURE: added
+	* DEPENDS: added gawk, pkgconfig, libtool
+	* CONFIGURE: added
 
 2005-11-25 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DEPENDS: auto-created or updated
@@ -43,3 +46,4 @@
 
 2005-11-25 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS, HISTORY: created spell
+
diff --git a/xorg-lib/libxmu/libXmu-1.0.3.tar.bz2.sig b/xorg-lib/libxmu/libXmu-1.0.3.tar.bz2.sig
new file mode 100644
index 0000000..c38f56f
Binary files /dev/null and b/xorg-lib/libxmu/libXmu-1.0.3.tar.bz2.sig differ
diff --git a/xorg-proto/xtrans/DEPENDS b/xorg-proto/xtrans/DEPENDS
deleted file mode 100755
index f9e25c3..0000000
--- a/xorg-proto/xtrans/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gawk
diff --git a/xorg-proto/xtrans/DETAILS b/xorg-proto/xtrans/DETAILS
deleted file mode 100755
index e8d45f6..0000000
--- a/xorg-proto/xtrans/DETAILS
+++ /dev/null
@@ -1,26 +0,0 @@
-          SPELL=xtrans
-         VERSION=0.99.2
-          SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
-   SOURCE_URL[0]=http://xorg.freedesktop.org/releases/X11R7.0-RC3/lib/${SOURCE}
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-      LICENSE[0]=XCL
-        WEB_SITE=http://xorg.freedesktop.org/
-         ENTERED=20051124
-         UPDATED=20051124
-           SHORT="A Protocol module of X.Org"
-cat << EOF
-The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
-maintain the official Public Implementation of X11.
-
-The XOrg Foundation invites anyone who has an interest to join in. Anyone
-may create and work on a branch in the repository. See XOrgRepository for
-more information about the XOrg Foundation repository.
-
-The repository consists of an imported XFree86 tree that is very close to
-their 4.4 release. Just before its 4.4 release, XFree86 adopted a new
-licensing scheme incompatible with the GPL. For this reason, we have
-recreated its tree as closely as possible without importing files affected
-by the new license. Our tree is being referred to as simply "XOrg", and a
-public release will be made shortly.
-EOF
diff --git a/xorg-proto/xtrans/HISTORY b/xorg-proto/xtrans/HISTORY
deleted file mode 100644
index dc403ea..0000000
--- a/xorg-proto/xtrans/HISTORY
+++ /dev/null
@@ -1,6 +0,0 @@
-2005-12-14 Robin Cook <rcook at wyrms.net>
-	* DETAILS: Updated SOURCE_URL
-
-2005-11-24 Robin Cook <rcook at wyrms.net>
-	* INITIAL: break up of xorg into modules X11R7.0.0	  
-
diff --git a/xorg-proto/xtrans/WIP b/xorg-proto/xtrans/WIP
deleted file mode 100755
index 94b065d..0000000
--- a/xorg-proto/xtrans/WIP
+++ /dev/null
@@ -1 +0,0 @@
-Work in progress to get Modular version working
diff --git a/xorg-proto/xtrans/xtrans-0.99.2.tar.bz2.sig b/xorg-proto/xtrans/xtrans-0.99.2.tar.bz2.sig
deleted file mode 100644
index 06eb4c2..0000000
Binary files a/xorg-proto/xtrans/xtrans-0.99.2.tar.bz2.sig and /dev/null differ



More information about the SM-Commit mailing list