Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (622c4407588a5616757bc390ef509ce5b1a7af2e)

Chronological Thread  
    < 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 (622c4407588a5616757bc390ef509ce5b1a7af2e)
  • Date: Wed, 28 Nov 2012 14:29:21 -0600
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 3 +++
graphics/darktable/DETAILS | 6 +++---
graphics/darktable/HISTORY | 9 +++++++++
graphics/darktable/PRE_BUILD | 5 -----
graphics/darktable/rsvg.patch | 24 ------------------------
graphics/luminance-hdr/BUILD | 1 +
graphics/luminance-hdr/CONFLICTS | 1 +
graphics/luminance-hdr/DEPENDS | 7 +++++++
graphics/luminance-hdr/DETAILS | 32 ++++++++++++++++++++++++++++++++
graphics/luminance-hdr/HISTORY | 12 ++++++++++++
graphics/qtpfsgui/BUILD | 2 +-
graphics/qtpfsgui/DEPENDS | 6 +-----
graphics/qtpfsgui/DETAILS | 39
+++++++--------------------------------
graphics/qtpfsgui/DOWNLOAD | 1 +
graphics/qtpfsgui/HISTORY | 5 +++++
graphics/qtpfsgui/INSTALL | 1 +
graphics/qtpfsgui/PRE_BUILD | 5 +----
graphics/qtpfsgui/TRIGGERS | 1 +
18 files changed, 86 insertions(+), 74 deletions(-)

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

rename graphics/qtpfsgui to luminance-hdr, version -> 2.2.1

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

graphics/darktable: version 1.1

diff --git a/ChangeLog b/ChangeLog
index 44dfb24..ea5038c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-11-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * graphics/qtpfsgui renamed to graphics/luminance-hdr
+
2012-11-25 Pol Vinogradov <vin.public AT gmail.com>
* lxde/lxinput: new spell, a small program used to configure
keyboard and mouse for LXDE
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index fed0949..688efcc 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,9 +1,9 @@
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=1.0.5
+ VERSION=1.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/1.0/${SOURCE}
-
SOURCE_HASH=sha512:52b532a07a029355a3e689971f15bf5c1a28a587419b5fae40aa342f724d3c15b4ceb557354ad46d4ca7f6e951e9b8de5ac15ccf0c4fa41a85249d5a41972cfb
+ SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/$(echo
$VERSION|cut -f1 -d.).$(echo $VERSION|cut -f2 -d.)/${SOURCE}
+
SOURCE_HASH=sha512:b0ecbaf3bf598fbe99ee58ff7e84e2d81a3f05647e1d4aaa5f4a5c2610c7c9a841cef6d20e52302edc0ab6fc4f4105d96d6070fcbb79f20a0f23a63d927ab24f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
if [[ "$DARKTABLE_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 462f335..3dc99c5 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,12 @@
+2012-11-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.1
+ * PRE_BUILD, rsvg.patch: removed
+
+2012-10-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependencies on atk, freetype2, gcc, ilmbase,
+ libgphoto2, pango and zlib. Removed dependencies on libraw and
+ sdl
+
2012-10-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* rsvg.patch, PRE_BUILD: add patch from upstream to prevent
compile error
diff --git a/graphics/darktable/PRE_BUILD b/graphics/darktable/PRE_BUILD
deleted file mode 100755
index 4a45c23..0000000
--- a/graphics/darktable/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- patch -p1 < ${SPELL_DIRECTORY}/rsvg.patch
-fi
diff --git a/graphics/darktable/rsvg.patch b/graphics/darktable/rsvg.patch
deleted file mode 100644
index 2ad46d2..0000000
--- a/graphics/darktable/rsvg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/iop/watermark.c b/src/iop/watermark.c
-index bcd65d6..e3da730 100644
---- a/src/iop/watermark.c
-+++ b/src/iop/watermark.c
-@@ -36,7 +36,10 @@
- #include <inttypes.h>
-
- #include <librsvg/rsvg.h>
-+// ugh, ugly hack. why do people break stuff all the time?
-+#ifndef RSVG_CAIRO_H
- #include <librsvg/rsvg-cairo.h>
-+#endif
-
- #include "common/metadata.h"
- #include "common/utility.h"
-@@ -712,7 +715,7 @@ static void refresh_watermarks( dt_iop_module_t *self )
- snprintf(filename, DT_MAX_PATH_LEN, "%s/%s", configdir, d_name);
- gtk_combo_box_append_text( g->combobox1, d_name );
- count++;
-- }
-+ }
- g_dir_close(dir) ;
- }
-
diff --git a/graphics/luminance-hdr/BUILD b/graphics/luminance-hdr/BUILD
new file mode 100755
index 0000000..2113434
--- /dev/null
+++ b/graphics/luminance-hdr/BUILD
@@ -0,0 +1 @@
+qt4_cmake_build
diff --git a/graphics/luminance-hdr/CONFLICTS
b/graphics/luminance-hdr/CONFLICTS
new file mode 100755
index 0000000..bca3b11
--- /dev/null
+++ b/graphics/luminance-hdr/CONFLICTS
@@ -0,0 +1 @@
+conflicts qtpfsgui y
diff --git a/graphics/luminance-hdr/DEPENDS b/graphics/luminance-hdr/DEPENDS
new file mode 100755
index 0000000..f966516
--- /dev/null
+++ b/graphics/luminance-hdr/DEPENDS
@@ -0,0 +1,7 @@
+depends qt4 &&
+depends exiv2 &&
+depends fftw &&
+depends tiff &&
+depends openexr &&
+depends gsl &&
+depends libraw
diff --git a/graphics/luminance-hdr/DETAILS b/graphics/luminance-hdr/DETAILS
new file mode 100755
index 0000000..b465d58
--- /dev/null
+++ b/graphics/luminance-hdr/DETAILS
@@ -0,0 +1,32 @@
+ SPELL=luminance-hdr
+ VERSION=2.2.1
+ SOURCE="${SPELL}-v${VERSION}.tar.gz"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/qtpfsgui/${SPELL}/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:8f8380afa6bd6e0fb217434fb16ca66a39bc44be17ffa5f0bf807e54ca56c4d630ed968a2adbe2931eb8baa608fef9f9ef3f11f4cc05c61b986a07f9c4ea17a5
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-v${VERSION}"
+ WEB_SITE="http://qtpfsgui.sourceforge.net/index.php";
+ LICENSE[0]=GPL
+ ENTERED=20080622
+ SHORT="an open source graphical user interface application that
aims to provide a workflow for HDR imaging"
+cat << EOF
+Qtpfsgui is an open source graphical user interface application that aims
+to provide a workflow for HDR imaging. Supported HDR formats:
+
+* OpenEXR (extension: exr)
+* Radiance RGBE (extension: hdr) * Tiff formats:
+ 16bit, 32bit (float) and LogLuv (extension: tiff)
+* Raw image formats (extension: various)
+* PFS native format (extension: pfs)
+
+Supported LDR formats:
+* JPEG, PNG, PPM, PBM, TIFF(8 bit)
+
+Supported features:
+* Create an HDR file from a set of images (formats: JPEG, TIFF 8bit
+ and 16bit, RAW) of the same scene taken at different exposure setting.
+* Save and load HDR images.
+* Rotate and resize HDR images.
+* Tonemap HDR images.
+* Copy exif data between sets of images.
+* Supports internationalization.
+EOF
diff --git a/graphics/luminance-hdr/HISTORY b/graphics/luminance-hdr/HISTORY
new file mode 100644
index 0000000..08cebb8
--- /dev/null
+++ b/graphics/luminance-hdr/HISTORY
@@ -0,0 +1,12 @@
+2012-11-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: spell renamed to luminance-hdr, version 2.2.1
+ * DEPENDS: added dependencies on gsl and libraw
+ * BUILD: switched to cmake
+ * CONFLICTS: added conflict with qtpfsgui
+
+2010-07-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: use qt4_build
+ * DETAILS: version 1.9.3
+
+2008-06-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, HISTORY, PRE_BUILD: spell created
diff --git a/graphics/qtpfsgui/BUILD b/graphics/qtpfsgui/BUILD
index eec3de4..27ba77d 100755
--- a/graphics/qtpfsgui/BUILD
+++ b/graphics/qtpfsgui/BUILD
@@ -1 +1 @@
-qt4_build
+true
diff --git a/graphics/qtpfsgui/DEPENDS b/graphics/qtpfsgui/DEPENDS
index 1bb2f27..3b0dee8 100755
--- a/graphics/qtpfsgui/DEPENDS
+++ b/graphics/qtpfsgui/DEPENDS
@@ -1,5 +1 @@
-depends qt4 &&
-depends exiv2 &&
-depends fftw &&
-depends tiff &&
-depends openexr
+depends luminance-hdr
diff --git a/graphics/qtpfsgui/DETAILS b/graphics/qtpfsgui/DETAILS
index 218aed7..e67046b 100755
--- a/graphics/qtpfsgui/DETAILS
+++ b/graphics/qtpfsgui/DETAILS
@@ -1,32 +1,7 @@
- SPELL=qtpfsgui
- VERSION=1.9.3
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:215bf59c6baf4a50713c5e6644a86041152698af790ed0b581565f50dece7a0412b1f77e0598e90b3b9fa35cd6715bdb46b421b15f9646c18b22ec98bca3d3eb
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://qtpfsgui.sourceforge.net/index.php";
- LICENSE[0]=GPL
- ENTERED=20080622
- SHORT="an open source graphical user interface application that
aims to provide a workflow for HDR imaging"
-cat << EOF
-Qtpfsgui is an open source graphical user interface application that aims
-to provide a workflow for HDR imaging. Supported HDR formats:
-
-* OpenEXR (extension: exr)
-* Radiance RGBE (extension: hdr) * Tiff formats:
- 16bit, 32bit (float) and LogLuv (extension: tiff)
-* Raw image formats (extension: various)
-* PFS native format (extension: pfs)
-
-Supported LDR formats:
-* JPEG, PNG, PPM, PBM, TIFF(8 bit)
-
-Supported features:
-* Create an HDR file from a set of images (formats: JPEG, TIFF 8bit
- and 16bit, RAW) of the same scene taken at different exposure setting.
-* Save and load HDR images.
-* Rotate and resize HDR images.
-* Tonemap HDR images.
-* Copy exif data between sets of images.
-* Supports internationalization.
-EOF
+ SPELL=qtpfsgui
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by luminance-hdr]
+ EOF
diff --git a/graphics/qtpfsgui/DOWNLOAD b/graphics/qtpfsgui/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/graphics/qtpfsgui/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/graphics/qtpfsgui/HISTORY b/graphics/qtpfsgui/HISTORY
index 76644fc..e54302b 100644
--- a/graphics/qtpfsgui/HISTORY
+++ b/graphics/qtpfsgui/HISTORY
@@ -1,3 +1,8 @@
+2012-11-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated [renamed to luminance-hdr]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2010-07-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: use qt4_build
* DETAILS: version 1.9.3
diff --git a/graphics/qtpfsgui/INSTALL b/graphics/qtpfsgui/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/graphics/qtpfsgui/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/graphics/qtpfsgui/PRE_BUILD b/graphics/qtpfsgui/PRE_BUILD
index 571c366..27ba77d 100755
--- a/graphics/qtpfsgui/PRE_BUILD
+++ b/graphics/qtpfsgui/PRE_BUILD
@@ -1,4 +1 @@
-QTBIN=${INSTALL_ROOT}/usr/bin/qt4
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-$QTBIN/lrelease project.pro
+true
diff --git a/graphics/qtpfsgui/TRIGGERS b/graphics/qtpfsgui/TRIGGERS
new file mode 100755
index 0000000..54fb660
--- /dev/null
+++ b/graphics/qtpfsgui/TRIGGERS
@@ -0,0 +1 @@
+on_cast qtpfsgui dispel_self


  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (622c4407588a5616757bc390ef509ce5b1a7af2e), Florian Franzmann, 11/28/2012

Archive powered by MHonArc 2.6.24.

Top of Page