[gentoo-commits] gentoo-x86 commit in media-gfx/digikam/files: digikam-2.0.0_rc-officialpgf2.patch digikam-2.0.0_rc-officialpgf.patch digikam-2.0.0_rc-oldpgf.patch

[Andreas HAttel (dilfridge)]

dilfridge    11/07/27 20:51:56

  Added:                digikam-2.0.0_rc-officialpgf2.patch
                        digikam-2.0.0_rc-officialpgf.patch
                        digikam-2.0.0_rc-oldpgf.patch
  Log:
  Version bump
  
  (Portage version: 2.1.10.7/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch?rev=1.1&content-type=text/plain

Index: digikam-2.0.0_rc-officialpgf2.patch
===================================================================
diff -ruN digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp
--- digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp	2011-06-28 16:38:45.000000000 +0200
+++ digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp	2011-07-05 13:50:20.036746353 +0200
@@ -29,6 +29,7 @@
 //#define ENABLE_DEBUG_MESSAGES
 
 #include "pgfloader.h"
+#include "config-digikam.h"
 
 // C Ansi includes
 
@@ -435,10 +436,8 @@
                          CallbackForLibPGF, this);
 
         UINT32 nWrittenBytes = 0;
-#ifdef PGFCodecVersionID
-#   if PGFCodecVersionID >= 0x061124
+#if PGFCodecVersionID >= 0x061124
         pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this);
-#   endif
 #else
         pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this);
 #endif



1.1                  media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch?rev=1.1&content-type=text/plain

Index: digikam-2.0.0_rc-officialpgf.patch
===================================================================
diff -ruN digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake
--- digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake	2011-06-28 16:38:50.000000000 +0200
+++ digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake	2011-07-04 15:32:50.000000000 +0200
@@ -1,9 +1,10 @@
 # - Try to find libpgf
 # Once done this will define
 #
-#  PGF_FOUND - system has libgf
-#  PGF_INCLUDE_DIRS - the libpgf include directory
-#  PGF_LIBRARIES - Link these to use libpgf
+#  PGF_FOUND            - system has libgf
+#  PGF_INCLUDE_DIRS     - the libpgf include directory
+#  PGF_LIBRARIES        - Link these to use libpgf
+#  PGF_CODEC_VERSION_ID - PGF codec version ID.
 
 # PKG-CONFIG is required.
 INCLUDE(FindPkgConfig REQUIRED)
@@ -12,4 +13,15 @@
 	INCLUDE(FindPkgConfig)
 
 	PKG_CHECK_MODULES(PGF libpgf)
+
+	MESSAGE(STATUS "PGF_INCLUDE_DIRS     = ${PGF_INCLUDE_DIRS}")
+	MESSAGE(STATUS "PGF_INCLUDEDIR       = ${PGF_INCLUDEDIR}")
+	MESSAGE(STATUS "PGF_LIBRARIES        = ${PGF_LIBRARIES}")
+	MESSAGE(STATUS "PGF_LDFLAGS          = ${PGF_LDFLAGS}")
+	MESSAGE(STATUS "PGF_CFLAGS           = ${PGF_CFLAGS}")
+	MESSAGE(STATUS "PGF_VERSION          = ${PGF_VERSION}")
+
+	STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}")
+	MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}")
+
 ENDIF(PKG_CONFIG_FOUND)
diff -ruN digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake
--- digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake	2011-06-28 16:38:50.000000000 +0200
+++ digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake	2011-07-04 15:29:24.000000000 +0200
@@ -57,6 +57,8 @@
 /* Define to 1 if we know how to start mysqld */
 #cmakedefine HAVE_INTERNALMYSQL 1
 
+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
+
 #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
 
 /*
diff -ruN digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp
--- digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp	2011-06-28 16:38:44.000000000 +0200
+++ digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp	2011-07-04 15:29:24.000000000 +0200
@@ -46,6 +46,7 @@
 // LibPGF includes
 
 #include "PGFimage.h"
+#include "config-digikam.h"
 
 namespace Digikam
 {



1.1                  media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch?rev=1.1&content-type=text/plain

Index: digikam-2.0.0_rc-oldpgf.patch
===================================================================
commit 1f80f35b68702136ebd3d315fe4baf7d75b3c142
Author: Gilles Caulier <caulier.gilles@×××××.com>
Date:   Sun Jul 3 10:57:21 2011 +0200

    compile with libpgf 6.09.44
    BUGS: 276969

diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp
index 2b5829f..758f12c 100644
--- a/libs/threadimageio/pgfutils.cpp
+++ b/libs/threadimageio/pgfutils.cpp
@@ -151,7 +151,14 @@ bool writePGFImageData(const QImage& img, QByteArray& data, int quality)
         // TODO : optimize memory allocation...
         CPGFMemoryStream stream(256000);
         UINT32 nWrittenBytes = 0;
+
+#ifdef PGFCodecVersionID
+#   if PGFCodecVersionID >= 0x061124
         pgfImg.Write(&stream, &nWrittenBytes);
+#   endif
+#else
+        pgfImg.Write(&stream, 0, 0, &nWrittenBytes);
+#endif
 
         data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes);