diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2005-08-02 11:42:33 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2005-08-02 11:42:33 +0000 |
| commit | 63d0089f78fdf83900a4c68f9d4ecdaec1420ed8 (patch) | |
| tree | 8856381563ca2b196e7508cd0e5dbc49ee95b830 | |
| parent | 4227b442c6698b4cc30aa2965bffd78577bacc0b (diff) | |
| download | gst-plugins-bad-63d0089f78fdf83900a4c68f9d4ecdaec1420ed8.tar.gz gst-plugins-bad-63d0089f78fdf83900a4c68f9d4ecdaec1420ed8.tar.bz2 gst-plugins-bad-63d0089f78fdf83900a4c68f9d4ecdaec1420ed8.zip | |
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...
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 |
3 files changed, 24 insertions, 4 deletions
@@ -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 7a1e22bc..21eb8c88 100644 --- 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 0bfa012c..e1c48692 100644 --- 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 |