sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Andraž Levstik (3be430622e9092cd8f977b3a791893fb122f3e00)
- From: Andraž Levstik <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (3be430622e9092cd8f977b3a791893fb122f3e00)
- Date: Sun, 3 Oct 2010 02:43:11 -0500
GIT changes to master grimoire by Andraž Levstik
<ruskie+2054d253 AT codemages.net>:
graphics/fotoxx/BUILD | 3 --
graphics/fotoxx/DEPENDS | 3 ++
graphics/fotoxx/DETAILS | 8 ++---
graphics/fotoxx/HISTORY | 8 +++++
graphics/fotoxx/INSTALL | 7 ++--
graphics/fotoxx/PRE_BUILD | 5 ---
graphics/ufraw/BUILD | 2 -
graphics/ufraw/CONFIGURE | 23 +++++++++------
graphics/ufraw/DEPENDS | 67
+++++++++++++++++++++++++---------------------
graphics/ufraw/DETAILS | 4 +-
graphics/ufraw/HISTORY | 8 +++++
graphics/ufraw/PREPARE | 4 +-
graphics/ufraw/PRE_BUILD | 2 -
13 files changed, 85 insertions(+), 59 deletions(-)
New commits:
commit cf90a4195b6722f81ac14c44a77ceb73e60e770b
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>
fotoxx: updated to 10.10.1
commit fcc72024c92b71f4dce803012441871414851011
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>
ufraw: various cleanups, dependency reorg, new config opts, old config
opts
diff --git a/graphics/fotoxx/BUILD b/graphics/fotoxx/BUILD
index 4c74ff9..9c07601 100755
--- a/graphics/fotoxx/BUILD
+++ b/graphics/fotoxx/BUILD
@@ -1,3 +1,2 @@
-PREFIX=${INSTALL_ROOT}/usr make &&
-PREFIX=${INSTALL_ROOT}/usr make launcher
+CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS PREFIX=${INSTALL_ROOT}/usr make
diff --git a/graphics/fotoxx/DEPENDS b/graphics/fotoxx/DEPENDS
index 4f68867..568729f 100755
--- a/graphics/fotoxx/DEPENDS
+++ b/graphics/fotoxx/DEPENDS
@@ -1,4 +1,7 @@
depends gtk+2 &&
depends g++ &&
depends exiv2 &&
+depends tiff &&
+depends ufraw &&
+depends image-exiftool &&
depends xdg-utils
diff --git a/graphics/fotoxx/DETAILS b/graphics/fotoxx/DETAILS
index f4774ae..95a7674 100755
--- a/graphics/fotoxx/DETAILS
+++ b/graphics/fotoxx/DETAILS
@@ -1,9 +1,9 @@
SPELL=fotoxx
- VERSION=5.7
+ VERSION=10.10.1
SOURCE="${SPELL}-$VERSION.tar.gz"
- SOURCE_URL[0]=http://kornelix.squarespace.com/storage/$SPELL/${SOURCE}
-
SOURCE_HASH=sha512:e3b43fa62523f6a9eff079b2485ab7e516ff24a2ca9eb0bdaff5513221c2302543d1ae9fa3110a163e0431c76aa651f718b76d53dcfdf7b1bdf5ebe58e5ed738
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ SOURCE_URL[0]=http://kornelix.squarespace.com/storage/downloads/${SOURCE}
+
SOURCE_HASH=sha512:063c632917ad6b0ec78c98bc26a03980e8f6817cc3b44c2504c6edc6fd3af5dca9963cd09a6580dbb9efa1117018ec226d085ecdc47affa2dff66d4b1bba0483
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
WEB_SITE="http://kornelix.squarespace.com/fotoxx";
LICENSE[0]=GPL
ENTERED=20080329
diff --git a/graphics/fotoxx/HISTORY b/graphics/fotoxx/HISTORY
index 5bc528e..4feed96 100644
--- a/graphics/fotoxx/HISTORY
+++ b/graphics/fotoxx/HISTORY
@@ -1,3 +1,11 @@
+2010-10-03 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 10.10.1
+ * PRE_BUILD: removed
+ * BUILD: updated
+ * DEPENDS: fresh depends
+ * INSTALL: updated
+
2008-12-02 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 5.7
diff --git a/graphics/fotoxx/INSTALL b/graphics/fotoxx/INSTALL
index 23f6512..0992043 100755
--- a/graphics/fotoxx/INSTALL
+++ b/graphics/fotoxx/INSTALL
@@ -1,3 +1,4 @@
-PREFIX=${INSTALL_ROOT}/usr make install &&
-mkdir -vp $INSTALL_ROOT/usr/share/applications/ &&
-cp -v kornelix-$SPELL.desktop $INSTALL_ROOT/usr/share/applications/
+PREFIX=${INSTALL_ROOT}/usr make install &&
+PREFIX=${INSTALL_ROOT}/usr make menu &&
+PREFIX=${INSTALL_ROOT}/usr make manpage
+
diff --git a/graphics/fotoxx/PRE_BUILD b/graphics/fotoxx/PRE_BUILD
deleted file mode 100755
index d350a1b..0000000
--- a/graphics/fotoxx/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sed -i "s:^CFLAGS = -O \(.*\):CFLAGS = \1 $CFLAGS:g" Makefile &&
-sed -i "s:^LFLAGS = -O \(.*\):LFLAGS = \1 $CFLAGS:g" Makefile &&
-sed -i "s:^LAUNCHER = .*:LAUNCHER = kornelix-\$(PROGRAM).desktop:g" Makefile
diff --git a/graphics/ufraw/BUILD b/graphics/ufraw/BUILD
index e1b74fe..54f8d89 100755
--- a/graphics/ufraw/BUILD
+++ b/graphics/ufraw/BUILD
@@ -1,2 +1,2 @@
-OPTS="$UFR_EXT $UFR_CRTST $UFR_HTPX $OPTS" &&
+OPTS="$UFRAW_OPTS $OPTS" &&
default_build
diff --git a/graphics/ufraw/CONFIGURE b/graphics/ufraw/CONFIGURE
index 2663b92..4bd0e29 100755
--- a/graphics/ufraw/CONFIGURE
+++ b/graphics/ufraw/CONFIGURE
@@ -1,11 +1,16 @@
-config_query_option UFR_EXT "build dcraw and nikon-curve ?" n \
- "--enable-extras" \
- "--disable-extras" &&
+config_query_option UFRAW_OPTS "Build dcraw and nikon-curve" n \
+ "--enable-extras" \
+ "--disable-extras" &&
-config_query_option UFR_CRTST "enable the contrast setting option ?" n \
- "--enable-contrast" \
- "--disable-constrast" &&
+config_query_option UFRAW_OPTS "Enable the contrast setting option" n \
+ "--enable-contrast" \
+ "--disable-constrast" &&
+
+config_query_option UFRAW_OPTS "Enable DST correction" n \
+ "--enable-dst-correction" \
+ "--disable-dst-correction" &&
+
+config_query_option UFRAW_OPTS "Install MIME files" n \
+ "--enable-mime" \
+ "--disable-mime"
-config_query_option UFR_HTPX "enable hot pixel elimination ?" n \
- "--enable-hotpixels" \
- "--disable-hotpixels"
diff --git a/graphics/ufraw/DEPENDS b/graphics/ufraw/DEPENDS
index 5e671c2..af5f1ea 100755
--- a/graphics/ufraw/DEPENDS
+++ b/graphics/ufraw/DEPENDS
@@ -1,35 +1,42 @@
-depends gtk+2 &&
-depends lcms &&
-depends gtkimageview &&
-if [ "$UFRAW_CVS" == "y" ]; then
+depends lcms &&
+depends glib2 &&
+if [[ "$UFRAW_CVS" == "y" ]]; then
depends CVS
fi &&
-optional_depends gimp \
- "--with-gimp" \
- "--without-gimp" \
- "for gimp plugin" &&
-optional_depends cinepaint \
- "--with-cinepaint" \
- "--without-cinepaint" \
+optional_depends gtk+2 \
+ "--with-gtk" \
+ "--without-gtk" \
+ "Build GTK UI" &&
+if is_depends_enabled $SPELL gtk+2 ; then
+depends gtkimageview
+fi &&
+optional_depends gimp \
+ "--with-gimp" \
+ "--without-gimp" \
+ "Build gimp plugin" &&
+optional_depends cinepaint \
+ "--with-cinepaint" \
+ "--without-cinepaint" \
"for cinepaint plugin" &&
-optional_depends jpeg \
- "" \
- "" \
- "for jpeg support" &&
-optional_depends tiff \
- "" \
- "" \
- "for tiff support" &&
-optional_depends exiv2 \
- "--with-exiv2" \
- "--without-exiv2" \
- "for exif support" &&
-optional_depends lensfun \
- "--with-lensfun" \
+optional_depends jpeg \
+ "" \
+ "" \
+ "for jpeg support" &&
+optional_depends tiff \
+ "" \
+ "" \
+ "for tiff support" &&
+optional_depends exiv2 \
+ "--with-exiv2" \
+ "--without-exiv2" \
+ "for exif support" &&
+optional_depends lensfun \
+ "--with-lensfun" \
"--without-lensfun" \
- "lensfun support" &&
-optional_depends cfitsio \
- "" \
- "" \
- "for FITS format support"
+ "lensfun support" &&
+optional_depends cfitsio \
+ "" \
+ "" \
+ "for FITS format support"
+
diff --git a/graphics/ufraw/DETAILS b/graphics/ufraw/DETAILS
index 012f6f7..331b2ba 100755
--- a/graphics/ufraw/DETAILS
+++ b/graphics/ufraw/DETAILS
@@ -1,6 +1,6 @@
SPELL=ufraw
-if [ "$UFRAW_CVS" == "y" ]; then
- if [ "$UFRAW_CVS_AUTOUPDATE" == "y" ]; then
+if [[ "$UFRAW_CVS" == "y" ]]; then
+ if [[ "$UFRAW_CVS_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=sfcvs
diff --git a/graphics/ufraw/HISTORY b/graphics/ufraw/HISTORY
index 4cf5a77..dce872f 100644
--- a/graphics/ufraw/HISTORY
+++ b/graphics/ufraw/HISTORY
@@ -1,3 +1,11 @@
+2010-10-03 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * BUILD: cleanup
+ * DEPENDS: some stuff is optional
+ * CONFIGURE: updated options
+ * PRE_BUILD: cleanup
+ * DETAILS: cleanup
+ * PREPARE: cleanup
+
2010-04-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.17
diff --git a/graphics/ufraw/PREPARE b/graphics/ufraw/PREPARE
index 43e221b..2d0c48b 100755
--- a/graphics/ufraw/PREPARE
+++ b/graphics/ufraw/PREPARE
@@ -1,6 +1,6 @@
config_query UFRAW_CVS "Use CVS version" n
-if [ "$UFRAW_CVS" == "y" ]; then
+if [[ "$UFRAW_CVS" == "y" ]]; then
config_query UFRAW_CVS_AUTOUPDATE \
"Update to the latest CVS automatically on every cast?" \
n
-fi
\ No newline at end of file
+fi
diff --git a/graphics/ufraw/PRE_BUILD b/graphics/ufraw/PRE_BUILD
index dce5e87..48b8190 100755
--- a/graphics/ufraw/PRE_BUILD
+++ b/graphics/ufraw/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
-if [ "$UFRAW_CVS" == "y" ]; then
+if [[ "$UFRAW_CVS" == "y" ]]; then
cd "$SOURCE_DIRECTORY" &&
NOCONFIGURE=ON ./autogen.sh
fi
- [SM-Commit] GIT changes to master grimoire by Andraž Levstik (3be430622e9092cd8f977b3a791893fb122f3e00), Andraž Levstik, 10/03/2010
Archive powered by MHonArc 2.6.24.