[Paraview] MJPEG instead of MPEG4 (issue 8925)

[Michael Wild]

Perfectly safe (that's how I created it in the first place). It just  
fixes what patch #1 botched...

Michael


On 7. Aug, 2009, at 9:02, Dominik Szczerba wrote:

> Is it safe to apply on the already patched tree or do I have to  
> repeat the whole procedure? - Dominik
>
> Michael Wild wrote:
>> Sorry, simple copy-paste error, fixed it manually in my build tree  
>> and  then forgot about it ;-)
>> Please try the following patch, if it works I will update the  
>> patches  on the bug-tracker.
>> diff --git a/VTK/Utilities/vtkoggtheora/CMakeLists.txt b/VTK/ 
>> Utilities/ vtkoggtheora/CMakeLists.txt
>> index 4b4a12d..a960a14 100644
>> --- a/VTK/Utilities/vtkoggtheora/CMakeLists.txt
>> +++ b/VTK/Utilities/vtkoggtheora/CMakeLists.txt
>> @@ -51,13 +51,13 @@ ELSE(HAVE_VTKOGGTHEORA_UINT32_T)
>>  ENDIF(HAVE_VTKOGGTHEORA_UINT32_T)
>>  IF(HAVE_VTKOGGTHEORA_UINT16_T)
>> -  SET(VTKOGGTHEORA_USIZE16 uint16_t)
>> +  SET(USIZE16 uint16_t)
>>  ELSEIF(VTKOGGTHEORA_SHORT EQUAL 2)
>>    SET(USIZE16 "unsigned short")
>>  ELSEIF(VTKOGGTHEORA_INT EQUAL 2)
>> -  SET(VTKOGGTHEORA_USIZE16 "unsigned int")
>> +  SET(USIZE16 "unsigned int")
>>  ELSEIF(LONG EQUAL 2)
>> -  SET(VTKOGGTHEORA_USIZE16 "unsigned long")
>> +  SET(USIZE16 "unsigned long")
>>  ELSE(HAVE_VTKOGGTHEORA_UINT16_T)
>>    MESSAGE(SEND_ERROR "No unsigned 16 bit type found")
>>  ENDIF(HAVE_VTKOGGTHEORA_UINT16_T)
>> On 7. Aug, 2009, at 8:31, Dominik Szczerba wrote:
>>> Hi,
>>>
>>> I get an error during patching and compilating CVS from a few  
>>> days  back:
>>>
>>> [ 17%] Building CXX object VTK/IO/CMakeFiles/vtkIO.dir/  
>>> vtkOggTheoraWriter.cxx.o
>>> In file included from /home/domel/build/paraview-cvs/VTK/ 
>>> Utilities/ vtkoggtheora/include/ogg/os_types.h:139,
>>>                from /home/domel/build/paraview-cvs/VTK/Utilities/  
>>> vtkoggtheora/include/ogg/ogg.h:26,
>>>                from /home/domel/pack/paraview-cvs/VTK/Utilities/  
>>> vtk_oggtheora.h:25,
>>>                from /home/domel/pack/paraview-cvs/VTK/IO/  
>>> vtkOggTheoraWriter.cxx:22:
>>> /home/domel/build/paraview-cvs/VTK/Utilities/vtkoggtheora/include/  
>>> ogg/config_types.h:15: error: ISO C++ forbids declaration of   
>>> ‘ogg_uint16_t’ with no type
>>> make[2]: *** [VTK/IO/CMakeFiles/vtkIO.dir/ 
>>> vtkOggTheoraWriter.cxx.o]  Error 1
>>> make[1]: *** [VTK/IO/CMakeFiles/vtkIO.dir/all] Error 2
>>>
>>> -- Dominik
>>>
>>> Michael Wild wrote:
>>>> Hi hope it works with a current checkout... Otherwise you might  
>>>> try  to  apply the patches on a checkout with a date in mid-July.
>>>> Yes, all three patches are necessary:
>>>> 1. adds the vtkoggtheora library to VTK
>>>> 2. adds the vtkOggTheoraWriter class to VTK
>>>> 3. adds the whole machinery into ParaView
>>>> Michael
>>>> On 5. Aug, 2009, at 13:42, Dominik Szczerba wrote:
>>>>> I would be glad to try it on linux. I assume I need to apply  
>>>>> all  the  3 patches to the latest CVS checkout - correct?
>>>>>
>>>>> - Dominik
>>>>>
>>>>>
>