old

Package-Manager: portage-2.1.9.24/cvs/Linux i686

6 files changed, 10 insertions, 317 deletions

diff --git a/media-gfx/luminance-hdr/ChangeLog b/media-gfx/luminance-hdr/ChangeLog
index d8845c7f1d67..fa3b2682a570 100644
--- a/media-gfx/luminance-hdr/ChangeLog
+++ b/media-gfx/luminance-hdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/luminance-hdr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.5 2010/11/14 17:02:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.6 2010/11/14 17:12:16 maekke Exp $
+
+  14 Nov 2010; Markus Meier <maekke@gentoo.org>
+  -luminance-hdr-1.9.2-r1.ebuild, -files/qtpfsgui-1.9.2-trunk.patch,
+  -luminance-hdr-1.9.3.ebuild, -files/qtpfsgui-1.9.3-hdr-save.patch:
+  old
 
   14 Nov 2010; Christian Faulhammer <fauli@gentoo.org>
   luminance-hdr-2.0.0.ebuild:
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 615eb7d91eba..1caa1c7e249f 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -1,22 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX qtpfsgui-1.9.2-trunk.patch 6650 RMD160 a4871cf796219f465401ad6bbd4ab0698aeeb351 SHA1 5fe75dcfb131617560cb9a6d82ee873f43ade7d5 SHA256 ab177b6887ab956e74776a69b5d6d541276a3e835d5de7718398457d7912a211
-AUX qtpfsgui-1.9.3-hdr-save.patch 797 RMD160 a1c9c8a6bfc312dc58062d5d52fb5097a83c47c4 SHA1 c70733810e261eaf01286f726cd3b13a4b13265c SHA256 13e63486fab65cc7fffd60e5ebaa2a23d63b22963f38822d19533752f3e22548
 DIST luminance-hdr_2.0.0.tar.gz 2450689 RMD160 679ada53c67c4c37853ac0153e8acb6fe0ed2df7 SHA1 7981cd1ac8b7e29343ce26288796ddc74cf23ca9 SHA256 6e6f6dadbe54d2c14e1c98c2dba928b3bc09ba4dbe5c63a071a32f5c372e16e8
 DIST luminance-v2.0.1.tar.gz 2435322 RMD160 d9d0faef0ccd2247a37acccb11d511d240d7246d SHA1 4777912d8f70b02ff2586ea8c31a196ee265c81e SHA256 c72c3df836854c6d9ea35f7c45985aafd13cf73e5d24a0d2041cafc833f8a67c
-DIST qtpfsgui-1.9.2.tar.gz 1181880 RMD160 df43f95e65db5d94e0e92b562a815023d193b1da SHA1 a47bcf234318325273f64ede9f694052bc4102d8 SHA256 4462ec3ea8cf17db7b1ebe624d378bf4e239b80e0de2b2c6bbdf8c00cce16c8e
-DIST qtpfsgui-1.9.3.tar.gz 1356731 RMD160 5188b2f1679d6788358067fe761d0c72c475bfe9 SHA1 adf037c54f55be50d931fa484cca169c01d0384d SHA256 016aaa339ede405bfa55d531069bd64f45fd6139836b6ea9b4d655e2734b8fd6
-EBUILD luminance-hdr-1.9.2-r1.ebuild 1426 RMD160 d62d5138485d699d40560f97371ea18bb51d1944 SHA1 64d39bb5444243baf60f24f8b204479e7e2d5efa SHA256 1b9e1e5fb4fa7a807e342103ab2cc51ee8cf38005798ccbc8e84b9f3b502f7db
-EBUILD luminance-hdr-1.9.3.ebuild 1402 RMD160 52218d0c0e65ae7818c9b4b28f9d0e98ec08fc8f SHA1 6bd429370f7ee910a57673e9b7be8c037abe9af3 SHA256 30b7951094da6372e69749d1f33e268318988e52b41d7d167925fac239149f16
 EBUILD luminance-hdr-2.0.0.ebuild 1409 RMD160 117c2999d957444a1cc53552b9098497905030dd SHA1 5c8398206899e3bbaee89bc1a005cb52b4800691 SHA256 4db5cd2ce0c0d249022f4c050fb21d36ef45fb0a0b440fba248961a5cb77f467
 EBUILD luminance-hdr-2.0.1.ebuild 1430 RMD160 e50a093d536df0eba65819e1fa3ca7a2d562051b SHA1 abf5431c3460a9d4aa326d0951938da9f8ddc299 SHA256 9b054975faa3bf373ecd42e919e981a4f8c2555336ea2ca3924ab776e704474b
-MISC ChangeLog 3625 RMD160 57c376b87089e68c01087e069f4b95f28bcd8729 SHA1 acc87e11ac19043486dfc299a2fd75b449c686c3 SHA256 64418380d3341b441e8381ddcbb0be1fbb7944be61943511478e7952ef3b4795
+MISC ChangeLog 3819 RMD160 d3a3509a795cad9d89fc70e2e125f7a4626d2e1c SHA1 5773fa1f6183fbba5d74e6495630e07800539443 SHA256 2466818d9672ef4c21432a6bea38a96ddcb3651504524bda6dc9690a5eeac007
 MISC metadata.xml 937 RMD160 188c7d5bcc2a1f029b36fb4644b45e0d4c42f5f7 SHA1 54bb4fd8c2ff64ddab7173aa25792d588f4977c5 SHA256 03752b3db20bdd5f73b81a4c7ac7a6173b7825c55aef76758cd48db98e778ef6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzgFmwACgkQNQqtfCuFneMdMgCfbdvGwfp7UD0pklIgFf6qoG6y
-KaMAoI+W2al15zCADdXFi2OfaqGzUA1d
-=iCKW
+iEUEARECAAYFAkzgGLIACgkQkKaRLQcq0GLbxACYlKJycP4WHq3zWhoxJh+hq9Du
+lgCgpFx9mKWuwtxMgnBYmTDxv3+DcyU=
+=bu1S
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/luminance-hdr/files/qtpfsgui-1.9.2-trunk.patch b/media-gfx/luminance-hdr/files/qtpfsgui-1.9.2-trunk.patch
deleted file mode 100644
index b817317b1af2..000000000000
--- a/media-gfx/luminance-hdr/files/qtpfsgui-1.9.2-trunk.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-Index: trunk/qtpfsgui/src/Fileformat/pfsoutldrimage.cpp
-===================================================================
---- trunk/qtpfsgui/src/Fileformat/pfsoutldrimage.cpp	(revision 319)
-+++ trunk/qtpfsgui/src/Fileformat/pfsoutldrimage.cpp	(working copy)
-@@ -62,9 +62,9 @@
- 			*(data + 2 + (y*width+x)*4) = ( clamp( (*R)( x, y )*255.f, 0, 255) );
- 			*(data + 3 + (y*width+x)*4) = 0xff;
- 			} else {
--			*(data + 3 + (y*width+x)*4) = ( clamp( (*B)( x, y )*255.f, 0, 255) );
-+			*(data + 3 + (y*width+x)*4) = ( clamp( (*R)( x, y )*255.f, 0, 255) );
- 			*(data + 2 + (y*width+x)*4) = ( clamp( (*G)( x, y )*255.f, 0, 255) );
--			*(data + 1 + (y*width+x)*4) = ( clamp( (*R)( x, y )*255.f, 0, 255) );
-+			*(data + 1 + (y*width+x)*4) = ( clamp( (*B)( x, y )*255.f, 0, 255) );
- 			*(data + 0 + (y*width+x)*4) = 0xff;
- 			}
- 		}
-Index: trunk/qtpfsgui/src/Common/gamma_and_levels.cpp
-===================================================================
---- trunk/qtpfsgui/src/Common/gamma_and_levels.cpp	(revision 319)
-+++ trunk/qtpfsgui/src/Common/gamma_and_levels.cpp	(working copy)
-@@ -189,12 +189,21 @@
- 		return;
- 	}
- 
--	//increment bins
--	for (int i=0; i<data.width()*data.height(); i+=accuracy) {
--		int v=qGray(*((QRgb*)(data.bits())+i));
--		assert(v>=0 && v<=255);
--		P[v] += 1;
--	}
-+// 	if (data.format()==QImage::Format_Indexed8) {
-+// 		//increment bins
-+// 		for (int i=0; i<data.width()*data.height(); i+=accuracy) {
-+// 			const unsigned char v=*((const unsigned char*)(data.bits())+i);
-+// 			P[v] += 1;
-+// 		}
-+// 		
-+// 	} else {
-+		//increment bins
-+		for (int i=0; i<data.width()*data.height(); i+=accuracy) {
-+			int v=qGray(*((QRgb*)(data.bits())+i));
-+			assert(v>=0 && v<=255);
-+			P[v] += 1;
-+		}
-+// 	}
- 
- 	//find max
- 	float max=-1;
-Index: trunk/qtpfsgui/src/Common/commandline.cpp
-===================================================================
---- trunk/qtpfsgui/src/Common/commandline.cpp	(revision 319)
-+++ trunk/qtpfsgui/src/Common/commandline.cpp	(working copy)
-@@ -378,7 +378,7 @@
- 	if (!saveHdrFilename.isEmpty()) {
- 		VERBOSEPRINT("Saving to file %1.",saveHdrFilename);
- 		QFileInfo qfi(saveHdrFilename);
--		const char* encodedName=QFile::encodeName(qfi.filePath()).constData();
-+		char* encodedName=strdup(QFile::encodeName(qfi.filePath()).constData());
- 		if (qfi.suffix().toUpper()=="EXR") {
- 			writeEXRfile(HDR,encodedName);
- 		} else if (qfi.suffix().toUpper()=="HDR") {
-@@ -397,6 +397,7 @@
- 		} else {
- 			error("Error, please specify a supported HDR file format.");
- 		}
-+		free(encodedName);
- 	} else {
- 		VERBOSEPRINT("NOT Saving HDR image to file. %1","");
- 	}
-Index: trunk/qtpfsgui/src/Common/options.cpp
-===================================================================
---- trunk/qtpfsgui/src/Common/options.cpp	(revision 319)
-+++ trunk/qtpfsgui/src/Common/options.cpp	(working copy)
-@@ -60,8 +60,9 @@
- 		if (!settings.contains(KEY_EXTERNAL_DCRAW_OPTIONS))
- 			settings.setValue(KEY_EXTERNAL_DCRAW_OPTIONS,"-T");
- 		dcraw_options=settings.value(KEY_EXTERNAL_DCRAW_OPTIONS).toStringList();
--		if (!settings.contains(KEY_EXTERNAL_AIS_OPTIONS))
--			settings.setValue(KEY_EXTERNAL_AIS_OPTIONS,"-a aligned_");
-+		//bug 2001032, remove spurious default QString "-a aligned_" value set by ver 1.9.2
-+		if (!settings.contains(KEY_EXTERNAL_AIS_OPTIONS) || settings.value(KEY_EXTERNAL_AIS_OPTIONS).toString()=="-a aligned_")
-+			settings.setValue(KEY_EXTERNAL_AIS_OPTIONS, QStringList() << "-a" << "aligned_");
- 		align_image_stack_options=settings.value(KEY_EXTERNAL_AIS_OPTIONS).toStringList();
- 	settings.endGroup();
- 
-Index: trunk/qtpfsgui/src/Threads/loadHdrThread.cpp
-===================================================================
---- trunk/qtpfsgui/src/Threads/loadHdrThread.cpp	(revision 319)
-+++ trunk/qtpfsgui/src/Threads/loadHdrThread.cpp	(working copy)
-@@ -58,7 +58,7 @@
- 	QString extension = qfi.suffix().toUpper();
- 	bool rawinput = (rawextensions.indexOf(extension)!=-1);
- 	try {
--		const char* encodedFileName=QFile::encodeName(qfi.filePath()).constData();
-+		char* encodedFileName=strdup(QFile::encodeName(qfi.filePath()).constData());
- 		if (extension=="EXR") {
- 			hdrpfsframe = readEXRfile(encodedFileName);
- 		} else if (extension=="HDR") {
-@@ -123,6 +123,7 @@
- 			emit load_failed(tr("ERROR: File %1 has unsupported extension.").arg(fname));
- 			return;
- 		}
-+		free(encodedFileName);
- #if 0
- 		pfs::Channel *R,*G,*B;
- 		hdrpfsframe->getRGBChannels( R, G, B );
-Index: trunk/qtpfsgui/src/HdrCreation/HdrCreationManager.cpp
-===================================================================
---- trunk/qtpfsgui/src/HdrCreation/HdrCreationManager.cpp	(revision 319)
-+++ trunk/qtpfsgui/src/HdrCreation/HdrCreationManager.cpp	(working copy)
-@@ -261,7 +261,7 @@
- 		clearlists(false);
- 		for (int i=0;i<fileList.size();i++) {
- 			//align_image_stack can only output tiff files
--			const char* fname=QFile::encodeName(QString(qtpfsgui_options->tempfilespath + "/aligned_" + QString("%1").arg(i,4,10,QChar('0'))+".tif")).constData();
-+			char* fname=strdup(QFile::encodeName(QString(qtpfsgui_options->tempfilespath + "/aligned_" + QString("%1").arg(i,4,10,QChar('0'))+".tif")).constData());
- 			//qDebug("HCM: Loading back file name=%s", fname);
- 			TiffReader reader(fname);
- 			//if 8bit ldr tiff
-@@ -279,6 +279,7 @@
- 				listmdrB.push_back(B);
- 			}
- 			QFile::remove(fname);
-+			free(fname);
- 		}
- 		QFile::remove(QString(qtpfsgui_options->tempfilespath + "/hugin_debug_optim_results.txt"));
- 		emit finishedAligning();
-Index: trunk/qtpfsgui/src/MainWindow/mainWindow.cpp
-===================================================================
---- trunk/qtpfsgui/src/MainWindow/mainWindow.cpp	(revision 319)
-+++ trunk/qtpfsgui/src/MainWindow/mainWindow.cpp	(working copy)
-@@ -192,7 +192,8 @@
- 		QString fname=(fd->selectedFiles()).at(0);
- 		if(!fname.isEmpty()) {
- 			QFileInfo qfi(fname);
--			const char* encodedName=QFile::encodeName(qfi.filePath()).constData();
-+			QString absoluteFileName=qfi.absoluteFilePath();
-+			char* encodedName=strdup(QFile::encodeName(absoluteFileName).constData());
- 			// if the new dir, the one just chosen by the user, is different from the one stored in the settings, update the settings.
- 			if (RecentDirHDRSetting != qfi.path() )
- 				// update internal field variable
-@@ -219,10 +220,11 @@
- 				delete fd;
- 				return;
- 			}
--			setCurrentFile(fname);
-+			free(encodedName);
-+			setCurrentFile(absoluteFileName);
- 			currenthdr->NeedsSaving=false;
--			currenthdr->filename=fname;
--			currenthdr->setWindowTitle(fname);
-+			currenthdr->filename=absoluteFileName;
-+			currenthdr->setWindowTitle(absoluteFileName);
- 		}
- 	} //if (fd->exec())
- 	delete fd;
diff --git a/media-gfx/luminance-hdr/files/qtpfsgui-1.9.3-hdr-save.patch b/media-gfx/luminance-hdr/files/qtpfsgui-1.9.3-hdr-save.patch
deleted file mode 100644
index f0ae9a083388..000000000000
--- a/media-gfx/luminance-hdr/files/qtpfsgui-1.9.3-hdr-save.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-backported from upstream revision 393
-
-diff -ru qtpfsgui-1.9.3.orig/src/MainWindow/mainWindow.cpp qtpfsgui-1.9.3/src/MainWindow/mainWindow.cpp
---- qtpfsgui-1.9.3.orig/src/MainWindow/mainWindow.cpp	2009-01-08 18:22:41.000000000 +0100
-+++ qtpfsgui-1.9.3/src/MainWindow/mainWindow.cpp	2009-05-23 10:56:17.000000000 +0200
-@@ -274,11 +274,13 @@
- 			normalSizeAct->setEnabled(true);

- 		}

- 	} else {

--		currenthdr=NULL;

--		normalSizeAct->setEnabled(false);

--		zoomInAct->setEnabled(false);

--		zoomOutAct->setEnabled(false);

--		fitToWindowAct->setEnabled(false);

-+		if (mdiArea->subWindowList().empty()) {

-+			currenthdr=NULL;

-+			normalSizeAct->setEnabled(false);

-+			zoomInAct->setEnabled(false);

-+			zoomOutAct->setEnabled(false);

-+			fitToWindowAct->setEnabled(false);

-+		}

- 	}

- }

- 

diff --git a/media-gfx/luminance-hdr/luminance-hdr-1.9.2-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-1.9.2-r1.ebuild
deleted file mode 100644
index 00f4aa4b4f90..000000000000
--- a/media-gfx/luminance-hdr/luminance-hdr-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-1.9.2-r1.ebuild,v 1.2 2010/11/08 22:53:28 maekke Exp $
-
-EAPI="1"
-
-inherit eutils qt4
-
-MY_PN="qtpfsgui"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Qtpfsgui is a graphical user interface that provides a workflow for HDR imaging."
-HOMEPAGE="http://qtpfsgui.sourceforge.net"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-LANGS="cs de es fr it pl ru tr"
-for lang in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-DEPEND="
-	media-gfx/dcraw
-	>=media-gfx/exiv2-0.14
-	>=media-libs/openexr-1.2.2-r2
-	>=media-libs/tiff-3.8.2-r2
-	>=sci-libs/fftw-3.0.1-r2
-	virtual/jpeg
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${MY_P}-trunk.patch"
-
-	# no insane CXXFLAGS
-	sed -i -e '/QMAKE_CXXFLAGS/d' project.pro || die
-
-	# no stripping
-	sed -i -e 's:TARGET:QMAKE_STRIP = true\nTARGET:' project.pro || die
-}
-
-src_compile() {
-	lrelease project.pro || die
-	eqmake4 project.pro PREFIX=/usr || die
-	emake || die
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-	dodoc README TODO || die
-
-	for lang in ${LANGS} ; do
-		use linguas_${lang} || rm "${D}"/usr/share/${MY_PN}/i18n/lang_${lang}.qm
-	done
-}
diff --git a/media-gfx/luminance-hdr/luminance-hdr-1.9.3.ebuild b/media-gfx/luminance-hdr/luminance-hdr-1.9.3.ebuild
deleted file mode 100644
index 68b4a71f1665..000000000000
--- a/media-gfx/luminance-hdr/luminance-hdr-1.9.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-1.9.3.ebuild,v 1.2 2010/11/08 22:53:28 maekke Exp $
-
-EAPI="2"
-
-inherit eutils qt4
-
-MY_PN="qtpfsgui"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Qtpfsgui is a graphical user interface that provides a workflow for HDR imaging."
-HOMEPAGE="http://qtpfsgui.sourceforge.net"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LANGS=" cs de es fr it pl ru tr"
-IUSE="openmp $(echo ${LANGS//\ /\ linguas_})"
-
-DEPEND="
-	media-gfx/dcraw
-	>=media-gfx/exiv2-0.14
-	>=media-libs/openexr-1.2.2-r2
-	>=media-libs/tiff-3.8.2-r2
-	>=sci-libs/fftw-3.0.1-r2
-	virtual/jpeg
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	>=sys-devel/gcc-4.2[openmp?]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_P}-hdr-save.patch
-
-	# no insane CXXFLAGS
-	sed -i -e '/QMAKE_CXXFLAGS/d' project.pro || die
-
-	if ! use openmp ; then
-		sed -i -e '/QMAKE_LFLAGS/d' project.pro || die
-	fi
-}
-
-src_compile() {
-	lrelease project.pro || die
-	eqmake4 project.pro PREFIX=/usr || die
-	emake || die
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-	dodoc README TODO || die
-
-	for lang in ${LANGS} ; do
-		use linguas_${lang} || rm "${D}"/usr/share/${MY_PN}/i18n/lang_${lang}.qm
-	done
-}