rpms/openoffice.org/F-12 ooo-build.ooo68717.gstreamer.video.patch, 1.2, 1.3 openoffice.org.spec, 1.2026, 1.2027

[David Tardon]

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1826

Modified Files:
	ooo-build.ooo68717.gstreamer.video.patch openoffice.org.spec 
Log Message:
Resolves: rhbz#532330 openoffice impress doesn't recognise .ogv files as video

ooo-build.ooo68717.gstreamer.video.patch:
 avmedia/prj/build.lst                             |    3 
 avmedia/source/gstreamer/ChangeLog                |  112 +++
 avmedia/source/gstreamer/exports.dxp              |    4 
 avmedia/source/gstreamer/gstcommon.hxx            |   83 ++
 avmedia/source/gstreamer/gstframegrabber.cxx      |  244 ++++++++
 avmedia/source/gstreamer/gstframegrabber.hxx      |   78 ++
 avmedia/source/gstreamer/gstmanager.cxx           |  114 +++
 avmedia/source/gstreamer/gstmanager.hxx           |   74 ++
 avmedia/source/gstreamer/gstplayer.cxx            |  628 ++++++++++++++++++++++
 avmedia/source/gstreamer/gstplayer.hxx            |  120 ++++
 avmedia/source/gstreamer/gstuno.cxx               |  111 +++
 avmedia/source/gstreamer/gstwindow.cxx            |  365 ++++++++++++
 avmedia/source/gstreamer/gstwindow.hxx            |  119 ++++
 avmedia/source/gstreamer/makefile.mk              |   85 ++
 avmedia/source/inc/mediamisc.hxx                  |    4 
 avmedia/source/viewer/mediawindow.cxx             |    3 
 avmedia/source/viewer/mediawindow_impl.cxx        |   52 +
 avmedia/source/viewer/mediawindow_impl.hxx        |    8 
 com/sun/star/wizards/letter/LocaleCodes.java      |    2 
 configure.in                                      |   21 
 scp2/source/ooo/file_library_ooo.scp              |    4 
 scp2/source/ooo/module_hidden_ooo.scp             |    1 
 set_soenv.in                                      |    1 
 slideshow/source/engine/shapes/viewmediashape.cxx |   38 +
 slideshow/source/engine/shapes/viewmediashape.hxx |    7 
 solenv/inc/settings.mk                            |    4 
 source/gstreamer/gstplayer.cxx                    |   15 
 source/gstreamer/gstplayer.hxx                    |    1 
 svtools/inc/svtools/inettype.hxx                  |    4 
 svtools/inc/svtools/svtools.hrc                   |  210 +++----
 svtools/source/misc1/inettype.cxx                 |    5 
 svtools/source/misc1/mediatyp.src                 |  162 +++++
 vcl/inc/vcl/salobj.hxx                            |    2 
 vcl/inc/vcl/syschild.hxx                          |    1 
 vcl/source/window/syschild.cxx                    |    6 
 vcl/unx/gtk/window/gtkobject.cxx                  |    8 
 vcl/unx/inc/plugins/gtk/gtkobject.hxx             |    2 
 37 files changed, 2586 insertions(+), 115 deletions(-)

Index: ooo-build.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-12/ooo-build.ooo68717.gstreamer.video.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ooo-build.ooo68717.gstreamer.video.patch	28 Apr 2009 09:32:23 -0000	1.2
+++ ooo-build.ooo68717.gstreamer.video.patch	2 Nov 2009 08:06:46 -0000	1.3
@@ -202,7 +202,7 @@ diff -u -u -r1.2 mediawindow_impl.hxx
 diff -rup avmedia-orig/source/viewer/mediawindow.cxx avmedia/source/viewer/mediawindow.cxx
 --- avmedia-orig/source/viewer/mediawindow.cxx	2006-09-21 12:10:28.000000000 +0200
 +++ avmedia/source/viewer/mediawindow.cxx	2006-09-21 12:15:19.000000000 +0200
-@@ -383,8 +383,10 @@
+@@ -383,8 +383,11 @@
                                          "AU Audio", "au",
                                          "AVI", "avi",
                                          "CD Audio", "cda",
@@ -210,6 +210,7 @@ diff -rup avmedia-orig/source/viewer/med
                                          "MIDI Audio", "mid;midi",
                                          "MPEG Audio", "mp2;mp3;mpa",
 +                                        "OGG Audio/Video", "ogg",
++                                        "OGG Video", "ogv",
                                          "MPEG Video", "mpg;mpeg;mpv;mp4",
                                          "Ogg bitstream", "ogg",
                                          "Quicktime Video", "mov",


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2026
retrieving revision 1.2027
diff -u -p -r1.2026 -r1.2027
--- openoffice.org.spec	30 Oct 2009 15:23:14 -0000	1.2026
+++ openoffice.org.spec	2 Nov 2009 08:06:46 -0000	1.2027
@@ -4258,6 +4258,8 @@ fi
 * Fri Oct 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.15-UNBUILT
 - Resolves: ooo#106497 language marked as providing spellchecking when
   unavailable (caolanm)
+- Resolves: rhbz#532330 openoffice impress doesn't recognise .ogv
+  files as video (dtardon)
 
 * Wed Oct 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.14
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)