Upgrade ECM and KF5 version requirements for 5.4.0 release.

Upgrade ECM and KF5 version requirements for 5.3.0 release.
Upgrade ECM and KF5 version requirements for 5.2.0 release.
2025-07-15 11:14:18 -04:00 · 2014-10-31 20:17:43 +00:00 · 2014-10-03 17:55:41 +00:00 · 2014-09-07 23:25:44 +00:00 · 2014-08-15 18:41:16 +01:00 · 2014-08-13 10:04:37 +02:00
30 changed files with 45 additions and 33 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)

 project(KImageFormats)

-find_package(ECM 1.0.0 REQUIRED NO_MODULE)
+find_package(ECM 1.4.0 REQUIRED NO_MODULE)

 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})

@ -30,13 +30,17 @@ if (UNIX)
    endif()
 endif()

-find_package(Jasper)
-set_package_properties(Jasper PROPERTIES
-    DESCRIPTION "A library for handling JPEG-2000 images"
-    PURPOSE "Required for the QImage plugin for JPEG-2000 images"
-    URL "http://www.ece.uvic.ca/~mdadams/jasper"
-    TYPE OPTIONAL
-)
+# QtImageFormats 5.3 comes with a JPEG-2000 plugin; don't duplicate it here
+# TODO: remove our JPEG-2000 plugin when we depend on Qt 5.3.
+if (Qt5Gui_VERSION VERSION_LESS 5.3.0)
+    find_package(Jasper)
+    set_package_properties(Jasper PROPERTIES
+        DESCRIPTION "A library for handling JPEG-2000 images"
+        PURPOSE "Required for the QImage plugin for JPEG-2000 images"
+        URL "http://www.ece.uvic.ca/~mdadams/jasper"
+        TYPE OPTIONAL
+    )
+endif()

 find_package(OpenEXR)
 set_package_properties(OpenEXR PROPERTIES
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # KImageFormats

-Image format plugins for Qt
+Plugins to allow QImage to support extra file formats.

 ## Introduction

@ -63,9 +63,3 @@ This framework is licensed under the
 The CMake code in this framework is licensed under the
 [BSD license](http://opensource.org/licenses/BSD-3-Clause).

-## Links
-
- Home page: <https://projects.kde.org/projects/frameworks/kimageformats>
- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-frameworks-devel>
- IRC channel: \#kde-devel on Freenode
- Git repository: <https://projects.kde.org/projects/frameworks/kimageformats/repository>
--- a/metainfo.yaml
+++ b/metainfo.yaml
@ -1,5 +1,5 @@
 maintainer: alexmerry
-description: Plugins to allow QImage to support extra file formats
+description: Image format plugins for Qt
 tier: 1
 type: functional
 platforms:
--- a/src/imageformats/CMakeLists.txt
+++ b/src/imageformats/CMakeLists.txt
@ -2,11 +2,15 @@

 ##################################

-add_library(kimg_dds MODULE dds.cpp)
-target_link_libraries(kimg_dds Qt5::Gui)
+if (Qt5Gui_VERSION VERSION_LESS 5.3.0)
+    add_library(kimg_dds MODULE dds.cpp)
+    target_link_libraries(kimg_dds Qt5::Gui)

-install(TARGETS kimg_dds  DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
-install(FILES dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+    install(TARGETS kimg_dds  DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+    install(FILES dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+else()
+    install(FILES dds-qt.desktop RENAME dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+endif()

 ##################################

@ -34,6 +38,9 @@ if(JASPER_FOUND)

    install(TARGETS kimg_jp2  DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
    install(FILES jp2.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+elseif (NOT Qt5Gui_VERSION VERSION_LESS 5.3.0)
+    # need this for Qt's version of the plugin
+    install(FILES jp2.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
 endif()

 ##################################
--- a/src/imageformats/dds-qt.desktop
+++ b/src/imageformats/dds-qt.desktop
@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=QImageIOPlugins
+X-KDE-ImageFormat=dds
+X-KDE-MimeType=image/x-dds
+X-KDE-Read=true
+X-KDE-Write=true
--- a/src/imageformats/dds.cpp
+++ b/src/imageformats/dds.cpp
@ -19,7 +19,7 @@
 *     rgb dds files only -- TODO
 */

-#include "dds.h"
+#include "dds_p.h"

 #include <QtCore/QStringList>
 #include <QImage>
--- a/src/imageformats/dds_p.h
+++ b/src/imageformats/dds_p.h
--- a/src/imageformats/eps.cpp
+++ b/src/imageformats/eps.cpp
@ -6,7 +6,7 @@
 *
 * This library is distributed under the conditions of the GNU LGPL.
 */
-#include "eps.h"
+#include "eps_p.h"

 #include <QDebug>
 #include <QImage>
--- a/src/imageformats/eps_p.h
+++ b/src/imageformats/eps_p.h
--- a/src/imageformats/exr.cpp
+++ b/src/imageformats/exr.cpp
@ -7,7 +7,7 @@
 * This library is distributed under the conditions of the GNU LGPL.
 */

-#include "exr.h"
+#include "exr_p.h"

 #include <ImfRgbaFile.h>
 #include <ImfStandardAttributes.h>
--- a/src/imageformats/exr_p.h
+++ b/src/imageformats/exr_p.h
--- a/src/imageformats/gimp_p.h
+++ b/src/imageformats/gimp_p.h
--- a/src/imageformats/hdr.cpp
+++ b/src/imageformats/hdr.cpp
@ -8,7 +8,7 @@
   version 2 of the License, or (at your option) any later version.
 */

-#include "hdr.h"
+#include "hdr_p.h"

 #include <QImage>
 #include <QtCore/QDataStream>
--- a/src/imageformats/hdr_p.h
+++ b/src/imageformats/hdr_p.h
--- a/src/imageformats/jp2.cpp
+++ b/src/imageformats/jp2.cpp
@ -5,7 +5,7 @@
 * This library is distributed under the conditions of the GNU LGPL.
 */

-#include "jp2.h"
+#include "jp2_p.h"

 #include <config-jp2.h>

--- a/src/imageformats/jp2_p.h
+++ b/src/imageformats/jp2_p.h
--- a/src/imageformats/pcx.cpp
+++ b/src/imageformats/pcx.cpp
@ -7,7 +7,7 @@
   version 2 of the License, or (at your option) any later version.
 */

-#include "pcx.h"
+#include "pcx_p.h"

 #include <QColor>
 #include <QDataStream>
--- a/src/imageformats/pcx_p.h
+++ b/src/imageformats/pcx_p.h
--- a/src/imageformats/pic.cpp
+++ b/src/imageformats/pic.cpp
@ -25,7 +25,7 @@
 * with his permission.
 */

-#include "pic.h"
+#include "pic_p.h"

 #include <QDataStream>
 #include <QDebug>
--- a/src/imageformats/pic_p.h
+++ b/src/imageformats/pic_p.h
--- a/src/imageformats/psd.cpp
+++ b/src/imageformats/psd.cpp
@ -17,7 +17,7 @@
 *     not supported
 */

-#include "psd.h"
+#include "psd_p.h"

 #include <QImage>
 #include <QtCore/QDataStream>
--- a/src/imageformats/psd_p.h
+++ b/src/imageformats/psd_p.h
--- a/src/imageformats/ras.cpp
+++ b/src/imageformats/ras.cpp
@ -9,7 +9,7 @@
   version 2 of the License, or (at your option) any later version.
 */

-#include "ras.h"
+#include "ras_p.h"

 #include <QImage>
 #include <QtCore/QDataStream>
--- a/src/imageformats/ras_p.h
+++ b/src/imageformats/ras_p.h
--- a/src/imageformats/rgb.cpp
+++ b/src/imageformats/rgb.cpp
@ -21,7 +21,7 @@
 * saved by this filter.
 */

-#include "rgb.h"
+#include "rgb_p.h"

 #include <QtCore/QMap>
 #include <QtCore/QVector>
--- a/src/imageformats/rgb_p.h
+++ b/src/imageformats/rgb_p.h
--- a/src/imageformats/tga.cpp
+++ b/src/imageformats/tga.cpp
@ -18,7 +18,7 @@
 *     uncompressed true color tga files
 */

-#include "tga.h"
+#include "tga_p.h"

 #include <assert.h>

--- a/src/imageformats/tga_p.h
+++ b/src/imageformats/tga_p.h
--- a/src/imageformats/xcf.cpp
+++ b/src/imageformats/xcf.cpp
@ -19,7 +19,7 @@
 *
 */

-#include "xcf.h"
+#include "xcf_p.h"

 #include <stdlib.h>
 #include <QImage>
@ -29,7 +29,7 @@
 #include <QtCore/QVector>
 // #include <QDebug>

-#include "gimp.h"
+#include "gimp_p.h"

 const float INCHESPERMETER = (100.0f / 2.54f);

--- a/src/imageformats/xcf_p.h
+++ b/src/imageformats/xcf_p.h
Author	SHA1	Message	Date
l10n daemon script	8ffd5bb2f7	Upgrade ECM and KF5 version requirements for 5.4.0 release.	2014-10-31 20:17:43 +00:00
l10n daemon script	5ae66b99d9	Upgrade ECM and KF5 version requirements for 5.3.0 release.	2014-10-03 17:55:41 +00:00
l10n daemon script	f4bea644eb	Upgrade ECM and KF5 version requirements for 5.2.0 release.	2014-09-07 23:25:44 +00:00
Alex Merry	415850f3d3	Switch the brief descriptions around Put the shorter description in metainfo.yaml, and the longer one in README.md.	2014-08-15 18:41:16 +01:00
Denis Steckelmacher	af19f49711	Add metadata about the QMake and CMake packages installed by this framework and remove Links from README.md	2014-08-13 10:04:37 +02:00
Alex Merry	3d45b270ea	Disable the DDS and JPEG-2000 plugins when Qt version is 5.3 or later QtImageFormats 5.3 comes with DDS and JPEG-2000 plugins that support more options and are generally better than our plugins. The only advantage our plugins offer is that the Qt DDS plugin does not work on sequential devices, while ours does. This is outweighed by other improvements, though, such as supporting more variants. REVIEW: 119590	2014-08-04 22:50:37 +01:00
Alex Merry	c9ca1f1862	Rename headers to end with _p.h Frameworks have a convention of naming uninstalled headers in src/ with a _p at the end of the name, to make it clear they are not part of the API. None of the headers in KImageFormats are installed, so it is not really necessary to follow this convention, but we follow it anyway for the benefit of both humans and tools (like kapidox).	2014-08-03 18:08:49 +01:00
l10n daemon script	a96a255f71	Upgrade ECM and KF5 version requirements for 5.1.0 release.	2014-08-02 08:19:18 +00:00