diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-30 16:55:12 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-30 16:55:12 +0200 |
| commit | aa010704b0bb609d29aa747321b3967f0c5abf50 (patch) | |
| tree | 2441cd1e0ff2026e391323722c69200e76763888 /package/sdl-image/patches/patch-configure_in | |
| parent | e9b04bc4f7f8e8cc8eb4932a85a15727ef6d1d32 (diff) | |
update sdl and sdl-image
be sure to link sdl-image to provided libpng, otherwise
TexturePacker in XBMC build will silently fail to pack the
png icons.
Diffstat (limited to 'package/sdl-image/patches/patch-configure_in')
| -rw-r--r-- | package/sdl-image/patches/patch-configure_in | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/package/sdl-image/patches/patch-configure_in b/package/sdl-image/patches/patch-configure_in new file mode 100644 index 000000000..caad9fb54 --- /dev/null +++ b/package/sdl-image/patches/patch-configure_in @@ -0,0 +1,44 @@ +--- SDL_image-1.2.12.orig/configure.in 2012-01-21 02:51:33.000000000 +0100 ++++ SDL_image-1.2.12/configure.in 2014-06-30 16:37:34.153488935 +0200 +@@ -202,27 +202,6 @@ if test "x$enable_png" = xyes; then + ]) + if test x$have_png_hdr = xyes -a x$have_png_lib = xyes; then + AC_DEFINE([LOAD_PNG]) +- +- case "$host" in +- *-*-darwin*) +- png_lib=[`find_lib libpng.dylib`] +- ;; +- *-*-cygwin* | *-*-mingw32*) +- png_lib=[`find_lib "libpng*.dll"`] +- ;; +- *) +- png_lib=[`find_lib "libpng.so.[0-9]"`] +- if test x$png_lib = x; then +- png_lib=[`find_lib "libpng.so.[0-9]*"`] +- fi +- if test x$png_lib = x; then +- png_lib=[`find_lib "libpng*.so.[0-9]"`] +- fi +- if test x$png_lib = x; then +- png_lib=[`find_lib "libpng*.so.[0-9]*"`] +- fi +- ;; +- esac + else + AC_MSG_WARN([*** Unable to find PNG library (http://www.libpng.org/pub/png/libpng.html)]) + AC_MSG_WARN([PNG image loading disabled]) +@@ -359,12 +338,7 @@ if test x$enable_jpg = xyes -a x$have_jp + fi + fi + if test x$enable_png = xyes -a x$have_png_hdr = xyes -a x$have_png_lib = xyes; then +- if test x$enable_png_shared = xyes && test x$png_lib != x; then +- echo "-- dynamic libpng -> $png_lib" +- AC_DEFINE_UNQUOTED(LOAD_PNG_DYNAMIC, "$png_lib") +- else +- IMG_LIBS="-lpng -lz $IMG_LIBS" +- fi ++ IMG_LIBS="-lpng -lz $IMG_LIBS" + fi + + LIBS="$saved_LIBS" |