rpms/aqsis/devel aqsis-trunk-piqsl_libtiff.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 aqsis.spec, 1.10, 1.11 import.log, 1.1, 1.2 sources, 1.3, 1.4 aqsis-1.4.1-gcc43.patch, 1.1, NONE aqsis_config.h.in.cmake, 1.1, NONE intsize_detect_fix.patch, 1.1, NONE

[Chauvet Nicolas]

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29093/devel

Modified Files:
	.cvsignore aqsis.spec import.log sources 
Added Files:
	aqsis-trunk-piqsl_libtiff.patch 
Removed Files:
	aqsis-1.4.1-gcc43.patch aqsis_config.h.in.cmake 
	intsize_detect_fix.patch 
Log Message:
Update to 1.4.2
Fix #481352


aqsis-trunk-piqsl_libtiff.patch:

--- NEW FILE aqsis-trunk-piqsl_libtiff.patch ---
diff -up aqsis-1.4.2/texturing/texlib/tiffoutputfile.cpp.pisql_tiff aqsis-1.4.2/texturing/texlib/tiffoutputfile.cpp
--- aqsis-1.4.2/texturing/texlib/tiffoutputfile.cpp.pisql_tiff	2009-01-21 22:12:32.000000000 +0100
+++ aqsis-1.4.2/texturing/texlib/tiffoutputfile.cpp	2009-02-03 13:00:13.000000000 +0100
@@ -26,6 +26,8 @@
 
 #include "tiffoutputfile.h"
 
+#include <cstring>  // for memcpy()
+
 #include <boost/scoped_array.hpp>
 
 #include "aqsismath.h"
@@ -111,10 +113,16 @@ void CqTiffOutputFile::writeScanlinePixe
 	const TqUint8* rawBuf = buffer.rawData();
 	const TqInt rowStride = buffer.channelList().bytesPerPixel()*buffer.width();
 	const TqInt endLine = m_currentLine + buffer.height();
+	// Temporary buffer for scanlines.  We need to copy the data into here
+	// since libtiff trashes the buffer when encoding is turned on.  (The TIFF
+	// docs don't seem to mention this though, ugh.)
+	boost::scoped_array<TqUint8> lineBuf(new TqUint8[rowStride]);
 	for(TqInt line = m_currentLine; line < endLine; ++line)
 	{
-		TIFFWriteScanline( dirHandle.tiffPtr(),
-				reinterpret_cast<tdata_t>(const_cast<TqUint8*>(rawBuf)),
+		// copy the data into temp buffer.
+		std::memcpy(lineBuf.get(), rawBuf, rowStride);
+		// write data
+		TIFFWriteScanline( dirHandle.tiffPtr(), reinterpret_cast<tdata_t>(lineBuf.get()),
 				static_cast<uint32>(line) );
 		rawBuf += rowStride;
 	}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Oct 2008 23:35:13 -0000	1.3
+++ .cvsignore	3 Feb 2009 13:45:48 -0000	1.4
@@ -1 +1 @@
-aqsis-1.4.1.tar.gz
+aqsis-1.4.2.tar.gz


Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/aqsis.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- aqsis.spec	19 Dec 2008 10:43:09 -0000	1.10
+++ aqsis.spec	3 Feb 2009 13:45:48 -0000	1.11
@@ -1,15 +1,13 @@
 Name:		aqsis
-Version:	1.4.1
-Release:	6%{?dist}
+Version:	1.4.2
+Release:	2%{?dist}
 Summary:	Open source RenderMan-compliant 3D rendering solution
 Group:		Applications/Multimedia
 
 License:	GPLv2+ and LGPLv2+
 URL:		http://www.aqsis.org
 Source0:	http://downloads.sourceforge.net/aqsis/aqsis-%{version}.tar.gz
-Source1:        aqsis_config.h.in.cmake
-Patch0:         intsize_detect_fix.patch
-Patch1:         aqsis-1.4.1-gcc43.patch
+Patch0:         aqsis-trunk-piqsl_libtiff.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -26,10 +24,6 @@
 BuildRequires:  OpenEXR-devel
 BuildRequires:  zlib-devel >= 1.1.4
 
-Requires(post): xdg-utils
-Requires(preun): xdg-utils
-
-
 Requires: aqsis-core = %{version}-%{release}
 Requires: aqsis-data = %{version}-%{release}
 
@@ -93,10 +87,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .intsize
-%patch1 -p0 -b .gcc43
-install -pm 0644 %{SOURCE1} aqsistypes/
-
+%patch0 -p1 -b .piqsl_tiff
 
 %build
 ## Do not Enable pdiff=yes Because it will conflict with Printdiff :
@@ -167,32 +158,22 @@
 
 
 %post
-xdg-icon-resource install --novendor --size 192 %{_datadir}/pixmaps/aqsis.png aqsis
-xdg-icon-resource install --novendor --context mimetypes --size 192 %{_datadir}/pixmaps/aqsis-doc.png application-x-slx
-xdg-icon-resource install --novendor --context mimetypes --size 192 %{_datadir}/pixmaps/aqsis-doc.png model-x-rib
-xdg-icon-resource install --novendor --context mimetypes --size 192 %{_datadir}/pixmaps/aqsis-doc.png model-x-rib-gzip
-xdg-icon-resource install --novendor --context mimetypes --size 192 %{_datadir}/pixmaps/aqsis-doc.png text-x-sl
-xdg-desktop-menu install --novendor %{_datadir}/applications/aqsis.desktop
-xdg-desktop-menu install --novendor %{_datadir}/applications/aqsl.desktop
-xdg-desktop-menu install --novendor %{_datadir}/applications/aqsltell.desktop
-xdg-desktop-menu install --novendor %{_datadir}/applications/eqsl.desktop
-xdg-desktop-menu install --novendor %{_datadir}/applications/piqsl.desktop
-xdg-mime install --novendor %{_datadir}/mime/packages/aqsis.xml  || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi 
+update-mime-database %{_datadir}/mime &> /dev/null
+update-desktop-database &> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
-%preun
-xdg-icon-resource uninstall --size 192 aqsis
-xdg-icon-resource uninstall --context mimetypes --size 192 application-x-slx
-xdg-icon-resource uninstall --context mimetypes --size 192 model-x-rib
-xdg-icon-resource uninstall --context mimetypes --size 192 model-x-rib-gzip
-xdg-icon-resource uninstall --context mimetypes --size 192 text-x-sl
-xdg-desktop-menu uninstall %{_datadir}/applications/aqsis.desktop
-xdg-desktop-menu uninstall %{_datadir}/applications/aqsl.desktop
-xdg-desktop-menu uninstall %{_datadir}/applications/aqsltell.desktop
-xdg-desktop-menu uninstall %{_datadir}/applications/eqsl.desktop
-xdg-desktop-menu uninstall %{_datadir}/applications/piqsl.desktop
-xdg-mime uninstall %{_datadir}/mime/packages/aqsis.xml || :
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null
+update-desktop-database &> /dev/null
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi || :
 
 %postun libs -p /sbin/ldconfig
 
@@ -266,6 +247,13 @@
 
 
 %changelog
+* Mon Feb  3 2009 kwizart < kwizart at gmail.com > - 1.4.2-2
+- Backport piqsl problem with libtiff
+- Fix unappropriate use of xdg-tools #481352
+
+* Tue Jan 27 2009 kwizart < kwizart at gmail.com > - 1.4.2-1
+- Update to 1.4.2
+
 * Fri Dec 19 2008 kwizart < kwizart at gmail.com > - 1.4.1-6
 - Improve -core summary - #477134
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2008 23:35:13 -0000	1.1
+++ import.log	3 Feb 2009 13:45:48 -0000	1.2
@@ -1 +1,2 @@
 aqsis-1_4_1-2_fc8_kwizart:HEAD:aqsis-1.4.1-2.fc8.kwizart.src.rpm:1223422459
+aqsis-1_4_2-2_fc10:HEAD:aqsis-1.4.2-2.fc10.src.rpm:1233668722


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2008 23:35:13 -0000	1.3
+++ sources	3 Feb 2009 13:45:48 -0000	1.4
@@ -1 +1 @@
-524f1392d2c07fbd0c6accc1ffe9cffe  aqsis-1.4.1.tar.gz
+6194c3af3ddc80999351565f2b2e2f55  aqsis-1.4.2.tar.gz


--- aqsis-1.4.1-gcc43.patch DELETED ---


--- aqsis_config.h.in.cmake DELETED ---


--- intsize_detect_fix.patch DELETED ---