File gpac-0.5.0-libpng15.patch of Package gpac

File gpac-0.5.0-libpng15.patch of Package gpac (Revision 4)

Currently displaying revision 4 , Show latest

Index: gpac-0.5.0.svn4668/configure
===================================================================
--- gpac-0.5.0.svn4668.orig/configure
+++ gpac-0.5.0.svn4668/configure
@@ -1150,12 +1150,12 @@ EOF
 
 if test "$cross_prefix" = "" ; then
     png_cflags="-I$prefix/include"
-    png_lflags="-L$prefix/lib -lpng -lz"
+    png_lflags="-L$prefix/lib -lpng15 -lz"
     #-nostdlib prevents from searching standard compiler libraries
     #if $cc -o $TMPO $TMPC -nostdlib $png_cflags $png_lflags 2> /dev/null  ; then
     if $cc -o $TMPO $TMPC $png_cflags $png_lflags $LDFLAGS 2> /dev/null  ; then
         has_png="system"
-    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng -lz 2> /dev/null  ; then
+    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng15 -lz 2> /dev/null  ; then
         has_png="system"
     elif test "$alt_macosx_dir" != "" ; then
         if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2> /dev/null ; then
@@ -1164,7 +1164,7 @@ if test "$cross_prefix" = "" ; then
     fi
 fi
 if test "$has_png" = "no" ; then
-    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng 2> /dev/null  ; then
+    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng15 2> /dev/null  ; then
         has_png="local"
     fi
 fi
Index: gpac-0.5.0.svn4668/src/Makefile
===================================================================
--- gpac-0.5.0.svn4668.orig/src/Makefile
+++ gpac-0.5.0.svn4668/src/Makefile
@@ -495,7 +495,7 @@ endif
 #5 - PNG support
 ifeq ($(CONFIG_PNG), no)
 else
-LINKLIBS+= -lpng
+LINKLIBS+= -lpng15
 ifeq ($(CONFIG_PNG), local)
 NEED_LOCAL_LIB="yes"
 MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
Index: gpac-0.5.0.svn4668/src/media_tools/img.c
===================================================================
--- gpac-0.5.0.svn4668.orig/src/media_tools/img.c
+++ gpac-0.5.0.svn4668/src/media_tools/img.c
@@ -33,7 +33,7 @@
 #endif
 
 /*include png.h before setjmp.h, otherwise we get compilation errors*/
-#include <png.h>
+#include <libpng15/png.h>
 
 #endif /*GPAC_HAS_PNG*/