diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-18 08:26:17 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-22 00:01:56 +0200 |
| commit | d7363984b83c938db6f0a16ca8732bed69ca8acb (patch) | |
| tree | 5f0e3968f74fb08eb5d78cbaf196dbaeeffb156c /meta-oe/recipes-graphics/gegl | |
| parent | 8dc1763bac8c42bb2d3f920ad2095d5467eebbf0 (diff) | |
| download | meta-openembedded-contrib-d7363984b83c938db6f0a16ca8732bed69ca8acb.tar.gz | |
gegl: Use pkg-config for SDL
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-oe/recipes-graphics/gegl')
| -rw-r--r-- | meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch | 21 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb | 3 |
2 files changed, 23 insertions, 1 deletions
diff --git a/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch b/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch new file mode 100644 index 0000000000..d145b625f6 --- /dev/null +++ b/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch @@ -0,0 +1,21 @@ +Index: gegl-0.2.0/configure.ac +=================================================================== +--- gegl-0.2.0.orig/configure.ac 2012-04-02 21:56:49.000000000 +0000 ++++ gegl-0.2.0/configure.ac 2014-07-17 21:34:15.312546602 +0000 +@@ -765,15 +765,7 @@ + + have_sdl="no" + if test "x$with_sdl" != "xno"; then +- AC_PATH_PROG(SDL_CONFIG, sdl-config, no) +- if test "$SDL_CONFIG" = "no"; then +- have_sdl="no (SDL library not found)" +- AC_MSG_RESULT([*** Check for SDL library failed.]) +- else +- have_sdl="yes" +- SDL_CFLAGS=`$SDL_CONFIG --cflags` +- SDL_LIBS=`$SDL_CONFIG --libs` +- fi ++ PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no (SDL library not found)"]) + fi + + AM_CONDITIONAL(HAVE_SDL, test "$have_sdl" = "yes") diff --git a/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb b/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb index 849fe9fed8..58103f61bd 100644 --- a/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb +++ b/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb @@ -11,7 +11,8 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper" PACKAGECONFIG[avformat] = "--with-libavformat,--without-libavformat,libav" -SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.2/${BP}.tar.bz2" +SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.2/${BP}.tar.bz2 \ + file://pkgconfig.patch " SRC_URI[md5sum] = "32b00002f1f1e316115c4ed922e1dec8" SRC_URI[sha256sum] = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426" |