[svn] / trunk / xvidcore / dshow / dxpatch / dx90sdk-update-gcc.patch Repository:
ViewVC logotype

Diff of /trunk/xvidcore/dshow/dxpatch/dx90sdk-update-gcc.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1525, Mon Jul 26 20:30:10 2004 UTC revision 1526, Tue Jul 27 21:15:37 2004 UTC
# Line 1  Line 1 
1  diff -rubN /c/DX90SDK-orig/Include/strmif.h ./Include/strmif.h  diff -burN /c/DX90SDK-orig/Include/DShow.h ./Include/DShow.h
2    --- /c/DX90SDK-orig/Include/DShow.h     Mon Aug 18 21:22:52 2003
3    +++ ./Include/DShow.h   Tue Jul 27 20:43:16 2004
4    @@ -44,7 +44,7 @@
5     // Include DirectShow include files
6     ///////////////////////////////////////////////////////////////////////////
7     #include <strmif.h>     // Generated IDL header file for streams interfaces
8    -#include <amvideo.h>    // ActiveMovie video interfaces and definitions
9    +#include <Amvideo.h>    // ActiveMovie video interfaces and definitions
10     #include <amaudio.h>    // ActiveMovie audio interfaces and definitions
11     #include <control.h>    // generated from control.odl
12     #include <evcode.h>     // event code definitions
13    diff -burN /c/DX90SDK-orig/Include/errors.h ./Include/errors.h
14    --- /c/DX90SDK-orig/Include/errors.h    Mon Aug 18 21:22:52 2003
15    +++ ./Include/errors.h  Tue Jul 27 20:44:04 2004
16    @@ -24,7 +24,7 @@
17     #define VFW_FIRST_CODE   0x200
18     #define MAX_ERROR_TEXT_LEN 160
19    
20    -#include <VFWMSGS.H>                    // includes all message definitions
21    +#include <vfwmsgs.h>                    // includes all message definitions
22    
23     typedef BOOL (WINAPI* AMGETERRORTEXTPROCA)(HRESULT, char *, DWORD);
24     typedef BOOL (WINAPI* AMGETERRORTEXTPROCW)(HRESULT, WCHAR *, DWORD);
25    diff -burN /c/DX90SDK-orig/Include/strmif.h ./Include/strmif.h
26  --- /c/DX90SDK-orig/Include/strmif.h    Mon Aug 18 21:22:54 2003  --- /c/DX90SDK-orig/Include/strmif.h    Mon Aug 18 21:22:54 2003
27  +++ ./Include/strmif.h  Wed Jul 21 21:45:28 2004  +++ ./Include/strmif.h  Tue Jul 27 20:45:07 2004
28  @@ -5604,7 +5604,7 @@  @@ -5604,7 +5604,7 @@
29       {       {
30       DWORD dwVersion;       DWORD dwVersion;
# Line 16  Line 40 
40       {       {
41  -    GUID *pGUID;  -    GUID *pGUID;
42  -    GUID GUID;  -    GUID GUID;
43  +    ::GUID *pGUID;  +    struct _GUID *pGUID;
44  +    ::GUID GUID;  +    struct _GUID GUID;
45       }  VMRGUID;       }  VMRGUID;
46    
47   typedef struct tagVMRMONITORINFO   typedef struct tagVMRMONITORINFO
48  diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/Makefile ./Samples/C++/DirectShow/BaseClasses/Makefile  diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/Makefile ./Samples/C++/DirectShow/BaseClasses/Makefile
49  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/Makefile Thu Jan  1 10:00:00 1970  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/Makefile Thu Jan  1 10:00:00 1970
50  +++ ./Samples/C++/DirectShow/BaseClasses/Makefile       Wed Jul 21 21:19:30 2004  +++ ./Samples/C++/DirectShow/BaseClasses/Makefile       Tue Jul 27 20:47:27 2004
51  @@ -0,0 +1,25 @@  @@ -0,0 +1,27 @@
52  +SRC=amextra.cpp amfilter.cpp amvideo.cpp combase.cpp cprop.cpp ctlutil.cpp ddmm.cpp dllentry.cpp dllsetup.cpp mtype.cpp outputq.cpp pstream.cpp pullpin.cpp refclock.cpp renbase.cpp schedule.cpp seekpt.cpp source.cpp strmctl.cpp sysclock.cpp transfrm.cpp transip.cpp videoctl.cpp vtrans.cpp winctrl.cpp winutil.cpp wxdebug.cpp wxlist.cpp wxutil.cpp  +SRC=amextra.cpp amfilter.cpp amvideo.cpp combase.cpp cprop.cpp ctlutil.cpp ddmm.cpp dllentry.cpp dllsetup.cpp mtype.cpp outputq.cpp pstream.cpp pullpin.cpp refclock.cpp renbase.cpp schedule.cpp seekpt.cpp source.cpp strmctl.cpp sysclock.cpp transfrm.cpp transip.cpp videoctl.cpp vtrans.cpp winctrl.cpp winutil.cpp wxdebug.cpp wxlist.cpp wxutil.cpp
53  +  +
54  +DXTREE=../../../..  +DXTREE=../../../..
55  +DXBASECLASSES=$(DXTREE)/Samples/C++/DirectShow/BaseClasses  +DXBASECLASSES=$(DXTREE)/Samples/C++/DirectShow/BaseClasses
56  +OBJ=$(SRC:.cpp=.o)  +OBJ=$(SRC:.cpp=.o)
57  +LIB=strmbase.lib  +LIB=strmbase.lib
58    +RANLIB=ranlib
59  +  +
60  +CXX=g++  +CXX=g++
61  +CXXFLAGS=-O2 -fno-for-scope -mthreads  +CXXFLAGS=-O2 -fno-for-scope -mthreads
# Line 39  Line 64 
64  +  +
65  +$(LIB): $(OBJ)  +$(LIB): $(OBJ)
66  +       $(AR) $(ARFLAGS) $@ $^  +       $(AR) $(ARFLAGS) $@ $^
67    +       $(RANLIB) $@
68  +  +
69  +.cpp.o:  +.cpp.o:
70  +       $(CXX) $(CXXFLAGS) \  +       $(CXX) $(CXXFLAGS) \
# Line 50  Line 76 
76  +  +
77  +clean:  +clean:
78  +       rm $(OBJ)  +       rm $(OBJ)
79  diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/amfilter.cpp ./Samples/C++/DirectShow/BaseClasses/amfilter.cpp  diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/amfilter.cpp ./Samples/C++/DirectShow/BaseClasses/amfilter.cpp
80  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/amfilter.cpp     Mon Aug 18 16:03:32 2003  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/amfilter.cpp     Mon Aug 18 16:03:32 2003
81  +++ ./Samples/C++/DirectShow/BaseClasses/amfilter.cpp   Sun Jul 25 13:06:01 2004  +++ ./Samples/C++/DirectShow/BaseClasses/amfilter.cpp   Tue Jul 27 20:42:25 2004
82  @@ -1363,7 +1363,7 @@  @@ -1363,7 +1363,7 @@
83    
84           /*  Make sure the destructor doesn't free these */           /*  Make sure the destructor doesn't free these */
# Line 62  Line 88 
88           cmt.pUnk     = NULL;           cmt.pUnk     = NULL;
89    
90    
91  diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.cpp ./Samples/C++/DirectShow/BaseClasses/ctlutil.cpp  diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.cpp ./Samples/C++/DirectShow/BaseClasses/ctlutil.cpp
92  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.cpp      Mon Aug 18 16:03:32 2003  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.cpp      Mon Aug 18 16:03:32 2003
93  +++ ./Samples/C++/DirectShow/BaseClasses/ctlutil.cpp    Sun Jul 25 13:03:03 2004  +++ ./Samples/C++/DirectShow/BaseClasses/ctlutil.cpp    Tue Jul 27 20:42:25 2004
94  @@ -709,7 +709,7 @@  @@ -709,7 +709,7 @@
95    
96   HRESULT   HRESULT
# Line 74  Line 100 
100   , LONGLONG * pll   , LONGLONG * pll
101   )   )
102   {   {
103  diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.h ./Samples/C++/DirectShow/BaseClasses/ctlutil.h  diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.h ./Samples/C++/DirectShow/BaseClasses/ctlutil.h
104  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.h        Mon Aug 18 16:03:32 2003  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.h        Mon Aug 18 16:03:32 2003
105  +++ ./Samples/C++/DirectShow/BaseClasses/ctlutil.h      Sun Jul 25 13:02:59 2004  +++ ./Samples/C++/DirectShow/BaseClasses/ctlutil.h      Tue Jul 27 20:42:25 2004
106  @@ -275,7 +275,7 @@  @@ -275,7 +275,7 @@
107       //  Prevent bugs from constructing from LONG (which gets       //  Prevent bugs from constructing from LONG (which gets
108       //  converted to double and then multiplied by 10000000       //  converted to double and then multiplied by 10000000
# Line 100  Line 126 
126                                   LONGLONG * pll );                                   LONGLONG * pll );
127   };   };
128    
129  diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ddmm.cpp ./Samples/C++/DirectShow/BaseClasses/ddmm.cpp  diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ddmm.cpp ./Samples/C++/DirectShow/BaseClasses/ddmm.cpp
130  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ddmm.cpp Mon Aug 18 16:03:32 2003  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ddmm.cpp Mon Aug 18 16:03:32 2003
131  +++ ./Samples/C++/DirectShow/BaseClasses/ddmm.cpp       Wed Jul 21 21:19:30 2004  +++ ./Samples/C++/DirectShow/BaseClasses/ddmm.cpp       Tue Jul 27 20:45:21 2004
132  @@ -17,8 +17,8 @@  @@ -17,8 +17,8 @@
133    */    */
134   typedef struct {   typedef struct {
135          LPSTR   szDevice;          LPSTR   szDevice;
136  -       GUID*   lpGUID;  -       GUID*   lpGUID;
137  -       GUID    GUID;  -       GUID    GUID;
138  +       ::GUID*   lpGUID;  +       struct _GUID*   lpGUID;
139  +       ::GUID    GUID;  +       struct _GUID    GUID;
140          BOOL    fFound;          BOOL    fFound;
141   }   FindDeviceData;   }   FindDeviceData;
142    
143  diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/mtype.cpp ./Samples/C++/DirectShow/BaseClasses/mtype.cpp  diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/mtype.cpp ./Samples/C++/DirectShow/BaseClasses/mtype.cpp
144  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/mtype.cpp        Mon Aug 18 16:03:32 2003  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/mtype.cpp        Mon Aug 18 16:03:32 2003
145  +++ ./Samples/C++/DirectShow/BaseClasses/mtype.cpp      Wed Jul 21 21:19:30 2004  +++ ./Samples/C++/DirectShow/BaseClasses/mtype.cpp      Tue Jul 27 20:42:25 2004
146  @@ -13,7 +13,6 @@  @@ -13,7 +13,6 @@
147   // in the streams IDL file, but also has (non-virtual) functions   // in the streams IDL file, but also has (non-virtual) functions
148    
# Line 125  Line 151 
151    
152   CMediaType::~CMediaType(){   CMediaType::~CMediaType(){
153       FreeMediaType(*this);       FreeMediaType(*this);
154  diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/refclock.h ./Samples/C++/DirectShow/BaseClasses/refclock.h  diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/refclock.h ./Samples/C++/DirectShow/BaseClasses/refclock.h
155  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/refclock.h       Mon Aug 18 16:03:32 2003  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/refclock.h       Mon Aug 18 16:03:32 2003
156  +++ ./Samples/C++/DirectShow/BaseClasses/refclock.h     Sun Jul 25 12:36:21 2004  +++ ./Samples/C++/DirectShow/BaseClasses/refclock.h     Tue Jul 27 20:42:25 2004
157  @@ -14,7 +14,11 @@  @@ -14,7 +14,11 @@
158    
159   const UINT RESOLUTION = 1;                      /* High resolution timer */   const UINT RESOLUTION = 1;                      /* High resolution timer */
# Line 140  Line 166 
166    
167   inline LONGLONG WINAPI ConvertToMilliseconds(const REFERENCE_TIME& RT)   inline LONGLONG WINAPI ConvertToMilliseconds(const REFERENCE_TIME& RT)
168   {   {
169  diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxdebug.cpp ./Samples/C++/DirectShow/BaseClasses/wxdebug.cpp  diff -ur /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/streams.h.orig ./Samples/C++/DirectShow/BaseClasses/streams.h
170    --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/streams.h      2004-07-27 23:04:18.000000000 +0200
171    +++ ./Samples/C++/DirectShow/BaseClasses/streams.h   2004-07-27 23:03:57.000000000 +0200
172    @@ -135,7 +135,7 @@
173    
174     #include <reftime.h>    // Helper class for REFERENCE_TIME management
175     #include <wxdebug.h>    // Debug support for logging and ASSERTs
176    -#include <amvideo.h>    // ActiveMovie video interfaces and definitions
177    +#include <Amvideo.h>    // ActiveMovie video interfaces and definitions
178     //include amaudio.h explicitly if you need it.  it requires the DirectX SDK.
179     //#include <amaudio.h>    // ActiveMovie audio interfaces and definitions
180     #include <wxutil.h>     // General helper classes for threads etc
181    diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxdebug.cpp ./Samples/C++/DirectShow/BaseClasses/wxdebug.cpp
182  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxdebug.cpp      Mon Aug 18 16:03:32 2003  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxdebug.cpp      Mon Aug 18 16:03:32 2003
183  +++ ./Samples/C++/DirectShow/BaseClasses/wxdebug.cpp    Wed Jul 21 21:19:30 2004  +++ ./Samples/C++/DirectShow/BaseClasses/wxdebug.cpp    Tue Jul 27 20:42:25 2004
184  @@ -564,7 +564,7 @@  @@ -564,7 +564,7 @@
185       {       {
186           // re-read the registry every second. We cannot use RegNotify() to           // re-read the registry every second. We cannot use RegNotify() to
# Line 187  Line 225 
225           pp->Release();           pp->Release();
226           return;           return;
227       }       }
228  diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxutil.cpp ./Samples/C++/DirectShow/BaseClasses/wxutil.cpp  diff -burN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxutil.cpp ./Samples/C++/DirectShow/BaseClasses/wxutil.cpp
229  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxutil.cpp       Mon Aug 18 16:03:32 2003  --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxutil.cpp       Mon Aug 18 16:03:32 2003
230  +++ ./Samples/C++/DirectShow/BaseClasses/wxutil.cpp     Sun Jul 25 12:56:29 2004  +++ ./Samples/C++/DirectShow/BaseClasses/wxutil.cpp     Tue Jul 27 20:42:25 2004
231  @@ -742,8 +742,13 @@  @@ -742,8 +742,13 @@
232    
233       /*  This will catch c == 0 and overflow */       /*  This will catch c == 0 and overflow */
# Line 218  Line 256 
256       }       }
257    
258       /*  Do the division */       /*  Do the division */
259  diff -rubN /c/DX90SDK-orig/mingw_dshow_port.h ./mingw_dshow_port.h  diff -burN /c/DX90SDK-orig/mingw_dshow_port.h ./mingw_dshow_port.h
260  --- /c/DX90SDK-orig/mingw_dshow_port.h  Thu Jan  1 10:00:00 1970  --- /c/DX90SDK-orig/mingw_dshow_port.h  Thu Jan  1 10:00:00 1970
261  +++ ./mingw_dshow_port.h        Wed Jul 21 21:19:30 2004  +++ ./mingw_dshow_port.h        Tue Jul 27 20:42:25 2004
262  @@ -0,0 +1,12 @@  @@ -0,0 +1,12 @@
263  +#include <wtypes.h>  +#include <wtypes.h>
264  +#include <unknwn.h>  +#include <unknwn.h>
Legend:
Removed from v.1525  
changed lines
  Added in v.1526
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4