diff options
| -rw-r--r-- | media-gfx/luminance-hdr/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/luminance-hdr/files/qtpfsgui-1.9.2-trunk.patch | 156 | ||||
| -rw-r--r-- | media-gfx/luminance-hdr/files/qtpfsgui-1.9.3-hdr-save.patch | 24 | ||||
| -rw-r--r-- | media-gfx/luminance-hdr/luminance-hdr-1.9.2-r1.ebuild | 65 | ||||
| -rw-r--r-- | media-gfx/luminance-hdr/luminance-hdr-1.9.3.ebuild | 61 |
5 files changed, 6 insertions, 307 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/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 -} |