View | Details | Raw Unified | Return to bug 103448
Collapse All | Expand All

(-)/usr/home/db/pwlib/files/patch-configureac (-4 / +7 lines)
Lines 1-5 Link Here
1
--- configure.ac.orig	Wed Feb 22 12:53:28 2006
1
--- configure.ac.orig	Wed Feb 22 06:53:28 2006
2
+++ configure.ac	Sun May  7 14:19:18 2006
2
+++ configure.ac	Thu Sep 21 01:33:15 2006
3
@@ -136,7 +136,7 @@
3
@@ -136,7 +136,7 @@
4
    x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86
4
    x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86
5
                    ;;
5
                    ;;
Lines 116-122 Link Here
116
 else
116
 else
117
   dnl SDL checks
117
   dnl SDL checks
118
   if test "${SDLLIB:-unset}" = "unset" ; then
118
   if test "${SDLLIB:-unset}" = "unset" ; then
119
@@ -1501,9 +1502,9 @@
119
@@ -1501,11 +1502,11 @@
120
     AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext)
120
     AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext)
121
   fi
121
   fi
122
 
122
 
Lines 126-133 Link Here
126
-    AC_CHECK_FILE(/usr/local/include/SDL11/SDL.h, HAS_SDL=1)
126
-    AC_CHECK_FILE(/usr/local/include/SDL11/SDL.h, HAS_SDL=1)
127
+    AC_CHECK_HEADER(SDL/SDL.h, HAS_SDL=1)
127
+    AC_CHECK_HEADER(SDL/SDL.h, HAS_SDL=1)
128
     if test "${HAS_SDL:-unset}" != "unset" ; then
128
     if test "${HAS_SDL:-unset}" != "unset" ; then
129
       SDLLIB=SDL-1.1
129
-      SDLLIB=SDL-1.1
130
+      SDLLIB=SDL
130
     fi
131
     fi
132
   fi
133
 
131
@@ -1527,7 +1528,7 @@
134
@@ -1527,7 +1528,7 @@
132
 dnl ########################################################################
135
 dnl ########################################################################
133
 dnl check for video capture support.
136
 dnl check for video capture support.
(-)/usr/home/db/pwlib/files/patch-include_ptclib_vsdl.h (+14 lines)
Line 0 Link Here
1
--- include/ptclib/vsdl.h.orig	Thu Sep 21 00:49:29 2006
2
+++ include/ptclib/vsdl.h	Thu Sep 21 00:49:53 2006
3
@@ -98,11 +98,7 @@
4
 #if P_SDL
5
 
6
 #include <ptlib.h>
7
-#if defined(P_FREEBSD)
8
-#include <SDL11/SDL.h>
9
-#else
10
 #include <SDL/SDL.h>
11
-#endif
12
 
13
 #undef main
14
 
(-)/usr/home/db/pwlib/files/patch-src_ptclib_vsdl.cxx (+14 lines)
Line 0 Link Here
1
--- src/ptclib/vsdl.cxx.orig	Thu Sep 21 00:50:56 2006
2
+++ src/ptclib/vsdl.cxx	Thu Sep 21 00:51:11 2006
3
@@ -102,11 +102,7 @@
4
 
5
 extern "C" {
6
 
7
-#if defined(P_FREEBSD)
8
-#include <SDL11/SDL.h>
9
-#else
10
 #include <SDL/SDL.h>
11
-#endif
12
 
13
 };
14
 

Return to bug 103448