Skip to Content.
Sympa Menu

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

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 (bdc48490e95f51a8fd3667812578a56c2f5d2e8f)
  • Date: Fri, 26 Oct 2012 15:35:22 -0500

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

graphics-libs/ilmbase/DETAILS | 9 --
graphics-libs/ilmbase/HISTORY | 3
graphics/autopano-sift-c/0001-add-missing-lm-to-libs.patch | 25 +++++++
graphics/autopano-sift-c/DETAILS | 4 -
graphics/autopano-sift-c/HISTORY | 5 +
graphics/autopano-sift-c/PRE_BUILD | 3
graphics/enblend/BUILD | 1
graphics/enblend/HISTORY | 3
graphics/hugin/0001-add-missing-header.patch | 31
+++++++++
graphics/hugin/0002-access-extract-through-this-pointer.patch | 34
++++++++++
graphics/hugin/DETAILS | 4 -
graphics/hugin/HISTORY | 5 +
graphics/hugin/PRE_BUILD | 4 +
graphics/openexr/0001-add-missing-header.patch | 24 +++++++
graphics/openexr/DETAILS | 7 --
graphics/openexr/HISTORY | 5 +
graphics/openexr/PRE_BUILD | 2
graphics/openexr/gcc43.patch | 26 -------
perl-cpan/image-exiftool/DETAILS | 4 -
perl-cpan/image-exiftool/HISTORY | 3
20 files changed, 158 insertions(+), 44 deletions(-)

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

graphics/hugin: version 2011.4.0

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

graphics/enblend: add missing library to LIBS

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

perl-cpan/image-exiftool: version 9.03

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

graphics/autopano-sift-c: version 2.5.1

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

graphics-libs/ilmbase: version 1.0.2

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

graphics/openexr: version 1.7.0

diff --git a/graphics-libs/ilmbase/DETAILS b/graphics-libs/ilmbase/DETAILS
index 4ba2cee..50da5fe 100755
--- a/graphics-libs/ilmbase/DETAILS
+++ b/graphics-libs/ilmbase/DETAILS
@@ -1,13 +1,10 @@
SPELL=ilmbase
- VERSION=1.0.1
+ VERSION=1.0.2
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=$SOURCE.sig
- SOURCE_URL[0]=http://download.savannah.nongnu.org/releases/openexr/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.sig
+
SOURCE_URL[0]=http://download.savannah.nongnu.org/releases/openexr/${SOURCE}
+
SOURCE_HASH[0]=sha512:5a1a0011ef43132f33832d2e322320abb81a0f495e921de52af8f6e9ee50e0bed63897a0054de228f4081cc2f6591cb99a686f908620e87bf86c9d2d689923cd
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.openexr.com/
- SOURCE_GPG=openexr.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
LICENSE[0]=http://www.ilm.com/opensource/ilm-bsd-lic.html
ENTERED=20071208
SHORT="High dynamic-range (HDR) image file format library and
tools"
diff --git a/graphics-libs/ilmbase/HISTORY b/graphics-libs/ilmbase/HISTORY
index 1a6415b..05509be 100644
--- a/graphics-libs/ilmbase/HISTORY
+++ b/graphics-libs/ilmbase/HISTORY
@@ -1,2 +1,5 @@
+2012-10-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.2
+
2007-12-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: spell created
diff --git a/graphics/autopano-sift-c/0001-add-missing-lm-to-libs.patch
b/graphics/autopano-sift-c/0001-add-missing-lm-to-libs.patch
new file mode 100644
index 0000000..60cc3e5
--- /dev/null
+++ b/graphics/autopano-sift-c/0001-add-missing-lm-to-libs.patch
@@ -0,0 +1,25 @@
+From 0b58850877cb12dd1469c05d63fe5f85d15db7db Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Fri, 26 Oct 2012 21:42:30 +0200
+Subject: [PATCH] add missing -lm to libs
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2364ad5..63e1bae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,7 @@ SET(LIBSIFT_SOURCES LoweDetector.c RANSAC.c
GaussianConvolution.c
+ ADD_LIBRARY(libsift STATIC ${LIBSIFT_SOURCES})
+
+ set(all_libs libsift ${JPEG_LIBRARIES} ${TIFF_LIBRARIES}
+- ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${PANO13_LIBRARIES}
${LIBXML2_LIBRARIES})
++ ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${PANO13_LIBRARIES}
${LIBXML2_LIBRARIES} -lm)
+
+ add_executable(generatekeys GenerateKeys.c)
+ TARGET_LINK_LIBRARIES(generatekeys ${all_libs})
+--
+1.8.0
+
diff --git a/graphics/autopano-sift-c/DETAILS
b/graphics/autopano-sift-c/DETAILS
index 154a5df..bbabb5b 100755
--- a/graphics/autopano-sift-c/DETAILS
+++ b/graphics/autopano-sift-c/DETAILS
@@ -11,10 +11,10 @@ if [ "$ASC_DEVEL" == "y" ]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
- VERSION=2.5.0
+ VERSION=2.5.1
SOURCE=autopano-sift-C-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/hugin/$SOURCE
-
SOURCE_HASH=sha512:779bf6c74201228fb1821d5d52eeaa67f50b4844624a56ad449aaae807b0577f9a287bc3edf9ec9a0905574c22d52a424f67b850e376b42c6bb62bf78dc95713

+
SOURCE_HASH=sha512:4f3c9e8738c7bc29ff6284033b7b813de61ef440c3d544755be8c4ad715a6e4175801ee4c02642df5e05bac82929c5554d85a5c488a2c27da1e5e81d3cd72931
SOURCE_DIRECTORY=$BUILD_DIRECTORY/autopano-sift-C-$VERSION
fi

diff --git a/graphics/autopano-sift-c/HISTORY
b/graphics/autopano-sift-c/HISTORY
index 83d7e89..a05d135 100644
--- a/graphics/autopano-sift-c/HISTORY
+++ b/graphics/autopano-sift-c/HISTORY
@@ -1,3 +1,8 @@
+2012-10-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.5.1
+ * 0001-add-missing-lm-to-libs.patch, PRE_BUILD: added patch to avoid
+ linker error
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/graphics/autopano-sift-c/PRE_BUILD
b/graphics/autopano-sift-c/PRE_BUILD
new file mode 100755
index 0000000..0a2e2fc
--- /dev/null
+++ b/graphics/autopano-sift-c/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SPELL_DIRECTORY}/0001-add-missing-lm-to-libs.patch
diff --git a/graphics/enblend/BUILD b/graphics/enblend/BUILD
new file mode 100755
index 0000000..a2ff730
--- /dev/null
+++ b/graphics/enblend/BUILD
@@ -0,0 +1 @@
+LIBS+="-lboost_filesystem" default_build
diff --git a/graphics/enblend/HISTORY b/graphics/enblend/HISTORY
index 6a7ce7c..2a42560 100644
--- a/graphics/enblend/HISTORY
+++ b/graphics/enblend/HISTORY
@@ -1,3 +1,6 @@
+2012-10-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlagnen.de>
+ * BUILD: added missing library to LIBS
+
2011-10-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.0

diff --git a/graphics/hugin/0001-add-missing-header.patch
b/graphics/hugin/0001-add-missing-header.patch
new file mode 100644
index 0000000..c03d0d6
--- /dev/null
+++ b/graphics/hugin/0001-add-missing-header.patch
@@ -0,0 +1,31 @@
+From 1a05cd9d1d5dd743416aa3554408a118a832aa51 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Fri, 26 Oct 2012 22:22:51 +0200
+Subject: [PATCH 1/2] add missing header
+
+---
+ src/celeste/Utilities.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/celeste/Utilities.cpp b/src/celeste/Utilities.cpp
+index 56bb2f7..6e6c2e6 100755
+--- a/src/celeste/Utilities.cpp
++++ b/src/celeste/Utilities.cpp
+@@ -27,6 +27,7 @@ Copyright (c) 2002-3 Adriaan Tijsseling
+
+ #include <math.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include "Utilities.h"
+
+ using namespace std;
+@@ -285,4 +286,4 @@ int SafeAbs( int val )
+ else return val;
+ }
+
+-}; // namespace
+\ No newline at end of file
++}; // namespace
+--
+1.8.0
+
diff --git a/graphics/hugin/0002-access-extract-through-this-pointer.patch
b/graphics/hugin/0002-access-extract-through-this-pointer.patch
new file mode 100644
index 0000000..c29b5be
--- /dev/null
+++ b/graphics/hugin/0002-access-extract-through-this-pointer.patch
@@ -0,0 +1,34 @@
+From 345bb4349b2c37e3193378347db557abf6d200aa Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Fri, 26 Oct 2012 22:24:43 +0200
+Subject: [PATCH 2/2] access extract through this pointer
+
+---
+ src/foreign/zthread/include/zthread/Guard.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/foreign/zthread/include/zthread/Guard.h
b/src/foreign/zthread/include/zthread/Guard.h
+index abcd92c..e690a5b 100755
+--- a/src/foreign/zthread/include/zthread/Guard.h
++++ b/src/foreign/zthread/include/zthread/Guard.h
+@@ -428,7 +428,7 @@ public:
+ template <class U, class V>
+ Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
+
+- LockingPolicy::shareScope(*this, extract(g));
++ LockingPolicy::shareScope(*this, this->extract(g));
+
+ }
+
+@@ -458,7 +458,7 @@ public:
+ template <class U, class V>
+ Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
+
+- LockingPolicy::transferScope(*this, extract(g));
++ LockingPolicy::transferScope(*this, this->extract(g));
+
+ }
+
+--
+1.8.0
+
diff --git a/graphics/hugin/DETAILS b/graphics/hugin/DETAILS
index cf2f442..94e9a67 100755
--- a/graphics/hugin/DETAILS
+++ b/graphics/hugin/DETAILS
@@ -1,8 +1,8 @@
SPELL=hugin
- VERSION=2011.2.0
+ VERSION=2011.4.0
SOURCE="$SPELL-$VERSION.tar.bz2"
SOURCE_URL[0]=$SOURCEFORGE_URL/hugin/$SOURCE
-
SOURCE_HASH=sha512:00352855f5bf9d96580d100a83322f4bb374e89da418ae2a9e97653a0e3c1598c28cbaa99f310bdbdb955e637ffbd5f7d47810052e455a6ecbc752c4e8b1eac5
+
SOURCE_HASH=sha512:13f2e1d72e1bc7e3c3871dd845ec3cd7aefe9dc1bf108808996b9dccdfff6a10a8dba2935f1a20c898385e97bdf8f08e9f77bb315e73ae5240eb594bfbc55803
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://hugin.sourceforge.net/";
LICENSE[0]=GPL
diff --git a/graphics/hugin/HISTORY b/graphics/hugin/HISTORY
index e9e6bc6..8c07406 100644
--- a/graphics/hugin/HISTORY
+++ b/graphics/hugin/HISTORY
@@ -1,3 +1,8 @@
+2012-10-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2011.4.0
+ * 0001-add-missing-header.patch,
0002-access-extract-through-this-pointer.patch,
+ PRE_BUILD: added patches to prevent compile errors
+
2010-10-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2011.2.0
* DEPENDS: added dependency on tclap
diff --git a/graphics/hugin/PRE_BUILD b/graphics/hugin/PRE_BUILD
new file mode 100755
index 0000000..c3b88b6
--- /dev/null
+++ b/graphics/hugin/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/0001-add-missing-header.patch &&
+patch -p1 < $SPELL_DIRECTORY/0002-access-extract-through-this-pointer.patch
diff --git a/graphics/openexr/0001-add-missing-header.patch
b/graphics/openexr/0001-add-missing-header.patch
new file mode 100644
index 0000000..d1f6a11
--- /dev/null
+++ b/graphics/openexr/0001-add-missing-header.patch
@@ -0,0 +1,24 @@
+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 6d3b051..0515ee8 100755
--- a/graphics/openexr/DETAILS
+++ b/graphics/openexr/DETAILS
@@ -1,13 +1,10 @@
SPELL=openexr
- VERSION=1.6.1
+ VERSION=1.7.0
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://savannah.nongnu.org/download/$SPELL/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE_URL[1]=http://www.openexr.com/downloads/$SOURCE
- SOURCE_GPG=openexr.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+
SOURCE_HASH[0]=sha512:1fb033f909961a9778b762241e09946d19c7e75bbade7b5a942bb159eec3af9200afd722c3170165ad4b1fa602d9dbe6938112aad1716e7c7e6b8c37ee3980e0
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 5329503..c00e89f 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,3 +1,8 @@
+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
+ * gcc43.patch: removed
+
2008-09-16 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD: -lpthread appended to LDFLAGS, PTHREAD_LIBS is no more

diff --git a/graphics/openexr/PRE_BUILD b/graphics/openexr/PRE_BUILD
index 7528467..f485a00 100755
--- a/graphics/openexr/PRE_BUILD
+++ b/graphics/openexr/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
+patch -p1 < $SCRIPT_DIRECTORY/0001-add-missing-header.patch
diff --git a/graphics/openexr/gcc43.patch b/graphics/openexr/gcc43.patch
deleted file mode 100644
index 47d39fd..0000000
--- a/graphics/openexr/gcc43.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# From http://bugs.gentoo.org/show_bug.cgi?id=212435
-#
-diff -Naur openexr-1.6.1-orig/exrenvmap/main.cpp
openexr-1.6.1/exrenvmap/main.cpp
---- openexr-1.6.1-orig/exrenvmap/main.cpp 2007-04-24 19:07:51.000000000
-0600
-+++ openexr-1.6.1/exrenvmap/main.cpp 2008-01-12 20:28:56.000000000 -0600
-@@ -43,6 +43,7 @@
- #include <makeLatLongMap.h>
- #include <ImfEnvmap.h>
- #include <iostream>
-+#include <cstring>
- #include <exception>
- #include <stdlib.h>
-
-diff -Naur openexr-1.6.1-orig/exrmaketiled/main.cpp
openexr-1.6.1/exrmaketiled/main.cpp
---- openexr-1.6.1-orig/exrmaketiled/main.cpp 2007-04-24 19:08:45.000000000
-0600
-+++ openexr-1.6.1/exrmaketiled/main.cpp 2008-01-12 20:28:14.000000000
-0600
-@@ -45,6 +45,7 @@
- #include <iostream>
- #include <exception>
- #include <string>
-+#include <cstring>
- #include <stdlib.h>
-
- using namespace Imf;
-
diff --git a/perl-cpan/image-exiftool/DETAILS
b/perl-cpan/image-exiftool/DETAILS
index 795def7..75c6c30 100755
--- a/perl-cpan/image-exiftool/DETAILS
+++ b/perl-cpan/image-exiftool/DETAILS
@@ -1,8 +1,8 @@
SPELL=image-exiftool
- VERSION=8.25
+ VERSION=9.03
SOURCE="Image-ExifTool-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.sno.phy.queensu.ca/~phil/exiftool/${SOURCE}
-
SOURCE_HASH=sha512:8d86b039047a890effffabf23f84ed9700142aff32dc4510a211f21b92a6ef68d2a8f211308771269c08e4980a12754f7129adff9a074d98837f7947255d112a
+
SOURCE_HASH=sha512:e8f56077dab9699a35d2492125b64e8e4bb1609eab3eaf6fa58408dc6bd8394371281b3481a271bbff862562538489be8ae1ce7df545261940442305521ae078
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Image-ExifTool-${VERSION}"
WEB_SITE="http://www.sno.phy.queensu.ca/~phil/exiftool/";
LICENSE[0]=PERL
diff --git a/perl-cpan/image-exiftool/HISTORY
b/perl-cpan/image-exiftool/HISTORY
index 5f57f04..a6d1f60 100644
--- a/perl-cpan/image-exiftool/HISTORY
+++ b/perl-cpan/image-exiftool/HISTORY
@@ -1,3 +1,6 @@
+2012-10-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 9.03
+
2010-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 8.25




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (bdc48490e95f51a8fd3667812578a56c2f5d2e8f), Florian Franzmann, 10/26/2012

Archive powered by MHonArc 2.6.24.

Top of Page