[libdv-cvs] CVS: libdv ChangeLog,1.55,1.56 configure.ac,1.6,1.7 libdv.pc.in,1.1,1.2

[Dan D. <dde...@us...>]

Update of /cvsroot/libdv/libdv
In directory usw-pr-cvs1:/tmp/cvs-serv19401

Modified Files:
	ChangeLog configure.ac libdv.pc.in 
Log Message:
pkg-config and endian fixes by Daniel Kobras, versions bumped

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libdv/libdv/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** ChangeLog	26 May 2002 21:02:42 -0000	1.55
--- ChangeLog	19 Jun 2002 03:51:26 -0000	1.56
***************
*** 1,2 ****
--- 1,10 ----
+ 2002-06-19  Dan Dennedy <da...@de...>
+ 	* YUY2.c, bitstream.h, dv_types.h:
+ 		big-endian fixes by Daniel Kobras
+ 	* libdv.pc.in, configure.ac:
+ 		remove glib/gtk, add popt dependencies by Daniel Kobras
+ 	* libdv/Makefile.am: bump libtool version to 2:0:0
+ 	* configure.ac: bump package version to 0.9.6
+ 
  2002-05-26  Stefan Lucke <Ste...@ep...>
  	* apply portability patch of Steven M. Schultz
***************
*** 9,13 ****
  	* added clamping for rgb render too. (green speckle bug)
  
! 2002-05-22  Dan Dennedy
  	* dv.h: add int dv_get_recording_datetime_tm()
  
--- 17,21 ----
  	* added clamping for rgb render too. (green speckle bug)
  
! 2002-05-22  Dan Dennedy <da...@de...>
  	* dv.h: add int dv_get_recording_datetime_tm()
  

Index: configure.ac
===================================================================
RCS file: /cvsroot/libdv/libdv/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** configure.ac	26 May 2002 21:02:42 -0000	1.6
--- configure.ac	19 Jun 2002 03:51:26 -0000	1.7
***************
*** 5,9 ****
  
  RPM_RELEASE=1
! AM_INIT_AUTOMAKE(libdv, 0.9.5)
  
  AC_CANONICAL_HOST
--- 5,9 ----
  
  RPM_RELEASE=1
! AM_INIT_AUTOMAKE(libdv, 0.9.6)
  
  AC_CANONICAL_HOST
***************
*** 153,156 ****
--- 153,158 ----
  REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4'
  PKG_CHECK_MODULES(GTK,$REQUIRES)
+ dnl Libs above are required for the apps, but not for the lib itself.
+ REQUIRES=''
  
  dnl pass-thru to .pc files
***************
*** 197,208 ****
  dnl Don't bother with popt on non-gcc build, because we make heavy use of 
  dnl gcc struct initialization extension in our popt code.  (Could be fixed)
  if test "$GCC" = "yes"; then
!       AC_CHECK_LIB(popt, poptGetContext,,
        [
! 	AC_MSG_WARN(playdv needs the popt package for command line parsing.
   		    The source archive for popt is available at:  
  			ftp://ftp.redhat.com/pub/redhat/code/popt)
        ])
  fi
  
  dnl Checks for header files.
--- 199,217 ----
  dnl Don't bother with popt on non-gcc build, because we make heavy use of 
  dnl gcc struct initialization extension in our popt code.  (Could be fixed)
+ REQUIRES_NOPKGCONFIG=""
  if test "$GCC" = "yes"; then
!       AC_CHECK_LIB(popt, poptGetContext,
        [
!         LIBS="-lpopt ${LIBS}"
!         AC_DEFINE(HAVE_LIBPOPT, 1, [Define if you have the 'popt' library])
!         REQUIRES_NOPKGCONFIG="-lpopt"
!       ],
!       [
!         AC_MSG_WARN(playdv needs the popt package for command line parsing.
   		    The source archive for popt is available at:  
  			ftp://ftp.redhat.com/pub/redhat/code/popt)
        ])
  fi
+ AC_SUBST(REQUIRES_NOPKGCONFIG)
  
  dnl Checks for header files.

Index: libdv.pc.in
===================================================================
RCS file: /cvsroot/libdv/libdv/libdv.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** libdv.pc.in	24 Jun 2001 17:57:46 -0000	1.1
--- libdv.pc.in	19 Jun 2002 03:51:26 -0000	1.2
***************
*** 8,11 ****
  Requires: @REQUIRES@
  Version: @VERSION@
! Libs: -L${libdir} -ldv
  Cflags: -I${includedir}
--- 8,11 ----
  Requires: @REQUIRES@
  Version: @VERSION@
! Libs: -L${libdir} -ldv @REQUIRES_NOPKGCONFIG@
  Cflags: -I${includedir}