Author: miriam Date: 2016-07-06 17:49:30 +0000 (Wed, 06 Jul 2016) New Revision: 15829
Added: packages/trunk/libtuxcap/debian/patches/cmake_imagemagick.patch Modified: packages/trunk/libtuxcap/debian/changelog packages/trunk/libtuxcap/debian/control packages/trunk/libtuxcap/debian/patches/series Log: Synchronized repo version with package in the archive: libtuxcap_1.4.0.dfsg2-2.2 Modified: packages/trunk/libtuxcap/debian/changelog =================================================================== --- packages/trunk/libtuxcap/debian/changelog 2016-06-30 15:48:29 UTC (rev 15828) +++ packages/trunk/libtuxcap/debian/changelog 2016-07-06 17:49:30 UTC (rev 15829) @@ -1,9 +1,19 @@ -libtuxcap (1.4.0.dfsg2-3) UNRELEASED; urgency=low +libtuxcap (1.4.0.dfsg2-2.2) unstable; urgency=medium - * Correct Vcs-* URLs to point to anonscm.debian.org + * Non-maintainer upload. + * Use pkg-config to get ImageMagick build flags (closes: #747908). - -- Evgeni Golov <[email protected]> Mon, 15 Jul 2013 22:21:41 +0200 + -- Colin Watson <[email protected]> Thu, 06 Nov 2014 10:16:34 +0000 +libtuxcap (1.4.0.dfsg2-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: Could NOT find ImageMagick": + add patch to deal with cmake's ImageMagick module changes + (Closes: #674369) + + -- gregor herrmann <[email protected]> Thu, 07 Jun 2012 16:14:22 +0200 + libtuxcap (1.4.0.dfsg2-2) unstable; urgency=low * Team upload. Modified: packages/trunk/libtuxcap/debian/control =================================================================== --- packages/trunk/libtuxcap/debian/control 2016-06-30 15:48:29 UTC (rev 15828) +++ packages/trunk/libtuxcap/debian/control 2016-07-06 17:49:30 UTC (rev 15829) @@ -8,8 +8,8 @@ Standards-Version: 3.9.2 Section: libs Homepage: http://tuxcap.sourceforge.net/ -Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/libtuxcap/ -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/libtuxcap/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/libtuxcap/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/libtuxcap/?op=log Package: libtuxcap-dev Section: libdevel Added: packages/trunk/libtuxcap/debian/patches/cmake_imagemagick.patch =================================================================== --- packages/trunk/libtuxcap/debian/patches/cmake_imagemagick.patch (rev 0) +++ packages/trunk/libtuxcap/debian/patches/cmake_imagemagick.patch 2016-07-06 17:49:30 UTC (rev 15829) @@ -0,0 +1,56 @@ +Description: Use pkg-config to get ImageMagick build flags +Origin: vendor +Bug-Debian: https://bugs.debian.org/747908 +Forwarded: no +Author: Colin Watson <[email protected]> +Last-Update: 2014-10-31 + +Index: b/tuxcap/CMakeLists.txt +=================================================================== +--- a/tuxcap/CMakeLists.txt ++++ b/tuxcap/CMakeLists.txt +@@ -16,10 +16,10 @@ + + Find_Package ( SDL REQUIRED ) + Find_Package ( SDL_mixer REQUIRED ) +-Find_Package ( ImageMagick REQUIRED ) + Find_Package ( OpenGL REQUIRED ) + +-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) Modified: packages/trunk/libtuxcap/debian/patches/series =================================================================== --- packages/trunk/libtuxcap/debian/patches/series 2016-06-30 15:48:29 UTC (rev 15828) +++ packages/trunk/libtuxcap/debian/patches/series 2016-07-06 17:49:30 UTC (rev 15829) @@ -4,3 +4,4 @@ abs_dirs.patch includes.patch kfreebsd.patch +cmake_imagemagick.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
