From: David I. L. <dl...@us...> - 2002-07-05 08:39:45
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: dlehn Date: Fri Jul 05 2002 01:39:44 PDT Branch: BRANCH-RELEASE-0_4_0 Log message: fixup libdv and maybe rtp too Modified files: . : configure.ac ext : Makefile.am ext/dv : Makefile.am Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/configure.ac.diff?r1=1.166.2.5&r2=1.166.2.6 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/Makefile.am.diff?r1=1.49.2.1&r2=1.49.2.2 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/dv/Makefile.am.diff?r1=1.8.2.1&r2=1.8.2.2 ====Begin Diffs==== Index: configure.ac =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/configure.ac,v retrieving revision 1.166.2.5 retrieving revision 1.166.2.6 diff -u -d -r1.166.2.5 -r1.166.2.6 --- configure.ac 4 Jul 2002 20:21:12 -0000 1.166.2.5 +++ configure.ac 5 Jul 2002 08:39:31 -0000 1.166.2.6 @@ -405,11 +405,14 @@ dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_interface ) dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no) -dnl *** dv *** -translit(dnm, m, l) AM_CONDITIONAL(USE_DV, true) -GST_CHECK_FEATURE(DV, [dv library], dv, [ - AM_PATH_LIBDV(HAVE_DV=yes, HAVE_DV=no) - AC_SUBST(DV_LIBS) +dnl *** libdv *** +translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true) +GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [ + dnl use this when gtk deps are removed from its pkg-config .pc + dnl PKG_CHECK_MODULES(LIBDV, libdv, HAVE_LIBDV="yes", HAVE_LIBDV="no") + AM_PATH_LIBDV(HAVE_LIBDV="yes", HAVE_LIBDV="no") + AC_SUBST(LIBDV_CFLAGS) + AC_SUBST(LIBDV_LIBS) ]) dnl *** dvdread *** @@ -541,14 +544,6 @@ AC_SUBST(LCS_LIBS) ]) -dnl *** libdv *** -translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true) -GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [ - PKG_CHECK_MODULES(LIBDV, libdv, HAVE_LIBDV="yes", HAVE_LIBDV="no") - AC_SUBST(LIBDV_CFLAGS) - AC_SUBST(LIBDV_LIBS) -]) - dnl *** libfame *** translit(dnm, m, l) AM_CONDITIONAL(USE_LIBFAME, true) GST_CHECK_FEATURE(LIBFAME, [libfame MPEG1/4 encoder], libfame, [ @@ -613,8 +608,8 @@ dnl FIXME : adapt and make it work translit(dnm, m, l) AM_CONDITIONAL(USE_RTP, true) GST_CHECK_FEATURE(RTP, [RTP library], rtpenc rtpdec,[ - AC_CHECK_LIB(rtp, rtp_packet_new_take_data, HAVE_RTP=yes, HAVE_RTP=no, $GST_CFLAGS $GST_LIBS) - RTP_LIBS="-lrtp" + AC_CHECK_LIB(ortp, ortp_init, HAVE_RTP=yes, HAVE_RTP=no, $GST_CFLAGS $GST_LIBS) + RTP_LIBS="-lortp" AC_SUBST(RTP_LIBS) ]) Index: Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/ext/Makefile.am,v retrieving revision 1.49.2.1 retrieving revision 1.49.2.2 diff -u -d -r1.49.2.1 -r1.49.2.2 --- Makefile.am 5 Jul 2002 08:17:12 -0000 1.49.2.1 +++ Makefile.am 5 Jul 2002 08:39:31 -0000 1.49.2.2 @@ -46,10 +46,10 @@ CDPARANOIA_DIR= endif -if USE_DV -DV_DIR=dv +if USE_LIBDV +LIBDV_DIR=dv else -DV_DIR= +LIBDV_DIR= endif if USE_DVDREAD Index: Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/ext/dv/Makefile.am,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -d -r1.8.2.1 -r1.8.2.2 --- Makefile.am 5 Jul 2002 08:17:14 -0000 1.8.2.1 +++ Makefile.am 5 Jul 2002 08:39:32 -0000 1.8.2.2 @@ -3,8 +3,8 @@ plugin_LTLIBRARIES = libgstdvdec.la libgstdvdec_la_SOURCES = gstdvdec.c -libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(DV_CFLAGS) -libgstdvdec_la_LIBADD = $(DV_LIBS) +libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(LIBDV_CFLAGS) +libgstdvdec_la_LIBADD = $(LIBDV_LIBS) libgstdvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstdvdec.h |