From edc87b8f93821ab537ca01190ad20ef271246688 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:34:30 +0000 Subject: import qt5-qtimageformats-5.9.2-1.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a47df7c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/qtimageformats-opensource-src-5.9.2.tar.xz diff --git a/.qt5-qtimageformats.metadata b/.qt5-qtimageformats.metadata new file mode 100644 index 0000000..4d5d489 --- /dev/null +++ b/.qt5-qtimageformats.metadata @@ -0,0 +1 @@ +dbf9b3a906da8d38cfe240c36b43cd2b7507d44e SOURCES/qtimageformats-opensource-src-5.9.2.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/qtimageformats-disable-neon.patch b/SOURCES/qtimageformats-disable-neon.patch new file mode 100644 index 0000000..7678658 --- /dev/null +++ b/SOURCES/qtimageformats-disable-neon.patch @@ -0,0 +1,87 @@ +diff --git a/src/3rdparty/libwebp/src/dsp/dsp.h b/src/3rdparty/libwebp/src/dsp/dsp.h +index 813fed4..ddc8fe4 100644 +--- a/src/3rdparty/libwebp/src/dsp/dsp.h ++++ b/src/3rdparty/libwebp/src/dsp/dsp.h +@@ -74,11 +74,11 @@ extern "C" { + + // The intrinsics currently cause compiler errors with arm-nacl-gcc and the + // inline assembly would need to be modified for use with Native Client. +-#if (defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) || \ +- defined(__aarch64__) || defined(WEBP_HAVE_NEON)) && \ +- !defined(__native_client__) +-#define WEBP_USE_NEON +-#endif ++// #if (defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) || \ ++// defined(__aarch64__) || defined(WEBP_HAVE_NEON)) && \ ++// !defined(__native_client__) ++// #define WEBP_USE_NEON ++// #endif + + #if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) + #define WEBP_USE_NEON +diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri +index 55d7e60..6302433 100644 +--- a/src/3rdparty/libwebp.pri ++++ b/src/3rdparty/libwebp.pri +@@ -122,32 +122,32 @@ integrity { + QMAKE_CFLAGS += -c99 + } + +-equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { +- SOURCES_FOR_NEON += \ +- $$PWD/libwebp/src/dsp/alpha_processing_neon.c \ +- $$PWD/libwebp/src/dsp/dec_neon.c \ +- $$PWD/libwebp/src/dsp/enc_neon.c \ +- $$PWD/libwebp/src/dsp/filters_neon.c \ +- $$PWD/libwebp/src/dsp/lossless_enc_neon.c \ +- $$PWD/libwebp/src/dsp/lossless_neon.c \ +- $$PWD/libwebp/src/dsp/rescaler_neon.c \ +- $$PWD/libwebp/src/dsp/upsampling_neon.c +- +- contains(QT_CPU_FEATURES.$$QT_ARCH, neon) { +- # Default compiler settings include this feature, so just add to SOURCES +- SOURCES += $$SOURCES_FOR_NEON +- } else { +- neon_comp.commands = $$QMAKE_CC -c $(CFLAGS) +- neon_comp.commands += $$QMAKE_CFLAGS_NEON +- neon_comp.commands += $(INCPATH) ${QMAKE_FILE_IN} +- msvc: neon_comp.commands += -Fo${QMAKE_FILE_OUT} +- else: neon_comp.commands += -o ${QMAKE_FILE_OUT} +- neon_comp.dependency_type = TYPE_C +- neon_comp.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} +- neon_comp.input = SOURCES_FOR_NEON +- neon_comp.variable_out = OBJECTS +- neon_comp.name = compiling[neon] ${QMAKE_FILE_IN} +- silent: neon_comp.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_comp.commands +- QMAKE_EXTRA_COMPILERS += neon_comp +- } +-} ++# equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { ++# SOURCES_FOR_NEON += \ ++# $$PWD/libwebp/src/dsp/alpha_processing_neon.c \ ++# $$PWD/libwebp/src/dsp/dec_neon.c \ ++# $$PWD/libwebp/src/dsp/enc_neon.c \ ++# $$PWD/libwebp/src/dsp/filters_neon.c \ ++# $$PWD/libwebp/src/dsp/lossless_enc_neon.c \ ++# $$PWD/libwebp/src/dsp/lossless_neon.c \ ++# $$PWD/libwebp/src/dsp/rescaler_neon.c \ ++# $$PWD/libwebp/src/dsp/upsampling_neon.c ++# ++# contains(QT_CPU_FEATURES.$$QT_ARCH, neon) { ++# # Default compiler settings include this feature, so just add to SOURCES ++# SOURCES += $$SOURCES_FOR_NEON ++# } else { ++# neon_comp.commands = $$QMAKE_CC -c $(CFLAGS) ++# neon_comp.commands += $$QMAKE_CFLAGS_NEON ++# neon_comp.commands += $(INCPATH) ${QMAKE_FILE_IN} ++# msvc: neon_comp.commands += -Fo${QMAKE_FILE_OUT} ++# else: neon_comp.commands += -o ${QMAKE_FILE_OUT} ++# neon_comp.dependency_type = TYPE_C ++# neon_comp.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} ++# neon_comp.input = SOURCES_FOR_NEON ++# neon_comp.variable_out = OBJECTS ++# neon_comp.name = compiling[neon] ${QMAKE_FILE_IN} ++# silent: neon_comp.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_comp.commands ++# QMAKE_EXTRA_COMPILERS += neon_comp ++# } ++# } diff --git a/SPECS/qt5-qtimageformats.spec b/SPECS/qt5-qtimageformats.spec new file mode 100644 index 0000000..4957705 --- /dev/null +++ b/SPECS/qt5-qtimageformats.spec @@ -0,0 +1,263 @@ + +%global qt_module qtimageformats + +%define docs 1 + +# where to enable webp support +%if 0%{?fedora} || 0%{?rhel} > 7 +%global webp 1 +%endif + +Summary: Qt5 - QtImageFormats component +Name: qt5-%{qt_module} +Version: 5.9.2 +Release: 1%{?dist} + +# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details +License: LGPLv2 with exceptions or GPLv3 with exceptions +Url: http://www.qt.io +Source0: http://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz + +Patch1: qtimageformats-disable-neon.patch + +BuildRequires: qt5-qtbase-devel >= %{version} +BuildRequires: libmng-devel +BuildRequires: libtiff-devel +BuildRequires: jasper-devel +%if 0%{?webp} +BuildRequires: libwebp-devel +%else +Provides: bundled(libwebp) +%endif + +# prior -devel subpkg contained only runtime cmake bits +Obsoletes: qt5-qtimageformats-devel < 5.4.0 +Provides: qt5-qtimageformats-devel = %{version}-%{release} + +%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} + +# filter plugin provides +%global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$ + +%description +The core Qt Gui library by default supports reading and writing image +files of the most common file formats: PNG, JPEG, BMP, GIF and a few more, +ref. Reading and Writing Image Files. The Qt Image Formats add-on module +provides optional support for other image file formats, including: +MNG, TGA, TIFF, WBMP. + +%if 0%{?docs} +%package doc +Summary: API documentation for %{name} +License: GFDL +Requires: %{name} = %{version}-%{release} +BuildRequires: qt5-qdoc +BuildRequires: qt5-qhelpgenerator +BuildArch: noarch +%description doc +%{summary}. +%endif + + +%prep +%setup -q -n %{qt_module}-opensource-src-%{version} + +%patch1 -p1 -b .qtimageformats-disable-neon + +%if 0%{?webp} +rm -rv src/3rdparty +%endif + +%build +%{qmake_qt5} + +make %{?_smp_mflags} + +%if 0%{?docs} +make %{?_smp_mflags} docs +%endif + + +%install +make install INSTALL_ROOT=%{buildroot} + +%if 0%{?docs} +make install_docs INSTALL_ROOT=%{buildroot} +%endif + + +%files +%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL* +%{_qt5_plugindir}/imageformats/libqmng.so +%{_qt5_plugindir}/imageformats/libqtga.so +%{_qt5_plugindir}/imageformats/libqtiff.so +%{_qt5_plugindir}/imageformats/libqwbmp.so +%{_qt5_plugindir}/imageformats/libqicns.so +%{_qt5_plugindir}/imageformats/libqjp2.so +%{_qt5_plugindir}/imageformats/libqwebp.so +%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_*Plugin.cmake + +%if 0%{?docs} +%files doc +%license LICENSE.FDL +%{_qt5_docdir}/qtimageformats.qch +%{_qt5_docdir}/qtimageformats/ +%endif + + +%changelog +* Fri Oct 06 2017 Jan Grulich - 5.9.2-1 +- Update to 5.9.2 + Resolves: bz#1482782 + +* Fri Aug 18 2017 Jan Grulich - 5.9.1-1 +- Update to 5.9.1 + Resolves: bz#1482782 + +* Wed Jan 11 2017 Jan Grulich - 5.6.2-1 +- Update to 5.6.2 + Resolves: bz#1384821 + +* Tue Aug 30 2016 Jan Grulich - 5.6.1-10 +- Increase build version to have newer version than in EPEL + Resolves: bz#1317404 + +* Wed Jun 08 2016 Jan Grulich - 5.6.1-1 +- Update to 5.6.1 + Resolves: bz#1317404 + +* Wed Apr 13 2016 Jan Grulich - 5.6.0-5 +- Enable documentation + Resolves: bz#1317404 + +* Thu Apr 07 2016 Jan Grulich - 5.6.0-4 +- Initial version for RHEL + Resolves: bz#1317404 + +* Sun Mar 20 2016 Rex Dieter - 5.6.0-3 +- rebuild + +* Fri Mar 18 2016 Rex Dieter - 5.6.0-2 +- rebuild + +* Mon Mar 14 2016 Helio Chissini de Castro - 5.6.0-1 +- 5.6.0 final release + +* Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.7.rc +- Update to final RC + +* Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.6 +- Update RC release + +* Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.5.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Dec 28 2015 Rex Dieter 5.6.0-0.4.beta +- update source URL, use %%license + +* Mon Dec 28 2015 Igor Gnatenko - 5.6.0-0.3 +- Rebuilt for libwebp soname bump + +* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.2 +- Official beta release + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + +* Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 +- Update to final release 5.5.1 + +* Tue Sep 29 2015 Helio Chissini de Castro - 5.5.1-1 +- Update to Qt 5.5.1 RC1 + +* Wed Jul 29 2015 Rex Dieter 5.5.0-2 +- -docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping + +* Wed Jun 24 2015 Helio Chissini de Castro - 5.5.0-0.2.rc +- Update for official RC1 released packages + +* Wed Jun 17 2015 Daniel Vrátil - 5.5.0-0.1.rc +- Qt 5.5.0 RC1 + +* Wed Jun 03 2015 Jan Grulich 5.4.2-1 +- 5.4.2 + +* Sat May 23 2015 Rex Dieter 5.4.1-4 +- Provides: qt5-qtimageformat-devel + +* Sat May 02 2015 Kalev Lember - 5.4.1-3 +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Feb 27 2015 Rex Dieter - 5.4.1-2 +- rebuild (gcc5) + +* Tue Feb 24 2015 Jan Grulich 5.4.1-1 +- 5.4.1 + +* Wed Dec 10 2014 Rex Dieter 5.4.0-1 +- 5.4.0 (final) + +* Fri Nov 28 2014 Rex Dieter 5.4.0-0.3.rc +- 5.4.0-rc + +* Mon Nov 03 2014 Rex Dieter 5.4.0-0.2.beta +- out-of-tree build, use %%qmake_qt5 + +* Sun Oct 19 2014 Rex Dieter 5.4.0-0.1.beta +- 5.4.0-beta, Obsoletes: qt5-qtimageformats-devel + +* Wed Sep 17 2014 Rex Dieter - 5.3.2-1 +- 5.3.2 + +* Sun Aug 17 2014 Fedora Release Engineering - 5.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jun 17 2014 Jan Grulich - 5.3.1-1 +- 5.3.1 + +* Sun Jun 08 2014 Fedora Release Engineering - 5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Jan Grulich - 5.3.0-1 +- 5.3.0 + +* Tue Mar 18 2014 Ville Skyttä - 5.2.1-2 +- Fix libmng test, build with system one instead of bundled + +* Wed Feb 05 2014 Rex Dieter 5.2.1-1 +- 5.2.1 + +* Thu Dec 12 2013 Rex Dieter 5.2.0-1 +- 5.2.0 + +* Mon Dec 02 2013 Rex Dieter 5.2.0-0.10.rc1 +- 5.2.0-rc1 + +* Sun Nov 10 2013 Rex Dieter 5.2.0-0.4.beta1 +- rebuild (arm/qreal) + +* Thu Oct 24 2013 Rex Dieter 5.2.0-0.3.beta1 +- 5.2.0-beta1 + +* Thu Oct 24 2013 Rex Dieter 5.2.0-0.2.alpha +- ppc bootstrap + +* Wed Oct 02 2013 Rex Dieter 5.2.0-0.1.alpha +- 5.2.0-alpha +- -devel subpkg +- -doc subpkg + +* Fri Aug 30 2013 Rex Dieter 5.1.1-1 +- 5.1.1 + +* Wed Aug 28 2013 Rex Dieter 5.0.2-2 +- update Source URL +- include license files +- improved description + +* Thu Apr 11 2013 Rex Dieter 5.0.2-1 +- 5.0.2 + +* Sat Feb 23 2013 Rex Dieter 5.0.1-1 +- first try +