[libdv-cvs] CVS: libdv/playdv Makefile.am,1.3,1.4 display.c,1.5,1.6

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

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

Modified Files:
	Makefile.am display.c 
Log Message:
apply build and portability patches from Daniel Kobras and Steven Schultz

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libdv/libdv/playdv/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am	5 Apr 2002 07:43:24 -0000	1.3
--- Makefile.am	12 Nov 2002 17:12:41 -0000	1.4
***************
*** 9,13 ****
  LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
  
! CFLAGS = @CFLAGS@ $(GTK_CFLAGS)
  
  bin_PROGRAMS= playdv
--- 9,13 ----
  LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
  
! CFLAGS = @CFLAGS@ $(SDL_CFLAGS) $(GTK_CFLAGS)
  
  bin_PROGRAMS= playdv
***************
*** 16,18 ****
  
  playdv_SOURCES= playdv.c display.c display.h oss.c
! playdv_LDADD= $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la
--- 16,18 ----
  
  playdv_SOURCES= playdv.c display.c display.h oss.c
! playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)

Index: display.c
===================================================================
RCS file: /cvsroot/libdv/libdv/playdv/display.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** display.c	26 May 2002 21:02:42 -0000	1.5
--- display.c	12 Nov 2002 17:12:41 -0000	1.6
***************
*** 577,584 ****
  
    XShmAttach(dv_dpy->dpy, &dv_dpy->shminfo);
    if (dv_dpy -> shminfo. shmid > 0)
      shmctl (dv_dpy -> shminfo. shmid, IPC_RMID, 0);
- 
-   XSync(dv_dpy->dpy, False);
  
    return 1;
--- 577,584 ----
  
    XShmAttach(dv_dpy->dpy, &dv_dpy->shminfo);
+   XSync(dv_dpy->dpy, False);
+ 
    if (dv_dpy -> shminfo. shmid > 0)
      shmctl (dv_dpy -> shminfo. shmid, IPC_RMID, 0);
  
    return 1;