sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (f8e9d85f868de7beff890c7d5c15f6cf676ec81f)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f8e9d85f868de7beff890c7d5c15f6cf676ec81f)
- Date: Sat, 11 May 2013 07:52:47 -0500
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
ChangeLog | 4
audio-creation/audacity/DETAILS | 6 -
devel/frama-c/DEPENDS | 5
devel/frama-c/DETAILS | 8 -
devel/valgrind/DETAILS | 4
devel/valgrind/PRE_BUILD | 2
devel/why3/DETAILS | 2
disk/lilo/BUILD | 1
gnome2-libs/gnome-settings-daemon/DEPENDS | 6 -
gnome2-libs/gtksourceview/DEPENDS | 17 ++
gnustep-apps/gnustep-oolite/DEPENDS | 10 -
gnustep-apps/gnustep-oolite/DETAILS | 24 +---
gnustep-apps/gnustep-oolite/PRE_BUILD | 3
gnustep-libs/gnustep-base/DETAILS | 2
gnustep-libs/gnustep-gui/DETAILS | 2
graphics/blender/BUILD | 56 ---------
graphics/blender/CONFIGURE | 25 +---
graphics/blender/DEPENDS | 177
+++++++++++++++---------------
graphics/blender/DETAILS | 4
graphics/blender/PREPARE | 2
graphics/blender/PRE_BUILD | 35 -----
http/webkitgtk3/BUILD | 8 +
http/webkitgtk3/PRE_BUILD | 5
mail/mutt/DETAILS | 2
perl-cpan/class-factory-util/DEPENDS | 1
perl-cpan/class-factory-util/DETAILS | 13 ++
perl-cpan/class-factory-util/HISTORY | 3
perl-cpan/class-load-xs/BUILD | 2
perl-cpan/class-load-xs/DEPENDS | 3
perl-cpan/class-load-xs/DETAILS | 14 ++
perl-cpan/class-load-xs/HISTORY | 3
perl-cpan/class-load-xs/INSTALL | 1
perl-cpan/datetime-format-builder/DEPENDS | 3
perl-cpan/datetime-format-builder/HISTORY | 1
perl-cpan/geo-gpx/DEPENDS | 3
perl-cpan/geo-gpx/HISTORY | 3
science/hdf5/DETAILS | 4
science/splitter/INSTALL | 2
science/splitter/splitter | 2
utils/colorgcc/DETAILS | 2
video/mplayer2/DEPENDS | 2
41 files changed, 224 insertions(+), 248 deletions(-)
New commits:
commit f8e9d85f868de7beff890c7d5c15f6cf676ec81f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
perl-cpan/geo-gpx: add dependency on class-load-xs
commit 64813e00ca4fa2cbad01d14a0fd88f9dfdc46d21
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
perl-cpan/datetime-format-builder: add dependency on class-factory-util
commit f006e756f6c42bcc4731b83f4036dce4e437b611
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
perl-cpan/class-factory-util: new spell, provide utility methods for
factory classes
commit 06e56e6116611075ac96bd808aa8de2b5e300ec5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
perl-cpan/class-load-xs: new spell, XS implementation parts of Class::Load
diff --git a/ChangeLog b/ChangeLog
index 3446754..9b4fac5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
classes and objects
* perl-cpan/file-find-rule: new spell, Alternative interface to
File::Find
* perl-cpan/datetime-format-iso8601: new spell, Parses ISO8601 formats
+ * perl-cpan/class-load-xs: new spell, XS implementation parts of
+ Class::Load
+ * perl-cpan/class-factory-util: new spell, provide utility methods for
+ factory classes
2013-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* perl-cpan/geo-gpx: new spell, generate and parse gpx files
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index 9f48789..ed73fea 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -12,10 +12,10 @@ in scm)
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
;; *)
- VERSION=2.0.2
- SOURCE=${SPELL}-minsrc-${VERSION}.tar.bz2
+ VERSION=2.0.3
+ SOURCE=${SPELL}-minsrc-${VERSION}.tar.xz
SOURCE_URL[0]=http://audacity.googlecode.com/files/${SOURCE}
-
SOURCE_HASH=sha512:3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e
+
SOURCE_HASH=sha512:b97f6e8e3e316571c57f97a231411bbadab3bd007dc6066eea9f059fe91ee6b42c3d69a7e6850c8eeb2e701b3c1af218ce9d9d798273c46676f95a3b21cbe4c9
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
;; esac
WEB_SITE=http://audacity.sourceforge.net/
diff --git a/devel/frama-c/DEPENDS b/devel/frama-c/DEPENDS
index f79ca40..1d13dac 100755
--- a/devel/frama-c/DEPENDS
+++ b/devel/frama-c/DEPENDS
@@ -10,4 +10,7 @@ depends pango &&
depends graphviz &&
depends ocaml &&
depends gtksourceview &&
-depends lablgtk2
+depends lablgtk2 &&
+depends why &&
+depends why3 &&
+depends alt-ergo
diff --git a/devel/frama-c/DETAILS b/devel/frama-c/DETAILS
index a1317e5..ed4518c 100755
--- a/devel/frama-c/DETAILS
+++ b/devel/frama-c/DETAILS
@@ -1,9 +1,9 @@
SPELL=frama-c
- VERSION=20111001
- SOURCE="${SPELL}-Nitrogen-${VERSION}.tar.gz"
+ VERSION=Fluorine-20130401
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.com/download/${SOURCE}
-
SOURCE_HASH=sha512:316eba07a5eff47c4fa22d116dc6a1c7adb5a617cd4719a01cf844d6dd5e9d4b2509fcd66c2ceba7d11c94f136cb7c57abd8df25415e1236361a794773580ace
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-Nitrogen-${VERSION}"
+
SOURCE_HASH=sha512:819551a6820eae793a84f7b024adea4b56fdbe15d15daca1e6d762d0c51532598a43f1d78fd398e5e56405e6b99ba0da8ff4843086b17347a73c3d21be7cea9f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://frama-c.com/index.html";
LICENSE[0]=GPL
ENTERED=20120209
diff --git a/devel/valgrind/DETAILS b/devel/valgrind/DETAILS
index 720a0f5..28943bb 100755
--- a/devel/valgrind/DETAILS
+++ b/devel/valgrind/DETAILS
@@ -13,8 +13,8 @@ then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
else
- VERSION=3.8.0
-
SOURCE_HASH=sha512:83a293f1cd71305ab94b2b7dd4929b813b419dab0c0c701c0bb65ae9c7b2571c5fabebbf399365cbb9aaf7e527fb0d68dafcf054c4085324c1c059c85454ce28
+ VERSION=3.8.1
+
SOURCE_HASH=sha512:ba31f5d43bd2d9533846bed6456a0eae40ac071ff8732201dd75c9e2cd7e9ce3224cb5928b9c8fc859a75ce6867a9b6a1fb2ba8ab62cd3944893d6d4156ab25c
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://valgrind.org/downloads/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/valgrind/PRE_BUILD b/devel/valgrind/PRE_BUILD
index 8c5c7b9..946f078 100755
--- a/devel/valgrind/PRE_BUILD
+++ b/devel/valgrind/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+patch -p1 < $SPELL_DIRECTORY/0001-fix-missing-include.patch &&
+
if [[ $VALGRIND_BRANCH == "scm" ]]
then
NOCONFIGURE=Y ./autogen.sh
diff --git a/devel/why3/DETAILS b/devel/why3/DETAILS
index 71caabb..2096a69 100755
--- a/devel/why3/DETAILS
+++ b/devel/why3/DETAILS
@@ -1,5 +1,5 @@
SPELL=why3
- VERSION=0.80
+ VERSION=0.81
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://gforge.inria.fr/frs/download.php/31724/${SOURCE}
SOURCE_HASH=sha512:260e94378146a9a9d5442cf0f420e3d3f95a12c003f6db70585d46dfb7289e5d48c8aadc01372c8fcf5e7f29ccb4888356d2601a56bb41353f8068b5b97e5e47
diff --git a/disk/lilo/BUILD b/disk/lilo/BUILD
index ce6a970..d4ec66b 100755
--- a/disk/lilo/BUILD
+++ b/disk/lilo/BUILD
@@ -1 +1,2 @@
+disable_pic &&
make DESTDIR="$INSTALL_ROOT" OPT="$CFLAGS" all
diff --git a/gnome2-libs/gnome-settings-daemon/DEPENDS
b/gnome2-libs/gnome-settings-daemon/DEPENDS
index 97f362b..ccec70e 100755
--- a/gnome2-libs/gnome-settings-daemon/DEPENDS
+++ b/gnome2-libs/gnome-settings-daemon/DEPENDS
@@ -16,12 +16,8 @@ depends gnome-desktop3 &&
depends startup-notification &&
depends colord &&
depends upower &&
+depends -sub GLIB pulseaudio
-if [[ $PULSE == pulse ]]; then
- depends -sub GLIB pulseaudio
-fi &&
-#optional_depends pulseaudio -sub "GLIB" "" "" \
-# "Enable PulseAudio support?" &&
optional_depends cups '--enable-cups' '--disable-cups' \
'Enable CUPS print support?' &&
diff --git a/gnome2-libs/gtksourceview/DEPENDS
b/gnome2-libs/gtksourceview/DEPENDS
index b8d0a1b..fb0bc17 100755
--- a/gnome2-libs/gtksourceview/DEPENDS
+++ b/gnome2-libs/gtksourceview/DEPENDS
@@ -1,8 +1,21 @@
depends libxml2 &&
depends glib2 &&
-depends gtk+2 &&
+depends gtk+3 &&
+depends intltool &&
+depends gettext &&
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "Build documentation with gtk-doc"
+ "Build documentation with gtk-doc" &&
+
+optional_depends glade3 \
+ "--enable-glade" \
+ "--disable-glade" \
+ "Build documentation with gtk-doc" &&
+
+optional_depends gobject-introspection \
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "for introspection support"
+
diff --git a/gnustep-apps/gnustep-oolite/DEPENDS
b/gnustep-apps/gnustep-oolite/DEPENDS
index 79bec0e..50e07b6 100755
--- a/gnustep-apps/gnustep-oolite/DEPENDS
+++ b/gnustep-apps/gnustep-oolite/DEPENDS
@@ -2,10 +2,6 @@ depends sdl &&
depends sdl_image &&
depends sdl_mixer &&
depends sdl_gfx &&
-if [[ ${OOLITE_DEVEL} == "y" ]]; then
- depends gnustep-base &&
- depends dos2unix &&
- suggest_depends espeak "" "" "support for spoken text" || return 1
-else
- depends gnustep-gui || return 1
-fi
+depends gnustep-base &&
+depends dos2unix &&
+depends espeak
diff --git a/gnustep-apps/gnustep-oolite/DETAILS
b/gnustep-apps/gnustep-oolite/DETAILS
index b4752fe..b5ce8d7 100755
--- a/gnustep-apps/gnustep-oolite/DETAILS
+++ b/gnustep-apps/gnustep-oolite/DETAILS
@@ -1,24 +1,14 @@
SPELL=gnustep-oolite
if [[ ${OOLITE_DEVEL} == "n" ]]; then
- VERSION=1.65
- SOURCE=oolite-$VERSION-src.tar.gz
- SOURCE2=oolite-$VERSION-data.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/oolite-$VERSION-src
- SOURCE_URL[0]=http://download.berlios.de/oolite-linux/${SOURCE}
- SOURCE_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE}
- SOURCE2_URL[0]=http://download.berlios.de/oolite-linux/${SOURCE2}
- SOURCE2_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE2}
-
SOURCE_HASH=sha512:d660e36d3679fadd7bcdb862db62c6d8eebd0bf10f68f17a16d2d83bf3570bee0c678fb9c5446158189f66d358e475c5ef1234b3b875a75091b497979c6d0135
-
SOURCE2_HASH=sha512:5d3ac8a42b4c0e46cf9a16da1bd8f32ceb730023d3b38fb3830d7031e44dfec92b465e8ae9e5a5815cd86c93540a17fedda324c42a9ebcae402ee412110b072e
+ VERSION=1.76.1
+
SOURCE_HASH=sha512:0923e17e6870a63056b2e26170015a9928cc1a7134459450ee90e903fd4544db549deee7bfbdca522869de25b4a903e118d101fd10aead5a07362a4e93d400e5
else
- VERSION=1.75.3
- SOURCE=oolite-dev-source-$VERSION.tar.bz2
-message "${MESSAGE_COLOR}SOURCE=${SOURCE}${DEFAULT_COLOR}"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/oolite-dev-source-$VERSION
- SOURCE_URL[0]=http://download.berlios.de/oolite-linux/${SOURCE}
- SOURCE_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE}
-
SOURCE_HASH=sha512:2f446404679a3de25ea59230fb0ce81501493f4029213b71f4b0b6a008f22f479e0333d8d72b065f0b6e3a200ad49178ecb59e5ccfd5375874b16618d1b0a84d
+ VERSION=1.77
+
SOURCE_HASH=sha512:d1cd2423322a0db47ed80939e979f2567721ddd54372189a407903bb8630f56d8a02f8e08976ed351a9355323b668da06ebbe9242fd2d6e97317f9739f8d27c6
fi
+ SOURCE=oolite-source-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/oolite-source-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/oolite-linux.berlios/$SOURCE
WEB_SITE=http://www.oolite.org/
LICENSE[0]="Creative Commons"
ENTERED=20060118
diff --git a/gnustep-apps/gnustep-oolite/PRE_BUILD
b/gnustep-apps/gnustep-oolite/PRE_BUILD
index c29b074..0461df4 100755
--- a/gnustep-apps/gnustep-oolite/PRE_BUILD
+++ b/gnustep-apps/gnustep-oolite/PRE_BUILD
@@ -1,9 +1,6 @@
default_pre_build &&
if [[ $OOLITE_DEVEL == "n" ]]; then
unpack_file 2 || return 1
-else
- dos2unix ${SOURCE_DIRECTORY}/deps/Cocoa-deps/scripts/update-mozilla.sh &&
- chmod +x ${SOURCE_DIRECTORY}/deps/Cocoa-deps/scripts/update-mozilla.sh ||
return 1
fi &&
cd $SOURCE_DIRECTORY &&
sedit 's/shared_obj/obj/g' GNUmakefile.postamble
diff --git a/gnustep-libs/gnustep-base/DETAILS
b/gnustep-libs/gnustep-base/DETAILS
index 187def8..26a1ec7 100755
--- a/gnustep-libs/gnustep-base/DETAILS
+++ b/gnustep-libs/gnustep-base/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnustep-base
- VERSION=1.24.0
+ VERSION=1.24.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/gnustep-libs/gnustep-gui/DETAILS
b/gnustep-libs/gnustep-gui/DETAILS
index a5743c3..b7f8f81 100755
--- a/gnustep-libs/gnustep-gui/DETAILS
+++ b/gnustep-libs/gnustep-gui/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnustep-gui
- VERSION=0.22.0
+ VERSION=0.23.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics/blender/BUILD b/graphics/blender/BUILD
index 04c5616..8e93e86 100755
--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -1,53 +1,3 @@
-if [ "$BLENDER_PLAYER" == "WITH_BF_PLAYER=True" ]; then
- BLENDER_GAMEENGINE="WITH_BF_GAMEENGINE=True"
-fi &&
-
-if is_depends_enabled $SPELL openjpeg; then
-
-cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-BF_OPENJPEG="/usr"
-BF_OPENJPEG_INC="/usr/include"
-BF_OPENJPEG_LIB="openjpeg"
-EOF
-
-fi &&
-
-#if is_depends_enabled $SPELL openexr; then
-#
-#cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-#BF_OPENEXR="/usr"
-#BF_OPENJPEG_INC="/usr/include"
-#BF_OPENEXR_INC="${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include"
-#BF_OPENEXR_LIBPATH="${BF_OPENEXR}/lib"
-#EOF
-#
-#fi &&
-
-if is_depends_enabled $SPELL lcms; then
-
-cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-BF_LCMS_INC="/usr/include/"
-BF_LCMS_LIB="lcms"
-BF_LCMS_LIBPATH="/usr/lib/"
-EOF
-
-fi &&
-
-echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${SOURCE_DIRECTORY}"/user-config.py
-
-local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',;
done`"
-echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >>
"${SOURCE_DIRECTORY}"/user-config.py
-echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >>
"${SOURCE_DIRECTORY}"/user-config.py
-
-echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE',
'-D_FILE_OFFSET_BITS=64']" >> "${SOURCE_DIRECTORY}"/user-config.py
-
-local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',;
done`"
-echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >>
"${SOURCE_DIRECTORY}"/user-config.py
-echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >>
"${SOURCE_DIRECTORY}"/user-config.py
-
-OPTS="WITHOUT_BF_PYTHON_INSTALL=True WITH_BF_3DMOUSE=False $BLENDER_PLAYER
$BLENDER_GAMEENGINE $BLENDER_OCEANSIM $BLENDER_OGG $OPTS"
-
-python ./scons/scons.py $OPTS
-
-make CFLAGS="${CFLAGS} -fPIC" LDFLAGS="-Bshareable" -C release/plugins
+OPTS+=" ${BLENDER_OPTS}" &&
+OPTS+=" -DWITH_INSTALL_PORTABLE=off" &&
+cmake_build
diff --git a/graphics/blender/CONFIGURE b/graphics/blender/CONFIGURE
index c61bebb..09c09c5 100755
--- a/graphics/blender/CONFIGURE
+++ b/graphics/blender/CONFIGURE
@@ -1,16 +1,9 @@
-config_query_option BLENDER_PLAYER "Build blender player" n \
- "WITH_BF_PLAYER=True" \
- "WITH_BF_PLAYER=False" &&
-
-config_query_option BLENDER_GAMEENGINE "Build GameEngine?" y \
- "WITH_BF_GAMEENGINE=True" \
- "WITH_BF_GAMEENGINE=False" &&
-
-config_query_option BLENDER_OCEANSIM "Build OceanSim?" y \
- "WITH_BF_OCEANSIM=True" \
- "WITH_BF_OCEANSIM=False" &&
-
-config_query_option BLENDER_OGG "Build ogg,vorbis,theora support?" n \
- "WITH_BF_OGG=True" \
- "WITH_BF_OGG=False"
-
+config_query_option BLENDER_OPTS "build the player application?" n
"-DWITH_PLAYER=on" "-DWITH_PLAYER=off" &&
+config_query_option BLENDER_OPTS "build smoke simulation?" y
"-DWITH_MOD_SMOKE=on" "-DWITH_MOD_SMOKE=off" &&
+config_query_option BLENDER_OPTS "build remesh?" y "-DWITH_MOD_REMESH=on"
"-DWITH_MOD_REMESH=off" &&
+config_query_option BLENDER_OPTS "build oceansim?" n
"-DWITH_MOD_OCEANSIM=on" "-DWITH_MOD_OCEANSIM=off" &&
+config_query_option BLENDER_OPTS "build fluid simulation?" y
"-DWITH_MOD_FLUID=on" "-DWITH_MOD_FLUID=off" &&
+config_query_option BLENDER_OPTS "build boolean operators?" y
"-DWITH_MOD_BOOLEAN=on" "-DWITH_MOD_BOOLEAN=off" &&
+config_query_option BLENDER_OPTS "build game engine?" y
"-DWITH_GAMEENGINE=on" "-DWITH_GAMEENGINE=off" &&
+config_query_option BLENDER_OPTS "build cycles renderer?" y
"-DWITH_CYCLES=on" "-DWITH_CYCLES=off" &&
+config_query_option BLENDER_OPTS "build internal AVI support?" y
"-DWITH_CODEC_AVI=on" "-DWITH_CODEC_AVI=off"
diff --git a/graphics/blender/DEPENDS b/graphics/blender/DEPENDS
index dfca6c6..3e2f0a8 100755
--- a/graphics/blender/DEPENDS
+++ b/graphics/blender/DEPENDS
@@ -1,10 +1,99 @@
-depends gcc &&
depends -sub CXX gcc &&
+depends cmake &&
+depends openimageio &&
+depends libpng &&
+depends JPEG &&
+depends zlib &&
depends python3 &&
-depends scons &&
+depends glu &&
+depends boost &&
+sub_depends boost "FILESYSTEM" &&
+sub_depends boost "REGEX" &&
+sub_depends boost "SYSTEM" &&
+sub_depends boost "THREAD" &&
+sub_depends boost "DATE_TIME" &&
+sub_depends boost "LOCALE" &&
+
depends OPENGL &&
-depends glew &&
-depends libsamplerate &&
+depends glew "-DWITH_SYSTEM_GLEW=on" &&
+depends yaml-cpp &&
+
+optional_depends LIBAVCODEC \
+ "-DWITH_CODEC_FFMPEG=on" \
+ "-DWITH_CODEC_FFMPEG=off" \
+ "for ffmpeg support " &&
+
+optional_depends libspnav \
+ "-DWITH_INPUT_NDOF=on" \
+ "-DWITH_INPUT_NDOF=off" \
+ "support for ndof devices" &&
+
+optional_depends fftw \
+ "-DWITH_FFTW3=on" \
+ "-DWITH_FFTW3=off" \
+ "enable fftw support?" &&
+
+optional_depends libsndfile \
+ "-DWITH_CODEC_SNDFILE=on" \
+ "-DWITH_CODEC_SNDFILE=off" \
+ "enable libsndfile support?" &&
+
+optional_depends libxxf86vm \
+ "-DWITH_X11_XF86VMODE=on" \
+ "-DWITH_X11_XF86VMODE=off" \
+ "enable X11 video mode switching" &&
+
+optional_depends libxi \
+ "-DWITH_X11_XINPUT=on" \
+ "-DWITH_X11_XINPUT=off" \
+ "tablet support and unicode input" &&
+
+optional_depends sdl \
+ "-DWITH_SDL=on" \
+ "-DWITH_SDL=off" \
+ "for sound and joystick support" &&
+
+optional_depends freealut \
+ "-DWITH_OPENAL=on" \
+ "-DWITH_OPENAL=off" \
+ "for sound support" &&
+
+optional_depends lzo \
+ "-DWITH_LZO=on" \
+ "-DWITH_LZO=off" \
+ "use lzo compression for pointcache?" &&
+
+optional_depends LZMA \
+ "-DWITH_LZMA=on" \
+ "-DWITH_LZMA=off" \
+ "use lzma compression for pointcache?" &&
+
+optional_depends JACK-DRIVER \
+ "-DWITH_JACK=on" \
+ "-DWITH_JACK=off" \
+ "enable jack support?" &&
+
+optional_depends tiff \
+ "-DWITH_TIFF=on" \
+ "-DWITH_TIFF=off" \
+ "enable TIFF support?" &&
+
+optional_depends openjpeg \
+ "-DWITH_OPENJPEG=on -DWITH_SYSTEM_OPENJPEG=on" \
+ "-DWITH_OPENJPEG=off" \
+ "enable openjpeg support?" &&
+
+optional_depends openexr \
+ "-DWITH_OPENEXR=on" \
+ "-DWITH_OPENEXR=off" \
+ "enable OpenEXR support?" &&
+
+optional_depends bullet \
+ "-DWITH_BULLET=on" \
+ "-DWITH_BULLET=off" \
+ "enable bullet physics engine support?" \
+ games &&
+
depends libice &&
depends libsm &&
depends libx11 &&
@@ -26,82 +115,4 @@ depends libxrandr &&
depends libxxf86misc &&
depends libxinerama &&
depends freetype2 &&
-depends eigen3 &&
-depends bullet "" "" games &&
-
-if [ "$BLENDER_OGG" == "WITH_BF_OGG=True" ]; then
- depends libogg &&
- depends libvorbis &&
- depends libtheora
-fi &&
-
-optional_depends gettext \
- "WITH_BF_INTERNATIONAL=True" \
- "WITH_BF_INTERNATIONAL=False" \
- "Enable international?" &&
-
-optional_depends JPEG \
- "WITH_BF_JPEG=True" \
- "WITH_BF_JPEG=False" \
- "Enable JPEG support?" &&
-
-optional_depends libpng \
- "WITH_BF_PNG=True" \
- "WITH_BF_PNG=False" \
- "Enable PNG support?" &&
-
-optional_depends tiff \
- "WITH_BF_TIFF=True" \
- "WITH_BF_TIFF=False" \
- "Enable TIFF support?" &&
-
-optional_depends openjpeg \
- "WITH_BF_OPENJPEG=True" \
- "WITH_BF_OPENJPEG=False" \
- "Enable openjpeg support?" &&
-
-optional_depends freealut \
- "WITH_BF_OPENAL=True" \
- "WITH_BF_OPENAL=False" \
- "Enable OpenAL support?" &&
-
-optional_depends libsndfile \
- "WITH_BF_SNDFILE=True BF_SNDFILE_INC=/usr/include" \
- "WITH_BF_SNDFILE=False" \
- "Enable libsndfile support?" &&
-
-optional_depends sdl \
- "WITH_BF_SDL=True" \
- "WITH_BF_SDL=False" \
- "Enable SDL support?" &&
-
-optional_depends openexr \
- "WITH_BF_OPENEXR=True" \
- "WITH_BF_OPENEXR=False" \
- "Enable openexr support?" &&
-
-optional_depends LIBAVCODEC \
- "WITH_BF_FFMPEG=True" \
- "WITH_BF_FFMPEG=False" \
- "Enable FFMPEG support?" &&
-
-optional_depends fftw \
- "WITH_BF_FFTW3=True" \
- "WITH_BF_FFTW3=False" \
- "Enable fftw support?" &&
-
-optional_depends zlib \
- "WITH_BF_ZLIB=True" \
- "WITH_BF_ZLIB=False" \
- "Enable zlib support?" &&
-
-optional_depends JACK-DRIVER \
- "WITH_BF_JACK=True" \
- "WITH_BF_JACK=False" \
- "Enable jack support?"
-
-#optional_depends glibc \
-# "WITH_BF_ICONV = True" \
-# "WITH_BF_ICONV = False" \
-# "Enable iconv support/"
-
+depends eigen3
diff --git a/graphics/blender/DETAILS b/graphics/blender/DETAILS
index e35dc3a..19f04b0 100755
--- a/graphics/blender/DETAILS
+++ b/graphics/blender/DETAILS
@@ -10,13 +10,13 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_URL[0]=svn_https://svn.blender.org/svnroot/bf-blender/trunk/blender:$SPELL-svn
SOURCE_IGNORE=volatile
else
- VERSION=2.62
+ VERSION=2.65a
SOURCE=$SPELL-${VERSION}.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION}"
SOURCE_URL[0]=http://download.blender.org/source/$SOURCE
SOURCE_URL[1]=http://mirror.cs.umn.edu/blender.org/source/$SOURCE
SOURCE_URL[2]=http://public.planetmirror.com/pub/blender/source/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:02d493a7395160047b39dcfb48dbd45c285fbeaec741d4248bef62a8da8743e6bf59bba4ecc401e35c0f21a8db4e883c9b29d620be6c4dd6d4852ae53e7c978f
fi
LICENSE[0]=GPL
KEYWORDS="graphics"
diff --git a/graphics/blender/INSTALL b/graphics/blender/INSTALL
old mode 100755
new mode 100644
diff --git a/graphics/blender/PREPARE b/graphics/blender/PREPARE
index 98d27e4..470e402 100755
--- a/graphics/blender/PREPARE
+++ b/graphics/blender/PREPARE
@@ -1,2 +1,2 @@
-. ${GRIMOIRE}/FUNCTIONS &&
+. ${GRIMOIRE}/FUNCTIONS &&
prepare_select_branch stable scm
diff --git a/graphics/blender/PRE_BUILD b/graphics/blender/PRE_BUILD
old mode 100755
new mode 100644
index d6532ef..ebad7e3
--- a/graphics/blender/PRE_BUILD
+++ b/graphics/blender/PRE_BUILD
@@ -1,9 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p0 < $SCRIPT_DIRECTORY/blender-2.61-desktop.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/blender-2.60-bmake.patch &&
-chmod 755 release/plugins/bmake &&
rm -r extern/libopenjpeg &&
patch -p1 < $SCRIPT_DIRECTORY/blender-2.60-openjpeg.patch &&
rm -r extern/glew &&
@@ -12,34 +9,4 @@ rm -r extern/Eigen3
&&
patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-eigen.patch &&
patch -p1 < $SCRIPT_DIRECTORY/blender-2.60a-libav-0.7.patch &&
patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-CVE-2009-3850.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-enable_site_module.patch &&
-
-cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-REL_CFLAGS=[]
-REL_CXXFLAGS=[]
-REL_CCFLAGS=[]
-EOF
-
-cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-C_WARN =[ '-w', '-g0' ]
-CC_WARN =[ '-w', '-g0' ]
-CXX_WARN=[ '-w', '-g0' ]
-EOF
-
-cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
-BF_INSTALLDIR="../install"
-WITH_PYTHON_SECURITY=1
-WITHOUT_BF_PYTHON_INSTALL=1
-BF_PYTHON="/usr"
-BF_PYTHON_VERSION="3.2"
-BF_PYTHON_ABI_FLAGS="m"
-BF_BUILDINFO=0
-BF_QUIET=1
-BF_NUMJOBS=${MAKE_NJOBS}
-BF_LINE_OVERWRITE=0
-WITH_BF_FHS=1
-WITH_BF_STATICOPENGL=0
-EOF
-# WITH_BF_BINRELOC=0
-# WITH_BF_OPENMP=${enable_openmp}
+patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-enable_site_module.patch
diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index d93409a..a3b1a28 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,4 +1,8 @@
OPTS="$WEBKIT_SVG $WEBKIT_WEBGL $OPTS" &&
-OPTS="--with-gtk=3.0 $OPTS" &&
-default_build
+CFLAGS+=" -fpermissive" &&
+CXXFLAGS+=" -fpermissive" &&
+
+default_build_configure &&
+make -j1 DerivedSources/WebCore/JSNode.h &&
+default_build_make
diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
index cdd362a..b983f66 100755
--- a/http/webkitgtk3/PRE_BUILD
+++ b/http/webkitgtk3/PRE_BUILD
@@ -2,4 +2,7 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
+sed -i '29i #include "../../../JavaScriptCore/icu/unicode/utf8.h"' \
+ Source/WebCore/platform/text/TextCodecUTF8.h &&
+patch -p1 < $SPELL_DIRECTORY/0001-add-missing-include.patch &&
+autoreconf -fi
diff --git a/mail/mutt/DETAILS b/mail/mutt/DETAILS
index 7657908..827cd28 100755
--- a/mail/mutt/DETAILS
+++ b/mail/mutt/DETAILS
@@ -15,7 +15,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-mercurial
;;
devel)
- VERSION=1.5.20
+ VERSION=1.5.21
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_URL[0]=ftp://ftp.mutt.org/mutt/devel/${SOURCE}
diff --git a/perl-cpan/class-factory-util/DEPENDS
b/perl-cpan/class-factory-util/DEPENDS
new file mode 100755
index 0000000..c1a1bc6
--- /dev/null
+++ b/perl-cpan/class-factory-util/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/perl-cpan/class-factory-util/DETAILS
b/perl-cpan/class-factory-util/DETAILS
new file mode 100755
index 0000000..6c9204d
--- /dev/null
+++ b/perl-cpan/class-factory-util/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=class-factory-util
+ VERSION=1.7
+ SOURCE="Class-Factory-Util-${VERSION}.tar.gz"
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/D/DR/DROLSKY/${SOURCE}
+
SOURCE_HASH=sha512:8b8af36f1100805a9f59bd8745bc41455ebc20af9ff9cedd8a36370f66e0fb63a761918ae4f268d5546aeeecdd4ca7de448aca36e84f27b8f0932f34db68982e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Class-Factory-Util-${VERSION}"
+ WEB_SITE="http://search.cpan.org/~/Class-Factory-Util/";
+ LICENSE[0]=ART
+ ENTERED=20130511
+ SHORT="provide utility methods for factory classes"
+cat << EOF
+This module exports a method that is useful for factory classes.
+EOF
diff --git a/perl-cpan/class-factory-util/HISTORY
b/perl-cpan/class-factory-util/HISTORY
new file mode 100644
index 0000000..72abf61
--- /dev/null
+++ b/perl-cpan/class-factory-util/HISTORY
@@ -0,0 +1,3 @@
+2013-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/class-load-xs/BUILD b/perl-cpan/class-load-xs/BUILD
new file mode 100755
index 0000000..2a0f65b
--- /dev/null
+++ b/perl-cpan/class-load-xs/BUILD
@@ -0,0 +1,2 @@
+perl Build.PL &&
+./Build
diff --git a/perl-cpan/class-load-xs/DEPENDS b/perl-cpan/class-load-xs/DEPENDS
new file mode 100755
index 0000000..5e7ed2f
--- /dev/null
+++ b/perl-cpan/class-load-xs/DEPENDS
@@ -0,0 +1,3 @@
+depends perl &&
+depends test-requires &&
+depends class-load
diff --git a/perl-cpan/class-load-xs/DETAILS b/perl-cpan/class-load-xs/DETAILS
new file mode 100755
index 0000000..2b3410c
--- /dev/null
+++ b/perl-cpan/class-load-xs/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=class-load-xs
+ VERSION=0.06
+ SOURCE="Class-Load-XS-${VERSION}.tar.gz"
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/D/DR/DROLSKY/${SOURCE}
+
SOURCE_HASH=sha512:07effa62cef0c27f25c5918e7dbc9aec3aa2ad88dfd06963cef2908c562532ea3048feb97717f0a120ca40250f3629f31a2d9d2263036e6de61158bebb6afe36
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Class-Load-XS-${VERSION}"
+ WEB_SITE="http://search.cpan.org/~/Class-Load-XS/";
+ LICENSE[0]=ART
+ ENTERED=20130511
+ SHORT="XS implementation of parts of Class::Load"
+cat << EOF
+This module provides an XS implementation for portions of Class::Load. See
+Class::Load for API details.
+EOF
diff --git a/perl-cpan/class-load-xs/HISTORY b/perl-cpan/class-load-xs/HISTORY
new file mode 100644
index 0000000..cb7d79d
--- /dev/null
+++ b/perl-cpan/class-load-xs/HISTORY
@@ -0,0 +1,3 @@
+2013-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/perl-cpan/class-load-xs/INSTALL b/perl-cpan/class-load-xs/INSTALL
new file mode 100755
index 0000000..bd76e0b
--- /dev/null
+++ b/perl-cpan/class-load-xs/INSTALL
@@ -0,0 +1 @@
+./Build install --prefix "${INSTALL_ROOT}/usr"
diff --git a/perl-cpan/datetime-format-builder/DEPENDS
b/perl-cpan/datetime-format-builder/DEPENDS
index 6db34d4..2480e8a 100755
--- a/perl-cpan/datetime-format-builder/DEPENDS
+++ b/perl-cpan/datetime-format-builder/DEPENDS
@@ -1,3 +1,4 @@
depends perl &&
depends datetime &&
-depends datetime-format-strptime
+depends datetime-format-strptime &&
+depends class-factory-util
diff --git a/perl-cpan/datetime-format-builder/HISTORY
b/perl-cpan/datetime-format-builder/HISTORY
index e41678e..6cdaa49 100644
--- a/perl-cpan/datetime-format-builder/HISTORY
+++ b/perl-cpan/datetime-format-builder/HISTORY
@@ -1,3 +1,4 @@
2013-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS: spell created
+ * BUILD: added dependency on class-factory-util
diff --git a/perl-cpan/geo-gpx/DEPENDS b/perl-cpan/geo-gpx/DEPENDS
index 534a118..ad8e0c0 100755
--- a/perl-cpan/geo-gpx/DEPENDS
+++ b/perl-cpan/geo-gpx/DEPENDS
@@ -3,4 +3,5 @@ depends datetime &&
depends datetime-format-iso8601 &&
depends html-parser &&
depends test-simple &&
-depends xml-descent
+depends xml-descent &&
+depends class-load-xs
diff --git a/perl-cpan/geo-gpx/HISTORY b/perl-cpan/geo-gpx/HISTORY
index 29065b4..8b6ad39 100644
--- a/perl-cpan/geo-gpx/HISTORY
+++ b/perl-cpan/geo-gpx/HISTORY
@@ -1,3 +1,6 @@
2013-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on class-load-xs
+
+2013-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS: spell created
diff --git a/science/hdf5/DETAILS b/science/hdf5/DETAILS
index cbbcbc6..b5304bc 100755
--- a/science/hdf5/DETAILS
+++ b/science/hdf5/DETAILS
@@ -1,9 +1,9 @@
SPELL=hdf5
- VERSION=1.8.8
+ VERSION=1.8.10-patch1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.hdfgroup.org/ftp/HDF5/current/src/${SOURCE}
SOURCE_URL[1]=http://www.hdfgroup.org/ftp/HDF5/prev-releases/hdf5-$VERSION/src/$SOURCE
-
SOURCE_HASH=sha512:d99e936a9591e731ce6fc03d15aff70c93a114ae13886f3d748e5310e50958267b9bf42b704390a043fb2a0fb8cbb5dcdef9ba1a7e964b05a25abe7550dd37fd
+
SOURCE_HASH=sha512:283301bf6c3131e3079e7430dce758ccefbc7add42b14ebfc87ca30b1d9ecb20bfc00ecf6ec823fc1e3cc7af16f8ed186cd09364444f55acfcab70c6981c10ed
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.hdfgroup.org/HDF5/";
LICENSE[0]="BSD"
diff --git a/science/splitter/INSTALL b/science/splitter/INSTALL
index c08e23b..4705816 100755
--- a/science/splitter/INSTALL
+++ b/science/splitter/INSTALL
@@ -1,3 +1,3 @@
mkdir -p ${INSTALL_ROOT}/usr/share/splitter
&&
-install -m644 ${SOURCE_DIRECTORY}/dist/splitter.jar
${INSTALL_ROOT}/usr/share/splitter/ &&
+install -m644 ${SOURCE_DIRECTORY}/dist/*.jar
${INSTALL_ROOT}/usr/share/splitter/ &&
install -m755 ${SCRIPT_DIRECTORY}/splitter ${INSTALL_ROOT}/usr/bin/
diff --git a/science/splitter/splitter b/science/splitter/splitter
index e73316e..59a47dc 100644
--- a/science/splitter/splitter
+++ b/science/splitter/splitter
@@ -1,3 +1,3 @@
#!/bin/bash
-java -jar /usr/share/splitter/splitter.jar "$@"
+java -cp /usr/share/splitter -jar /usr/share/splitter/splitter.jar "$@"
diff --git a/utils/colorgcc/DETAILS b/utils/colorgcc/DETAILS
index 595d382..35de7a8 100755
--- a/utils/colorgcc/DETAILS
+++ b/utils/colorgcc/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=${SPELL}rc.txt
SOURCE2_URL[0]=http://schlueters.de/${SOURCE2}
SOURCE2_HASH=sha512:8f014286d471eccee04866df6890c98baa3a13fd8a3a8b2938f24c48aed2aa32d1980af1f00e3415e2f3f11f1d15ffd35831339ee9917737f051fccfa7917d49
- WEB_SITE=http://www.mindspring.com/~jamoyers/software/
+ WEB_SITE=http://schlueters.de/colorgcc.html
ENTERED=20051213
LICENSE[0]=GPL
KEYWORDS="compiler utils"
diff --git a/video/mplayer2/DEPENDS b/video/mplayer2/DEPENDS
index 8b4c123..c35ff04 100755
--- a/video/mplayer2/DEPENDS
+++ b/video/mplayer2/DEPENDS
@@ -1,4 +1,4 @@
-depends LIBAVCODEC &&
+depends -sub STABLE ffmpeg &&
depends libcap &&
depends libass &&
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f8e9d85f868de7beff890c7d5c15f6cf676ec81f), Florian Franzmann, 05/11/2013
Archive powered by MHonArc 2.6.24.