SourceForge.net: Hugin: hugin-cvs

Home / Browse / Hugin / Mail / Archive

Email Archive: hugin-cvs (read-only)

2005:	_Jan (84)	_Feb (83)	_Mar (36)	_Apr (15)	_May (250)	_Jun (81)	_Jul (29)	_Aug (62)	_Sep (22)	_Oct (13)	_Nov (62)	_Dec (30)
2006:	_Jan (67)	_Feb (68)	_Mar (149)	_Apr (51)	_May (8)	_Jun (23)	_Jul (87)	_Aug (132)	_Sep (9)	_Oct (1)	_Nov (22)	_Dec (163)
2007:	_Jan (74)	_Feb (71)	_Mar (2)	_Apr (121)	_May (57)	_Jun (168)	_Jul (151)	_Aug (73)	_Sep (4)	_Oct (91)	_Nov (30)	_Dec (38)
2008:	_Jan (178)	_Feb (159)	_Mar (49)	_Apr (65)	_May (43)	_Jun (56)	_Jul (99)	_Aug (132)	_Sep (71)	_Oct (57)	_Nov (42)	_Dec (11)
2009:	_Jan (40)	_Feb (74)	_Mar (80)	_Apr (45)	_May (86)	_Jun (76)	_Jul (160)	_Aug (170)	_Sep (227)	_Oct (161)	_Nov (49)	_Dec (108)
2010:	_Jan (108)	_Feb (82)	_Mar (62)	_Apr (33)	_May (60)	_Jun (38)	_Jul (46)	_Aug (69)	_Sep (157)	_Oct (123)	_Nov (130)	_Dec (154)
2011:	_Jan (138)	_Feb (112)	_Mar (128)	_Apr (4)	_May (86)	_Jun (81)	_Jul (128)	_Aug (98)	_Sep (69)	_Oct (32)	_Nov (50)	_Dec (41)
2012:	_Jan (10)	_Feb (6)	_Mar (17)	_Apr (10)	_May (67)	_Jun (57)	_Jul (41)	_Aug (54)	_Sep (17)	_Oct (15)	_Nov (34)	_Dec (45)
2013:	_Jan (62)	_Feb (47)	_Mar (71)	_Apr (25)	_May (11)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
1	2	3	4	5	6	7
(1)
8	9	10	11	12	13	14
	(1)		(2)			(1)
15	16	17	18	19	20	21
(1)		(1)	(3)
22	23	24	25	26	27	28

29	30	31

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Fix incorrect line ending in japanese ...

From: <hugin-cvs@li...> - 2012-01-18 09:47

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/782cca2ac745
changeset:  5730:782cca2ac745
user:       harryvanderwolf <hvdwolf@...>
date:       Wed Jan 18 10:46:39 2012 +0100
description:

Fix incorrect line ending in japanese translation

diffstat:

 src/translations/ja.po |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 01a4d85886b9 -r 782cca2ac745 src/translations/ja.po
--- a/src/translations/ja.po	Wed Jan 18 10:14:15 2012 +0100
+++ b/src/translations/ja.po	Wed Jan 18 10:46:39 2012 +0100
@@ -751,7 +751,7 @@
 msgstr ""
 "ã³ã³ããã¼ã«ãã¤ã³ããçæãã¾ãã\n"
 "çæãããæ°ãæ¸ããã«ã¯ã\n"
-"å¤ãå¤§ãããã¦ä¸ããã\n"
+"å¤ãå¤§ãããã¦ä¸ããã"
 
 #: hugin1/hugin/CPEditorPanel.cpp:1578
 msgid "Corner Detection threshold"

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: [OSX] correct Utils.cpp otherwise it e...

From: <hugin-cvs@li...> - 2012-01-18 09:14

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/01a4d85886b9
changeset:  5729:01a4d85886b9
user:       harryvanderwolf <hvdwolf@...>
date:       Wed Jan 18 10:14:15 2012 +0100
description:

[OSX] correct Utils.cpp otherwise it even doesn't compile for 64bits; Doesn't solve bus error on 64bits

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj |   1 +
 src/hugin_cpfind/cpfind/Utils.cpp   |  26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diffs (47 lines):

diff -r 52d31ba5dafc -r 01a4d85886b9 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Tue Jan 17 17:31:14 2012 +0100
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Wed Jan 18 10:14:15 2012 +0100
@@ -14228,6 +14228,7 @@
 					"-framework",
 					Foundation,
 				);
+				PER_ARCH_CFLAGS_x86_64 = "-march=core2 -mtune=core2 -ftree-vectorize";
 				PREBINDING = YES;
 				PRODUCT_NAME = cpfind;
 				ZERO_LINK = NO;
diff -r 52d31ba5dafc -r 01a4d85886b9 src/hugin_cpfind/cpfind/Utils.cpp
--- a/src/hugin_cpfind/cpfind/Utils.cpp	Tue Jan 17 17:31:14 2012 +0100
+++ b/src/hugin_cpfind/cpfind/Utils.cpp	Wed Jan 18 10:14:15 2012 +0100
@@ -65,19 +65,19 @@
     return status.ullTotalPhys;
 };
 #elif defined __APPLE__
-unsigned long long utils::getTotalMemory()
-{
-    long ramSize;
-    if(Gestalt(gestaltPhysicalRAMSizeInMegabytes, &ramSize)==noErr)
-    {
-        return ramSize * 1024 * 1024;
-    }
-    else
-    {
-        // if query was not successful return 1 GB, 
-        // return 0 would result in crash in calling function
-        return 1024*1024*1024;
-    }
+unsigned long long utils::getTotalMemory()
+{
+    SInt32 ramSize;
+    if(Gestalt(gestaltPhysicalRAMSizeInMegabytes, &ramSize)==noErr)
+    {
+        return ramSize * 1024 * 1024;
+    }
+    else
+    {
+        // if query was not successful return 1 GB, 
+        // return 0 would result in crash in calling function
+        return 1024*1024*1024;
+    }
 };
 #else
 unsigned long long utils::getTotalMemory()

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin-web: Make notice of mac bugfix for rele...

From: <hugin-cvs@li...> - 2012-01-18 07:32

branch:     htdocs
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin-web/hgrepo/h/hu/hugin/hugin-web/rev/8d4030b31d98
changeset:  326:8d4030b31d98
user:       harryvanderwolf <hvdwolf@...>
date:       Wed Jan 18 08:32:26 2012 +0100
description:

Make notice of mac bugfix for release version of 2011.4.0

diffstat:

 download/index.shtml |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 9b4e99f534f4 -r 8d4030b31d98 download/index.shtml
--- a/download/index.shtml	Wed Dec 21 08:20:48 2011 +0100
+++ b/download/index.shtml	Wed Jan 18 08:32:26 2012 +0100
@@ -56,7 +56,7 @@
 
       <ul>
         <li>Windows: Official 2011.4.0 <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/HuginSetup_2011.4.0-32bit_Windows.exe/download">32-bit</a> and <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/HuginSetup_2011.4.0-64bit_Windows.exe/download">64-bit</a>.</li>
-        <li>Mac: Official Hugin, PTBatcherGui and Calibrate_lens_gui 2011.2.0: <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/hugin-mac-2011.4.0-installer.dmg/download">Installer</a> and <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/hugin-mac-2011.4.0.dmg/download">a dmg simply containing the bundles</a>. For Tiger, Leopard, Snow Leopard and Lion. <i>Tiger and Lion users <strong>must</strong> read the "Read Me First (Mac)" in the dmg</i>.</li>
+        <li>Mac <strong>(bugfix 18 Jan 2012)</strong>: Official Hugin, PTBatcherGui and Calibrate_lens_gui 2011.2.0: <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/hugin-mac-2011.4.0-installer.dmg/download">Installer</a> and <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/hugin-mac-2011.4.0.dmg/download">a dmg simply containing the bundles</a>. For Tiger, Leopard, Snow Leopard and Lion. <i>Tiger and Lion users <strong>must</strong> read the "Read Me First (Mac)" in the dmg</i>.</li>
         <li>Linux: use your distribution's official package manager.
           <ul>
             <li>Fedora: Instructions for using the Hugin snapshot repository can be found at the <a href="http://wiki.panotools.org/Hugin_Compiling_Fedora">Fedora page on the panotools wiki</a></li>

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Update Dutch translation: typo (Thanks...

From: <hugin-cvs@li...> - 2012-01-17 16:31

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/52d31ba5dafc
changeset:  5728:52d31ba5dafc
user:       harryvanderwolf <hvdwolf@...>
date:       Tue Jan 17 17:31:14 2012 +0100
description:

Update Dutch translation: typo (Thanks to Kris de Gussem)

diffstat:

 src/translations/nl.po |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r b9ea6e72528c -r 52d31ba5dafc src/translations/nl.po
--- a/src/translations/nl.po	Sun Jan 15 22:39:29 2012 +0100
+++ b/src/translations/nl.po	Tue Jan 17 17:31:14 2012 +0100
@@ -9,7 +9,7 @@
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
 "POT-Creation-Date: 2011-10-21 22:38+0200\n"
-"PO-Revision-Date: 2011-11-13 08:29+0100\n"
+"PO-Revision-Date: 2012-01-17 17:30+0100\n"
 "Last-Translator: Harry van der Wolf <harryvanderwolf@..."
 "Language-Team: American English <kde-i18n-doc@..."
 "Language: \n"
@@ -6575,7 +6575,7 @@
 #: translations/xrc.cpp:770
 #: xrc.cpp:770
 msgid "0 for automatic detection"
-msgstr "0 vor automatische detectie"
+msgstr "0 voor automatische detectie"
 
 #: translations/xrc.cpp:771
 #: xrc.cpp:771

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: [OSX} compile cpfind universal i386/pp...

From: <hugin-cvs@li...> - 2012-01-15 21:39

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/b9ea6e72528c
changeset:  5727:b9ea6e72528c
user:       harryvanderwolf <hvdwolf@...>
date:       Sun Jan 15 22:39:29 2012 +0100
description:

[OSX} compile cpfind universal i386/ppc, x86_64 still segfaults; minor update enblend-openmp script

diffstat:

 mac/ExternalPrograms/scripts/enblend-openmp.sh |  15 ++++++++++-----
 mac/Hugin.xcodeproj/project.pbxproj            |   3 +--
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r 9b626b9be8b4 -r b9ea6e72528c mac/ExternalPrograms/scripts/enblend-openmp.sh
--- a/mac/ExternalPrograms/scripts/enblend-openmp.sh	Sat Jan 14 20:23:26 2012 +0900
+++ b/mac/ExternalPrograms/scripts/enblend-openmp.sh	Sun Jan 15 22:39:29 2012 +0100
@@ -28,6 +28,12 @@
 
 # init
 
+fail()
+{
+        echo "** Failed at $1 **"
+        exit 1
+}
+
 # Fancy doc builds on Enblend 3.2 are doomed to failure, so don't even try...
 AC_INIT=$(grep AC_INIT Configure.in)
 TEX=$(which tex)
@@ -127,9 +133,8 @@
    PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \
    ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \
      --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \
-     --disable-image-cache --enable-openmp=yes \
-     --with-glew $extraConfig \
-   ;
+     --disable-image-cache --enable-openmp \
+     --with-glew $extraConfig || fail "configure step for $ARCH";
 
  # hack; AC_FUNC_MALLOC sucks!!
 
@@ -147,8 +152,8 @@
  sed -e "s/-O[0-9]/-O3/g" "src/Makefile.bak" > src/Makefile
 
  make clean;
- make all $extraBuild ;
- make install $extraInstall ;
+ make all $extraBuild || fail "failed at make step of $ARCH";
+ make install $extraInstall || fail "failed at make install step of $ARCH";
  
 done
 
diff -r 9b626b9be8b4 -r b9ea6e72528c mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Sat Jan 14 20:23:26 2012 +0900
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Sun Jan 15 22:39:29 2012 +0100
@@ -14185,8 +14185,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+				ARCHS = "$(RELEASE_ARCHS_32)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: updated Japanese translation

From: <hugin-cvs@li...> - 2012-01-14 11:25

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/9b626b9be8b4
changeset:  5726:9b626b9be8b4
user:       Masahiro Kitagawa <arctica0316@...>
date:       Sat Jan 14 20:23:26 2012 +0900
description:

updated Japanese translation

diffstat:

 src/translations/ja.po |  544 +++++++++++++++++-------------------------------
1 ファイル変更、追加 189 行(+)、削除 355 行(-)

差分 (1855 行から 500 行に切り詰め):

diff -r 16488a7f1a41 -r 9b626b9be8b4 src/translations/ja.po
--- a/src/translations/ja.po	Wed Jan 11 16:40:01 2012 +0100
+++ b/src/translations/ja.po	Sat Jan 14 20:23:26 2012 +0900
@@ -19,12 +19,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82
-#, c-format
 msgid ""
 "External program %s not found as specified in preferences, reverting to "
 "bundled version"
 msgstr ""
-"外部実行ファイル「%s」が初期設定に指定された場所に見つかりませんでした。付属"
+"外部実行ファイル %s が初期設定に指定された場所に見つかりませんでした。付属"
 "のものを使用します。"
 
 #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57
@@ -55,17 +54,15 @@
 #: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69
 #: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
 #: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/PanoPanel.cpp:1202
-#, c-format
 msgid "External program %s not found in the bundle, reverting to system path"
 msgstr ""
-"付属の実行ファイル「%s」が見つかりませんでした。システム標準のパスを使用しま"
+"付属の実行ファイル %s が見つかりませんでした。システム標準のパスを使用しま"
 "す。"
 
 #: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109
-#, c-format
 msgid "Program %s not found in preferences, reverting to default value"
 msgstr ""
-"プログラム「%s」が環境設定で指定された場所に見つかりませんでした。デフォルト"
+"プログラム %s が環境設定で指定された場所に見つかりませんでした。デフォルト"
 "のものを使用します。"
 
 #: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134
@@ -151,25 +148,22 @@
 "Incompatible lens parameter file, image sizes do not match\n"
 "Apply settings anyway?"
 msgstr ""
-"画像のサイズが合わない、この画像と互換性のないレンズ設定ファイルです。\n"
-"それでも適用しますか？"
+"この画像と互換性のない、画像サイズが合わないレンズ設定ファイルです。\n"
+"設定を適用して構いませんか？"
 
 #: hugin1/base_wx/LensTools.cpp:242
 msgid "Error loading lens parameters"
 msgstr "レンズの設定を読み込み中にエラー"
 
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:160
-#, c-format
 msgid "Failed to kill process %ld, error %d: %s"
 msgstr "プロセス %ld を強制終了できませんでした。エラー %d：%s"
 
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:179
-#, c-format
 msgid "Error pausing process %ld, code 1"
 msgstr "プロセス %ld を停止。エラーコード 1."
 
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:196
-#, c-format
 msgid "Error pausing process %ld, code 2"
 msgstr "プロセス %ld を停止。エラーコード 2."
 
@@ -221,15 +215,13 @@
 
 #: hugin1/base_wx/RunStitchPanel.cpp:145 hugin1/base_wx/RunStitchPanel.cpp:312
 #: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:88
-#, c-format
 msgid "could not open script : %s"
 msgstr "スクリプトを開けませんでした：%s"
 
 #: hugin1/base_wx/RunStitchPanel.cpp:166 hugin1/base_wx/RunStitchPanel.cpp:320
 #: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:115
-#, c-format
 msgid "error while parsing panotools script: %s"
-msgstr "PanoTools スクリプトの構文読み込み中にエラー：%s"
+msgstr "PanoTools スクリプトの構文解析にエラー：%s"
 
 #: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:227
 #: hugin1/base_wx/RunStitchPanel.cpp:346
@@ -249,12 +241,10 @@
 msgstr "既存ファイルの上書き"
 
 #: hugin1/base_wx/RunStitchPanel.cpp:282
-#, c-format
 msgid "Stitching %s"
-msgstr "スティッチ中：%s"
+msgstr "%s をスティッチ中"
 
 #: hugin1/base_wx/RunStitchPanel.cpp:286
-#, c-format
 msgid ""
 "Error while stitching project\n"
 "%s"
@@ -268,7 +258,6 @@
 msgstr "スティッチ中にエラー"
 
 #: hugin1/base_wx/RunStitchPanel.cpp:365
-#, c-format
 msgid ""
 "Error while running assistant\n"
 "%s"
@@ -307,13 +296,12 @@
 "xrc directory not found, hugin needs to be properly installed\n"
 "Tried Path:"
 msgstr ""
-"XRCディレクトリが見つかりません。再インストールして下さい。\n"
+"XRC ディレクトリが見つかりません。再インストールして下さい。\n"
 "検索した場所："
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:98
 #: hugin1/calibrate_lens/LensCalFrame.cpp:461 hugin1/hugin/MainFrame.cpp:148
 #: hugin1/hugin/MainFrame.cpp:993
-#, c-format
 msgid ""
 "The filename(s) contains one of the following invalid characters: %s\n"
 "Hugin can not work with these filenames. Please rename your file(s) and try "
@@ -324,26 +312,26 @@
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:169
 msgid "Hugin Lens calibration GUI"
-msgstr ""
+msgstr "Hugin レンズ補正GUI"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:371
-#, c-format
 msgid "Added %s"
-msgstr ""
+msgstr "%s を追加"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:397
-#, c-format
 msgid ""
 "The size of the images (%s) does not match with the already added image(s)."
 msgstr ""
+"画像サイズ (%s) が追加済みの画像と一致しません。"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:410
-#, c-format
 msgid ""
 "The EXIF information of the added images (%s) are not consistent with the "
 "already added image(s).\n"
 "Please check the image again, if you selected the correct images."
 msgstr ""
+"追加した画像のEXIF 情報が追加済みの画像と整合性がありません。\n"
+"正しい画像を選んでいるか、再度チェックしてください。"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:419 hugin1/hugin/MainFrame.cpp:928
 #: hugin1/hugin/wxPanoCommand.cpp:415 hugin1/hugin/wxPanoCommand.cpp:594
@@ -356,37 +344,33 @@
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:492
 #: hugin1/calibrate_lens/LensCalFrame.cpp:502
-#, c-format
 msgid "%s (%d lines)"
-msgstr ""
+msgstr "%s (%d 本の線)"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:590
 #: hugin1/calibrate_lens/LensCalFrame.cpp:613
 #: hugin1/calibrate_lens/LensCalFrame.cpp:728
 #: hugin1/calibrate_lens/LensCalFrame.cpp:770
 #: hugin1/calibrate_lens/LensCalFrame.cpp:842
-#, fuzzy
 msgid ""
 "There are invalid values in the input boxes.\n"
 "Please check your inputs."
 msgstr ""
-"少なくともひとつ空欄があります。\n"
+"不適切な値の欄があります。\n"
 "記入を確認してください。"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:599
 msgid "Detecting edges..."
-msgstr ""
+msgstr "エッジを検出しています…"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:601
-#, fuzzy
 msgid "Finding lines..."
-msgstr "レンズの変更…"
+msgstr "線を探しています…"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:605
 #: hugin1/calibrate_lens/LensCalFrame.cpp:721
-#, fuzzy
 msgid "Finished"
-msgstr "Suomi（フィンランド語）"
+msgstr "完了"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:621
 msgid ""
@@ -394,10 +378,13 @@
 "Please run \"Find lines\" before. If there are no lines found, change the "
 "parameters."
 msgstr ""
+"検出済みの線がありません。\n"
+"まず「線を探す」を実行してください。もし線が検出されないなら、パラメータを"
+"変更してください。"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:705
 msgid "Optimizing lens distortion parameters..."
-msgstr ""
+msgstr "レンズの歪みのパラメータを最適化中…"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:736
 msgid ""
@@ -405,6 +392,9 @@
 "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If "
 "there are no lines found, change the parameters."
 msgstr ""
+"検出済みの線がありません。\n"
+"まず「線を探す」を実行してください。もし線が検出されないなら、パラメータを"
+"変更してください。"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:741 hugin1/hugin/LensPanel.cpp:763
 msgid "Save lens parameters file"
@@ -417,9 +407,8 @@
 #: hugin1/calibrate_lens/LensCalFrame.cpp:754
 #: hugin1/calibrate_lens/LensCalFrame.cpp:785 hugin1/hugin/MainFrame.cpp:739
 #: hugin1/hugin/MaskEditorPanel.cpp:359
-#, c-format
 msgid "File %s exists. Overwrite?"
-msgstr "%s というファイルが存在します。上書きしますか?"
+msgstr "%s というファイルは存在します。上書きしますか?"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:755
 #: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:740
@@ -436,7 +425,6 @@
 msgstr "Huginプロジェクト (*.pto)|*.pto|すべて (*)|*"
 
 #: hugin1/hugin/AboutDialog.cpp:129
-#, c-format
 msgid "Operating System: %s"
 msgstr "オペレーティングシステム：%s"
 
@@ -449,58 +437,48 @@
 msgstr "32 ビット"
 
 #: hugin1/hugin/AboutDialog.cpp:135
-#, c-format
 msgid "Architecture: %s"
 msgstr "アーキテクチャ：%s"
 
 #: hugin1/hugin/AboutDialog.cpp:138
-#, c-format
 msgid "Free memory: %ld kiB"
 msgstr "メモリの空き：%ld kiB"
 
 #: hugin1/hugin/AboutDialog.cpp:141
-#, c-format
 msgid "Active Codepage: %u"
-msgstr "利用中のコードページ：%u"
+msgstr "アクティブなコードページ：%u"
 
 #: hugin1/hugin/AboutDialog.cpp:173
-#, c-format
 msgid "Version: %s"
 msgstr "バージョン：%s"
 
 #: hugin1/hugin/AboutDialog.cpp:174
-#, c-format
 msgid "Path to resources: %s"
 msgstr "リソースへのパス：%s"
 
 #: hugin1/hugin/AboutDialog.cpp:175
-#, c-format
 msgid "Path to data: %s"
 msgstr "データへのパス：%s"
 
 #: hugin1/hugin/AboutDialog.cpp:176
-#, fuzzy
 msgid "Libraries"
-msgstr "ディレクトリ"
+msgstr "ライブラリ"
 
 #: hugin1/hugin/AssistantPanel.cpp:224
 msgid "Please load images by pressing on the Load images button."
 msgstr "「画像を登録」ボタンを押して画像を読み込んで下さい"
 
 #: hugin1/hugin/AssistantPanel.cpp:257
-#, c-format
 msgid "%lu images loaded."
 msgstr "%lu 枚の画像が読み込まれました。"
 
 #: hugin1/hugin/AssistantPanel.cpp:294
-#, c-format
 msgid "Images are connected by %lu control points.\n"
 msgstr ""
 "画像は %lu 個のコントロールポイントで接続されています。\n"
 "\n"
 
 #: hugin1/hugin/AssistantPanel.cpp:303
-#, c-format
 msgid "%d unconnected image groups found: "
 msgstr "%d個の接続されていない画像グループがあります： "
 
@@ -545,7 +523,6 @@
 "置の最適化処理に失敗したかも知れません。手動で調整する必要があります。"
 
 #: hugin1/hugin/AssistantPanel.cpp:326
-#, c-format
 msgid "Mean error after optimization: %.1f pixel, max: %.1f\n"
 msgstr ""
 "最適化後の誤差　平均： %.1f ピクセル　最大：%.1f ピクセル\n"
@@ -578,7 +555,6 @@
 msgstr "アシスタントを実行中"
 
 #: hugin1/hugin/AssistantPanel.cpp:432
-#, c-format
 msgid "Warning %d unconnected image groups found:"
 msgstr "警告：%d 個の接続されていない画像グループがあります："
 
@@ -604,17 +580,16 @@
 "してください。"
 
 #: hugin1/hugin/AssistantPanel.cpp:491
-#, fuzzy
 msgid "Project file not found"
-msgstr "画像ファイルが見つかりません"
+msgstr "プロジェクトファイルが見つかりません"
 
 #: hugin1/hugin/AssistantPanel.cpp:503
 msgid "Can't launch PTBatcherGui"
-msgstr ""
+msgstr "PTBatcherGui を実行できません。"
 
 #: hugin1/hugin/AssistantPanel.cpp:509
 msgid "Launched incorrect programme"
-msgstr ""
+msgstr "正しくないプログラムを実行しました。"
 
 #: hugin1/hugin/CPDetectorDialog.cpp:93
 msgid "Autopano from http://autopano.kolor.com is not available for OSX"
@@ -697,7 +672,6 @@
 
 #: hugin1/hugin/CPEditorPanel.cpp:699 hugin1/hugin/CPEditorPanel.cpp:829
 #: hugin1/hugin/CPEditorPanel.cpp:965
-#, c-format
 msgid ""
 "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
 "%0.3f %0.3f "
@@ -725,7 +699,6 @@
 msgstr "Hugin"
 
 #: hugin1/hugin/CPEditorPanel.cpp:979
-#, c-format
 msgid ""
 "Check the similarity visually.\n"
 "Correlation coefficient (%.3f) is lower than the threshold set in the "
@@ -735,7 +708,6 @@
 "相関係数（%.3f）が環境設定で指定された閾値より低いです。"
 
 #: hugin1/hugin/CPEditorPanel.cpp:984
-#, c-format
 msgid ""
 "No similar point found. Check the similarity visually.\n"
 "Correlation coefficient (%.3f) is lower than the threshold set in the "
@@ -750,7 +722,6 @@
 
 #: hugin1/hugin/CPEditorPanel.cpp:1019 hugin1/hugin/CPEditorPanel.cpp:1022
 #: hugin1/hugin/CPEditorPanel.cpp:1267 hugin1/hugin/CPListFrame.cpp:436
-#, c-format
 msgid "Line %d"
 msgstr "直線 %d"
 
@@ -779,8 +750,8 @@
 "enter a higher number."
 msgstr ""
 "コントロールポイントを生成します。\n"
-"生成される数を減らすには、値を大きくして下さい。\n"
-" "
+"生成される数を減らすには、\n"
+"値を大きくして下さい。\n"
 
 #: hugin1/hugin/CPEditorPanel.cpp:1578
 msgid "Corner Detection threshold"
@@ -799,7 +770,6 @@
 msgid "Error during control point creation:\n"
 msgstr ""
 "コントロールポイント生成中にエラー：\n"
-"\n"
 
 #: hugin1/hugin/CPEditorPanel.cpp:1691
 msgid "Select Point in right image"
@@ -832,7 +802,6 @@
 msgstr "モデルファイルをロードしています"
 
 #: hugin1/hugin/CPEditorPanel.cpp:1837 hugin1/hugin/MainFrame.cpp:1705
-#, c-format
 msgid "Removed %d control points"
 msgstr "%d 個のコントロールポイントを削除しました"
 
@@ -1022,7 +991,6 @@
 msgstr "モザイク、個別"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:639
-#, fuzzy
 msgid "Resets the projection's parameters to their default values."
 msgstr "投影法のパラメータをデフォルト値にリセット"
 
@@ -1079,12 +1047,11 @@
 
 #: hugin1/hugin/GLPreviewFrame.cpp:1597
 msgid "Do you want to keep the current non-zero translation parameters?"
-msgstr ""
+msgstr "現在のゼロでない移動パラメータを保持しますか？"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:1598
-#, fuzzy
 msgid "Keep XYZ parameters?"
-msgstr "XYZ パラメータをリセットしますか？"
+msgstr "XYZ パラメータを保持しますか？"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:1682
 msgid ""
@@ -1131,12 +1098,10 @@
 msgstr "上の境界は下の境界より小さい必要があります。"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:2563 hugin1/hugin/PanoPanel.cpp:595
-#, c-format
 msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf."
 msgstr "水平画角の値が不正です. この投影法の水平画角の最大値は %lf です."
 
 #: hugin1/hugin/GLPreviewFrame.cpp:2594 hugin1/hugin/PanoPanel.cpp:626
-#, c-format
 msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf."
 msgstr "無効な垂直画角です。この投影法の垂直画角の最大は %lf です。"
 
@@ -1247,11 +1212,8 @@
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:177
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:194
-#, c-format
 msgid "Input \"%s\" for %s is not a valid number\n"
-msgstr ""
-"入力された \"%s\" は %s に対して無効な数値です\n"
-"\n"
+msgstr "入力された \"%s\" は %s に対して無効な数値です\n"
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:178
 msgid "Iteration"
@@ -1266,7 +1228,6 @@
 msgstr "間違った入力"
 
 #: hugin1/hugin/HFOVDialog.cpp:77
-#, c-format
 msgid ""
 "No or only partial information about field of view was found in image file\n"
 "%s\n"
@@ -1366,9 +1327,8 @@
 msgstr "マスクの数："
 
 #: hugin1/hugin/ImagesPanel.cpp:334
-#, c-format
 msgid "Added %lu control points"
-msgstr "コントロールポイントを %lu 個追加しました。"
+msgstr "%lu 個のコントロールポイントを追加しました。"
 
 #: hugin1/hugin/ImagesPanel.cpp:334
 msgid "Control point detector result"
@@ -1391,7 +1351,6 @@
 msgstr "クリーン終了"
 
 #: hugin1/hugin/ImagesPanel.cpp:384
-#, c-format
 msgid "Removed %u control points"
 msgstr "%u 個のコントロールポイントを削除しました"
 
@@ -1400,9 +1359,8 @@
 msgstr "クリーン中"
 
 #: hugin1/hugin/ImagesPanel.cpp:909
-#, c-format
 msgid "Really Delete %lu control points?"
-msgstr "本当にコントロールポイント%lu 個を消去しますか？"
+msgstr "本当にコントロールポイント %lu 個を消去しますか？"
 
 #: hugin1/hugin/ImagesPanel.cpp:911
 msgid "Delete Control Points"
@@ -1429,7 +1387,6 @@
 msgstr "スタック番号を変更"
 
 #: hugin1/hugin/ImagesPanel.cpp:1116
-#, c-format
 msgid "Removed %lu control points"
 msgstr "%lu 個のコントロールポイントを削除しました"
 
@@ -1444,6 +1401,8 @@
 "You selected only one image.\n"
 "Should the loaded parameters applied to all images with the same lens?"
 msgstr ""
+"画像がひとつしか選択されていません。\n"
+"読み込まれたパラメータを同じレンズによる画像全てに適用してよいですか？"
 
 #: hugin1/hugin/LensPanel.cpp:787 hugin1/ptbatcher/FindPanoDialog.cpp:178
 #: hugin1/ptbatcher/FindPanoDialog.cpp:213
@@ -1456,6 +1415,9 @@

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: [OSX] add gsl (gnu science and math li...

From: <hugin-cvs@li...> - 2012-01-11 15:40

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/16488a7f1a41
changeset:  5725:16488a7f1a41
user:       harryvanderwolf <hvdwolf@...>
date:       Wed Jan 11 16:40:01 2012 +0100
description:

[OSX] add gsl (gnu science and math lib) script to enable build of enblend trunk

diffstat:

 mac/ExternalPrograms/scripts/gsl.sh |  211 ++++++++++++++++++++++++++++++++++++
 1 files changed, 211 insertions(+), 0 deletions(-)

diffs (215 lines):

diff -r e32bcb8de436 -r 16488a7f1a41 mac/ExternalPrograms/scripts/gsl.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mac/ExternalPrograms/scripts/gsl.sh	Wed Jan 11 16:40:01 2012 +0100
@@ -0,0 +1,211 @@
+# ------------------
+#     gsl 
+# ------------------
+# $Id: $
+# Copyright (c) 2008, Ippei Ukai
+# 2012, Harry van der Wolf
+
+
+# prepare
+
+# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \
+# ARCHS="ppc i386" \
+#  ppcTARGET="powerpc-apple-darwin8" \
+#  i386TARGET="i386-apple-darwin8" \
+#  ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \
+#  i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \
+#  ppcONLYARG="-mcpu=G3 -mtune=G4" \
+#  i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \
+#  OTHERARGs="";
+
+# -------------------------------
+# 20120111.0 initial version of gnu science library
+# -------------------------------
+
+# init
+
+fail()
+{
+        echo "** Failed at $1 **"
+        exit 1
+}
+
+
+GSLVER="0"
+
+let NUMARCH="0"
+
+for i in $ARCHS
+do
+  NUMARCH=$(($NUMARCH + 1))
+done
+
+mkdir -p "$REPOSITORYDIR/bin";
+mkdir -p "$REPOSITORYDIR/lib";
+mkdir -p "$REPOSITORYDIR/include";
+
+# compile
+
+for ARCH in $ARCHS
+do
+
+ mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin";
+ mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib";
+ mkdir -p "$REPOSITORYDIR/arch/$ARCH/include";
+
+ ARCHARGs=""
+ MACSDKDIR=""
+
+ if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then
+   TARGET=$i386TARGET
+   MACSDKDIR=$i386MACSDKDIR
+   ARCHARGs="$i386ONLYARG"
+   OSVERSION="$i386OSVERSION"
+   CC=$i386CC
+   CXX=$i386CXX
+ elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then
+   TARGET=$ppcTARGET
+   MACSDKDIR=$ppcMACSDKDIR
+   ARCHARGs="$ppcONLYARG"
+   OSVERSION="$ppcOSVERSION"
+   CC=$ppcCC
+   CXX=$ppcCXX
+ elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then
+   TARGET=$ppc64TARGET
+   MACSDKDIR=$ppc64MACSDKDIR
+   ARCHARGs="$ppc64ONLYARG"
+   OSVERSION="$ppc64OSVERSION"
+   CC=$ppc64CC
+   CXX=$ppc64CXX
+ elif [ $ARCH = "x86_64" ] ; then
+   TARGET=$x64TARGET
+   MACSDKDIR=$x64MACSDKDIR
+   ARCHARGs="$x64ONLYARG"
+   OSVERSION="$x64OSVERSION"
+   CC=$x64CC
+   CXX=$x64CXX
+ fi
+
+ env \
+  CC=$CC CXX=$CXX \
+  CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \
+  CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \
+  CPPFLAGS="-I$REPOSITORYDIR/include" \
+  LDFLAGS="-L$REPOSITORYDIR/lib -arch $ARCH -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \
+  NEXT_ROOT="$MACSDKDIR" \
+  ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \
+  --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \
+  --enable-shared --enable-static  || fail "configure step for $ARCH";
+
+ make clean;
+
+ make $OTHERMAKEARGs || fail "failed at make step of $ARCH";
+ make install || fail "make install step of $ARCH";
+done
+
+
+# merge gsl libs
+
+for liba in lib/libgsl.a lib/libgsl.$GSLVER.dylib lib/libgslcblas.a lib/libgslcblas.$GSLVER.dylib
+do
+
+ if [ $NUMARCH -eq 1 ] ; then
+   if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then
+		 echo "Moving arch/$ARCHS/$liba to $liba"
+  	 mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba";
+	   #Power programming: if filename ends in "a" then ...
+	   [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba";
+  	 continue
+	 else
+		 echo "Program arch/$ARCHS/$liba not found. Aborting build";
+		 exit 1;
+	 fi
+ fi
+
+ LIPOARGs=""
+ 
+ for ARCH in $ARCHS
+ do
+	if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then
+		echo "Adding arch/$ARCH/$liba to bundle"
+		LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba"
+	else
+		echo "File arch/$ARCH/$liba was not found. Aborting build";
+		exit 1;
+	fi
+ done
+
+ lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba";
+ #Power programming: if filename ends in "a" then ...
+ [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba";
+
+done
+
+
+if [ -f "$REPOSITORYDIR/lib/libgsl.$GSLVER.dylib" ]
+then
+ install_name_tool -id "$REPOSITORYDIR/lib/libgsl.$GSLVER.dylib" "$REPOSITORYDIR/lib/libgsl.$GSLVER.dylib"
+ ln -sfn libgsl.$GSLVER.dylib $REPOSITORYDIR/lib/libgsl.dylib;
+fi
+
+if [ -f "$REPOSITORYDIR/lib/libgslcblas.$GSLVER.dylib" ]
+then
+ install_name_tool -id "$REPOSITORYDIR/lib/libgslcblas.$GSLVER.dylib" "$REPOSITORYDIR/lib/libgslcblas.$GSLVER.dylib"
+ ln -sfn libgslcblas.$GSLVER.dylib $REPOSITORYDIR/lib/libgslcblas.dylib;
+fi
+
+# merge execs
+
+for program in bin/gsl-randist bin/gsl-histogram
+do
+
+ if [ $NUMARCH -eq 1 ] ; then
+   if [ -f $REPOSITORYDIR/arch/$ARCHS/$program ] ; then
+		 echo "Moving arch/$ARCHS/$program to $program"
+  	 mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program";
+  	 strip -x "$REPOSITORYDIR/$program";
+  	 continue
+	 else
+		 echo "Program arch/$ARCHS/$program not found. Aborting build";
+		 exit 1;
+	 fi
+ fi
+
+ LIPOARGs=""
+
+ for ARCH in $ARCHS
+ do
+ 	if [ -f $REPOSITORYDIR/arch/$ARCH/$program ] ; then
+		echo "Adding arch/$ARCH/$program to bundle"
+ 		LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program"
+	else
+		echo "File arch/$ARCH/$program was not found. Aborting build";
+		exit 1;
+	fi
+ done
+
+ lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program";
+ strip -x "$REPOSITORYDIR/$program";
+
+done
+
+# Last step for gsl. gsl-histogram and gsl-randist are linked during build against their own dylibs and therefore have
+# an install_name based on the arch/$ARCH directory. We need to change that. Unfortunately we need to do it for every 
+# arch even though it is only mentioned once for one of the arc/$ARCHs.
+
+for ARCH in $ARCHS
+do
+  install_name_tool -change $REPOSITORYDIR/arch/$ARCH/lib/libgsl.$GSLVER.dylib $REPOSITORYDIR/lib/libgslcblas.$GSLVER.dylib $REPOSITORYDIR/bin/gsl-histogram
+  install_name_tool -change $REPOSITORYDIR/arch/$ARCH/lib/libgsl.$GSLVER.dylib $REPOSITORYDIR/lib/libgslcblas.$GSLVER.dylib $REPOSITORYDIR/bin/gsl-randist
+done
+
+
+
+##pkgconfig
+#for ARCH in $ARCHS
+#do
+# mkdir -p $REPOSITORYDIR/lib/pkgconfig
+# sed 's/^exec_prefix.*$/exec_prefix=\$\{prefix\}/' $REPOSITORYDIR/arch/$ARCH/lib/pkgconfig/gsl.pc > $REPOSITORYDIR/lib/pkgconfig/gsl.pc
+# break;
+#done
+

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: [OSX] Add lcms2 (lcms version 2) scrip...

From: <hugin-cvs@li...> - 2012-01-11 12:49

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/e32bcb8de436
changeset:  5724:e32bcb8de436
user:       harryvanderwolf <hvdwolf@...>
date:       Wed Jan 11 13:48:47 2012 +0100
description:

[OSX] Add lcms2 (lcms version 2) script for enblend trunk; minor modifications to multiblend script

diffstat:

 mac/ExternalPrograms/scripts/lcms2.sh      |  155 +++++++++++++++++++++++++++++
 mac/ExternalPrograms/scripts/multiblend.sh |    7 +-
 2 files changed, 159 insertions(+), 3 deletions(-)

diffs (186 lines):

diff -r cd2f5e37af3b -r e32bcb8de436 mac/ExternalPrograms/scripts/lcms2.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mac/ExternalPrograms/scripts/lcms2.sh	Wed Jan 11 13:48:47 2012 +0100
@@ -0,0 +1,155 @@
+# ------------------
+#     liblcms2
+# ------------------
+# $Id: liblcms.sh 1902 2008-01-02 22:27:47Z Harry $
+# Copyright (c) 2007, Ippei Ukai
+# script skeleton Copyright (c) 2007, Ippei Ukai
+# lcms2 specifics 2012, Harry van der Wolf
+
+
+# prepare
+
+# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \
+# ARCHS="ppc i386" \
+#  ppcTARGET="powerpc-apple-darwin8" \
+#  i386TARGET="i386-apple-darwin8" \
+#  ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \
+#  i386MACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \
+#  ppcONLYARG="-mcpu=G3 -mtune=G4" \
+#  i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \
+#  OTHERARGs="";
+
+# -------------------------------
+# 20120111.0 hvdw initial lcms2 (lcms version 2) script
+# -------------------------------
+
+# init
+
+fail()
+{
+        echo "** Failed at $1 **"
+        exit 1
+}
+
+
+LCMSVER="2"
+
+let NUMARCH="0"
+
+for i in $ARCHS
+do
+  NUMARCH=$(($NUMARCH + 1))
+done
+
+mkdir -p "$REPOSITORYDIR/bin";
+mkdir -p "$REPOSITORYDIR/lib";
+mkdir -p "$REPOSITORYDIR/include";
+
+# compile
+
+for ARCH in $ARCHS
+do
+
+ mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin";
+ mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib";
+ mkdir -p "$REPOSITORYDIR/arch/$ARCH/include";
+
+ ARCHARGs=""
+ MACSDKDIR=""
+
+ if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then
+   TARGET=$i386TARGET
+   MACSDKDIR=$i386MACSDKDIR
+   ARCHARGs="$i386ONLYARG"
+   OSVERSION="$i386OSVERSION"
+   CC=$i386CC
+   CXX=$i386CXX
+ elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then
+   TARGET=$ppcTARGET
+   MACSDKDIR=$ppcMACSDKDIR
+   ARCHARGs="$ppcONLYARG"
+   OSVERSION="$ppcOSVERSION"
+   CC=$ppcCC
+   CXX=$ppcCXX
+ elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then
+   TARGET=$ppc64TARGET
+   MACSDKDIR=$ppc64MACSDKDIR
+   ARCHARGs="$ppc64ONLYARG"
+   OSVERSION="$ppc64OSVERSION"
+   CC=$ppc64CC
+   CXX=$ppc64CXX
+ elif [ $ARCH = "x86_64" ] ; then
+   TARGET=$x64TARGET
+   MACSDKDIR=$x64MACSDKDIR
+   ARCHARGs="$x64ONLYARG"
+   OSVERSION="$x64OSVERSION"
+   CC=$x64CC
+   CXX=$x64CXX
+ fi
+
+
+
+
+
+ env \
+  CC=$CC CXX=$CXX \
+  CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \
+  CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \
+  CPPFLAGS="-I$REPOSITORYDIR/include" \
+  LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip" \
+  NEXT_ROOT="$MACSDKDIR" \
+  ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \
+  --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \
+  --enable-static --enable-shared --with-zlib=$MACSDKDIR/usr/lib \
+  || fail "configure step for $ARCH";
+
+ make clean
+ make || fail "failed at make step of $ARCH";
+ make $OTHERMAKEARGs install || fail "make install step of $ARCH";
+
+done
+
+
+# merge liblcms
+
+for liba in lib/liblcms2.a lib/liblcms2.$LCMSVER.dylib
+do
+
+ if [ $NUMARCH -eq 1 ] ; then
+   if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then
+		 echo "Moving arch/$ARCHS/$liba to $liba"
+  	 mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba";
+	   #Power programming: if filename ends in "a" then ...
+	   [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba";
+  	 continue
+	 else
+		 echo "Program arch/$ARCHS/$liba not found. Aborting build";
+		 exit 1;
+	 fi
+ fi
+
+ LIPOARGs=""
+ 
+ for ARCH in $ARCHS
+ do
+	if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then
+		echo "Adding arch/$ARCH/$liba to bundle"
+		LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba"
+	else
+		echo "File arch/$ARCH/$liba was not found. Aborting build";
+		exit 1;
+	fi
+ done
+
+ lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba";
+ #Power programming: if filename ends in "a" then ...
+ [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba";
+
+done
+
+
+if [ -f "$REPOSITORYDIR/lib/liblcms2.$LCMSVER.dylib" ]
+then
+ install_name_tool -id "$REPOSITORYDIR/lib/liblcms2.$LCMSVER.dylib" "$REPOSITORYDIR/lib/liblcms2.$LCMSVER.dylib"
+ ln -sfn liblcms2.$LCMSVER.dylib $REPOSITORYDIR/lib/liblcms2.dylib;
+fi
diff -r cd2f5e37af3b -r e32bcb8de436 mac/ExternalPrograms/scripts/multiblend.sh
--- a/mac/ExternalPrograms/scripts/multiblend.sh	Mon Jan 09 18:24:25 2012 +0100
+++ b/mac/ExternalPrograms/scripts/multiblend.sh	Wed Jan 11 13:48:47 2012 +0100
@@ -21,6 +21,7 @@
 # -------------------------------
 # 20111231.0 hvdw first version. Still experimental. Don't know which
 #		  cross arch settings are necessary and which not.
+# 20120106.0 hvdw adaprt for version 0.2
 # -------------------------------
 
 # init
@@ -106,12 +107,12 @@
  echo "## Now compiling $ARCH version ##\n"
  env \
    CC=$CC CXX=$CXX \
-   CFLAGS="-isysroot $MACSDKDIR -I. -I$REPOSITORYDIR/include -O -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
-   CXXFLAGS="-isysroot $MACSDKDIR -I. -I$REPOSITORYDIR/include -O -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
+   CFLAGS="-isysroot $MACSDKDIR -I. -I$REPOSITORYDIR/include -O2 -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
+   CXXFLAGS="-isysroot $MACSDKDIR -I. -I$REPOSITORYDIR/include -O2 -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
    CPPFLAGS="-I. -I$REPOSITORYDIR/include -I/usr/include" \
    LDFLAGS="-ltiff -ljpeg -L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \
    NEXT_ROOT="$MACSDKDIR" \
-   $CXX -L$REPOSITORYDIR/lib/ -O -I$REPOSITORYDIR/include/ -I$MACSDKDIR/usr/include -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs \
+   $CXX -L$REPOSITORYDIR/lib/ -O2 -I$REPOSITORYDIR/include/ -I$MACSDKDIR/usr/include -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs \
    -ltiff -ljpeg multiblend.cpp -o multiblend || fail "compile step for $ARCH";
 
    mv multiblend $REPOSITORYDIR/arch/$ARCH/bin

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: [OSX] some minor script changes to boo...

From: <hugin-cvs@li...> - 2012-01-09 17:25

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/cd2f5e37af3b
changeset:  5723:cd2f5e37af3b
user:       harryvanderwolf <hvdwolf@...>
date:       Mon Jan 09 18:24:25 2012 +0100
description:

[OSX] some minor script changes to boost.sh and multiblend.sh

diffstat:

 mac/ExternalPrograms/scripts/boost.sh      |   2 ++
 mac/ExternalPrograms/scripts/multiblend.sh |  11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 658ded2153f2 -r cd2f5e37af3b mac/ExternalPrograms/scripts/boost.sh
--- a/mac/ExternalPrograms/scripts/boost.sh	Sun Jan 01 13:23:39 2012 +0100
+++ b/mac/ExternalPrograms/scripts/boost.sh	Mon Jan 09 18:24:25 2012 +0100
@@ -47,6 +47,8 @@
 
 mkdir -p "$REPOSITORYDIR/include"
 rm -rf "$REPOSITORYDIR/include/boost";
+echo "\n## First copying all boost includes to $REPOSITORYDIR/include/ ##"
+echo "## This will take some time ##\n"
 cp -R "./boost" "$REPOSITORYDIR/include/";
 
 echo "## First compiling bjam ##\n"
diff -r 658ded2153f2 -r cd2f5e37af3b mac/ExternalPrograms/scripts/multiblend.sh
--- a/mac/ExternalPrograms/scripts/multiblend.sh	Sun Jan 01 13:23:39 2012 +0100
+++ b/mac/ExternalPrograms/scripts/multiblend.sh	Mon Jan 09 18:24:25 2012 +0100
@@ -103,15 +103,16 @@
    CXX=$x64CXX
  fi
 
+ echo "## Now compiling $ARCH version ##\n"
  env \
    CC=$CC CXX=$CXX \
-   CFLAGS="-isysroot $MACSDKDIR -I. -I$REPOSITORYDIR/include -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
-   CXXFLAGS="-isysroot $MACSDKDIR -I. -I$REPOSITORYDIR/include -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
+   CFLAGS="-isysroot $MACSDKDIR -I. -I$REPOSITORYDIR/include -O -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
+   CXXFLAGS="-isysroot $MACSDKDIR -I. -I$REPOSITORYDIR/include -O -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
    CPPFLAGS="-I. -I$REPOSITORYDIR/include -I/usr/include" \
-   LDFLAGS="-lm -ltiff -ltiffxx -L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \
+   LDFLAGS="-ltiff -ljpeg -L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \
    NEXT_ROOT="$MACSDKDIR" \
-   $CXX -lm -L$REPOSITORYDIR/lib/ -O -I$REPOSITORYDIR/include/ -I$MACSDKDIR/usr/include -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs \
-   -ltiff multiblend.cpp -o multiblend || fail "compile step for $ARCH";
+   $CXX -L$REPOSITORYDIR/lib/ -O -I$REPOSITORYDIR/include/ -I$MACSDKDIR/usr/include -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs \
+   -ltiff -ljpeg multiblend.cpp -o multiblend || fail "compile step for $ARCH";
 
    mv multiblend $REPOSITORYDIR/arch/$ARCH/bin 
 done

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: [OSX] Add multiblend to bundle; Make s...

From: <hugin-cvs@li...> - 2012-01-01 12:24

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/658ded2153f2
changeset:  5722:658ded2153f2
user:       harryvanderwolf <hvdwolf@...>
date:       Sun Jan 01 13:23:39 2012 +0100
description:

[OSX] Add multiblend to bundle; Make switching boost versions more robust

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj |  22 +++++++++++++---------
 mac/complete-bundle.sh              |  13 ++++++++++++-
 2 files changed, 25 insertions(+), 10 deletions(-)

diffs (136 lines):

diff -r b7e8b4eed7cc -r 658ded2153f2 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Sat Dec 31 18:10:16 2011 +0100
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Sun Jan 01 13:23:39 2012 +0100
@@ -4465,6 +4465,8 @@
 		739C2E8812DA50E1006C4F77 /* ProjectionGridTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectionGridTool.cpp; sourceTree = "<group>"; };
 		739F846B0EC75402004771D6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_macu_gl-2.8.dylib"; path = "lib/libwx_macu_gl-2.8.dylib"; sourceTree = "<group>"; };
+		73A20D1114B05A9D008B4EAD /* multiblend */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = multiblend; path = "../../ExternalPrograms/3way-repository/bin/multiblend"; sourceTree = SOURCE_ROOT; };
+		73A20D3114B05B88008B4EAD /* libtiffxx.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libtiffxx.dylib; path = "../../ExternalPrograms/3way-repository/lib/libtiffxx.dylib"; sourceTree = SOURCE_ROOT; };
 		73A8A31E13F56DB600BB58F2 /* _hsi.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = _hsi.so; sourceTree = BUILT_PRODUCTS_DIR; };
 		73A8A35213F5709500BB58F2 /* hsi_ImageVariableGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hsi_ImageVariableGroup.h; path = hugin_script_interface/hsi_ImageVariableGroup.h; sourceTree = "<group>"; };
 		73A8A35313F5709500BB58F2 /* hsi_Panorama.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hsi_Panorama.h; path = hugin_script_interface/hsi_Panorama.h; sourceTree = "<group>"; };
@@ -6289,6 +6291,7 @@
 		5745FBE5094E1C4700E6B672 /* repository */ = {
 			isa = PBXGroup;
 			children = (
+				73A20D1114B05A9D008B4EAD /* multiblend */,
 				73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */,
 				73360A161247E32E009225D2 /* libboost_date_time.dylib */,
 				734BB03C1247AB3A0062CF12 /* libboost_regex.dylib */,
@@ -6318,6 +6321,7 @@
 				573B8F85067BAAB900B7B355 /* libpano13.dylib */,
 				577092FA06BD7388004058A1 /* libpng.dylib */,
 				577092FB06BD7388004058A1 /* libtiff.dylib */,
+				73A20D3114B05B88008B4EAD /* libtiffxx.dylib */,
 				57D14A4506B8A3D100D8A03D /* libjpeg.dylib */,
 				577786100BF347B80041F8FF /* libIex.dylib */,
 				5777860A0BF3477A0041F8FF /* libImath.dylib */,
@@ -9707,7 +9711,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi\n\n# fix new issue with libboost libraries where the softlink is not copied\ncd $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries\nln -s libboost_date_time-1_44.dylib libboost_date_time.dylib\nln -s libboost_filesystem-1_44.dylib libboost_filesystem.dylib\nln -s libboost_iostreams-1_44.dylib libboost_iostreams.dylib\nln -s libboost_regex-1_44.dylib libboost_regex.dylib\nln -s libboost_thread-1_44.dylib libboost_thread.dylib\nln -s libboost_system-1_44.dylib libboost_system.dylib\n";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi\n";
 		};
 		57D50A5B0F595A6300CCDCB5 /* Locale Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -9750,7 +9754,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi\n\n# fix new issue with libboost libraries where the softlink is not copied\ncd $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries\nln -s libboost_date_time-1_44.dylib libboost_date_time.dylib\nln -s libboost_filesystem-1_44.dylib libboost_filesystem.dylib\nln -s libboost_iostreams-1_44.dylib libboost_iostreams.dylib\nln -s libboost_regex-1_44.dylib libboost_regex.dylib\nln -s libboost_thread-1_44.dylib libboost_thread.dylib\nln -s libboost_system-1_44.dylib libboost_system.dylib\n";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		57D50A720F595D0E00CCDCB5 /* Patch XRC */ = {
@@ -9912,7 +9916,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi\n\n# fix new issue with libboost libraries where the softlink is not copied\ncd $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries\nln -s libboost_date_time-1_44.dylib libboost_date_time.dylib\nln -s libboost_filesystem-1_44.dylib libboost_filesystem.dylib\nln -s libboost_iostreams-1_44.dylib libboost_iostreams.dylib\nln -s libboost_regex-1_44.dylib libboost_regex.dylib\nln -s libboost_thread-1_44.dylib libboost_thread.dylib\nln -s libboost_system-1_44.dylib libboost_system.dylib\n";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		737E498611D3FD74002BA8AE /* Patch and Copy XRC */ = {
@@ -9971,7 +9975,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi\n\n# fix new issue with libboost libraries where the softlink is not copied\ncd $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries\nln -s libboost_date_time-1_44.dylib libboost_date_time.dylib\nln -s libboost_filesystem-1_44.dylib libboost_filesystem.dylib\nln -s libboost_iostreams-1_44.dylib libboost_iostreams.dylib\nln -s libboost_regex-1_44.dylib libboost_regex.dylib\nln -s libboost_thread-1_44.dylib libboost_thread.dylib\nln -s libboost_system-1_44.dylib libboost_system.dylib\n";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi\n\n";
 			showEnvVarsInLog = 0;
 		};
 		737E498A11D3FD74002BA8AE /* Complete Embedding */ = {
@@ -10016,7 +10020,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# $Id: copyExtraTools.sh $\n\n# This script will copy all extra tools to the Hugin.app MacOS folder\n\nbin_dir=\"$REPOSITORY_DIR/bin\"\nApp=\"$TARGET_BUILD_DIR/$PRODUCT_NAME.app\"\n\n\nExtbins=\"PTBlender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop exiv2 gnumake enblend enfuse\"\n\n# Copy external binaries to MacOS folder in Hugin.app from Repositorydir folder\nfor bins in $Extbins\ndo\n cp -Rf $bin_dir/$bins \"$App/Contents/MacOS/\"\ndone\n\n";
+			shellScript = "# $Id: copyExtraTools.sh $\n\n# This script will copy all extra tools to the Hugin.app MacOS folder\n\nbin_dir=\"$REPOSITORY_DIR/bin\"\nApp=\"$TARGET_BUILD_DIR/$PRODUCT_NAME.app\"\n\n\nExtbins=\"PTBlender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop exiv2 gnumake enblend enfuse multiblend\"\n\n# Copy external binaries to MacOS folder in Hugin.app from Repositorydir folder\nfor bins in $Extbins\ndo\n cp -Rf $bin_dir/$bins \"$App/Contents/MacOS/\"\ndone\n\n";
 		};
 		739286DF14225FDB0051CAEC /* Patch and Copy XRC */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -10074,7 +10078,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi\n\n# fix new issue with libboost libraries where the softlink is not copied\ncd $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries\nln -s libboost_date_time-1_44.dylib libboost_date_time.dylib\nln -s libboost_filesystem-1_44.dylib libboost_filesystem.dylib\nln -s libboost_iostreams-1_44.dylib libboost_iostreams.dylib\nln -s libboost_regex-1_44.dylib libboost_regex.dylib\nln -s libboost_thread-1_44.dylib libboost_thread.dylib\nln -s libboost_system-1_44.dylib libboost_system.dylib\n";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi\n\n";
 			showEnvVarsInLog = 0;
 		};
 		739286E314225FDB0051CAEC /* Complete Embedding */ = {
@@ -10132,7 +10136,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# $Id: copyExtraTools.sh $\n\n# This script will copy all extra tools to the Hugin.app MacOS folder\n\nbin_dir=\"$REPOSITORY_DIR/bin\"\nApp=\"$TARGET_BUILD_DIR/$PRODUCT_NAME.app\"\n\n\nExtbins=\"PTBlender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop exiv2 gnumake enblend enfuse\"\n\n# Copy external binaries to MacOS folder in Hugin.app from Repositorydir folder\nfor bins in $Extbins\ndo\n cp -Rf $bin_dir/$bins \"$App/Contents/MacOS/\"\ndone\n\n";
+			shellScript = "# $Id: copyExtraTools.sh $\n\n# This script will copy all extra tools to the Hugin.app MacOS folder\n\nbin_dir=\"$REPOSITORY_DIR/bin\"\nApp=\"$TARGET_BUILD_DIR/$PRODUCT_NAME.app\"\n\n\nExtbins=\"PTBlender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop exiv2 gnumake enblend enfuse multiblend\"\n\n# Copy external binaries to MacOS folder in Hugin.app from Repositorydir folder\nfor bins in $Extbins\ndo\n cp -Rf $bin_dir/$bins \"$App/Contents/MacOS/\"\ndone\n\n";
 		};
 		73A8AB4913F5A3BD00BB58F2 /* Create Hugin Tools folder with symlinks */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -10146,7 +10150,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#!/bin/sh\n\n#  $Id: create_hugin_tools_folder with symlinks $\n\nbinaries=\"align_image_stack autooptimiser celeste_standalone checkpto cpclean cpfind deghosting_mask exiv2 fulla hugin_hdrmerge icpfind linefind matchpoint nona pano_modify pano_trafo pto2mk pto_gen pto_merge PTBatcher PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop tca_correct vig_optimize enfuse enblend gnumake\"\ntarg_folder=\"$TARGET_BUILD_DIR/InstallerFolder/HuginTools\"\n\n#------------------------------------------------\n\nrm -rf \"$targ_folder\"\nmkdir -p \"$targ_folder\"\ncd \"$targ_folder\"\nfor bins in $binaries\ndo\n ln -s \"../Hugin.app/Contents/MacOS/$bins\" \"$bins\"\ndone\n";
+			shellScript = "#!/bin/sh\n\n#  $Id: create_hugin_tools_folder with symlinks $\n\nbinaries=\"align_image_stack autooptimiser celeste_standalone checkpto cpclean cpfind deghosting_mask exiv2 fulla hugin_hdrmerge icpfind linefind matchpoint multiblend nona pano_modify pano_trafo pto2mk pto_gen pto_merge PTBatcher PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop tca_correct vig_optimize enfuse enblend gnumake\"\ntarg_folder=\"$TARGET_BUILD_DIR/InstallerFolder/HuginTools\"\n\n#------------------------------------------------\n\nrm -rf \"$targ_folder\"\nmkdir -p \"$targ_folder\"\ncd \"$targ_folder\"\nfor bins in $binaries\ndo\n ln -s \"../Hugin.app/Contents/MacOS/$bins\" \"$bins\"\ndone\n";
 		};
 		73B1AD1313A6A5D1006A3C54 /* let swig create wrapper swigpyrun.h */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -10188,7 +10192,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi\n\n# fix new issue with libboost libraries where the softlink is not copied\ncd $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries\nln -s libboost_date_time-1_44.dylib libboost_date_time.dylib\nln -s libboost_filesystem-1_44.dylib libboost_filesystem.dylib\nln -s libboost_iostreams-1_44.dylib libboost_iostreams.dylib\nln -s libboost_regex-1_44.dylib libboost_regex.dylib\nln -s libboost_thread-1_44.dylib libboost_thread.dylib\nln -s libboost_system-1_44.dylib libboost_system.dylib\n";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi\n";
 		};
 		73DFBDD4139B6CC300558A2D /* Locale Script */ = {
 			isa = PBXShellScriptBuildPhase;
diff -r b7e8b4eed7cc -r 658ded2153f2 mac/complete-bundle.sh
--- a/mac/complete-bundle.sh	Sat Dec 31 18:10:16 2011 +0100
+++ b/mac/complete-bundle.sh	Sun Jan 01 13:23:39 2012 +0100
@@ -10,7 +10,7 @@
 App="$TARGET_BUILD_DIR/$PRODUCT_NAME.app"
 
 archs="ppc i386 x86_64"
-libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER $BOOST_DATE_TIME_LIB-$BOOST_VER $BOOST_FILESYSTEM_LIB-$BOOST_VER $BOOST_IOSTREAMS_LIB-$BOOST_VER $BOOST_REGEX_LIB-$BOOST_VER $BOOST_SYSTEM_LIB-$BOOST_VER $BOOST_SIGNALS_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi libiconv" 
+libs="libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER $BOOST_DATE_TIME_LIB-$BOOST_VER $BOOST_FILESYSTEM_LIB-$BOOST_VER $BOOST_IOSTREAMS_LIB-$BOOST_VER $BOOST_REGEX_LIB-$BOOST_VER $BOOST_SYSTEM_LIB-$BOOST_VER $BOOST_SIGNALS_LIB-$BOOST_VER libpng libtiff libtiffxx libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi libiconv" 
 
 #binaries="$App/Contents/$dylib_install_loc/*.dylib $App/Contents/MacOS/* $App/Contents/Frameworks/Hugin*.framework/Hugin* $App/Contents/Frameworks/icpfind.framework/icpfind* $App/Contents/Frameworks/local*.framework/local* $App/Contents/Frameworks/hugin_python*.framework/hugin* $App/Contents/Resources/align_image_stack $App/Contents/Resources/cpfind"
 # temporary remove python stuff
@@ -49,3 +49,14 @@
  done
 
 done
+
+
+# fix issue with libboost libraries where the symlink is not copied
+cd $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries
+ln -s libboost_date_time-$BOOST_VER.dylib libboost_date_time.dylib
+ln -s libboost_filesystem-$BOOST_VER.dylib libboost_filesystem.dylib
+ln -s libboost_iostreams-$BOOST_VER.dylib libboost_iostreams.dylib
+ln -s libboost_regex-$BOOST_VER.dylib libboost_regex.dylib
+ln -s libboost_thread-$BOOST_VER.dylib libboost_thread.dylib
+ln -s libboost_system-$BOOST_VER.dylib libboost_system.dylib
+