diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2016-12-18 01:58:43 +0000 |
|---|---|---|
| committer | Damjan Jovanovic <damjan@apache.org> | 2016-12-18 01:58:43 +0000 |
| commit | 0a09230b9e7793eb19f7c659249662397ded36fc (patch) | |
| tree | 5752c0e141be5a0969181cb85bda23d86481db1e /postprocess | |
| parent | 3494812abc0593bc7f8f3239be4b11e10c5056fa (diff) | |
Port main/avmedia to gbuild, for real this time.
The problem with the last attempt was that
main/avmedia/source/java/avmedia.jar.component was getting delivered to the
solver verbatim, without the processing neeeded to add the "uri"
attribute to the "component" XML tag, which was causing AOO to crash on
startup since UNO couldn't bootstrap.
Since avmedia.jar isn't built but a pre-existing copy is just delivered,
this was solved by adding an already processed copy of
avmedia.jar.component to deliver instead.
Patch by: me
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 82665e7bf876..7029637d34e1 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -47,7 +47,6 @@ my_components = \ stocservices \ abp \ analysis \ - avmedia \ basctl \ basprov \ bib \ @@ -58,6 +57,7 @@ my_components = \ charttools \ chartview \ component/animations/source/animcore/animcore \ + component/avmedia/util/avmedia \ component/binaryurp/source/binaryurp \ component/canvas/source/factory/canvasfactory \ component/canvas/source/simplecanvas/simplecanvas \ @@ -315,8 +315,8 @@ my_components += \ .IF "$(OS)" == "MACOSX" my_components += \ - avmediaQuickTime \ - avmediaMacAVF \ + component/avmedia/source/macavf/avmediaMacAVF \ + component/avmedia/source/quicktime/avmediaQuickTime \ fps_aqua \ macab1 \ macbe1 \ @@ -352,7 +352,7 @@ my_components += \ .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" my_components += \ - avmediawin \ + component/avmedia/source/win/avmediawin \ component/canvas/source/directx/directx9canvas \ component/canvas/source/directx/gdipluscanvas .END @@ -387,11 +387,11 @@ my_components += evoab .END .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != "" -my_components += avmediagst +my_components += component/avmedia/source/gstreamer/avmediagst .END .IF "$(OS)" != "WNT" && "$(SOLAR_JAVA)" == "TRUE" -my_components += avmedia.jar +my_components += component/avmedia/source/java/avmedia.jar .END my_ooo_components = mailmerge |