diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-12-19 13:06:14 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-12-19 13:06:14 +0000 |
| commit | dc8a7d8e311a7f49910cb9f4906d2921cdef90e1 (patch) | |
| tree | c9e84c4547161167da7a0ada3a5c67a0ea55c8fd /media-libs/xine-lib/files | |
| parent | Fix build with forced asneeded, bug #247916, honour CC and CFLAGS, bug #24084... (diff) | |
| download | gentoo-2-dc8a7d8e311a7f49910cb9f4906d2921cdef90e1.tar.gz gentoo-2-dc8a7d8e311a7f49910cb9f4906d2921cdef90e1.tar.bz2 gentoo-2-dc8a7d8e311a7f49910cb9f4906d2921cdef90e1.zip | |
Fix build with latest imagemagick, by Robin H. Johnson <robbat2@gentoo.org>
Bug #247292
(Portage version: 2.2_rc17/cvs/Linux 2.6.27.8 x86_64)
Diffstat (limited to 'media-libs/xine-lib/files')
| -rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch new file mode 100644 index 000000000000..c1c572dc72b3 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch @@ -0,0 +1,25 @@ +Upstream ImageMagick changed part of the API and did not updated their +deprecated support stuff, so bump us along for now to avoid having to downgrade. + +Gentoo-bug: 247292 +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Nuar --exclude '*~' xine-lib-1.1.15.orig/src/libxinevdec/image.c xine-lib-1.1.15/src/libxinevdec/image.c +--- xine-lib-1.1.15.orig/src/libxinevdec/image.c 2008-06-14 16:15:00.000000000 -0700 ++++ xine-lib-1.1.15/src/libxinevdec/image.c 2008-11-26 18:10:16.416309036 -0800 +@@ -110,7 +110,15 @@ + width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */ + height = MagickGetImageHeight(wand); + img_buf = malloc(width * height * 3); ++/* In 6.4.5.4 MagickGetImagePixels changed to MagickGetAuthenticPixels ++ * But upstream did not update their deprecated compat stuff. ++ * So do a fun hack to make it work. ++ * - 2008/11/26 Robin H. Johnson <robbat2@gentoo.org> ++ */ ++#if MagickLibVersion >= 0x645 ++#define MagickGetImagePixels MagickGetAuthenticPixels ++#endif + MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf); + DestroyMagickWand(wand); + + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width); |