diff --git a/.gitignore b/.gitignore index efd7d31..a47df7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtimageformats-opensource-src-5.6.2.tar.xz +SOURCES/qtimageformats-opensource-src-5.9.2.tar.xz diff --git a/.qt5-qtimageformats.metadata b/.qt5-qtimageformats.metadata index 79009d5..4d5d489 100644 --- a/.qt5-qtimageformats.metadata +++ b/.qt5-qtimageformats.metadata @@ -1 +1 @@ -51036cb2fd81c20172d1e9509ba0881c44ca4b1e SOURCES/qtimageformats-opensource-src-5.6.2.tar.xz +dbf9b3a906da8d38cfe240c36b43cd2b7507d44e SOURCES/qtimageformats-opensource-src-5.9.2.tar.xz 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 index 019f761..4957705 100644 --- a/SPECS/qt5-qtimageformats.spec +++ b/SPECS/qt5-qtimageformats.spec @@ -4,19 +4,21 @@ %define docs 1 # where to enable webp support -%if 0%{?fedora} || 0%{?rhel} > 6 +%if 0%{?fedora} || 0%{?rhel} > 7 %global webp 1 %endif Summary: Qt5 - QtImageFormats component Name: qt5-%{qt_module} -Version: 5.6.2 +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.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +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 @@ -34,6 +36,9 @@ 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, @@ -56,28 +61,28 @@ BuildArch: noarch %prep %setup -q -n %{qt_module}-opensource-src-%{version} + +%patch1 -p1 -b .qtimageformats-disable-neon + %if 0%{?webp} rm -rv src/3rdparty %endif %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{qmake_qt5} .. +%{qmake_qt5} make %{?_smp_mflags} %if 0%{?docs} make %{?_smp_mflags} docs %endif -popd %install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} +make install INSTALL_ROOT=%{buildroot} %if 0%{?docs} -make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} +make install_docs INSTALL_ROOT=%{buildroot} %endif @@ -87,7 +92,6 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %{_qt5_plugindir}/imageformats/libqtga.so %{_qt5_plugindir}/imageformats/libqtiff.so %{_qt5_plugindir}/imageformats/libqwbmp.so -%{_qt5_plugindir}/imageformats/libqdds.so %{_qt5_plugindir}/imageformats/libqicns.so %{_qt5_plugindir}/imageformats/libqjp2.so %{_qt5_plugindir}/imageformats/libqwebp.so @@ -102,6 +106,14 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %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