diff options
| author | Aleric Inglewood | 2010-10-08 22:43:56 +0200 |
|---|---|---|
| committer | Jacek Antonelli | 2011-01-17 00:21:35 -0600 |
| commit | 4f81ce3e43058ba71ff48e5f692cf0e48587b273 (patch) | |
| tree | 867bcf685f1c17046f2dfe081618524eb459d45c /linden/indra | |
| parent | Better format for channel/version string. (diff) | |
| download | meta-impy-4f81ce3e43058ba71ff48e5f692cf0e48587b273.zip meta-impy-4f81ce3e43058ba71ff48e5f692cf0e48587b273.tar.gz meta-impy-4f81ce3e43058ba71ff48e5f692cf0e48587b273.tar.bz2 meta-impy-4f81ce3e43058ba71ff48e5f692cf0e48587b273.tar.xz | |
IMP-429: Link against prebuilt libraries / always use gtk-related system libs (linux)
(cherry picked from commit a3cffd06a0e7aa92e1b6c28e7bad655b7085296c)
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/cmake/GStreamer.cmake | 2 | ||||
| -rw-r--r-- | linden/indra/cmake/UI.cmake | 2 | ||||
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 30 |
3 files changed, 20 insertions, 14 deletions
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index f5f9c03..19349ca 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake | |||
| @@ -80,6 +80,7 @@ else (WINDOWS) | |||
| 80 | gmodule-2.0 | 80 | gmodule-2.0 |
| 81 | gthread-2.0 | 81 | gthread-2.0 |
| 82 | glib-2.0 | 82 | glib-2.0 |
| 83 | gio-2.0 | ||
| 83 | xml2.2 | 84 | xml2.2 |
| 84 | ) | 85 | ) |
| 85 | 86 | ||
| @@ -99,6 +100,7 @@ else (WINDOWS) | |||
| 99 | gthread-2.0 | 100 | gthread-2.0 |
| 100 | rt | 101 | rt |
| 101 | glib-2.0 | 102 | glib-2.0 |
| 103 | gio-2.0 | ||
| 102 | ) | 104 | ) |
| 103 | 105 | ||
| 104 | endif (DARWIN) | 106 | endif (DARWIN) |
diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake index b70a531..9d068c4 100644 --- a/linden/indra/cmake/UI.cmake +++ b/linden/indra/cmake/UI.cmake | |||
| @@ -39,6 +39,7 @@ else (STANDALONE) | |||
| 39 | gdk-x11-2.0 | 39 | gdk-x11-2.0 |
| 40 | gdk_pixbuf-2.0 | 40 | gdk_pixbuf-2.0 |
| 41 | glib-2.0 | 41 | glib-2.0 |
| 42 | gio-2.0 | ||
| 42 | gmodule-2.0 | 43 | gmodule-2.0 |
| 43 | gobject-2.0 | 44 | gobject-2.0 |
| 44 | gthread-2.0 | 45 | gthread-2.0 |
| @@ -48,6 +49,7 @@ else (STANDALONE) | |||
| 48 | pangox-1.0 | 49 | pangox-1.0 |
| 49 | pangoxft-1.0 | 50 | pangoxft-1.0 |
| 50 | pixman-1 | 51 | pixman-1 |
| 52 | pangocairo-1.0 | ||
| 51 | ) | 53 | ) |
| 52 | endif (LINUX) | 54 | endif (LINUX) |
| 53 | 55 | ||
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index b16226a..c5a4e98 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -931,18 +931,19 @@ class Linux_i686Manifest(LinuxManifest): | |||
| 931 | self.path("libalut.so.0") | 931 | self.path("libalut.so.0") |
| 932 | 932 | ||
| 933 | # GTK+ and dependencies | 933 | # GTK+ and dependencies |
| 934 | self.path("libatk-1.0.so.0") | 934 | ## Lets just use the system libraries for all of these: |
| 935 | self.path("libcairo.so.2") | 935 | ##self.path("libatk-1.0.so.0") |
| 936 | self.path("libfontconfig.so.1") | 936 | ##self.path("libcairo.so.2") |
| 937 | self.path("libfreetype.so.6") | 937 | ##self.path("libfontconfig.so.1") |
| 938 | ##self.path("libfreetype.so.6") | ||
| 938 | # self.path("libgdk_pixbuf-2.0.so.0") # see linux64 why | 939 | # self.path("libgdk_pixbuf-2.0.so.0") # see linux64 why |
| 939 | self.path("libgdk-x11-2.0.so.0") | 940 | ##self.path("libgdk-x11-2.0.so.0") |
| 940 | self.path("libgtk-x11-2.0.so.0") | 941 | ##self.path("libgtk-x11-2.0.so.0") |
| 941 | # self.path("libpango-1.0.so.0") # dto. | 942 | # self.path("libpango-1.0.so.0") # dto. |
| 942 | # self.path("libpangoft2-1.0.so.0") | 943 | # self.path("libpangoft2-1.0.so.0") |
| 943 | # self.path("libpangox-1.0.so.0") | 944 | # self.path("libpangox-1.0.so.0") |
| 944 | # self.path("libpangoxft-1.0.so.0") | 945 | # self.path("libpangoxft-1.0.so.0") |
| 945 | self.path("libpixman-1.so.0") | 946 | ##self.path("libpixman-1.so.0") |
| 946 | 947 | ||
| 947 | # Gstreamer libs | 948 | # Gstreamer libs |
| 948 | self.path("libgstbase-0.10.so.0") | 949 | self.path("libgstbase-0.10.so.0") |
| @@ -1058,18 +1059,19 @@ class Linux_x86_64Manifest(LinuxManifest): | |||
| 1058 | self.path("libalut.so.0") | 1059 | self.path("libalut.so.0") |
| 1059 | 1060 | ||
| 1060 | # GTK+ and dependencies | 1061 | # GTK+ and dependencies |
| 1061 | self.path("libatk-1.0.so.0") | 1062 | ## Lets just use the system libraries for all of these: |
| 1062 | self.path("libcairo.so.2") | 1063 | ##self.path("libatk-1.0.so.0") |
| 1063 | self.path("libfontconfig.so.1") | 1064 | ##self.path("libcairo.so.2") |
| 1064 | self.path("libfreetype.so.6") | 1065 | ##self.path("libfontconfig.so.1") |
| 1066 | ##self.path("libfreetype.so.6") | ||
| 1065 | # self.path("libgdk_pixbuf-2.0.so.0") # use systems gdk pixbufs instead | 1067 | # self.path("libgdk_pixbuf-2.0.so.0") # use systems gdk pixbufs instead |
| 1066 | self.path("libgdk-x11-2.0.so.0") | 1068 | ##self.path("libgdk-x11-2.0.so.0") |
| 1067 | self.path("libgtk-x11-2.0.so.0") | 1069 | ##self.path("libgtk-x11-2.0.so.0") |
| 1068 | # self.path("libpango-1.0.so.0") # use systems pango instead | 1070 | # self.path("libpango-1.0.so.0") # use systems pango instead |
| 1069 | # self.path("libpangoft2-1.0.so.0") # Both gdk pixbufs and pango would load systems modules | 1071 | # self.path("libpangoft2-1.0.so.0") # Both gdk pixbufs and pango would load systems modules |
| 1070 | # self.path("libpangox-1.0.so.0") # and crash if not compatible or present. | 1072 | # self.path("libpangox-1.0.so.0") # and crash if not compatible or present. |
| 1071 | # self.path("libpangoxft-1.0.so.0") # So we depend system gdk pixbufs and pango anyway. | 1073 | # self.path("libpangoxft-1.0.so.0") # So we depend system gdk pixbufs and pango anyway. |
| 1072 | self.path("libpixman-1.so.0") | 1074 | ##self.path("libpixman-1.so.0") |
| 1073 | 1075 | ||
| 1074 | # Gstreamer libs | 1076 | # Gstreamer libs |
| 1075 | self.path("libgstbase-0.10.so.0") | 1077 | self.path("libgstbase-0.10.so.0") |