Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (d722dfa9c5510c9493366386c4be9b87158c9525)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (d722dfa9c5510c9493366386c4be9b87158c9525)
  • Date: Mon, 22 Apr 2013 05:12:01 -0500

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

audio-players/mpg123/DETAILS | 2 -
audio-players/mpg123/HISTORY | 3 ++
audio-players/ripperx/BUILD | 1
audio-players/ripperx/DETAILS | 2 -
audio-players/ripperx/HISTORY | 4 ++
audio-soft/rockbox-utility/DETAILS | 4 +-
audio-soft/rockbox-utility/HISTORY | 3 ++
dev/null |binary
devel/fpc/BUILD | 2 -
devel/fpc/DETAILS | 34
++++++++-----------------
devel/fpc/EXPORTS | 1
devel/fpc/HISTORY | 6 ++++
devel/fpc/INSTALL | 8 -----
devel/fpc/PREPARE | 1
devel/fpc/PRE_BUILD | 14 ++--------
devel/fpc/REPAIR^none^EXPORTS | 1
devel/libunwind/BUILD | 4 ++
devel/libunwind/DETAILS | 10 ++++++-
devel/libunwind/PREPARE | 2 +
graphics-libs/ilmbase/DETAILS | 4 +-
graphics-libs/ilmbase/HISTORY | 4 ++
graphics-libs/ilmbase/PRE_BUILD | 3 --
graphics-libs/ilmbase/gcc45.patch | 24 -----------------
graphics/gmic/DETAILS | 4 +-
graphics/gmic/HISTORY | 4 ++
graphics/gmic/opencv-buildfix.patch | 28 +++++---------------
graphics/openexr/0001-add-missing-header.patch | 24 -----------------
graphics/openexr/DETAILS | 4 +-
graphics/openexr/HISTORY | 4 ++
graphics/openexr/PRE_BUILD | 3 --
python-pypi/mercurial/DETAILS | 4 +-
python-pypi/mercurial/HISTORY | 3 ++
video/avidemux2/BUILD | 9 ++++--
video/avidemux2/HISTORY | 6 ++++
video/avidemux2/INSTALL | 4 ++
35 files changed, 98 insertions(+), 136 deletions(-)

New commits:
commit c67ea0c4a08069cef1a95fcd11561f86d43829e3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mercurial: => 2.5.4

commit e921b8d65f1d4be95f28ab15a6b83e22a20a1a30
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libunwind: => 1.1

commit a1bec3bad3a609af1867978fde7ec9a9ab99b47c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fpc 2.6.2

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

audio-players/ripperx: fix SOURCE_URL[0], add -lm to LIBS

commit f7953d77d8021f003606f81e6ffa972edbbe6b4b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

avidemux2: switch to provided build script, enabling avidemux to
actually do something since plugins are not missing

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

gmic 1.5.5.2

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

openexr 2.0.0

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

ilmbase 2.0.0

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

audio-soft/rockbox-utility: version 1.3.1

commit b93a3583d34fccd86efc4fdd6380052cee746d93
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mpg123: bump to 1.15.3

diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index 67d08b9..5c8df1e 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
SPELL=mpg123
- VERSION=1.15.1
+ VERSION=1.15.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 71df869..ddf426a 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,6 @@
+2013-04-03 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.15.3
+
2013-02-24 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated spell to 1.15.1

diff --git a/audio-players/ripperx/BUILD b/audio-players/ripperx/BUILD
new file mode 100755
index 0000000..a908acd
--- /dev/null
+++ b/audio-players/ripperx/BUILD
@@ -0,0 +1 @@
+LIBS+=" -lm" default_build
diff --git a/audio-players/ripperx/DETAILS b/audio-players/ripperx/DETAILS
index 7b202cf..42b962a 100755
--- a/audio-players/ripperx/DETAILS
+++ b/audio-players/ripperx/DETAILS
@@ -2,7 +2,7 @@
VERSION=2.7.3
SOURCE=ripperX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ripperX-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/ripperx/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$VERSION/$SOURCE

SOURCE_HASH=sha512:fad4d8ee5e7ea37608b827230446f213c871d425920d0ffae5b0151e2270b36ca67156a78a530a3267141f8c5d0577a17647e4342468662472ea0f88bda69cea
WEB_SITE=http://sourceforge.net/projects/ripperx/
ENTERED=20020116
diff --git a/audio-players/ripperx/HISTORY b/audio-players/ripperx/HISTORY
index 4ff6ea9..4968b0e 100644
--- a/audio-players/ripperx/HISTORY
+++ b/audio-players/ripperx/HISTORY
@@ -1,3 +1,7 @@
+2013-04-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+ * BUILD: add -lm to LIBS
+
2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.7.3

diff --git a/audio-soft/rockbox-utility/DETAILS
b/audio-soft/rockbox-utility/DETAILS
index 20ca05e..e5fd9f9 100755
--- a/audio-soft/rockbox-utility/DETAILS
+++ b/audio-soft/rockbox-utility/DETAILS
@@ -1,8 +1,8 @@
SPELL=rockbox-utility
- VERSION=1.2.13
+ VERSION=1.3.1
SOURCE="RockboxUtility-v${VERSION}-src.tar.bz2"
SOURCE_URL[0]=http://download.rockbox.org/rbutil/source/${SOURCE}
-
SOURCE_HASH=sha512:bf456f85114ee87ced58465014b2d881c0c7f98294ff7ad6bc8edbbaafb0420b44b7231af040bc2d9128736fd3e16ea2712924b5a97c2ca68aee728bd9b56459
+
SOURCE_HASH=sha512:8df11fee706be49291e499dec0dac0abd2a774f059d5080bcfd0222125eaa61a40838e81d856139040c40119e3f9475502bd084d9974881e740ea2328574b13c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/RockboxUtility-v${VERSION}"
WEB_SITE="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility";
LICENSE[0]=GPL
diff --git a/audio-soft/rockbox-utility/HISTORY
b/audio-soft/rockbox-utility/HISTORY
index 660eb0d..b1865b5 100644
--- a/audio-soft/rockbox-utility/HISTORY
+++ b/audio-soft/rockbox-utility/HISTORY
@@ -1,3 +1,6 @@
+2013-04-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3.1
+
2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.2.13, fixed SOURCE and
SOURCE_DIRECTORY

diff --git a/devel/fpc/BUILD b/devel/fpc/BUILD
index 132dd0c..d34d73a 100755
--- a/devel/fpc/BUILD
+++ b/devel/fpc/BUILD
@@ -7,7 +7,7 @@ else
fi &&

if ! spell_ok fpc ; then
- PP=$SOURCE_DIRECTORY/bootstrap/lib/fpc/$VERSIONB/ppc$ARCH
+ PP=$SOURCE_DIRECTORY/bootstrap/lib/fpc/$VERSION/ppc$ARCH
else
PP=$INSTALL_ROOT/usr/bin/fpc
fi &&
diff --git a/devel/fpc/DETAILS b/devel/fpc/DETAILS
index 5204725..55f5c0f 100755
--- a/devel/fpc/DETAILS
+++ b/devel/fpc/DETAILS
@@ -1,30 +1,20 @@
SPELL=fpc
-if [[ $FPV_DEV == y ]];then
- VERSION=2.4.4
-
SOURCE_HASH=sha512:05ada1f2605622f342dbc9caad00fb6ea3abd90cda431d8482e74518ef188a99a9eddcb63f2e6fb20607b59b5c59de34032e48e03fe8c65825ea812b1b29204e
+ VERSION=2.6.2
+
SOURCE_HASH=sha512:caa1b2c54907b30b536db2ca65bcdd646e8b9e6f2e99fedf9a88edf65f912660a0a9d060cede2ae0f06cdc8bc8099f73274a617cfa65df46c982a1c17ed42192
SOURCE=$SPELL-$VERSION.source.tar.gz
- SOURCE_URL[0]=${SOURCEFORGE_URL}/freepascal/$SOURCE
- SOURCE_URL[1]=ftp://ftp.freepascal.org/fpc/dist/source-${VERSION}/$SOURCE
-else
- VERSION=2.4.4
-
SOURCE_HASH=sha512:05ada1f2605622f342dbc9caad00fb6ea3abd90cda431d8482e74518ef188a99a9eddcb63f2e6fb20607b59b5c59de34032e48e03fe8c65825ea812b1b29204e
- SOURCE=$SPELL-$VERSION.source.tar.gz
- SOURCE_URL[0]=${SOURCEFORGE_URL}/freepascal/$SOURCE
- SOURCE_URL[1]=ftp://ftp.freepascal.org/fpc/dist/source-${VERSION}/$SOURCE
-fi
+ SOURCE_URL[0]=$SOURCEFORGE_URL/freepascal/Source/$VERSION/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.freepascal.org/fpc/dist/$VERSION/source/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.freepascal.org
if ! spell_ok fpc ; then
- VERSIONB=2.4.4
- if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
- SOURCE2=$SPELL-$VERSIONB.i386-linux.tar
- elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
- SOURCE2=$SPELL-$VERSIONB.x86_64-linux.tar
- else
- SOURCE2=$SPELL-$VERSIONB.i386-linux.tar
- fi
- SOURCE2_URL[0]=$SOURCEFORGE_URL/freepascal/$SOURCE2
- SOURCE2_GPG=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
+case "${SMGL_COMPAT_ARCHS[1]}" in
+ia32) B_ARCH=i386-linux ARCH=386 ;;
+*) B_ARCH=${SMGL_COMPAT_ARCHS[1]}-linux ARCH=x64 ;;
+esac
+ SOURCE2=$SPELL-$VERSION.$B_ARCH.tar
+ SOURCE2_URL[0]=$SOURCEFORGE_URL/freepascal/Linux/$VERSION/$SOURCE2
+ SOURCE2_URL[1]=ftp://ftp.freepascal.org/fpc/dist/$VERSION/$B_ARCH/$SOURCE2
+
SOURCE2_HASH=sha512:3ac22bff975197b3ecc40bd76bb66093f71253290d6eb095e1bf014cb1cdf0354cf05212516bca008d9b525f906c173c1bf2067eda9015cb3db64a42b576a512
fi
LICENSE[0]=GPL
KEYWORDS="pascal compiler devel"
diff --git a/devel/fpc/EXPORTS b/devel/fpc/EXPORTS
index 9f1d54c..91a9309 100644
--- a/devel/fpc/EXPORTS
+++ b/devel/fpc/EXPORTS
@@ -1,3 +1,2 @@
-FPV_DEV
VERSION
SOURCE_HASH
diff --git a/devel/fpc/HISTORY b/devel/fpc/HISTORY
index cdbc136..18da7e0 100644
--- a/devel/fpc/HISTORY
+++ b/devel/fpc/HISTORY
@@ -1,3 +1,9 @@
+2013-04-21 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, EXPORTS, INSTALL, PREPARE, PRE_BUILD,
+ REPAIR^none^EXPORTS: updated spell to 2.6.2
+ Fixed SOURCE_URL[0] and SOURCE2_URL[0]
+ Removed FPV_DEV, VERSIONB, added ARCH and B_ARCH variables
+
2011-10-12 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.4.4

diff --git a/devel/fpc/INSTALL b/devel/fpc/INSTALL
index 160e31b..10a1985 100755
--- a/devel/fpc/INSTALL
+++ b/devel/fpc/INSTALL
@@ -1,11 +1,3 @@
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
- ARCH=386
-elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
- ARCH=x64
-else
- ARCH=386
-fi &&
-
local FPCDEST FPCDIR FPC_COMP FPC_MAKE
&&
FPCDEST=${INSTALL_ROOT}/usr
&&
FPCDIR=$FPCDEST/lib/fpc/${VERSION//rc?}
&&
diff --git a/devel/fpc/PREPARE b/devel/fpc/PREPARE
deleted file mode 100755
index ed8ce23..0000000
--- a/devel/fpc/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query FPV_DEV 'build devel version?' n
diff --git a/devel/fpc/PRE_BUILD b/devel/fpc/PRE_BUILD
index 84cccd3..efe28d4 100755
--- a/devel/fpc/PRE_BUILD
+++ b/devel/fpc/PRE_BUILD
@@ -1,13 +1,5 @@
default_pre_build &&

-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
- ARCH=i386
-elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
- ARCH=x86_64
-else
- ARCH=i386
-fi &&
-
cd $SOURCE_DIRECTORY &&
#
# Setup bootstrapping, only if we don't have fpc already
@@ -16,8 +8,8 @@ if ! spell_ok fpc ; then
mkdir bootstrap &&
cd bootstrap &&
unpack_file 2 &&
-tar -xf binary.$ARCH-linux.tar &&
-tar -xzf base.$ARCH-linux.tar.gz
+tar -xf fpc-$VERSION.$B_ARCH/binary.$B_ARCH.tar &&
+tar -xzf base.$B_ARCH.tar.gz
fi &&

cd $SOURCE_DIRECTORY &&
@@ -26,7 +18,7 @@ local GDB WHERE &&
GDB=$INSTALL_ROOT/usr/lib/libgdb.a &&

if [[ -e $GDB ]];then
- WHERE=packages/base/gdbint/libgdb/units/$ARCH-linux/ &&
+ WHERE=packages/base/gdbint/libgdb/units/$B_ARCH/ &&
mkdir -p $WHERE &&
cp $GDB $WHERE
fi
diff --git a/devel/fpc/REPAIR^none^EXPORTS b/devel/fpc/REPAIR^none^EXPORTS
index 9f1d54c..91a9309 100644
--- a/devel/fpc/REPAIR^none^EXPORTS
+++ b/devel/fpc/REPAIR^none^EXPORTS
@@ -1,3 +1,2 @@
-FPV_DEV
VERSION
SOURCE_HASH
diff --git a/devel/fpc/fpc-2.4.4.i386-linux.tar.sig
b/devel/fpc/fpc-2.4.4.i386-linux.tar.sig
deleted file mode 100644
index 8b2de15..0000000
Binary files a/devel/fpc/fpc-2.4.4.i386-linux.tar.sig and /dev/null differ
diff --git a/devel/fpc/fpc-2.4.4.x86_64-linux.tar.sig
b/devel/fpc/fpc-2.4.4.x86_64-linux.tar.sig
deleted file mode 100644
index 2a305ce..0000000
Binary files a/devel/fpc/fpc-2.4.4.x86_64-linux.tar.sig and /dev/null differ
diff --git a/devel/libunwind/BUILD b/devel/libunwind/BUILD
index 3afa5d0..ce7473a 100755
--- a/devel/libunwind/BUILD
+++ b/devel/libunwind/BUILD
@@ -1,7 +1,9 @@
+if [[$LIBUNWIND_BRANCH == scm]];then
mkdir -p config &&
libtoolize --copy &&
aclocal &&
autoheader &&
automake --add-missing --copy &&
-autoconf &&
+autoconf
+fi &&
default_build
diff --git a/devel/libunwind/DETAILS b/devel/libunwind/DETAILS
index 3798004..e98c502 100755
--- a/devel/libunwind/DETAILS
+++ b/devel/libunwind/DETAILS
@@ -1,4 +1,5 @@
SPELL=libunwind
+if [[$LIBUNWIND_BRANCH == scm]];then
if [[ "$DRM_AUTOUPDATE" == "y" ]]
then
VERSION="$(date +%Y%m%d)"
@@ -9,7 +10,14 @@ fi
FORCE_DOWNLOAD=on
SOURCE_URL=git://git.sv.gnu.org/libunwind.git
SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-git
+else
+ VERSION=1.1
+
SOURCE_HASH=sha512:bfe04f2bfac9f9e47c37f0b23ed2f264d8d3d3d6f1392fe9d794ee13cad216b3740979e922e4276fb65c1ccdc836fce48812cb5459ecdd2a89a621036a35d7c1
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_URL=http://download.savannah.gnu.org/releases/libunwind/$SOURCE
+fi
+
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.nongnu.org/libunwind/
ENTERED=20090421
LICENSE[0]=MIT
diff --git a/devel/libunwind/PREPARE b/devel/libunwind/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/devel/libunwind/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/graphics-libs/ilmbase/DETAILS b/graphics-libs/ilmbase/DETAILS
index 50da5fe..b910b8d 100755
--- a/graphics-libs/ilmbase/DETAILS
+++ b/graphics-libs/ilmbase/DETAILS
@@ -1,8 +1,8 @@
SPELL=ilmbase
- VERSION=1.0.2
+ VERSION=2.0.0
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://download.savannah.nongnu.org/releases/openexr/${SOURCE}
-
SOURCE_HASH[0]=sha512:5a1a0011ef43132f33832d2e322320abb81a0f495e921de52af8f6e9ee50e0bed63897a0054de228f4081cc2f6591cb99a686f908620e87bf86c9d2d689923cd
+
SOURCE_HASH[0]=sha512:a24b2593b48f18239bf22e3ada96b196e1c1fc9113e205cd12206f27ace7379bb0846bd4f4a66f763a6c6a5857c286ae364ccdc4c6e8f0ad5f5aaeccd2a28aa2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.openexr.com/
LICENSE[0]=http://www.ilm.com/opensource/ilm-bsd-lic.html
diff --git a/graphics-libs/ilmbase/HISTORY b/graphics-libs/ilmbase/HISTORY
index c852668..f52eec8 100644
--- a/graphics-libs/ilmbase/HISTORY
+++ b/graphics-libs/ilmbase/HISTORY
@@ -1,3 +1,7 @@
+2013-04-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.0
+ * PRE_BUILD, gcc45.patch: removed
+
2013-02-01 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: added, to apply patch
* gcc45.patch: added, fix compilation of programs dependent
diff --git a/graphics-libs/ilmbase/PRE_BUILD b/graphics-libs/ilmbase/PRE_BUILD
deleted file mode 100755
index 23b6a15..0000000
--- a/graphics-libs/ilmbase/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p2 < $SPELL_DIRECTORY/gcc45.patch
diff --git a/graphics-libs/ilmbase/gcc45.patch
b/graphics-libs/ilmbase/gcc45.patch
deleted file mode 100644
index 826a9d4..0000000
--- a/graphics-libs/ilmbase/gcc45.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 63e3627213e6d7a352210f76c0004fb88d5e19e0 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart AT gmail.com>
-Date: Mon, 18 Jun 2012 23:35:33 +0200
-Subject: [PATCH] Fix build with gcc-4.5
-
----
- IlmBase/Imath/ImathMatrix.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/IlmBase/Imath/ImathMatrix.h b/IlmBase/Imath/ImathMatrix.h
-index 5887412..bbf8cd1 100644
---- a/IlmBase/Imath/ImathMatrix.h
-+++ b/IlmBase/Imath/ImathMatrix.h
-@@ -49,6 +49,7 @@
- #include "ImathVec.h"
- #include "ImathShear.h"
-
-+#include <cstring>
- #include <iostream>
- #include <iomanip>
- #include <string.h>
---
-1.7.10
-
diff --git a/graphics/gmic/DETAILS b/graphics/gmic/DETAILS
index aeac322..69f0109 100755
--- a/graphics/gmic/DETAILS
+++ b/graphics/gmic/DETAILS
@@ -1,9 +1,9 @@
SPELL=gmic
- VERSION=1.5.1.7
+ VERSION=1.5.5.2
SOURCE="${SPELL}_${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SOURCE}
SOURCE_URL[1]=$SOURCEFORGE_URL/project/${SPELL}/old/${SOURCE}
-
SOURCE_HASH=sha512:1ed7b7ea4e00e418d3fe37c9a04a5805bfbbc358b50fe213c02ca5d040af9e9cb6a6e4df7b32fa695f2988eda8a176933af9d6aabbe51d7418aee7a180f2a2d3
+
SOURCE_HASH=sha512:a0f2175aef8d93fa56bbc923793d59c716399231afedf391fcb1a9525ac2397ccb6ce1a542928f5c08d12ebd06af26ac5aec17fe7ae0d4c04e215bfac4ca586e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://gmic.sourceforge.net/";
LICENSE[0]="CeCILL"
diff --git a/graphics/gmic/HISTORY b/graphics/gmic/HISTORY
index 6d3e973..450c1fe 100644
--- a/graphics/gmic/HISTORY
+++ b/graphics/gmic/HISTORY
@@ -1,3 +1,7 @@
+2013-04-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.5.2
+ * opencv-buildfix.patch: updated
+
2012-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.1.7
* patch-configure, patch-src_Makefile: removed
diff --git a/graphics/gmic/opencv-buildfix.patch
b/graphics/gmic/opencv-buildfix.patch
index da32314..ae6f714 100644
--- a/graphics/gmic/opencv-buildfix.patch
+++ b/graphics/gmic/opencv-buildfix.patch
@@ -2,31 +2,19 @@ diff -wbBur gmic-1.5.1.7/src/Makefile
gmic-1.5.1.7.q/src/Makefile
--- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400
+++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400
@@ -296,7 +296,7 @@
-
+
zart: lib
ifneq ($(OS),Darwin)
- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
+ cd ../zart && qmake zart.pro && $(MAKE) && strip zart
else
- cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS)
$(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)"
+ cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS)
$(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)"
endif
@@ -403,6 +403,7 @@
- mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
+ mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
+ cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+ cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
+ if test -d /usr/share/bash-completion/completions; then mkdir -p
$(DESTDIR)/usr/share/bash-completion/completions/; cp -f
gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic;
fi
- if test -d /etc/bash_completion.d/; then mkdir -p
$(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh
$(DESTDIR)/etc/bash_completion.d/gmic; fi
- if test -d /opt/local/etc/bash_completion.d/; then mkdir -p
$(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh
$(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
-
-diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro
---- gmic-1.5.1.7/zart/zart.pro 2012-07-26 12:59:33.000000000 +0400
-+++ gmic-1.5.1.7.q/zart/zart.pro 2012-08-03 12:32:27.000000000 +0400
-@@ -34,7 +34,7 @@
- FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui
-
- !macx {
-- LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml
-lfftw3
-+ LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv`
-lopencv_core -lopencv_ml -lopencv_highgui -lfftw3
- } else {
- LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3
- }
+ if test -d /etc/bash_completion.d/; then mkdir -p
$(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh
$(DESTDIR)/etc/bash_completion.d/gmic; fi
+ if test -d /opt/local/etc/bash_completion.d/; then mkdir -p
$(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh
$(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
+
diff --git a/graphics/openexr/0001-add-missing-header.patch
b/graphics/openexr/0001-add-missing-header.patch
deleted file mode 100644
index d1f6a11..0000000
--- a/graphics/openexr/0001-add-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 72441c32e66131d5a880f5a2804f2b3c075cd59d Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Fri, 26 Oct 2012 21:21:56 +0200
-Subject: [PATCH] add missing header
-
----
- exrenvmap/blurImage.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/exrenvmap/blurImage.cpp b/exrenvmap/blurImage.cpp
-index 04edb8d..9700914 100644
---- a/exrenvmap/blurImage.cpp
-+++ b/exrenvmap/blurImage.cpp
-@@ -45,6 +45,7 @@
- #include "Iex.h"
- #include <iostream>
- #include <algorithm>
-+#include <string.h>
-
- using namespace std;
- using namespace Imf;
---
-1.8.0
-
diff --git a/graphics/openexr/DETAILS b/graphics/openexr/DETAILS
index 0515ee8..859fdf1 100755
--- a/graphics/openexr/DETAILS
+++ b/graphics/openexr/DETAILS
@@ -1,10 +1,10 @@
SPELL=openexr
- VERSION=1.7.0
+ VERSION=2.0.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://savannah.nongnu.org/download/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.openexr.com/downloads/$SOURCE
-
SOURCE_HASH[0]=sha512:1fb033f909961a9778b762241e09946d19c7e75bbade7b5a942bb159eec3af9200afd722c3170165ad4b1fa602d9dbe6938112aad1716e7c7e6b8c37ee3980e0
+
SOURCE_HASH[0]=sha512:ebbc233834903357ce1a86b4b039d2860318f55e1302d6b949096ad799e84a012ec34692ff9423befe2fc31a6a342267d38d45771ff5ccd7697d3b1fa271d3ff
WEB_SITE=http://www.openexr.com/
ENTERED=20030123
LICENSE[0]=http://www.ilm.com/opensource/ilm-bsd-lic.html
diff --git a/graphics/openexr/HISTORY b/graphics/openexr/HISTORY
index c00e89f..90e4455 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,3 +1,7 @@
+2013-04-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.0
+ * PRE_BUILD, 0001-add-missing-header.patch: removed
+
2012-10-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.0
* 0001-add-missing-header.patch, PRE_BUILD: added patch to avoid
compile error
diff --git a/graphics/openexr/PRE_BUILD b/graphics/openexr/PRE_BUILD
deleted file mode 100755
index f485a00..0000000
--- a/graphics/openexr/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/0001-add-missing-header.patch
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index b57dab0..01a754d 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
SPELL=mercurial
- VERSION=2.5.3
-
SOURCE_HASH=sha512:be952e6fa15859074ee627a69bad3a4ccce79cb676e349d88c4aea280e0bd2afd4c1c24f953174b9faf4a4ca6f60c39f66d21751cbe98871076260ec3ed30a13
+ VERSION=2.5.4
+
SOURCE_HASH=sha512:928fdeaaf0eaec80adbd8765521de9666ab56aaa2101fb9ab2cb392d8b29475d3b052d89652ff9b67522cfcc6cd958717ac715f51b0573ee088e9a595f29afe2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://mercurial.selenic.com/release/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index e202da9..d057f5f 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2013-04-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated to 2.5.4
+
2013-04-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 2.5.3

diff --git a/video/avidemux2/BUILD b/video/avidemux2/BUILD
index c8d7939..e4e8f01 100755
--- a/video/avidemux2/BUILD
+++ b/video/avidemux2/BUILD
@@ -1,5 +1,8 @@
if is_depends_enabled $SPELL qt4; then
- OPTS="-DQT_QMAKE_EXECUTABLE=${INSTALL_ROOT}/usr/bin/qt4/qmake
-DLRELEASE_EXECUTABLE=${INSTALL_ROOT}/usr/bin/qt4/lrelease $OPTS"
+ PATH="/usr/bin/qt4:$PATH"
fi &&
-
-cmake_build
+# sudo calls would install stuff right away
+sed -i 's:^sudo:# sudo:' bootStrap.sh &&
+# For avidemux 2.6, add $OPTS here and switch to .bash .
+# The 2.5 build script doesn't know any options.
+bash bootStrap.sh
diff --git a/video/avidemux2/HISTORY b/video/avidemux2/HISTORY
index 7a6e685..e27e364 100644
--- a/video/avidemux2/HISTORY
+++ b/video/avidemux2/HISTORY
@@ -1,3 +1,9 @@
+2013-04-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD, INSTALL: switch to usage of provided build script
+ Our build was just broken (for me at least): No plugins! Couldn't
+ even play audio. Now we don't have the absolute control to disable
+ any optionals if they are present in system, but at least it works.
+
2012-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.5.6

diff --git a/video/avidemux2/INSTALL b/video/avidemux2/INSTALL
new file mode 100755
index 0000000..2b4fca1
--- /dev/null
+++ b/video/avidemux2/INSTALL
@@ -0,0 +1,4 @@
+# bootStrap script contains install commands
+# need to duplicate them here ...
+cd buildMain && make install && cd .. &&
+cd buildPlugins && make install && cd ..



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (d722dfa9c5510c9493366386c4be9b87158c9525), Treeve Jelbert, 04/22/2013

Archive powered by MHonArc 2.6.24.

Top of Page