diff options
| author | Jacek Antonelli | 2009-11-18 04:11:55 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-18 04:11:55 -0600 |
| commit | b8d07a9439ff21fce8ae2405db3aa38dd3d9fc14 (patch) | |
| tree | 22d65bf20307a2086bc746d6a160cca8bf9d307e /linden/indra | |
| parent | VWR-12620: Linux compile fails with -O2 (--type=Release) (diff) | |
| download | meta-impy-b8d07a9439ff21fce8ae2405db3aa38dd3d9fc14.zip meta-impy-b8d07a9439ff21fce8ae2405db3aa38dd3d9fc14.tar.gz meta-impy-b8d07a9439ff21fce8ae2405db3aa38dd3d9fc14.tar.bz2 meta-impy-b8d07a9439ff21fce8ae2405db3aa38dd3d9fc14.tar.xz | |
Added Linux package for liboil 0.3.16.
It's needed by some GStreamer plugins.
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/cmake/GStreamer.cmake | 1 | ||||
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index 992b61e..55a8f43 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake | |||
| @@ -97,6 +97,7 @@ else (WINDOWS) | |||
| 97 | 97 | ||
| 98 | else (DARWIN) # Linux | 98 | else (DARWIN) # Linux |
| 99 | 99 | ||
| 100 | use_prebuilt_binary(liboil) | ||
| 100 | use_prebuilt_binary(theora) | 101 | use_prebuilt_binary(theora) |
| 101 | 102 | ||
| 102 | set(GSTREAMER_LIBRARIES | 103 | set(GSTREAMER_LIBRARIES |
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 798eab1..e729db0 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -839,6 +839,7 @@ class Linux_i686Manifest(LinuxManifest): | |||
| 839 | self.path("libtheora.so.0") | 839 | self.path("libtheora.so.0") |
| 840 | self.path("libvorbis.so.0") | 840 | self.path("libvorbis.so.0") |
| 841 | self.path("libvorbisenc.so.2") | 841 | self.path("libvorbisenc.so.2") |
| 842 | self.path("liboil-0.3.so.0") | ||
| 842 | 843 | ||
| 843 | # Gstreamer plugins | 844 | # Gstreamer plugins |
| 844 | if self.prefix("gstreamer-plugins"): | 845 | if self.prefix("gstreamer-plugins"): |