[packages/luminance-hdr] - updated to 2.3.1 (the last qt4 version) - added qt4pld patch, use system qt4 translations - requir

qboosh qboosh at pld-linux.org
Fri Sep 9 19:03:51 CEST 2016 

commit 73ccfbc3765c5524e6e388fb8633aad716d45441
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Sep 9 19:05:21 2016 +0200

    - updated to 2.3.1 (the last qt4 version)
    - added qt4pld patch, use system qt4 translations
    - require QtSql sqlite driver

 luminance-hdr-qt4pld.patch |  11 +++++
 luminance-hdr.spec         | 102 +++++++++++++++++++++++++++++++++------------
 2 files changed, 87 insertions(+), 26 deletions(-)
---
diff --git a/luminance-hdr.spec b/luminance-hdr.spec
index a5ed136..b36d219 100644
--- a/luminance-hdr.spec
+++ b/luminance-hdr.spec
@@ -1,31 +1,60 @@
+#
+# Conditional build:
+%bcond_with	sse	# SSE instructions
+%bcond_with	sse2	# SSE2 instructions
+
+%ifarch pentium3 pentium4 %{x8664} x32
+%define	with_sse	1
+%endif
+%ifarch pentium4 %{x8664} x32
+%define	with_sse2	1
+%endif
 Summary:	Luminance HDR - HDR Image compositor
 Summary(pl.UTF-8):	Luminance HDR - narzędzie do składania obrazów HDR
 Name:		luminance-hdr
-Version:	2.2.0
-Release:	8
+Version:	2.3.1
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/qtpfsgui/%{name}-%{version}.tar.bz2
-# Source0-md5:	15caab0747cc5d5f1a3a496752b733d4
+# Source0-md5:	86499294fb9a6dc211a54cbaa9af2b8a
+Patch0:		%{name}-qt4pld.patch
 URL:		http://qtpfsgui.sourceforge.net/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	QtCore-devel >= 4.3
 BuildRequires:	QtGui-devel >= 4.3
+BuildRequires:	QtNetwork-devel >= 4.3
 BuildRequires:	QtSql-devel >= 4.3
 BuildRequires:	QtWebKit-devel >= 4.3
 BuildRequires:	QtXml-devel >= 4.3
+BuildRequires:	boost-devel
 BuildRequires:	cmake >= 2.6.0
-BuildRequires:	exiv2-devel
-BuildRequires:	fftw3-single-devel
+BuildRequires:	exiv2-devel >= 0.12
+BuildRequires:	fftw3-single-devel >= 3
 BuildRequires:	gcc-c++ >= 6:4.3
 BuildRequires:	gsl-devel
+BuildRequires:	lcms2-devel >= 2
 BuildRequires:	libgomp-devel
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libraw-devel
+BuildRequires:	libstdc++-devel >= 6:4.3
 BuildRequires:	libtiff-devel
 BuildRequires:	qt4-build >= 4.3.3-3
 BuildRequires:	qt4-linguist >= 4.3.3-3
 BuildRequires:	qt4-qmake >= 4.3.3-3
 BuildRequires:	rpmbuild(macros) >= 1.605
+BuildRequires:	sed >= 4.0
+Requires(post,postun):	gtk-update-icon-cache
+Requires:	QtCore >= 4.3
+Requires:	QtGui >= 4.3
+Requires:	QtNetwork >= 4.3
+Requires:	QtSql >= 4.3
+Requires:	QtSql-sqlite3 >= 4.3
+Requires:	QtWebKit >= 4.3
+Requires:	QtXml >= 4.3
+Requires:	exiv2 >= 0.12
+Requires:	hicolor-icon-theme
 Obsoletes:	qtpfsgui
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,15 +65,24 @@ Luminance HDR - HDR Image compositor.
 Luminance HDR - narzędzie do składania obrazów HDR.
 
 %prep
-%setup -q -c
+%setup -q
+%patch0 -p1
+
+%if %{without sse2}
+%{__sed} -i -e 's/ -msse2//' cmake/CompilerSettings.cmake
+%endif
+%if %{without sse}
+%{__sed} -i -e 's/ -msse//' cmake/CompilerSettings.cmake
+%endif
 
 %build
 # "build" dir is already occupied, use other name
 mkdir obj
 cd obj
-%cmake ..
+%cmake .. \
+	-DBUILD_SHARED_LIBS:BOOL=OFF
+
 %{__make}
-#lrelease project.pro
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,31 +91,43 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/luminance/{AUTHORS,Changelog,LICENSE,README}
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/luminance-hdr/{AUTHORS,Changelog,LICENSE,README}
+# use Qt translations packaged with qt4
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/luminance-hdr/i18n/qt_*.qm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS Changelog README TODO
 %attr(755,root,root) %{_bindir}/luminance-hdr
+%attr(755,root,root) %{_bindir}/luminance-hdr-cli
+%dir %{_datadir}/luminance-hdr
+%dir %{_datadir}/luminance-hdr/help
+%{_datadir}/luminance-hdr/help/en
+%dir %{_datadir}/luminance-hdr/i18n
+%lang(cs) %{_datadir}/luminance-hdr/i18n/lang_cs.qm
+%lang(da) %{_datadir}/luminance-hdr/i18n/lang_da.qm
+%lang(de) %{_datadir}/luminance-hdr/i18n/lang_de.qm
+%lang(es) %{_datadir}/luminance-hdr/i18n/lang_es.qm
+%lang(fi) %{_datadir}/luminance-hdr/i18n/lang_fi.qm
+%lang(fr) %{_datadir}/luminance-hdr/i18n/lang_fr.qm
+%lang(hi) %{_datadir}/luminance-hdr/i18n/lang_hi.qm
+%lang(hu) %{_datadir}/luminance-hdr/i18n/lang_hu.qm
+%lang(id) %{_datadir}/luminance-hdr/i18n/lang_id.qm
+%lang(it) %{_datadir}/luminance-hdr/i18n/lang_it.qm
+%lang(pl) %{_datadir}/luminance-hdr/i18n/lang_pl.qm
+%lang(ro) %{_datadir}/luminance-hdr/i18n/lang_ro.qm
+%lang(ru) %{_datadir}/luminance-hdr/i18n/lang_ru.qm
+%lang(sk) %{_datadir}/luminance-hdr/i18n/lang_sk.qm
+%lang(tr) %{_datadir}/luminance-hdr/i18n/lang_tr.qm
+%lang(zh_CN) %{_datadir}/luminance-hdr/i18n/lang_zh.qm
 %{_desktopdir}/luminance-hdr.desktop
 %{_iconsdir}/hicolor/48x48/apps/luminance-hdr.png
-%dir %{_datadir}/luminance
-%dir %{_datadir}/luminance/help
-%{_datadir}/luminance/help/en
-%{_datadir}/luminance/help/js
-%dir %{_datadir}/luminance/i18n
-%lang(cs) %{_datadir}/luminance/i18n/lang_cs.qm
-%lang(de) %{_datadir}/luminance/i18n/lang_de.qm
-%lang(es) %{_datadir}/luminance/i18n/lang_es.qm
-%lang(fi) %{_datadir}/luminance/i18n/lang_fi.qm
-%lang(fr) %{_datadir}/luminance/i18n/lang_fr.qm
-%lang(hu) %{_datadir}/luminance/i18n/lang_hu.qm
-%lang(id) %{_datadir}/luminance/i18n/lang_id.qm
-%lang(it) %{_datadir}/luminance/i18n/lang_it.qm
-%lang(pl) %{_datadir}/luminance/i18n/lang_pl.qm
-%lang(ro) %{_datadir}/luminance/i18n/lang_ro.qm
-%lang(ru) %{_datadir}/luminance/i18n/lang_ru.qm
-%lang(tr) %{_datadir}/luminance/i18n/lang_tr.qm
diff --git a/luminance-hdr-qt4pld.patch b/luminance-hdr-qt4pld.patch
new file mode 100644
index 0000000..df59a85
--- /dev/null
+++ b/luminance-hdr-qt4pld.patch
@@ -0,0 +1,11 @@
+--- luminance-hdr-2.3.1/src/Common/TranslatorManager.cpp.orig	2013-04-07 20:41:14.000000000 +0200
++++ luminance-hdr-2.3.1/src/Common/TranslatorManager.cpp	2016-09-09 18:49:00.625142009 +0200
+@@ -83,7 +83,7 @@
+ 
+     if ( qtTranslator->load(QString("qt_") + lang, QString("i18n")) ||
+          // qtTranslator->load(QString("qt_") + lang, I18NDIR) )
+-         qtTranslator->load(QString("qt_") + lang, QLibraryInfo::location(
++         qtTranslator->load(QString("qt4_") + lang, QLibraryInfo::location(
+                                 QLibraryInfo::TranslationsPath)) )
+     {
+         QCoreApplication::installTranslator(qtTranslator.data());
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/luminance-hdr.git/commitdiff/73ccfbc3765c5524e6e388fb8633aad716d45441

More information about the pld-cvs-commit mailing list