Control: tag -1 patch Control: user ubuntu-de...@lists.ubuntu.com Control: usertag -1 ubuntu-patch vivid
On Fri, Sep 12, 2014 at 01:14:47PM +0200, Markus Koschany wrote: > On Mon, 12 May 2014 21:33:52 +0000 bastien ROUCARIES > <roucaries.bast...@gmail.com> wrote: > > Please allow libtuxcap to compile with newer imagemagick. > > > > I have a patch to test but due to cmake bug I could not yet test. > > Hi, > > I have just tested your patch. Unfortunately libtuxcap still FTBFS in > the configure step. Here's a simpler patch that gets the job done. I effectively replaced the existing cmake_imagemagick.patch rather than creating too much patch-on-patch spaghetti there. * Use pkg-config to get ImageMagick build flags. diff -u libtuxcap-1.4.0.dfsg2/debian/patches/cmake_imagemagick.patch libtuxcap-1.4.0.dfsg2/debian/patches/cmake_imagemagick.patch --- libtuxcap-1.4.0.dfsg2/debian/patches/cmake_imagemagick.patch +++ libtuxcap-1.4.0.dfsg2/debian/patches/cmake_imagemagick.patch @@ -1,19 +1,56 @@ -Description: cmake's ImageMagick module seems to have changed and now looks - for the executables, while we only need the libs here +Description: Use pkg-config to get ImageMagick build flags Origin: vendor -Bug-Debian: http://bugs.debian.org/674369 +Bug-Debian: https://bugs.debian.org/747908 Forwarded: no -Author: gregor herrmann <gre...@debian.org> -Last-Update: 2012-06-07 +Author: Colin Watson <cjwat...@ubuntu.com> +Last-Update: 2014-10-31 +Index: b/tuxcap/CMakeLists.txt +=================================================================== --- a/tuxcap/CMakeLists.txt +++ b/tuxcap/CMakeLists.txt -@@ -16,7 +16,7 @@ +@@ -16,10 +16,10 @@ Find_Package ( SDL REQUIRED ) Find_Package ( SDL_mixer REQUIRED ) -Find_Package ( ImageMagick REQUIRED ) -+Find_Package ( ImageMagick COMPONENTS Magick++ MagickWand MagickCore REQUIRED ) Find_Package ( OpenGL REQUIRED ) - FIND_PACKAGE(ImageMagickLib) +-FIND_PACKAGE(ImageMagickLib) ++FIND_PACKAGE(PkgConfig REQUIRED) ++PKG_CHECK_MODULES(IMAGEMAGICK REQUIRED Magick++ MagickWand MagickCore) + + FIND_PACKAGE(AudiereLib) + IF(AUDIERELIB_FOUND) +@@ -31,8 +31,7 @@ + ${SDL_LIBRARY} + ${SDLMIXER_LIBRARY} + ${OPENGL_LIBRARIES} +- ${IMAGEMAGICKLIB_LIBRARIES} +- ${IMAGEMAGICKLIB_CXX_LIBRARIES} ++ ${IMAGEMAGICK_LIBRARIES} + ) + + IF (PYTHON_LIBRARIES) +@@ -76,11 +75,7 @@ + MESSAGE(FATAL_ERROR "libSDL requested but not found.") + ENDIF(SDL_FOUND) + +-IF(IMAGEMAGICKLIB_FOUND) +-MESSAGE("lib ImageMagick found. ${IMAGEMAGICKLIB_INCLUDE_DIR} ${IMAGEMAGICKLIB_LIBRARIES} ${IMAGEMAGICKLIB_CXX_LIBRARIES}") +-ELSE(IMAGEMAGICKLIB_FOUND) +-MESSAGE(FATAL_ERROR "lib ImageMagick requested but not found.") +-ENDIF(IMAGEMAGICKLIB_FOUND) ++MESSAGE("lib ImageMagick found. ${IMAGEMAGICK_INCLUDE_DIRS} ${IMAGEMAGICK_LIBRARIES}") + + IF(SDLMIXER_FOUND) + MESSAGE("libSDL_mixer found. ${SDLMIXER_INCLUDE_DIR} ${SDLMIXER_LIBRARY}") +@@ -96,7 +91,7 @@ + + SET ( MY_INCLUDE_DIRS + #/usr/include/swfdec-0.5 /usr/include/glib-2.0 /usr/lib/glib-2.0/include +-{SDL_INCLUDE_DIR} ${IMAGEMAGICKLIB_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ) ++{SDL_INCLUDE_DIR} ${IMAGEMAGICK_INCLUDE_DIRS} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ) + IF(AUDIERELIB_FOUND) + SET ( MY_INCLUDE_DIRS ${MY_INCLUDE_DIRS} ${AUDIERELIB_INCLUDE_DIR} ) + ENDIF(AUDIERELIB_FOUND) Thanks, -- Colin Watson [cjwat...@ubuntu.com] -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
