This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 1d004424d902dbe3d85026ef44fe0cf8b7164265 Author: Tobias Hansen <[email protected]> Date: Sat Mar 14 17:05:41 2015 +0100 Add patch to find libpixman. --- debian/control | 1 + debian/patches/find_libpixman.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 22 insertions(+) diff --git a/debian/control b/debian/control index ac0605f..c8407e7 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Debian Games Team <[email protected]> Uploaders: Tobias Hansen <[email protected]> Build-Depends: debhelper (>= 9), cmake, + pkg-config, libpng-dev, libgif-dev, libjpeg-dev, diff --git a/debian/patches/find_libpixman.patch b/debian/patches/find_libpixman.patch new file mode 100644 index 0000000..1ac9157 --- /dev/null +++ b/debian/patches/find_libpixman.patch @@ -0,0 +1,20 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -120,11 +120,12 @@ + endif() + + if(USE_SHARED_PIXMAN) +- find_library(LIBPIXMAN_LIBRARY NAMES pixman) +- find_path(LIBPIXMAN_INCLUDE_DIR NAMES pixman.h) +- +- set(libs3rdparty ${libs3rdparty} ${LIBPIXMAN_LIBRARY}) +- include_directories(${LIBPIXMAN_INCLUDE_DIR}) ++ find_package(PkgConfig) ++ pkg_check_modules(PIXMAN pixman-1) ++ if(PIXMAN_FOUND) ++ set(libs3rdparty ${libs3rdparty} ${PIXMAN_LIBRARIES}) ++ include_directories(${PIXMAN_INCLUDE_DIRS}) ++ endif(PIXMAN_FOUND) + else() + set(libs3rdparty ${libs3rdparty} pixman) + include_directories(${PIXMAN_DIR}/pixman) diff --git a/debian/patches/series b/debian/patches/series index e8007c0..4a3dd2e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ fix-unittests.patch disable-file-and-gif-tests.patch disable-resize_image_tests.patch resizing_from_options_gui.patch +find_libpixman.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
