| 1 |
dilfridge 11/07/05 11:39:35 |
| 2 |
|
| 3 |
Added: digikam-1.9.0-newpgf.patch |
| 4 |
Log: |
| 5 |
Include build fix for media-libs/libpgf-6.11.24, bug 373893 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/digikam/files/digikam-1.9.0-newpgf.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: digikam-1.9.0-newpgf.patch |
| 16 |
=================================================================== |
| 17 |
diff -ruN digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake digikam-1.9.0/cmake/modules/FindPGF.cmake |
| 18 |
--- digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake 2011-02-27 19:58:23.000000000 +0100 |
| 19 |
+++ digikam-1.9.0/cmake/modules/FindPGF.cmake 2011-07-05 12:03:41.000000000 +0200 |
| 20 |
@@ -1,9 +1,10 @@ |
| 21 |
# - Try to find libpgf |
| 22 |
# Once done this will define |
| 23 |
# |
| 24 |
-# PGF_FOUND - system has libgf |
| 25 |
-# PGF_INCLUDE_DIRS - the libpgf include directory |
| 26 |
-# PGF_LIBRARIES - Link these to use libpgf |
| 27 |
+# PGF_FOUND - system has libgf |
| 28 |
+# PGF_INCLUDE_DIRS - the libpgf include directory |
| 29 |
+# PGF_LIBRARIES - Link these to use libpgf |
| 30 |
+# PGF_CODEC_VERSION_ID - PGF codec version ID. |
| 31 |
|
| 32 |
# PKG-CONFIG is required. |
| 33 |
INCLUDE(FindPkgConfig REQUIRED) |
| 34 |
@@ -12,4 +13,15 @@ |
| 35 |
INCLUDE(FindPkgConfig) |
| 36 |
|
| 37 |
PKG_CHECK_MODULES(PGF libpgf) |
| 38 |
+ |
| 39 |
+ MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}") |
| 40 |
+ MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}") |
| 41 |
+ MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}") |
| 42 |
+ MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}") |
| 43 |
+ MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}") |
| 44 |
+ MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}") |
| 45 |
+ |
| 46 |
+ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}") |
| 47 |
+ MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}") |
| 48 |
+ |
| 49 |
ENDIF(PKG_CONFIG_FOUND) |
| 50 |
diff -ruN digikam-1.9.0.prepared/config-digikam.h.cmake digikam-1.9.0/config-digikam.h.cmake |
| 51 |
--- digikam-1.9.0.prepared/config-digikam.h.cmake 2011-02-27 19:58:07.000000000 +0100 |
| 52 |
+++ digikam-1.9.0/config-digikam.h.cmake 2011-07-05 12:05:59.000000000 +0200 |
| 53 |
@@ -54,6 +54,8 @@ |
| 54 |
/* Define to 1 if you have Nepomuk shared libraries installed */ |
| 55 |
#cmakedefine HAVE_NEPOMUK 1 |
| 56 |
|
| 57 |
+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID} |
| 58 |
+ |
| 59 |
#define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" |
| 60 |
|
| 61 |
#endif /* CONFIG_DIGIKAM_H */ |
| 62 |
diff -ruN digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp |
| 63 |
--- digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp 2011-02-27 19:58:08.000000000 +0100 |
| 64 |
+++ digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp 2011-07-05 12:22:56.000000000 +0200 |
| 65 |
@@ -29,6 +29,7 @@ |
| 66 |
//#define ENABLE_DEBUG_MESSAGES |
| 67 |
|
| 68 |
#include "pgfloader.h" |
| 69 |
+#include "config-digikam.h" |
| 70 |
|
| 71 |
// C Ansi includes |
| 72 |
|
| 73 |
@@ -435,7 +436,11 @@ |
| 74 |
CallbackForLibPGF, this); |
| 75 |
|
| 76 |
UINT32 nWrittenBytes = 0; |
| 77 |
+#if PGFCodecVersionID >= 0x061124 |
| 78 |
+ pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this); |
| 79 |
+#else |
| 80 |
pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this); |
| 81 |
+#endif |
| 82 |
|
| 83 |
#ifdef ENABLE_DEBUG_MESSAGES |
| 84 |
kDebug() << "PGF width = " << header.width; |
| 85 |
diff -ruN digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp digikam-1.9.0/libs/threadimageio/pgfutils.cpp |
| 86 |
--- digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp 2011-02-27 19:58:07.000000000 +0100 |
| 87 |
+++ digikam-1.9.0/libs/threadimageio/pgfutils.cpp 2011-07-05 12:19:15.000000000 +0200 |
| 88 |
@@ -46,6 +46,7 @@ |
| 89 |
// LibPGF includes |
| 90 |
|
| 91 |
#include "PGFimage.h" |
| 92 |
+#include "config-digikam.h" |
| 93 |
|
| 94 |
namespace Digikam |
| 95 |
{ |
| 96 |
@@ -136,7 +137,12 @@ |
| 97 |
// TODO : optimize memory allocation... |
| 98 |
CPGFMemoryStream stream(256000); |
| 99 |
UINT32 nWrittenBytes = 0; |
| 100 |
+ |
| 101 |
+#if PGFCodecVersionID >= 0x061124 |
| 102 |
+ pgfImg.Write(&stream, &nWrittenBytes); |
| 103 |
+#else |
| 104 |
pgfImg.Write(&stream, 0, NULL, &nWrittenBytes); |
| 105 |
+#endif |
| 106 |
|
| 107 |
data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes); |
| 108 |
} |
Archives