--- a/ChangeLog	Mon Jul 21 06:02:02 2008 +0000
+++ b/ChangeLog	Mon Jul 21 06:21:46 2008 +0000
@@ -1,3 +1,10 @@
+2008-07-21  Chris Wang <[email protected]>
+
+	* SUNWgnome-img-editor.spec: add gimp-hdrtools plugin
+	* base-specs/gimp-hdr.spec: add spec file tp build hdrtools plugin
+	* patches/gimp-hdr-01-compile.diff: patch to build hdrtools on solaris
+	* copyright/SUNWgnome-img-editor.copyright: extend hdrtools copyright
+	
 2008-07-21  Rick Ju <[email protected]>
 
 	* base-specs/pidgin-otr.spec: bump pidgin-otr/libotr to 3.2

--- a/SUNWgnome-img-editor.spec	Mon Jul 21 06:02:02 2008 +0000
+++ b/SUNWgnome-img-editor.spec	Mon Jul 21 06:21:46 2008 +0000
@@ -12,7 +12,7 @@
 %include Solaris.inc
 
 %use gimp = gimp.spec
-
+%use gimphdr = gimp-hdr.spec
 Name:                    SUNWgnome-img-editor
 Summary:                 The Gimp image editor
 Version:                 %{default_pkg_version}
@@ -75,17 +75,25 @@
 rm -rf %name-%version
 mkdir %name-%version
 %gimp.prep -d %name-%version
+%gimphdr.prep -d %name-%version
 
 %build
 export CFLAGS="%optflags -I%{_includedir} -KPIC"
 export RPM_OPT_FLAGS="$CFLAGS"
 export CPPFLAGS="-I/usr/sfw/include"
 export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib"
+export PATH=$PATH:%{_builddir}/%name-%version/gimp-%{gimp.version}
+export PKG_CONFIG_PATH=%{_builddir}/%name-%version/gimp-%{gimp.version}
+export EXTRA_CFLAGS="-I%{_builddir}/%name-%version/gimp-%{gimp.version}/ -I%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimpcolor -I%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimpmath -I%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimp -I%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimpconfig -I%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimpwidgets"
+export EXTRA_LDFLAGS="-L%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimpbase/.libs -L%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimpcolor/.libs -L%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimpmath/.libs -L%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimp/.libs -L%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimpconfig/.libs -L%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimpwidgets/.libs -L%{_builddir}/%name-%version/gimp-%{gimp.version}/libgimpmodule/.libs"
 
 %gimp.build -d %name-%version
+%gimphdr.build -d %name-%version
 
 %install
+export PATH=$PATH:%{_builddir}/%name-%version/gimp-%{gimp.version}
 %gimp.install -d %name-%version
+%gimphdr.install -d %name-%version
 
 %if %build_l10n
 %else

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/gimp-hdr.spec	Mon Jul 21 06:21:46 2008 +0000
@@ -0,0 +1,53 @@
+#
+# spec file for package gimp-hdr
+#
+# Copyright 2008 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Owner: bewitche
+#
+Summary: GIMP high dynamic range image plugin
+Name:    gimp-hdrtools
+Version: 0.1
+Release: 1
+License: GPL V2
+Group:   System/GUI/GNOME
+URL:     http://nifelheim.dyndns.org/~cocidius/hdrtools/
+Source0: http://nifelheim.dyndns.org/~cocidius/hdrtools/gimp-hdrtools-0.1.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+# date:2008-07-18 owner:bewitche type:branding
+Patch1:       gimp-hdr-01-compile.diff
+%description
+
+%prep
+%setup -q
+%patch1 -p1
+
+%build
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+  CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+  CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+  CPUS=1
+fi
+
+make -j $CPUS
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT install
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, root)
+
+%changelog
+* Thu Jul 17 2008  <[email protected]> 
+- Initial build.
+
+

--- a/copyright/SUNWgnome-img-editor.copyright	Mon Jul 21 06:02:02 2008 +0000
+++ b/copyright/SUNWgnome-img-editor.copyright	Mon Jul 21 06:21:46 2008 +0000
@@ -248,3 +248,22 @@
   SOFTWARE.
  
 --------------------------------------------------------------------
+
+  hdrtools GIMP plugin
+
+  Copyright (C) 2007 Shawn Kirst <[email protected]>
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gimp-hdr-01-compile.diff	Mon Jul 21 06:21:46 2008 +0000
@@ -0,0 +1,162 @@
+--- gimp-hdrtools-0.1/hdrtools.c.orig	2008-07-18 13:21:24.412734000 +0800
++++ gimp-hdrtools-0.1/hdrtools.c	2008-07-18 13:33:25.517065000 +0800
+@@ -1228,19 +1228,19 @@
+    g_object_set_data(G_OBJECT(gamma_spin), "preview", preview);
+ 
+ 
+-   gtk_signal_connect(GTK_OBJECT(dlg), "response",
+-                      GTK_SIGNAL_FUNC(dialog_response), 0);
+-   gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
+-                      GTK_SIGNAL_FUNC(gtk_main_quit), 0);
+-   gtk_signal_connect(GTK_OBJECT(preview), "invalidated",
+-                      GTK_SIGNAL_FUNC(tonemap_image),
+-                      drawable);
+-   gtk_signal_connect(GTK_OBJECT(exposure_spin), "value_changed",
+-                      GTK_SIGNAL_FUNC(on_spin_changed),
+-                      &g_tonemap_vals.exposure);
+-   gtk_signal_connect(GTK_OBJECT(gamma_spin), "value_changed",
+-                      GTK_SIGNAL_FUNC(on_spin_changed),
+-                      &g_tonemap_vals.gamma);
++   g_signal_connect(dlg, "response",
++                    G_CALLBACK(dialog_response), 0);
++   g_signal_connect(dlg, "destroy",
++                    G_CALLBACK(gtk_main_quit), 0);
++   g_signal_connect(preview, "invalidated",
++                    G_CALLBACK(tonemap_image),
++                    drawable);
++   g_signal_connect(exposure_spin, "value_changed",
++                    G_CALLBACK(on_spin_changed),
++                    &g_tonemap_vals.exposure);
++   g_signal_connect(gamma_spin, "value_changed",
++                    G_CALLBACK(on_spin_changed),
++                    &g_tonemap_vals.gamma);
+    
+    gtk_widget_show(dlg);
+    
+@@ -1291,14 +1291,14 @@
+                              slider, 1, 0);
+    g_object_set_data(G_OBJECT(slider), "preview", preview);
+ 
+-   gtk_signal_connect(GTK_OBJECT(dlg), "response",
+-                      GTK_SIGNAL_FUNC(dialog_response), 0);
+-   gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
+-                      GTK_SIGNAL_FUNC(gtk_main_quit), 0);
+-   gtk_signal_connect(GTK_OBJECT(preview), "invalidated",
+-                      GTK_SIGNAL_FUNC(convert_rgbe_to_rgbdiv8), drawable);
+-   gtk_signal_connect(GTK_OBJECT(slider), "value_changed",
+-                      GTK_SIGNAL_FUNC(on_slider_changed),
++   g_signal_connect(dlg, "response",
++                    G_CALLBACK(dialog_response), 0);
++   g_signal_connect(dlg, "destroy",
++                    G_CALLBACK(gtk_main_quit), 0);
++   g_signal_connect(preview, "invalidated",
++                    G_CALLBACK(convert_rgbe_to_rgbdiv8), drawable);
++   g_signal_connect(slider, "value_changed",
++                    G_CALLBACK(on_slider_changed),
+                       &g_rgbd8_vals.range);
+    
+    gtk_widget_show(dlg);
+@@ -1389,22 +1389,22 @@
+    g_object_set_data(G_OBJECT(uflchk), "exposure_spin", exposure_spin);
+    g_object_set_data(G_OBJECT(uflchk), "gamma_spin", gamma_spin);
+ 
+-   gtk_signal_connect(GTK_OBJECT(dlg), "response",
+-                      GTK_SIGNAL_FUNC(dialog_response), 0);
+-   gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
+-                      GTK_SIGNAL_FUNC(gtk_main_quit), 0);
+-   gtk_signal_connect(GTK_OBJECT(tmchk), "clicked",
+-                      GTK_SIGNAL_FUNC(on_checkbox_clicked),
+-                      &g_tonemap_vals.tonemap);
+-   gtk_signal_connect(GTK_OBJECT(uflchk), "clicked",
+-                      GTK_SIGNAL_FUNC(on_file_levels_checked),
+-                      &g_tonemap_vals.usefilelevels);
+-   gtk_signal_connect(GTK_OBJECT(exposure_spin), "value_changed",
+-                      GTK_SIGNAL_FUNC(on_spin_changed),
+-                      &g_tonemap_vals.exposure);
+-   gtk_signal_connect(GTK_OBJECT(gamma_spin), "value_changed",
+-                      GTK_SIGNAL_FUNC(on_spin_changed),
+-                      &g_tonemap_vals.gamma);
++   g_signal_connect(dlg, "response",
++                    G_CALLBACK(dialog_response), 0);
++   g_signal_connect(dlg, "destroy",
++                    G_CALLBACK(gtk_main_quit), 0);
++   g_signal_connect(tmchk, "clicked",
++                    G_CALLBACK(on_checkbox_clicked),
++                    &g_tonemap_vals.tonemap);
++   g_signal_connect(uflchk, "clicked",
++                    G_CALLBACK(on_file_levels_checked),
++                    &g_tonemap_vals.usefilelevels);
++   g_signal_connect(exposure_spin, "value_changed",
++                    G_CALLBACK(on_spin_changed),
++                    &g_tonemap_vals.exposure);
++   g_signal_connect(gamma_spin, "value_changed",
++                    G_CALLBACK(on_spin_changed),
++                    &g_tonemap_vals.gamma);
+    
+    gtk_widget_show(dlg);
+    
+@@ -1494,22 +1494,22 @@
+    g_object_set_data(G_OBJECT(wlchk), "exposure_spin", exposure_spin);
+    g_object_set_data(G_OBJECT(wlchk), "gamma_spin", gamma_spin);
+ 
+-   gtk_signal_connect(GTK_OBJECT(dlg), "response",
+-                      GTK_SIGNAL_FUNC(dialog_response), 0);
+-   gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
+-                      GTK_SIGNAL_FUNC(gtk_main_quit), 0);
+-   gtk_signal_connect(GTK_OBJECT(rlechk), "clicked",
+-                      GTK_SIGNAL_FUNC(on_checkbox_clicked),
+-                      &g_write_vals.rle);
+-   gtk_signal_connect(GTK_OBJECT(wlchk), "clicked",
+-                      GTK_SIGNAL_FUNC(on_write_levels_checked),
+-                      &g_write_vals.writelevels);
+-   gtk_signal_connect(GTK_OBJECT(exposure_spin), "value_changed",
+-                      GTK_SIGNAL_FUNC(on_spin_changed),
+-                      &g_write_vals.exposure);
+-   gtk_signal_connect(GTK_OBJECT(gamma_spin), "value_changed",
+-                      GTK_SIGNAL_FUNC(on_spin_changed),
+-                      &g_write_vals.gamma);
++   g_signal_connect(dlg, "response",
++                    G_CALLBACK(dialog_response), 0);
++   g_signal_connect(dlg, "destroy",
++                    G_CALLBACK(gtk_main_quit), 0);
++   g_signal_connect(rlechk, "clicked",
++                    G_CALLBACK(on_checkbox_clicked),
++                    &g_write_vals.rle);
++   g_signal_connect(wlchk, "clicked",
++                    G_CALLBACK(on_write_levels_checked),
++                    &g_write_vals.writelevels);
++   g_signal_connect(exposure_spin, "value_changed",
++                    G_CALLBACK(on_spin_changed),
++                    &g_write_vals.exposure);
++   g_signal_connect(gamma_spin, "value_changed",
++                    G_CALLBACK(on_spin_changed),
++                    &g_write_vals.gamma);
+    
+    gtk_widget_show(dlg);
+    
+--- gimp-hdrtools-0.1/Makefile.orig	2008-07-18 13:21:34.184384000 +0800
++++ gimp-hdrtools-0.1/Makefile	2008-07-18 13:55:38.240222000 +0800
+@@ -1,10 +1,10 @@
+ 
+ GIMPTOOL=gimptool-2.0
+ 
+-CC=gcc
+-CFLAGS=-g -O2 -Wall `$(GIMPTOOL) --cflags` -DGETTEXT_PACKAGE
+-LD=gcc
++CFLAGS=-xO2 -w `$(GIMPTOOL) --cflags` -DGETTEXT_PACKAGE $(EXTRA_CFLAGS)
++LD=$(CC)
+-LDFLAGS=
++LDFLAGS=$(EXTRA_LDFLAGS) 
++PREFIX=$(DESTDIR)
+ 
+ TARGET=hdrtools
+ 
+@@ -24,7 +24,7 @@
+ 	rm -f $(OBJS) $(TARGET)
+ 	
+ install: all
+-	$(GIMPTOOL) --install-bin $(TARGET)
++	$(GIMPTOOL) --prefix=$(PREFIX) --install-admin-bin $(TARGET)
+ 		
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $<