Ported pngenc , still have to port pngdec...

Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
* ext/libpng/Makefile.am:
* ext/libpng/gstpng.c:
* ext/libpng/gstpngenc.c:
Ported pngenc , still have to port pngdec...

diff --git a/ChangeLog b/ChangeLog
index b92e0e7..7a3160f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-02  Edward Hervey  <edward@fluendo.com>
+
+       * configure.ac:
+       * ext/Makefile.am:
+       * ext/libpng/Makefile.am:
+       * ext/libpng/gstpng.c:
+       * ext/libpng/gstpngenc.c:
+       Ported pngenc , still have to port pngdec...
+
 2005-08-01  Stefan Kost  <ensonic@users.sf.net>
 
        reviewed by: <delete if not using a buddy>

diff --git a/configure.ac b/configure.ac
index 7a1e22b..21eb8c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -519,6 +519,16 @@ GST_CHECK_FEATURE(ESD, [esound plug-ins], esdsink, [
   ])
 ])
 
+dnl *** libpng ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true)
+GST_CHECK_FEATURE(LIBPNG, [libpng PNG encoder], pngenc, [
+  PKG_CHECK_MODULES(LIBPNG, libpng12, HAVE_LIBPNG="yes", HAVE_LIBPNG="no")
+  AC_SUBST(LIBPNG_CFLAGS)
+  AC_SUBST(LIBPNG_LIBS)
+])
+
+
+
 dnl also add builddir include for enumtypes and marshal
 GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_ERROR"
 
@@ -600,6 +610,7 @@ ext/aalib/Makefile
 ext/dv/Makefile
 ext/gconf/Makefile
 ext/libcaca/Makefile
+ext/libpng/Makefile
 ext/mad/Makefile
 ext/raw1394/Makefile
 ext/shout2/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 0bfa012..e1c4869 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -208,11 +208,11 @@ LIBFAME_DIR=
 LIBMNG_DIR=
 # endif
 
-# if USE_LIBPNG
-# LIBPNG_DIR=libpng
-# else
+if USE_LIBPNG
+LIBPNG_DIR=libpng
+else
 LIBPNG_DIR=
-# endif
+endif
 
 # if USE_POLYP
 # POLYP_DIR=polyp