sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (ec5baf3c9d19ade4db20cfc1f48d2f67cb0fc537)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (ec5baf3c9d19ade4db20cfc1f48d2f67cb0fc537)
Date: Mon, 21 Nov 2011 21:17:17 -0600

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

database/mongodb/DETAILS | 4 ++--
database/mongodb/HISTORY | 5 +++++
database/mongodb/PRE_BUILD | 4 +---
database/mongodb/jsscan.patch | 10
----------
dev/null |binary
devel/binutils/DETAILS | 5 ++---
devel/binutils/HISTORY | 3 +++
graphics-libs/mesalib/DEPENDS | 4 ++++
graphics-libs/mesalib/DETAILS | 4 ++--
graphics-libs/mesalib/HISTORY | 9 +++++++++
graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig |binary
graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig | 0
graphics-libs/mesalib/PRE_BUILD | 8 +++++---
graphics-libs/mesalib/PRE_SUB_DEPENDS | 2 +-
graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS | 2 +-
graphics-libs/mesalib/SUB_DEPENDS | 10
+++++-----
kernels/linux/HISTORY | 4 ++++
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2 | 5 +++++
kernels/linux/latest.defaults | 2 +-
python-pypi/scons/DETAILS | 4 ++--
python-pypi/scons/HISTORY | 3 +++
utils/htop/DETAILS | 4 ++--
utils/htop/HISTORY | 3 +++
video/ffmpeg/DETAILS | 6 +++---
video/ffmpeg/HISTORY | 3 +++
25 files changed, 66 insertions(+), 38 deletions(-)

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

mesalib: MESALIB_VER -> MESALIB_BRANCH
Also, "git" -> "scm" for MESALIB_BRANCH selection

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

mesalib: Latest development is 7.11.1
Spell "development" correctly (and match PREPARE)
llvm is required to build at least r300 Gallium drivers in 7.11
No X11R6 mentioned in Makefiles and no Makefile.template
for dri driver for 7.11.

commit 2b5afd9edec1d82f5ca5b0251b0c166251fab9e4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

ffmpeg 0.7.8, SECURITY_PATCH=9

commit 10da669c812eb3b5cb6ea93a962598e2b9a023d6
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux 3.1.2

commit 81bc90e0524e972af763c8bc4329a39292489bdf
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

htop 1.0

commit b7b9a6ac9c189387a88fbcc32d8a09feb04e9695
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mongodb: => 2.0.1

commit 8cdf432975e79e8915d27ccf3d4978dd7e4fd9c1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

scons: => 2.1.0

commit be9d9500d6f66adcc3421e0928473351cbcd1b5c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

binutils 2.22

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

mesalib: Remove old 7.8.2 sig

diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS
index a395948..85dcc85 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,8 +1,8 @@
SPELL=mongodb
- VERSION=2.0.0
+ VERSION=2.0.1
SOURCE=$SPELL-src-r$VERSION.tar.gz
SOURCE_URL[0]=http://downloads.mongodb.org/src/$SOURCE
-
SOURCE_HASH=sha512:51d8d13c64a37c8b0a51682cd387f8cea7f8e037fbf3f5ff403cb6b615d6e9335fc9e3cd6d3ad1f229cf558a12c39069991b2f3951ef214e82ef4e1522d8e9eb
+
SOURCE_HASH=sha512:a95f28646ce502247d69c79e6f00411f7b3ec130d298794a0f8695e7fb4c91f522e5b61e0fd1fe796baaa44572dd925f1547b8922210ca32c9e594788e746ce6
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION"
LICENSE[0]=AGPL
LICENSE[1]=APACHE
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index de57dbb..75faa92 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,8 @@
+2011-11-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.1
+ * PRE_BUILD: removed dirty hacks
+ * jsscan.patch: trashed, fixed by newer scons
+
2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.0.0
* DEPENDS: added optional dependencies, spidermonkey is included in
diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD
index bf67a0f..3888f4e 100755
--- a/database/mongodb/PRE_BUILD
+++ b/database/mongodb/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/jsscan.patch" &&
-
-sed -i "s:\" -O3 \":os.environ['CXXFLAGS']:;s:lib64:lib:g" SConstruct
+sed -i "s:lib64:lib:g" SConstruct
diff --git a/database/mongodb/jsscan.patch b/database/mongodb/jsscan.patch
deleted file mode 100644
index b44e0b4..0000000
--- a/database/mongodb/jsscan.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/js-1.7/jsscan.c.orig 2011-09-14 12:36:51.000000000 +0400
-+++ third_party/js-1.7/jsscan.c 2011-09-14 12:39:38.920064658 +0400
-@@ -109,7 +109,6 @@
- #define JSKW_GOT_MATCH(index) i = (index); goto got_match;
- #define JSKW_TEST_GUESS(index) i = (index); goto test_guess;
- #define JSKW_NO_MATCH() goto no_match;
--#include "jsautokw.h"
- #undef JSKW_NO_MATCH
- #undef JSKW_TEST_GUESS
- #undef JSKW_GOT_MATCH
diff --git a/devel/binutils/DETAILS b/devel/binutils/DETAILS
index ae80873..7586ae4 100755
--- a/devel/binutils/DETAILS
+++ b/devel/binutils/DETAILS
@@ -1,9 +1,8 @@
SPELL=binutils
- VERSION=2.21.1a
- VERSIONX=2.21.1
+ VERSION=2.22
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSIONX"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index a14ba83..364f4f0 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,6 @@
+2011-11-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.22
+
2011-08-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.21.1a; quoting paths; switched to
upstream
gpg checking
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index cfd8091..50ec31d 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -49,4 +49,8 @@ fi &&

if [[ $MESALIB_BRANCH == "scm" ]]; then
depends git
+fi &&
+
+if [[ "$MESALIB_BRANCH" == "development" && "$MESALIB_GALLIUM" != "none" ]];
then
+ depends llvm
fi
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 862b4f1..a2b1c2e 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -11,8 +11,8 @@ case "$MESALIB_BRANCH" in
feature)
VERSION=7.10.3
;;
- developement)
- VERSION=7.10.3
+ development)
+ VERSION=7.11.1
;;
scm)
if [[ "$MESALIB_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 86ab54d..fd6b3a7 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,12 @@
+2011-11-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Latest development is 7.11.1
+ Spell "development" correctly (and match PREPARE)
+ * DEPENDS: llvm is required to build at least r300 Gallium drivers in
7.11
+ * PRE_BUILD: No X11R6 mentioned in Makefiles and no Makefile.template
+ for dri driver for 7.11.
+ * PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: MESALIB_VER ->
MESALIB_BRANCH
+ Also, "git" -> "scm" for MESALIB_BRANCH selection
+
2011-09-27 Ismael Luceno <ismael AT sourcemage.org>
* CONFIGURE: Fix broken case statement

diff --git a/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig
new file mode 100644
index 0000000..2916753
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig
deleted file mode 100644
index 38ce699..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 43c0330..93c1def 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -24,12 +24,14 @@ do
done &&
cd ${SOURCE_DIRECTORY}/docs &&
sedit "s:/X11R6::g" install.html &&
-cd ${SOURCE_DIRECTORY}/src/mesa/drivers/dri &&
-sedit "s:/X11R6::g" Makefile.template &&
+if [[ "$MESALIB_BRANCH" != "development" ]]; then
+ cd ${SOURCE_DIRECTORY}/src/mesa/drivers/dri &&
+ sedit "s:/X11R6::g" Makefile.template
+fi &&
cd ${SOURCE_DIRECTORY}/src/glw &&
sedit "s:/X11R6::g" Makefile &&

-if [[ $MESALIB_VER == "git" ]]; then
+if [[ "$MESALIB_BRANCH" == "scm" ]]; then
cd "$SOURCE_DIRECTORY" &&
patch -p0 < "${SCRIPT_DIRECTORY}/autogen.patch" &&
./autogen.sh
diff --git a/graphics-libs/mesalib/PRE_SUB_DEPENDS
b/graphics-libs/mesalib/PRE_SUB_DEPENDS
index 5408815..e3cccf7 100755
--- a/graphics-libs/mesalib/PRE_SUB_DEPENDS
+++ b/graphics-libs/mesalib/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- NONSTABLE) [[ "$MESALIB_VER" != "stable" ]] && return 0 ;;
+ NONSTABLE) [[ "$MESALIB_BRANCH" != "stable" ]] && return 0 ;;
DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
esac
return 1
diff --git a/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
b/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
index 5408815..e3cccf7 100755
--- a/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
+++ b/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- NONSTABLE) [[ "$MESALIB_VER" != "stable" ]] && return 0 ;;
+ NONSTABLE) [[ "$MESALIB_BRANCH" != "stable" ]] && return 0 ;;
DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
esac
return 1
diff --git a/graphics-libs/mesalib/SUB_DEPENDS
b/graphics-libs/mesalib/SUB_DEPENDS
index cb287af..b4a77c0 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -1,8 +1,8 @@
case $THIS_SUB_DEPENDS in
NONSTABLE)
- if [[ "$MESALIB_VER" == "stable" ]]; then
- MESALIB_VER="feature" &&
- persistent_add MESALIB_VER &&
+ if [[ "$MESALIB_BRANCH" == "stable" ]]; then
+ MESALIB_BRANCH="feature" &&
+ persistent_add MESALIB_BRANCH &&
message "${MESSAGE_COLOR}Non-stable branch of
${SPELL_COLOR}mesalib${DEFAULT_COLOR}" \
"${MESSAGE_COLOR}requested, upgrading to
${SPELL_COLOR}feature${DEFAULT_COLOR}" \
"${MESSAGE_COLOR}branch."
@@ -20,9 +20,9 @@ case $THIS_SUB_DEPENDS in

. $GRIMOIRE/config_query_multi.function &&
if [[ $MESALIB_BUILD == dri ]]; then
- if [[ "$MESALIB_VER" == "stable" ]]; then
+ if [[ "$MESALIB_BRANCH" == "stable" ]]; then
AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600
radeon s3v savage sis tdfx trident unichrome ffb swrast"
- elif [[ "$MESALIB_VER" == "feature" ]]; then
+ elif [[ "$MESALIB_BRANCH" == "feature" ]]; then
AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600
radeon s3v savage sis tdfx trident unichrome ffb swrast"
else
AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga nouveau r128 r200 r300
r600 radeon s3v savage sis tdfx trident unichrome ffb swrast"
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 692ba9b..0658619 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2011-11-22 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.1.2
+ * info/patches/maintenance_patches_3/patch-3.1.2: added
+
2011-11-21 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.1.1
* info/patches/maintenance_patches_3/patch-3.1.1: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2
new file mode 100755
index 0000000..e38e8ce
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2
@@ -0,0 +1,5 @@
+appliedkernels="3.1"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="9d9348cb4e1fed7fcf8accdbb921d09b92da136a"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 1b93548..8b07da8 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.1
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.1.1
+LATEST_maintenance_patches_3=patch-3.1.2
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/python-pypi/scons/DETAILS b/python-pypi/scons/DETAILS
index 78a276b..0101cff 100755
--- a/python-pypi/scons/DETAILS
+++ b/python-pypi/scons/DETAILS
@@ -1,6 +1,6 @@
SPELL=scons
- VERSION=1.3.1
-
SOURCE_HASH=sha512:2107de6974893ad668344a5f4481984a77f5fed1f72fc02212e3525dda30104770f3ad1da0702240837b777f6b993dd913a2922dabe849d84a91d5036916c207
+ VERSION=2.1.0
+
SOURCE_HASH=sha512:1eaa89aa842f3f801a817bd7a9b9b4993ad5d00be420bd2aa3cc55f04cf4a3959638f7ee2d6a1e93ce716315b05016888cd20d1884b025fe97613d1a3382527e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/scons/HISTORY b/python-pypi/scons/HISTORY
index 4b1ecb3..a50c8d4 100644
--- a/python-pypi/scons/HISTORY
+++ b/python-pypi/scons/HISTORY
@@ -1,3 +1,6 @@
+2011-11-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.0
+
2010-08-16 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.3.1

diff --git a/utils/htop/DETAILS b/utils/htop/DETAILS
index dfd5c94..202605f 100755
--- a/utils/htop/DETAILS
+++ b/utils/htop/DETAILS
@@ -1,11 +1,11 @@
SPELL=htop
- VERSION=0.9
+ VERSION=1.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://htop.sourceforge.net/
ENTERED=20050218
-
SOURCE_HASH=sha512:0b799afd3ad71d9b8012d37db010c708a84949f2aac47b272c987344abf10a10f9a8f2aea72240b3c8a1d5dd36ea63cd49c0293d91c0c1c05bab82bf186266c8
+
SOURCE_HASH=sha512:99ad5c2d1ffb1aabd18c100d1f5f995ce2e6bf0345b2adf006ef15b5e7b996d30b2d6f895ab81e97d36f647e69659fbb416972ebe9b0b42091df6921da60068a
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="an interactive process viewer for Linux"
diff --git a/utils/htop/HISTORY b/utils/htop/HISTORY
index 31f32af..74d3883 100644
--- a/utils/htop/HISTORY
+++ b/utils/htop/HISTORY
@@ -1,3 +1,6 @@
+2011-11-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 1bdd096..bf605c2 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,10 +1,10 @@
SPELL=ffmpeg
- VERSION=0.7.7
- SECURITY_PATCH=8
+ VERSION=0.7.8
+ SECURITY_PATCH=9
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
-
SOURCE_HASH=sha512:a3cee24a06fdecb7474e90f6c668ab5b05b04caf08426aa5bbc9486b20458fa4c46216b37f5db3de5bcc5335c94459fbab99c7fd2731844444e8fe2c4624803e
+
SOURCE_HASH=sha512:2368bd2d7c3d553fedbfa6e2e738c60a76951f61702d5fd4b030f542ff92c98f43f3e494f56c57dcafe156d007447ca109b096b95cd57415c216530aa381ef60
#case $FFAMR in
# none);;
# *)
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 9276b19..676d75f 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2011-11-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.7.8, SECURITY_PATCH=9
+
2011-11-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.7, SECURITY_PATCH=8

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (ec5baf3c9d19ade4db20cfc1f48d2f67cb0fc537), Eric Sandall, 11/21/2011