diff options
author | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
---|---|---|
committer | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
commit | c0034c520c6e61b64822e276316651ec6912bd98 (patch) | |
tree | 910442027b6a2c1406d80ca93949755b54badf5c /linden/install.xml | |
parent | Use all those cores for compile (diff) | |
parent | Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about llvosky.h (diff) | |
download | meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.zip meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.gz meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.bz2 meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.xz |
Merge branch 'mccabe-plugins' into plugins_merge
Conflicts:
linden/doc/contributions.txt
linden/indra/cmake/GStreamer.cmake
linden/indra/cmake/LLMedia.cmake
linden/indra/cmake/OPENAL.cmake
linden/indra/llmedia/CMakeLists.txt
linden/indra/llprimitive/material_codes.h
linden/indra/newview/chatbar_as_cmdline.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/llviewerwindow.cpp
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/pipeline.cpp
linden/indra/newview/pipeline.h
linden/indra/newview/viewer_manifest.py
linden/install.xml
Diffstat (limited to '')
-rwxr-xr-x | linden/install.xml | 159 |
1 files changed, 116 insertions, 43 deletions
diff --git a/linden/install.xml b/linden/install.xml index 4985b69..0c20157 100755 --- a/linden/install.xml +++ b/linden/install.xml | |||
@@ -483,6 +483,21 @@ | |||
483 | </map> | 483 | </map> |
484 | </map> | 484 | </map> |
485 | </map> | 485 | </map> |
486 | <key>freeglut</key> | ||
487 | <map> | ||
488 | <key>license</key> | ||
489 | <string>mit</string> | ||
490 | <key>packages</key> | ||
491 | <map> | ||
492 | <key>windows</key> | ||
493 | <map> | ||
494 | <key>md5sum</key> | ||
495 | <string>fcbb695ff203775fad96d184bf5f34fc</string> | ||
496 | <key>url</key> | ||
497 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freeglut-2.4.0-windows-20090608.tar.bz2</uri> | ||
498 | </map> | ||
499 | </map> | ||
500 | </map> | ||
486 | <key>freetype</key> | 501 | <key>freetype</key> |
487 | <map> | 502 | <map> |
488 | <key>copyright</key> | 503 | <key>copyright</key> |
@@ -601,6 +616,28 @@ | |||
601 | </map> | 616 | </map> |
602 | </map> | 617 | </map> |
603 | </map> | 618 | </map> |
619 | <key>glui</key> | ||
620 | <map> | ||
621 | <key>license</key> | ||
622 | <string>lgpl</string> | ||
623 | <key>packages</key> | ||
624 | <map> | ||
625 | <key>darwin</key> | ||
626 | <map> | ||
627 | <key>md5sum</key> | ||
628 | <string>84f792a860691d0fad6d1de6eeb31baa</string> | ||
629 | <key>url</key> | ||
630 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.36-darwin-20090623a.tar.bz2</uri> | ||
631 | </map> | ||
632 | <key>windows</key> | ||
633 | <map> | ||
634 | <key>md5sum</key> | ||
635 | <string>5b8631fe510d4ebaeb965c673937e1e7</string> | ||
636 | <key>url</key> | ||
637 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.3.6-windows-freeglut-20090608.tar.bz2</uri> | ||
638 | </map> | ||
639 | </map> | ||
640 | </map> | ||
604 | <key>google</key> | 641 | <key>google</key> |
605 | <map> | 642 | <map> |
606 | <key>license</key> | 643 | <key>license</key> |
@@ -650,15 +687,8 @@ | |||
650 | <key>url</key> | 687 | <key>url</key> |
651 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux64-20091230.tar.bz2</uri> | 688 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux64-20091230.tar.bz2</uri> |
652 | </map> | 689 | </map> |
653 | <key>windows</key> | ||
654 | <map> | ||
655 | <key>md5sum</key> | ||
656 | <string>da6c3fd73a7e5c9bef768edab8a38c2f</string> | ||
657 | <key>url</key> | ||
658 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.22-windows-20100825.tar.bz2</uri> | ||
659 | </map> | 690 | </map> |
660 | </map> | 691 | </map> |
661 | </map> | ||
662 | <key>gstreamer-plugins</key> | 692 | <key>gstreamer-plugins</key> |
663 | <map> | 693 | <map> |
664 | <key>license</key> | 694 | <key>license</key> |
@@ -672,29 +702,8 @@ | |||
672 | <key>url</key> | 702 | <key>url</key> |
673 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-darwin-20100826.tar.bz2</uri> | 703 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-darwin-20100826.tar.bz2</uri> |
674 | </map> | 704 | </map> |
675 | <key>linux</key> | ||
676 | <map> | ||
677 | <key>md5sum</key> | ||
678 | <string>973aabcba37f6ee0ceab2e3d063eea84</string> | ||
679 | <key>url</key> | ||
680 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux-20100827.tar.bz2</uri> | ||
681 | </map> | 705 | </map> |
682 | <key>linux64</key> | ||
683 | <map> | ||
684 | <key>md5sum</key> | ||
685 | <string>663c29f3885ab8429ad6841d80181c31</string> | ||
686 | <key>url</key> | ||
687 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux64-20100827.tar.bz2</uri> | ||
688 | </map> | 706 | </map> |
689 | <key>windows</key> | ||
690 | <map> | ||
691 | <key>md5sum</key> | ||
692 | <string>a5c7e5f2dbd5ed247f6e9c54f03a8b42</string> | ||
693 | <key>url</key> | ||
694 | <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-20100825.tar.bz2</uri> | ||
695 | </map> | ||
696 | </map> | ||
697 | </map> | ||
698 | <key>gtk-etc</key> | 707 | <key>gtk-etc</key> |
699 | <map> | 708 | <map> |
700 | <key>copyright</key> | 709 | <key>copyright</key> |
@@ -1039,39 +1048,32 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura | |||
1039 | </map> | 1048 | </map> |
1040 | </map> | 1049 | </map> |
1041 | </map> | 1050 | </map> |
1042 | <key>llmozlib</key> | 1051 | <key>llqtwebkit</key> |
1043 | <map> | 1052 | <map> |
1044 | <key>license</key> | 1053 | <key>license</key> |
1045 | <string>mozillaPL</string> | 1054 | <string>lgpl</string> |
1046 | <key>packages</key> | 1055 | <key>packages</key> |
1047 | <map> | 1056 | <map> |
1048 | <key>darwin</key> | 1057 | <key>darwin</key> |
1049 | <map> | 1058 | <map> |
1050 | <key>md5sum</key> | 1059 | <key>md5sum</key> |
1051 | <string>c951587726618d33646f2b169c290bd3</string> | 1060 | <string>becffca6bd8dcb239de284ea2a8b485b</string> |
1052 | <key>url</key> | 1061 | <key>url</key> |
1053 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-2_0_0_21-darwin-20090304.tar.bz2</uri> | 1062 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+cookies-darwin-20100617.tar.bz2</uri> |
1054 | </map> | 1063 | </map> |
1055 | <key>linux</key> | 1064 | <key>linux</key> |
1056 | <map> | 1065 | <map> |
1057 | <key>md5sum</key> | 1066 | <key>md5sum</key> |
1058 | <string>b7ebcf0fb764ed4fa57c62d068b4a769</string> | 1067 | <string>414d72dd59e3d83c96f0e1531360792e</string> |
1059 | <key>url</key> | ||
1060 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-linux-20090304prfhk.tar.bz2</uri> | ||
1061 | </map> | ||
1062 | <key>linux64</key> | ||
1063 | <map> | ||
1064 | <key>md5sum</key> | ||
1065 | <string>afa946a118d3d71123003785189a31f2</string> | ||
1066 | <key>url</key> | 1068 | <key>url</key> |
1067 | <uri>http://imprudenceviewer.org/download/libs/llmozlib-linux64-20091231.tar.bz2</uri> | 1069 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100618.tar.bz2</uri> |
1068 | </map> | 1070 | </map> |
1069 | <key>windows</key> | 1071 | <key>windows</key> |
1070 | <map> | 1072 | <map> |
1071 | <key>md5sum</key> | 1073 | <key>md5sum</key> |
1072 | <string>e9454e258b99668782d8570481b5eda1</string> | 1074 | <string>df1bdd683128e060d60e435f65d8f7e8</string> |
1073 | <key>url</key> | 1075 | <key>url</key> |
1074 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-windows-20090306.tar.bz2</uri> | 1076 | <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100617.tar.bz2</uri> |
1075 | </map> | 1077 | </map> |
1076 | </map> | 1078 | </map> |
1077 | </map> | 1079 | </map> |
@@ -1338,6 +1340,77 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn | |||
1338 | </map> | 1340 | </map> |
1339 | </map> | 1341 | </map> |
1340 | </map> | 1342 | </map> |
1343 | <key>pulseaudio</key> | ||
1344 | <map> | ||
1345 | <key>copyright</key> | ||
1346 | <string>Copyright 2004-2006 Lennart Poettering, Copyright 2006 Pierre Ossman (ossman@cendio.se) for Cendio AB</string> | ||
1347 | <key>description</key> | ||
1348 | <string>pulseaudio: headers only</string> | ||
1349 | <key>license</key> | ||
1350 | <string>lgpl</string> | ||
1351 | <key>packages</key> | ||
1352 | <map> | ||
1353 | <key>linux</key> | ||
1354 | <map> | ||
1355 | <key>md5sum</key> | ||
1356 | <string>30cb00069fe2a545fbf7be1070386236</string> | ||
1357 | <key>url</key> | ||
1358 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri> | ||
1359 | </map> | ||
1360 | </map> | ||
1361 | </map> | ||
1362 | <key>quicktime</key> | ||
1363 | <map> | ||
1364 | <key>copyright</key> | ||
1365 | <string>Copyright (C) 1990-2006 by Apple Computer, Inc., all rights reserved.</string> | ||
1366 | <key>description</key> | ||
1367 | <string>Separate download. Used to play in-world video clips on a prim. </string> | ||
1368 | <key>license</key> | ||
1369 | <string>quicktime</string> | ||
1370 | <key>packages</key> | ||
1371 | <map> | ||
1372 | <key>windows</key> | ||
1373 | <map> | ||
1374 | <key>md5sum</key> | ||
1375 | <string>7a2e6fc89b1ef027f3a36ebb46fb0c8a</string> | ||
1376 | <key>url</key> | ||
1377 | <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/quicktime-windows-20080611.tar.bz2</uri> | ||
1378 | </map> | ||
1379 | </map> | ||
1380 | </map> | ||
1381 | <key>smartheap</key> | ||
1382 | <map> | ||
1383 | <key>copyright</key> | ||
1384 | <string>Copyright (C) 1991-2000 Compuware Corporation. All Rights Reserved.</string> | ||
1385 | <key>description</key> | ||
1386 | <string>Memory Management Library</string> | ||
1387 | <key>license</key> | ||
1388 | <string>smartheap</string> | ||
1389 | <key>packages</key> | ||
1390 | <map> | ||
1391 | <key>darwin</key> | ||
1392 | <map> | ||
1393 | <key>md5sum</key> | ||
1394 | <string>f54131b5f228e805c64c2e4e6c96579a</string> | ||
1395 | <key>url</key> | ||
1396 | <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-darwin-20080610.tar.bz2</uri> | ||
1397 | </map> | ||
1398 | <key>linux</key> | ||
1399 | <map> | ||
1400 | <key>md5sum</key> | ||
1401 | <string>499208522bf7d7843e1d014d64214e06</string> | ||
1402 | <key>url</key> | ||
1403 | <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-linux-20080610.tar.bz2</uri> | ||
1404 | </map> | ||
1405 | <key>windows</key> | ||
1406 | <map> | ||
1407 | <key>md5sum</key> | ||
1408 | <string>78fd47017f21d11eae43bca3e38a3e1e</string> | ||
1409 | <key>url</key> | ||
1410 | <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-windows-20080611.tar.bz2</uri> | ||
1411 | </map> | ||
1412 | </map> | ||
1413 | </map> | ||
1341 | <key>theora</key> | 1414 | <key>theora</key> |
1342 | <map> | 1415 | <map> |
1343 | <key>copyright</key> | 1416 | <key>copyright</key> |