Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (133d8211601727fa4d34a5986fcfc5ca77dfd116)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (133d8211601727fa4d34a5986fcfc5ca77dfd116)
  • Date: Wed, 15 Feb 2012 14:57:20 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

devel/ghc/BUILD | 2 ++
devel/ghc/HISTORY | 4 ++++
devel/ghc/PRE_BUILD | 8 ++++++++
haskell/happy/DETAILS | 4 ++--
haskell/happy/HISTORY | 3 +++
haskell/haskell-bytestring/DETAILS | 4 ++--
haskell/haskell-bytestring/HISTORY | 3 +++
haskell/haskell-deepseq/DETAILS | 4 ++--
haskell/haskell-deepseq/HISTORY | 3 +++
haskell/haskell-random/DETAILS | 4 ++--
haskell/haskell-random/HISTORY | 3 +++
haskell/haskell-syb/DETAILS | 4 ++--
haskell/haskell-syb/HISTORY | 3 +++
haskell/haskell-x11/DEPENDS | 5 +++--
haskell/haskell-x11/DETAILS | 4 ++--
haskell/haskell-x11/HISTORY | 4 ++++
video/ffmpeg/DEPENDS | 2 +-
video/ffmpeg/HISTORY | 3 +++
18 files changed, 52 insertions(+), 15 deletions(-)

New commits:
commit 133d8211601727fa4d34a5986fcfc5ca77dfd116
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/ghc: create /lib64 symlink on x86_64

commit 844fe716406e6fb61c559eb7b78ca520e6ff4c60
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/ghc: activated parallel build

commit 1bd3e8b6eed98907b3f3719e10ee20d4c25ef1b9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/ffmpeg: added --disable-libopenjpeg switch to openjpeg dependency

commit e237b2d0b8574bf3438ceb759a97bb5d7a7e71e7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-random: version 1.0.1.1

commit 375d21e9292f8b71a7021241cd661360e98770fd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-x11: version 1.5.0.1

commit 379cb4f19a3b50a10292ea954c6f67bbd0d630b2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-bytestring: version 0.9.2.1

commit 9b4bd17ba27e590e4655b2d3bab240b11052dbd5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/happy: version 1.18.9

commit ccaced20d49eda5482cf763bffb412559c2a260c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-deepseq: version 1.3.0.0

commit 232fee6393bd839415693c63f89e21048a5b6497
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-syb: version 0.3.6

diff --git a/devel/ghc/BUILD b/devel/ghc/BUILD
index 3f38164..1998651 100755
--- a/devel/ghc/BUILD
+++ b/devel/ghc/BUILD
@@ -18,6 +18,8 @@ if [[ $SOURCE2 != "" ]] ; then
cd ..
fi &&

+make_normal &&
+
cd $SPELL-$VERSION &&

./configure --prefix=${INSTALL_ROOT}/usr \
diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index dd83989..e92e7a1 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,7 @@
+2012-02-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: activated parallel build
+ * PRE_BUILD: create /lib64 symlink on x86_64
+
2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: marked 'base' as trusted to work around compile error caused
by 7.2.1
* DETAILS: version 7.4.1, TMPFS=off
diff --git a/devel/ghc/PRE_BUILD b/devel/ghc/PRE_BUILD
index 18e4368..4e62d69 100755
--- a/devel/ghc/PRE_BUILD
+++ b/devel/ghc/PRE_BUILD
@@ -1,3 +1,11 @@
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
+then
+ if [[ ! -d $INSTALL_ROOT/lib64 ]] && [[ ! -h $INSTALL_ROOT/lib64 ]]
+ then
+ ln -sf $INSTALL_ROOT/lib $INSTALL_ROOT/lib64
+ fi
+fi &&
+
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&

diff --git a/haskell/happy/DETAILS b/haskell/happy/DETAILS
index ba75c35..e052f29 100755
--- a/haskell/happy/DETAILS
+++ b/haskell/happy/DETAILS
@@ -1,8 +1,8 @@
SPELL=happy
- VERSION=1.18.6
+ VERSION=1.18.9
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:2a05d933baa79b3c052956a8fc094dcb831ae03361196d3107c229380d8f231b0410b2caec2d7c2fc42b227754d484a061da7d6f1e9c1900fccc2b7e671345f0
+
SOURCE_HASH=sha512:eaf601e6d78546947b475dd5d396d9086af070f2fc6c49c04a7c373e233bda330702454b8f08650bca8493f7bad04b1ef6ee59d47fadc0b5fcbd68ad07f6d79b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.haskell.org/happy/";
LICENSE[0]=BSD3
diff --git a/haskell/happy/HISTORY b/haskell/happy/HISTORY
index 7813bcc..7b45c63 100644
--- a/haskell/happy/HISTORY
+++ b/haskell/happy/HISTORY
@@ -1,3 +1,6 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.18.9
+
2011-10-15 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description

diff --git a/haskell/haskell-bytestring/DETAILS
b/haskell/haskell-bytestring/DETAILS
index cb05296..9bd57b7 100755
--- a/haskell/haskell-bytestring/DETAILS
+++ b/haskell/haskell-bytestring/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-bytestring
- VERSION=0.9.2.0
+ VERSION=0.9.2.1
SOURCE="bytestring-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/bytestring/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:dac19622eb5bbb4891d0076a797e80d21e78da3413f93022e60f956ea81f35640ff505ac9c3335833d35bd5c51568acd37b88a453a0b43b0fa7428fe8c9888f3
+
SOURCE_HASH=sha512:8a7fff14319b1f2236b25d207556f4507097396eb8e8fd0bc76e12378be7e4d75d25c2fca4e0e288da549f554ea1f70409f9f442190e5f38cb8a5bdfd2788f22
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/bytestring-${VERSION}"
WEB_SITE="http://www.cse.unsw.edu.au/~dons/fps.html";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-bytestring/HISTORY
b/haskell/haskell-bytestring/HISTORY
index 93106cb..e9857e5 100644
--- a/haskell/haskell-bytestring/HISTORY
+++ b/haskell/haskell-bytestring/HISTORY
@@ -1,3 +1,6 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9.2.1
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.9.2.0

diff --git a/haskell/haskell-deepseq/DETAILS b/haskell/haskell-deepseq/DETAILS
index dff3efa..fea3644 100755
--- a/haskell/haskell-deepseq/DETAILS
+++ b/haskell/haskell-deepseq/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-deepseq
- VERSION=1.2.0.1
+ VERSION=1.3.0.0
SOURCE="deepseq-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/deepseq/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:9f02c05c14a79f4ad743f1fb25ed47706789c0141b6f765e140e9b088c5358bdde9ba6b096bf4d478f970839d347e1af40326063d4f3f913c33dc4b3b993454a
+
SOURCE_HASH=sha512:f845b483e7cfd37e63e0a4d8515a54c130a38e219dfe7f3f1a9af2ba0420603097d90985b992f5ff9af3bcbc6ae106f315b821be561c669374115597938cc9fb
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/deepseq-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/deepseq";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-deepseq/HISTORY b/haskell/haskell-deepseq/HISTORY
index 059b8a6..b9f951a 100644
--- a/haskell/haskell-deepseq/HISTORY
+++ b/haskell/haskell-deepseq/HISTORY
@@ -1,3 +1,6 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3.0.0
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-random/DETAILS b/haskell/haskell-random/DETAILS
index e9faf3c..377e229 100755
--- a/haskell/haskell-random/DETAILS
+++ b/haskell/haskell-random/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-random
- VERSION=1.0.1.0
+ VERSION=1.0.1.1
SOURCE="random-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/random/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:0fe104e72de6e323342310f64643519bc95542873c994c85936c09b4bba4bc7e91f6b135bedc829df69098252f3052afac9476faac958c20959b0b3271fedde2
+
SOURCE_HASH=sha512:dc2f76e87a497d6f5196a8829027d5a9f0eaa2907995f432e26a1594c287c90884253a994fc4a325b0c05c97816e3c3b940a97ccb50d31917a87a99200f1ebff
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/random-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/random";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-random/HISTORY b/haskell/haskell-random/HISTORY
index 059b8a6..d7c6ad4 100644
--- a/haskell/haskell-random/HISTORY
+++ b/haskell/haskell-random/HISTORY
@@ -1,3 +1,6 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.1.1
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-syb/DETAILS b/haskell/haskell-syb/DETAILS
index 582c6a0..7d7a9d3 100755
--- a/haskell/haskell-syb/DETAILS
+++ b/haskell/haskell-syb/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-syb
- VERSION=0.3.3
+ VERSION=0.3.6
SOURCE="syb-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/syb/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:0347d7ea9084e00c16fef423c1e8610cc9dd9e8ae3501b4c3fdd8c4033801378723deb4f2134c14028162196f4b5d4aa6505092078cb4bf21d3003da88955e21
+
SOURCE_HASH=sha512:346a786aba6ca531981dff3dd5fbf76721bbbb3a515fc4667b9328f65e5985e8011a6d68399f7700be0a051ebb2871de0d789dc07d0417fc8b6d8bf009d4e8f1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/syb-${VERSION}"
WEB_SITE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-syb/HISTORY b/haskell/haskell-syb/HISTORY
index 218d010..87d594f 100644
--- a/haskell/haskell-syb/HISTORY
+++ b/haskell/haskell-syb/HISTORY
@@ -1,3 +1,6 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.6
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.3

diff --git a/haskell/haskell-x11/DEPENDS b/haskell/haskell-x11/DEPENDS
index 3cc2d89..d35e204 100755
--- a/haskell/haskell-x11/DEPENDS
+++ b/haskell/haskell-x11/DEPENDS
@@ -1,2 +1,3 @@
-depends ghc &&
-depends xorg-libs
+depends ghc &&
+depends xorg-libs &&
+depends haskell-syb
diff --git a/haskell/haskell-x11/DETAILS b/haskell/haskell-x11/DETAILS
index 94753d2..9c00d83 100755
--- a/haskell/haskell-x11/DETAILS
+++ b/haskell/haskell-x11/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-x11
- VERSION=1.5.0.0
+ VERSION=1.5.0.1
SOURCE="X11-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/X11/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:dc097012c09c19a7dbb42711fd0cd54c84e98cb3bc150d77a7470c63912908d3241079a87ca3797cae36b00fa2d52c9e6db33287e9d44dc58a43f1b85ee33518
+
SOURCE_HASH=sha512:de3e32543fcdcf86aa14443aea02a6862ed39cdbaaf732cee325155af2e84570a9cbdbb9da69ab247bfcdc8e475b9d3b7c678f9e7b3e996370bbbb9b1aacabce
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/X11-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-x11/HISTORY b/haskell/haskell-x11/HISTORY
index f676bae..363bd26 100644
--- a/haskell/haskell-x11/HISTORY
+++ b/haskell/haskell-x11/HISTORY
@@ -1,3 +1,7 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.5.0.1
+ * DEPENDS: added dependency on haskell-syb
+
2010-12-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: added to fix build process

diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 4f06b6d..4edab6b 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -36,7 +36,7 @@ optional_depends speex \
"support for the Speex codec" &&
optional_depends openjpeg \
"--enable-libopenjpeg" \
- "" \
+ "--disable-libopenjpeg" \
"support for JPEG 2000" &&
optional_depends "lame" \
"--enable-libmp3lame" \
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index f986aa7..1a8114b 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2012-02-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added --disable-libopenjpeg switch to openjpeg dependency
+
2012-02-13 Vlad Glagolev <stealth AT sourcemage.org>
* UP_TRIGGERS: corrected major version detection




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (133d8211601727fa4d34a5986fcfc5ca77dfd116), Florian Franzmann, 02/15/2012

Archive powered by MHonArc 2.6.24.

Top of Page