[SM-Commit] GIT changes to master xorg-modular grimoire by Lalo Martins (2ee3a8288fe66580be898cd6206caeecf2af68ea)

Lalo Martins scm at mail.sourcemage.org
Sun Nov 19 09:00:34 EST 2006


GIT changes to master xorg-modular grimoire by Lalo Martins <lalo at salmao.laranja.org>:

 beryl/beryl-core/DETAILS       |    8 +++++---
 beryl/beryl-core/HISTORY       |    4 ++++
 beryl/beryl-core/PRE_BUILD     |    6 ++++++
 beryl/beryl-manager/DETAILS    |    8 +++++---
 beryl/beryl-manager/HISTORY    |    4 ++++
 beryl/beryl-manager/PRE_BUILD  |    2 ++
 beryl/beryl-plugins/DETAILS    |    8 +++++---
 beryl/beryl-plugins/HISTORY    |    4 ++++
 beryl/beryl-plugins/PRE_BUILD  |    2 ++
 beryl/beryl-settings/DETAILS   |    8 +++++---
 beryl/beryl-settings/HISTORY   |    4 ++++
 beryl/beryl-settings/PRE_BUILD |    2 ++
 beryl/beryl/DETAILS            |    1 +
 beryl/emerald-themes/DETAILS   |    8 +++++---
 beryl/emerald-themes/HISTORY   |    4 ++++
 beryl/emerald-themes/PRE_BUILD |    2 ++
 beryl/emerald/DETAILS          |    9 +++++----
 beryl/emerald/HISTORY          |    4 ++++
 beryl/emerald/PRE_BUILD        |    2 ++
 19 files changed, 71 insertions(+), 19 deletions(-)

New commits:
commit 2ee3a8288fe66580be898cd6206caeecf2af68ea
Author: Lalo Martins <lalo at salmao.laranja.org>
Commit: Lalo Martins <lalo at salmao.laranja.org>

    updating beryl spells to compile from the release tarballs

diff --git a/beryl/beryl-core/DETAILS b/beryl/beryl-core/DETAILS
index dd509cd..985c651 100755
--- a/beryl/beryl-core/DETAILS
+++ b/beryl/beryl-core/DETAILS
@@ -8,16 +8,18 @@ if [ "$BERYL_CORE_TRUNK" == "y" ]; then
    SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/trunk/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-svn.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+  FORCE_DOWNLOAD=1
+   SOURCE_IGNORE=volatile
 else
          VERSION=0.1.2
-   SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/tags/release-$VERSION/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://releases.beryl-project.org/$VERSION/$SOURCE
+      SOURCE_HASH=sha512:e1922d118a018dfebc8ee163a3f468758fde717edf1ccecd342d1bc4c4974b9f1b061653120726506425baa7894afa7da3c0f22291cef57314daa001376d6740
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
-  FORCE_DOWNLOAD=1
-   SOURCE_IGNORE=volatile
         WEB_SITE=http://www.beryl-project.org/
          ENTERED=20060724
+      PATCHLEVEL=1
       LICENSE[0]=GPL
            SHORT="OpenGL composition manager"
 cat << EOF
diff --git a/beryl/beryl-core/HISTORY b/beryl/beryl-core/HISTORY
index 1622369..c6e10c9 100644
--- a/beryl/beryl-core/HISTORY
+++ b/beryl/beryl-core/HISTORY
@@ -1,3 +1,7 @@
+2006-11-18 Lalo Martins <lalo at sourcemage.org>
+        * DETAILS, PRE_BUILD: now there are actual release tarballs, use them
+	* DETAILS: PATCHLEVEL++
+
 2006-11-10 David Brown <dmlb2000 at gmail.com>
 	* DETAILS: fixed svn options to pull to the same tarball when updating
 	daily also added force download updated to 0.1.2 as well
diff --git a/beryl/beryl-core/PRE_BUILD b/beryl/beryl-core/PRE_BUILD
index 2a4e7d0..1af06ba 100755
--- a/beryl/beryl-core/PRE_BUILD
+++ b/beryl/beryl-core/PRE_BUILD
@@ -1,3 +1,9 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
+if [ -x autogen.sh ]; then
 NOCONFIGURE=Y ./autogen.sh
+fi &&
+if [ -e mesa/src/Makefile ]; then
+# fix half-built mesalib -- bug in the release tarball
+cd mesa/src && make clean
+fi
diff --git a/beryl/beryl-manager/DETAILS b/beryl/beryl-manager/DETAILS
index 891f15b..d4781ea 100755
--- a/beryl/beryl-manager/DETAILS
+++ b/beryl/beryl-manager/DETAILS
@@ -8,16 +8,18 @@ if [ "$BERYL_MANAGER_TRUNK" == "y" ]; th
    SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/trunk/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-svn.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+  FORCE_DOWNLOAD=1
+   SOURCE_IGNORE=volatile
 else
          VERSION=0.1.2
-   SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/tags/release-$VERSION/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://releases.beryl-project.org/$VERSION/$SOURCE
+      SOURCE_HASH=sha512:23463f10ffadbad634ac73dd7ff387f8b05d4a83e02dc71bf465caf95e95020ba55e34c229edab391f743da8e43f34dddcd0102eb2ed1b9a564796b81c9c6a91
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
-  FORCE_DOWNLOAD=1
-   SOURCE_IGNORE=volatile
         WEB_SITE=http://www.beryl-project.org/
          ENTERED=20061027
+      PATCHLEVEL=1
       LICENSE[0]=GPL
            SHORT="A daemon and systray icon to start (and restart) Beryl"
 cat << EOF
diff --git a/beryl/beryl-manager/HISTORY b/beryl/beryl-manager/HISTORY
index 72e5835..caed02b 100644
--- a/beryl/beryl-manager/HISTORY
+++ b/beryl/beryl-manager/HISTORY
@@ -1,3 +1,7 @@
+2006-11-18 Lalo Martins <lalo at sourcemage.org>
+        * DETAILS, PRE_BUILD: now there are actual release tarballs, use them
+	* DETAILS: PATCHLEVEL++
+
 2006-11-10 David Brown <dmlb2000 at gmail.com>
         * DETAILS: fixed svn options to pull to the same tarball when updating
         daily also added force download updated to 0.1.2 as well
diff --git a/beryl/beryl-manager/PRE_BUILD b/beryl/beryl-manager/PRE_BUILD
index 2a4e7d0..0789c71 100755
--- a/beryl/beryl-manager/PRE_BUILD
+++ b/beryl/beryl-manager/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
+if [ -x autogen.sh ]; then
 NOCONFIGURE=Y ./autogen.sh
+fi
diff --git a/beryl/beryl-plugins/DETAILS b/beryl/beryl-plugins/DETAILS
index 0649a7e..2ac6f6b 100755
--- a/beryl/beryl-plugins/DETAILS
+++ b/beryl/beryl-plugins/DETAILS
@@ -8,16 +8,18 @@ if [ "$BERYL_PLUGINS_TRUNK" == "y" ]; th
    SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/trunk/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-svn.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+  FORCE_DOWNLOAD=1
+   SOURCE_IGNORE=volatile
 else
          VERSION=0.1.2
-   SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/tags/release-$VERSION/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://releases.beryl-project.org/$VERSION/$SOURCE
+      SOURCE_HASH=sha512:f1e91c8125322b1b49ff84aea545c82b514c93f0d0a67541bce7146a9a0e0a3445e25ba2d6422a8f33476eaf8e5c1adc256653089ad09e5dd5a8f77969da235a
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
-  FORCE_DOWNLOAD=1
-   SOURCE_IGNORE=volatile
         WEB_SITE=http://www.beryl-project.org/
          ENTERED=20060724
+      PATCHLEVEL=1
       LICENSE[0]=GPL
            SHORT="OpenGL composition manager plugins"
 cat << EOF
diff --git a/beryl/beryl-plugins/HISTORY b/beryl/beryl-plugins/HISTORY
index 45dd4b7..11005ae 100644
--- a/beryl/beryl-plugins/HISTORY
+++ b/beryl/beryl-plugins/HISTORY
@@ -1,3 +1,7 @@
+2006-11-18 Lalo Martins <lalo at sourcemage.org>
+        * DETAILS, PRE_BUILD: now there are actual release tarballs, use them
+	* DETAILS: PATCHLEVEL++
+
 2006-11-10 David Brown <dmlb2000 at gmail.com>
         * DETAILS: fixed svn options to pull to the same tarball when updating
         daily also added force download updated to 0.1.2 as well
diff --git a/beryl/beryl-plugins/PRE_BUILD b/beryl/beryl-plugins/PRE_BUILD
index 2a4e7d0..0789c71 100755
--- a/beryl/beryl-plugins/PRE_BUILD
+++ b/beryl/beryl-plugins/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
+if [ -x autogen.sh ]; then
 NOCONFIGURE=Y ./autogen.sh
+fi
diff --git a/beryl/beryl-settings/DETAILS b/beryl/beryl-settings/DETAILS
index d3dfc7f..15ff25b 100755
--- a/beryl/beryl-settings/DETAILS
+++ b/beryl/beryl-settings/DETAILS
@@ -8,15 +8,17 @@ if [ "$BERYL_SETTINGS_TRUNK" == "y" ]; t
    SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/trunk/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-svn.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+  FORCE_DOWNLOAD=1
+   SOURCE_IGNORE=volatile
 else
          VERSION=0.1.2
-   SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/tags/release-$VERSION/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://releases.beryl-project.org/$VERSION/$SOURCE
+      SOURCE_HASH=sha512:b9d3b0edc5ef527c3b4ebb1aa80c407976ff018a6c5b2bb85c04ef671bcaa63fd5e13a3c879b28d232a7a6f00911e91f2b71ec0dd129007397ebd082fda68855
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
-  FORCE_DOWNLOAD=1
-   SOURCE_IGNORE=volatile
         WEB_SITE=http://www.beryl-project.org/
+      PATCHLEVEL=1
       LICENSE[0]=GPL
            SHORT="Beryl Settings Manager"
 cat << EOF
diff --git a/beryl/beryl-settings/HISTORY b/beryl/beryl-settings/HISTORY
index 4845cb3..0bfc16b 100644
--- a/beryl/beryl-settings/HISTORY
+++ b/beryl/beryl-settings/HISTORY
@@ -1,3 +1,7 @@
+2006-11-18 Lalo Martins <lalo at sourcemage.org>
+        * DETAILS, PRE_BUILD: now there are actual release tarballs, use them
+	* DETAILS: PATCHLEVEL++
+
 2006-11-10 David Brown <dmlb2000 at gmail.com>
         * DETAILS: fixed svn options to pull to the same tarball when updating
         daily also added force download updated to 0.1.2 as well
diff --git a/beryl/beryl-settings/PRE_BUILD b/beryl/beryl-settings/PRE_BUILD
index 2a4e7d0..0789c71 100755
--- a/beryl/beryl-settings/PRE_BUILD
+++ b/beryl/beryl-settings/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
+if [ -x autogen.sh ]; then
 NOCONFIGURE=Y ./autogen.sh
+fi
diff --git a/beryl/beryl/DETAILS b/beryl/beryl/DETAILS
index dcbe50d..044ba48 100755
--- a/beryl/beryl/DETAILS
+++ b/beryl/beryl/DETAILS
@@ -2,6 +2,7 @@
          VERSION=0.1.2
         WEB_SITE=http://www.beryl-project.org/
          ENTERED=20061027
+      PATCHLEVEL=1
       LICENSE[0]=GPL
            SHORT="Cast this to install everything you need to run Beryl"
 cat << EOF
diff --git a/beryl/emerald-themes/DETAILS b/beryl/emerald-themes/DETAILS
index 4cda03d..649322d 100755
--- a/beryl/emerald-themes/DETAILS
+++ b/beryl/emerald-themes/DETAILS
@@ -8,16 +8,18 @@ if [ "$EMERALD_THEMES_TRUNK" == "y" ]; t
    SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/trunk/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-svn.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+  FORCE_DOWNLOAD=1
+   SOURCE_IGNORE=volatile
 else
          VERSION=0.1.2
-   SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/tags/release-$VERSION/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://releases.beryl-project.org/$VERSION/$SOURCE
+      SOURCE_HASH=sha512:2bb40ac8c9a9680c0a1221072a2dddeedace44dc9b002d8f03e1e8e9e22c50fe8c9ae7bb4b40f232e3f42c9595c906945d513c4b3bc4d19b0cbf87850400e568
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
-  FORCE_DOWNLOAD=1
-   SOURCE_IGNORE=volatile
         WEB_SITE=http://www.beryl-project.org/
          ENTERED=20060804
+      PATCHLEVEL=1
       LICENSE[0]=GPL
            SHORT="Themes for Beryl's window decorator"
 cat << EOF
diff --git a/beryl/emerald-themes/HISTORY b/beryl/emerald-themes/HISTORY
index ca39482..fab6f7c 100644
--- a/beryl/emerald-themes/HISTORY
+++ b/beryl/emerald-themes/HISTORY
@@ -1,3 +1,7 @@
+2006-11-18 Lalo Martins <lalo at sourcemage.org>
+        * DETAILS, PRE_BUILD: now there are actual release tarballs, use them
+	* DETAILS: PATCHLEVEL++
+
 2006-11-10 David Brown <dmlb2000 at gmail.com>
         * DETAILS: fixed svn options to pull to the same tarball when updating
         daily also added force download updated to 0.1.2 as well
diff --git a/beryl/emerald-themes/PRE_BUILD b/beryl/emerald-themes/PRE_BUILD
index 2a4e7d0..0789c71 100755
--- a/beryl/emerald-themes/PRE_BUILD
+++ b/beryl/emerald-themes/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
+if [ -x autogen.sh ]; then
 NOCONFIGURE=Y ./autogen.sh
+fi
diff --git a/beryl/emerald/DETAILS b/beryl/emerald/DETAILS
index 0bc8fc8..8733096 100755
--- a/beryl/emerald/DETAILS
+++ b/beryl/emerald/DETAILS
@@ -8,17 +8,18 @@ if [ "$EMERALD_TRUNK" == "y" ]; then
    SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/trunk/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-svn.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+  FORCE_DOWNLOAD=1
+   SOURCE_IGNORE=volatile
 else
          VERSION=0.1.2
-   SOURCE_URL[0]=svn://svn.beryl-project.org/beryl/tags/release-$VERSION/$SPELL:$SPELL-$VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://releases.beryl-project.org/$VERSION/$SOURCE
+      SOURCE_HASH=sha512:7ee4b1ab8eef8dc905b66852e83787bd00f4f47342e983041e00b28bb9b4e7875c0ab2c19eafee09ec2b48b0b3c179501807d22222eed86a2e05e1e54b33bcfa
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
-  FORCE_DOWNLOAD=1
-   SOURCE_IGNORE=volatile
         WEB_SITE=http://www.beryl-project.org/
          ENTERED=20060724
-      PATCHLEVEL=1
+      PATCHLEVEL=2
       LICENSE[0]=GPL
            SHORT="Window Decorator for Beryl"
 cat << EOF
diff --git a/beryl/emerald/HISTORY b/beryl/emerald/HISTORY
index 0406f30..6218846 100644
--- a/beryl/emerald/HISTORY
+++ b/beryl/emerald/HISTORY
@@ -1,3 +1,7 @@
+2006-11-18 Lalo Martins <lalo at sourcemage.org>
+        * DETAILS, PRE_BUILD: now there are actual release tarballs, use them
+	* DETAILS: PATCHLEVEL++
+
 2006-11-14 Flavien Bridault <vlaaad at sourcemage.org>
 	* BUILD: added, disable mime database rebuild during install
 	* FINAL: added, update mime database there
diff --git a/beryl/emerald/PRE_BUILD b/beryl/emerald/PRE_BUILD
index 2a4e7d0..0789c71 100755
--- a/beryl/emerald/PRE_BUILD
+++ b/beryl/emerald/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
+if [ -x autogen.sh ]; then
 NOCONFIGURE=Y ./autogen.sh
+fi



More information about the SM-Commit mailing list