Skip to Content.
Sympa Menu

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

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 (c3725149e7920cbb1b171ed621302d6a07ab0da3)
  • Date: Fri, 14 Oct 2011 05:20:15 -0500

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

graphics/rawstudio/DEPENDS | 7 +++++++
graphics/rawstudio/DETAILS | 4 ++--
graphics/rawstudio/HISTORY | 7 +++++++
graphics/rawstudio/PRE_BUILD | 1 -
graphics/rawstudio/gcc-4.4.patch | 11 -----------
libs/flickcurl/DETAILS | 4 ++--
libs/flickcurl/HISTORY | 4 ++++
7 files changed, 22 insertions(+), 16 deletions(-)

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

graphics/rawstudio: version 2.0

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

libs/flickcurl: version 1.21

diff --git a/graphics/rawstudio/DEPENDS b/graphics/rawstudio/DEPENDS
index 2143498..53ed9bd 100755
--- a/graphics/rawstudio/DEPENDS
+++ b/graphics/rawstudio/DEPENDS
@@ -5,7 +5,14 @@ depends JPEG &&
depends libpng &&
depends tiff &&
depends libxml2 &&
+depends curl &&
+depends dbus &&
+depends fftw &&
+depends lensfun &&
depends exiv2 &&
+depends flickcurl &&
+depends libgphoto2 &&
+depends sqlite &&
if [[ $RAWSTUDIO_SCM == y ]]; then
depends subversion
fi &&
diff --git a/graphics/rawstudio/DETAILS b/graphics/rawstudio/DETAILS
index 64e523b..4cc7e75 100755
--- a/graphics/rawstudio/DETAILS
+++ b/graphics/rawstudio/DETAILS
@@ -11,10 +11,10 @@ fi
SOURCE_IGNORE=volatiles
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-scm
else
- VERSION=1.2
+ VERSION=2.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=http://rawstudio.org/files/release/$SOURCE
-
SOURCE_HASH=sha512:4cdae123ab71b8aa030ab2ea99bbdc1a6648b8f9c93f7c3f83236af4bd8db6b6c5a18043a96ca6939638708727e260232765cdca20d4416b28c384cc27ab3add
+
SOURCE_HASH=sha512:583018b26b77485f8eccab44ccb1301d2d3f55e1751e01fb51d8d5b0088a2ef94cd0b10b0ca7435b14071681afebf4be6b8722a5f152ee7e4f36427b824c5071
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
fi
WEB_SITE=http://rawstudio.org
diff --git a/graphics/rawstudio/HISTORY b/graphics/rawstudio/HISTORY
index a8616ca..7bcfb1d 100644
--- a/graphics/rawstudio/HISTORY
+++ b/graphics/rawstudio/HISTORY
@@ -1,3 +1,10 @@
+2011-10-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0
+ * DEPENDS: added dependencies on flickcurl, libgphoto2
+ curl, dbus, fftw, lensfun and sqlite
+ * gcc-4.4.patch: removed
+ * PRE_BUILD: don't use gcc-4.4.patch
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/graphics/rawstudio/PRE_BUILD b/graphics/rawstudio/PRE_BUILD
index d81cd9f..c00f9e7 100755
--- a/graphics/rawstudio/PRE_BUILD
+++ b/graphics/rawstudio/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.patch &&
if [[ $RAWSTUDIO_SCM == y ]]; then
NOCONFIGURE=X ./autogen.sh
fi
diff --git a/graphics/rawstudio/gcc-4.4.patch
b/graphics/rawstudio/gcc-4.4.patch
deleted file mode 100644
index 60818af..0000000
--- a/graphics/rawstudio/gcc-4.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rawstudio-1.2/src/dcraw.cc 2009-04-09 23:21:45.000000000 +0200
-+++ rawstudio-1.2.fixed/src/dcraw.cc 2010-04-15 11:38:21.188270444 +0200
-@@ -8510,7 +8510,7 @@
- argv[argc] = "";
- for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) {
- opt = argv[arg++][1];
-- if ((cp = strchr (sp="nbrkStqmHACg", opt)))
-+ if ((cp = const_cast<char *>(strchr (sp="nbrkStqmHACg", opt))))
- for (i=0; i < "114111111422"[cp-sp]-'0'; i++)
- if (!isdigit(argv[arg+i][0])) {
- dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"),
opt);
diff --git a/libs/flickcurl/DETAILS b/libs/flickcurl/DETAILS
index 2db821b..6fa87c5 100755
--- a/libs/flickcurl/DETAILS
+++ b/libs/flickcurl/DETAILS
@@ -1,9 +1,9 @@
SPELL=flickcurl
- VERSION=1.20
+ VERSION=1.21
SOURCE=$SPELL-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://download.dajobe.org/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:c995afe46a6b545f1a9f61b4e07276d336f743284d75dc1b17354cbf35372c34834db39d9e6bf07c1db110ff229a5638c143b2d580cb152fbe1d9fe676bf7190
+
SOURCE_HASH=sha512:499e300be108f0ad39a9dd756dc14f77a98c91de459717f6812eba9c9695302890e841de30481c0013e08634b774e164ece99ea2a0ccc640bd9249a688ad0878
LICENSE[0]=LGPL/GPL/Apache
WEB_SITE=http://librdf.org/flickcurl/
ENTERED=20100226
diff --git a/libs/flickcurl/HISTORY b/libs/flickcurl/HISTORY
index eec6f5d..25930b7 100644
--- a/libs/flickcurl/HISTORY
+++ b/libs/flickcurl/HISTORY
@@ -1,3 +1,7 @@
+2011-10-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.21
+ * PRE_BUILD: replace include for curl/types.h by curl/curl.h
+
2010-11-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.20




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c3725149e7920cbb1b171ed621302d6a07ab0da3), Florian Franzmann, 10/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page