[xiph-cvs] cvs commit: snatch Makefile Snatch x11.c

[Monty]

xiphmont    02/03/09 14:25:21

  Modified:    .        Makefile Snatch x11.c
  Log:
  linking libsnatch requires -lX11 as some realplayers are missing XGetGeometry!
  
  auth dialog popup detection fix

Revision  Changes    Path
1.2       +3 -3      snatch/Makefile

Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/snatch/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	2002/02/26 06:01:38	1.1
+++ Makefile	2002/03/09 22:25:20	1.2
@@ -2,14 +2,14 @@
 LIBDIR  = /usr/local/lib
 
 CC	= gcc
-CFLAGS	= -O2 -W
-SOFLAGS = -shared
+CFLAGS	= -O2 -W 
+SOFLAGS = -shared -L/usr/X11/lib
 INSTALL = install
 
 all:		libsnatch.so snatch2yuv snatch2yuv2 snatch2wav
 
 libsnatch.so: 	libsnatch.c x11.c oss.c esd.c realppm.h snatchppm.h waitppm.h
-	$(CC) $(CFLAGS) $(SOFLAGS) libsnatch.c -o libsnatch.so
+	$(CC) $(CFLAGS) $(SOFLAGS) libsnatch.c -o libsnatch.so -lX11
 
 snatch2yuv: 	snatchconvert.c snatch2yuv.c
         $(CC) $(CFLAGS) snatchconvert.c snatch2yuv.c -o snatch2yuv -lm

<p><p>1.7       +1 -1      snatch/Snatch

Index: Snatch
===================================================================
RCS file: /usr/local/cvsroot/snatch/Snatch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Snatch	2001/11/26 05:45:02	1.6
+++ Snatch	2002/03/09 22:25:20	1.7
@@ -15,7 +15,7 @@
     exit 1;
 }
 
-$version="Snatch 20011125";
+$version="Snatch 20020308";
 $configdir=$HOME."/.snatch";
 $configfile=$configdir."/config.txt";
 $historyfile=$configdir."/history.txt";

<p><p>1.28      +4 -3      snatch/x11.c

Index: x11.c
===================================================================
RCS file: /usr/local/cvsroot/snatch/x11.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- x11.c	2002/02/26 06:01:14	1.27
+++ x11.c	2002/03/09 22:25:21	1.28
@@ -463,7 +463,8 @@
 
   /* watch for the auth password window */
   if(username || password){
-    if(n>32 &&  !memcmp(data,"AuthDialogShell\0RCACoreAppShell\0",32)){
+
+    if(n>=32 &&  !memcmp(data,"AuthDialogShell\0RCACoreAppShell\0",32)){
       if(rpauth_already>2){
         fprintf(stderr,
                 "**ERROR: Password not accepted.\n");
@@ -485,7 +486,7 @@
 
   /* watch for the open location window */
   if(location){
-    if(n>36 &&  !memcmp(data,"OpenLocationDialogShell\0RCACoreAppShell\0",36)){
+    if(n>=40 &&  !memcmp(data,"OpenLocationDialogShell\0RCACoreAppShell\0",40)){
       fprintf(stderr,
             "    ...: RealPlayer popped open location dialog.  Watching for\n"
               "         dialog window tree...\n");
@@ -498,7 +499,7 @@
   }
   if(openfile){
     /* watch for the open file window */
-    if(n>32 && !memcmp(data,"OpenFileDialogShell\0RCACoreAppShell\0",32)){
+    if(n>=32 && !memcmp(data,"OpenFileDialogShell\0RCACoreAppShell\0",32)){
       fprintf(stderr,
               "    ...: RealPlayer popped open file dialog.\n");
       rpfile_shell=id;

<p><p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.