| 1 |
radhermit 14/01/02 09:01:51 |
| 2 |
|
| 3 |
Added: graphicsmagick-1.3.19-flags.patch |
| 4 |
graphicsmagick-1.3.19-perl.patch |
| 5 |
graphicsmagick-1.3.19-freetype.patch |
| 6 |
Log: |
| 7 |
Version bump. Add webp use flag, fix perl bindings build issue (bug #456180, patch by Tiziano Müller), and fix generated config file flags (bug #479560). |
| 8 |
|
| 9 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: graphicsmagick-1.3.19-flags.patch |
| 18 |
=================================================================== |
| 19 |
Fix various preprocessor, compiler, and linker flags added to config wrappers. |
| 20 |
Previously they would add build time flags to the files which is incorrect. |
| 21 |
|
| 22 |
--- GraphicsMagick-1.3.19/configure.ac |
| 23 |
+++ GraphicsMagick-1.3.19/configure.ac |
| 24 |
@@ -346,6 +346,7 @@ |
| 25 |
|
| 26 |
AC_OPENMP([C]) |
| 27 |
CFLAGS="$OPENMP_CFLAGS $CFLAGS" |
| 28 |
+MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS" |
| 29 |
#CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS" |
| 30 |
#LDFLAGS="$LDFLAGS $OPENMP_CFLAGS" |
| 31 |
AC_SUBST(OPENMP_CFLAGS) |
| 32 |
@@ -3407,9 +3408,10 @@ |
| 33 |
MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'` |
| 34 |
#LIBS=`echo $LIBS | sed -e 's/ */ /g'` |
| 35 |
|
| 36 |
-MAGICK_API_CFLAGS=$CFLAGS |
| 37 |
+MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/ */ /g'` |
| 38 |
MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'` |
| 39 |
-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS" |
| 40 |
+MAGICK_API_CXXFLAGS="" |
| 41 |
+MAGICK_API_LDFLAGS="-L$LIB_DIR" |
| 42 |
MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS" |
| 43 |
MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS" |
| 44 |
|
| 45 |
@@ -3440,6 +3442,7 @@ |
| 46 |
|
| 47 |
AC_SUBST(MAGICK_API_CFLAGS) |
| 48 |
AC_SUBST(MAGICK_API_CPPFLAGS) |
| 49 |
+AC_SUBST(MAGICK_API_CXXFLAGS) |
| 50 |
AC_SUBST(MAGICK_API_PC_CPPFLAGS) |
| 51 |
AC_SUBST(MAGICK_API_LDFLAGS) |
| 52 |
AC_SUBST(MAGICK_API_LIBS) |
| 53 |
--- GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in |
| 54 |
+++ GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in |
| 55 |
@@ -30,7 +30,7 @@ |
| 56 |
echo @PACKAGE_VERSION@ |
| 57 |
;; |
| 58 |
--cflags) |
| 59 |
- echo '@CFLAGS@' |
| 60 |
+ echo '@MAGICK_API_CFLAGS@' |
| 61 |
;; |
| 62 |
--cppflags) |
| 63 |
echo '@MAGICK_API_CPPFLAGS@' |
| 64 |
--- GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in |
| 65 |
+++ GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in |
| 66 |
@@ -33,7 +33,7 @@ |
| 67 |
echo '@MAGICK_API_CPPFLAGS@' |
| 68 |
;; |
| 69 |
--cxxflags) |
| 70 |
- echo '@CXXFLAGS@' |
| 71 |
+ echo '@MAGICK_API_CXXFLAGS@' |
| 72 |
;; |
| 73 |
--ldflags) |
| 74 |
echo '@MAGICK_API_LDFLAGS@' |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.1 media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-perl.patch |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-perl.patch?rev=1.1&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-perl.patch?rev=1.1&content-type=text/plain |
| 82 |
|
| 83 |
Index: graphicsmagick-1.3.19-perl.patch |
| 84 |
=================================================================== |
| 85 |
Link perl bindings against built libraries instead of system libraries (bug #456180). |
| 86 |
|
| 87 |
--- GraphicsMagick-1.3.19/PerlMagick/Makefile.PL.in |
| 88 |
+++ GraphicsMagick-1.3.19/PerlMagick/Makefile.PL.in |
| 89 |
@@ -23,7 +23,7 @@ |
| 90 |
my $magick_BIN_DIR="$ENV{'DESTDIR'}@BIN_DIR@"; |
| 91 |
my $magick_DEP_LIBS='@MAGICK_DEP_LIBS@'; |
| 92 |
my $magick_PERLMAINCC='@PERLMAINCC@'; |
| 93 |
-my $magick_LIB_DIR="$ENV{'DESTDIR'}@MAGICKLIBDIR@"; |
| 94 |
+my $magick_LIB_DIR="../magick/.libs"; |
| 95 |
|
| 96 |
# Compute test specification |
| 97 |
my $delegate_tests='t/*.t'; |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.1 media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch?rev=1.1&view=markup |
| 104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch?rev=1.1&content-type=text/plain |
| 105 |
|
| 106 |
Index: graphicsmagick-1.3.19-freetype.patch |
| 107 |
=================================================================== |
| 108 |
https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940 |
| 109 |
|
| 110 |
--- GraphicsMagick-1.3.19/configure.ac |
| 111 |
+++ GraphicsMagick-1.3.19/configure.ac |
| 112 |
@@ -2283,8 +2284,8 @@ |
| 113 |
then |
| 114 |
freetype_prefix=`${freetype_config} --prefix` |
| 115 |
freetype_exec_prefix=`${freetype_config} --exec-prefix` |
| 116 |
- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib" |
| 117 |
- CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2" |
| 118 |
+ LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`" |
| 119 |
+ CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`" |
| 120 |
fi |
| 121 |
|
| 122 |
dnl First see if there is a library |
Archives