[Contrib-commits] r4112 - in applications/games/secondlife: . files
contrib-commits at pardus.org.tr
contrib-commits at pardus.org.tr
2 Mayıs 2007 Çar 23:00:35 EEST
Author: murat
Date: Wed May 2 23:00:35 2007
New Revision: 4112
Added:
applications/games/secondlife/files/slviewer-1.15.0.2-enable_fmod.patch
Removed:
applications/games/secondlife/files/slviewer-1.14.0.1-enable_fmod.patch
Modified:
applications/games/secondlife/files/pardus-build.patch
applications/games/secondlife/pspec.xml
Log:
stable bump
Modified: applications/games/secondlife/files/pardus-build.patch
=================================================================
--- applications/games/secondlife/files/pardus-build.patch (original)
+++ applications/games/secondlife/files/pardus-build.patch Wed May 2 23:00:35 2007
@@ -1,7 +1,7 @@
diff -Naur linden.orig/indra/llcommon/llsdserialize_xml.cpp linden/indra/llcommon/llsdserialize_xml.cpp
---- linden.orig/indra/llcommon/llsdserialize_xml.cpp 2007-04-03 19:55:48.000000000 +0300
-+++ linden/indra/llcommon/llsdserialize_xml.cpp 2007-04-04 20:08:30.000000000 +0300
-@@ -35,7 +35,7 @@
+--- linden.orig/indra/llcommon/llsdserialize_xml.cpp 2007-04-25 22:12:58.000000000 +0300
++++ linden/indra/llcommon/llsdserialize_xml.cpp 2007-05-02 22:35:58.000000000 +0300
+@@ -36,7 +36,7 @@
extern "C"
{
@@ -11,21 +11,21 @@
/**
diff -Naur linden.orig/indra/llcommon/llsys.cpp linden/indra/llcommon/llsys.cpp
---- linden.orig/indra/llcommon/llsys.cpp 2007-04-03 19:55:48.000000000 +0300
-+++ linden/indra/llcommon/llsys.cpp 2007-04-04 20:08:54.000000000 +0300
-@@ -30,7 +30,7 @@
+--- linden.orig/indra/llcommon/llsys.cpp 2007-04-25 22:12:59.000000000 +0300
++++ linden/indra/llcommon/llsys.cpp 2007-05-02 22:35:58.000000000 +0300
+@@ -31,7 +31,7 @@
#include "llsys.h"
#include <iostream>
-#include <zlib/zlib.h>
+#include <zlib.h>
+
#include "processor.h"
- #if LL_WINDOWS
diff -Naur linden.orig/indra/llimage/llimagejpeg.h linden/indra/llimage/llimagejpeg.h
---- linden.orig/indra/llimage/llimagejpeg.h 2007-04-03 19:55:48.000000000 +0300
-+++ linden/indra/llimage/llimagejpeg.h 2007-04-04 20:09:58.000000000 +0300
-@@ -33,8 +33,8 @@
+--- linden.orig/indra/llimage/llimagejpeg.h 2007-04-25 22:12:59.000000000 +0300
++++ linden/indra/llimage/llimagejpeg.h 2007-05-02 22:35:37.000000000 +0300
+@@ -34,8 +34,8 @@
#include "llimage.h"
extern "C" {
@@ -36,22 +36,10 @@
}
class LLImageJPEG : public LLImageFormatted
-diff -Naur linden.orig/indra/llmessage/llhttpassetstorage.cpp linden/indra/llmessage/llhttpassetstorage.cpp
---- linden.orig/indra/llmessage/llhttpassetstorage.cpp 2007-04-03 19:55:50.000000000 +0300
-+++ linden/indra/llmessage/llhttpassetstorage.cpp 2007-04-04 20:10:31.000000000 +0300
-@@ -36,7 +36,7 @@
- #include "llvfile.h"
- #include "llvfs.h"
-
--#include "zlib/zlib.h"
-+#include "zlib.h"
-
- const U32 MAX_RUNNING_REQUESTS = 1;
- const F32 MAX_PROCESSING_TIME = 0.005f;
diff -Naur linden.orig/indra/llrender/llfont.cpp linden/indra/llrender/llfont.cpp
---- linden.orig/indra/llrender/llfont.cpp 2007-04-03 19:55:50.000000000 +0300
-+++ linden/indra/llrender/llfont.cpp 2007-04-04 20:11:23.000000000 +0300
-@@ -31,7 +31,7 @@
+--- linden.orig/indra/llrender/llfont.cpp 2007-04-25 22:13:02.000000000 +0300
++++ linden/indra/llrender/llfont.cpp 2007-05-02 22:35:58.000000000 +0300
+@@ -32,7 +32,7 @@
// Freetype stuff
#if LL_LINUX // I had to do some work to avoid the system-installed FreeType headers... --ryan.
@@ -61,9 +49,9 @@
#include <ft2build.h>
#endif
diff -Naur linden.orig/indra/llxml/llxmlnode.h linden/indra/llxml/llxmlnode.h
---- linden.orig/indra/llxml/llxmlnode.h 2007-04-03 19:55:51.000000000 +0300
-+++ linden/indra/llxml/llxmlnode.h 2007-04-04 20:11:52.000000000 +0300
-@@ -29,7 +29,7 @@
+--- linden.orig/indra/llxml/llxmlnode.h 2007-04-25 22:13:05.000000000 +0300
++++ linden/indra/llxml/llxmlnode.h 2007-05-02 22:35:37.000000000 +0300
+@@ -30,7 +30,7 @@
#define LL_LLXMLNODE_H
#define XML_STATIC
@@ -73,9 +61,9 @@
#include "indra_constants.h"
diff -Naur linden.orig/indra/llxml/llxmlparser.h linden/indra/llxml/llxmlparser.h
---- linden.orig/indra/llxml/llxmlparser.h 2007-04-03 19:55:51.000000000 +0300
-+++ linden/indra/llxml/llxmlparser.h 2007-04-04 20:12:14.000000000 +0300
-@@ -29,7 +29,7 @@
+--- linden.orig/indra/llxml/llxmlparser.h 2007-04-25 22:13:05.000000000 +0300
++++ linden/indra/llxml/llxmlparser.h 2007-05-02 22:35:37.000000000 +0300
+@@ -30,7 +30,7 @@
#define LL_LLXMLPARSER_H
#define XML_STATIC
@@ -85,9 +73,9 @@
class LLXmlParser
{
diff -Naur linden.orig/indra/newview/llviewerobjectlist.cpp linden/indra/newview/llviewerobjectlist.cpp
---- linden.orig/indra/newview/llviewerobjectlist.cpp 2007-04-03 19:56:02.000000000 +0300
-+++ linden/indra/newview/llviewerobjectlist.cpp 2007-04-04 20:13:31.000000000 +0300
-@@ -60,7 +60,7 @@
+--- linden.orig/indra/newview/llviewerobjectlist.cpp 2007-04-25 22:13:15.000000000 +0300
++++ linden/indra/newview/llviewerobjectlist.cpp 2007-05-02 22:35:59.000000000 +0300
+@@ -61,7 +61,7 @@
#include "u64.h"
#include "llviewerimagelist.h"
#include "lldatapacker.h"
@@ -97,9 +85,9 @@
extern BOOL gVelocityInterpolate;
diff -Naur linden.orig/indra/newview/llwebbrowserctrl.h linden/indra/newview/llwebbrowserctrl.h
---- linden.orig/indra/newview/llwebbrowserctrl.h 2007-04-03 19:55:56.000000000 +0300
-+++ linden/indra/newview/llwebbrowserctrl.h 2007-04-04 20:16:27.000000000 +0300
-@@ -155,6 +155,9 @@
+--- linden.orig/indra/newview/llwebbrowserctrl.h 2007-04-25 22:13:10.000000000 +0300
++++ linden/indra/newview/llwebbrowserctrl.h 2007-05-02 22:38:56.000000000 +0300
+@@ -156,6 +156,9 @@
////////////////////////////////////////////////////////////////////////////////
//
@@ -109,7 +97,7 @@
class LLWebBrowserCtrl :
public LLUICtrl,
public LLEmbeddedBrowserWindowObserver
-@@ -239,7 +242,7 @@
+@@ -249,7 +252,7 @@
class LLWebBrowserTexture : public LLDynamicTexture
{
public:
@@ -119,37 +107,37 @@
virtual void preRender( BOOL clear_depth = TRUE ) {};
diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
---- linden.orig/indra/SConstruct 2007-04-03 19:55:46.000000000 +0300
-+++ linden/indra/SConstruct 2007-04-04 20:18:21.000000000 +0300
-@@ -187,13 +187,15 @@
- if arch == 'x86_64' or arch == 'x86_64cross':
- flags += '-DLL_FMOD=0 '
- flags += '-DLL_X11=1 -DLL_GTK=1 '
-- client_external_libs += [ 'gtk-x11-2.0', 'elfio' ]
-- include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ]
-- include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0']
-- include_dirs += [ '../libraries/' + system_str + '/include/pango-1.0' ]
-- include_dirs += [ '../libraries/' + system_str + '/include/atk-1.0' ]
-- include_dirs += [ '../libraries/' + system_str + '/include/ELFIO' ]
-- include_dirs += [ '../libraries/' + system_str + '/include/llfreetype2' ]
-+ client_external_libs += [ 'gtk-x11-2.0' ]
-+ include_dirs += [ '/usr/include/gtk-2.0' ]
-+ include_dirs += [ '/usr/include/glib-2.0' ]
-+ include_dirs += [ '/usr/lib/glib-2.0/include' ]
-+ include_dirs += [ '/usr/lib/gtk-2.0/include' ]
-+ include_dirs += [ '/usr/include/pango-1.0' ]
-+ include_dirs += [ '/usr/include/atk-1.0' ]
-+ include_dirs += [ '/usr/include/freetype2' ]
-+ include_dirs += [ '/usr/include/cairo' ]
-
- # llmozlib stuff
- if enable_mozlib == 'yes':
-@@ -217,7 +219,7 @@
- # ENVIRONMENT #
- ################
-
-- gcc_bin = 'g++-3.4'
-+ gcc_bin = 'g++'
- # If you strip more aggressively than -S then the quality of crash-
- # logger backtraces deteriorates.
- strip_cmd = 'strip -S -o $TARGET $SOURCE'
+--- linden.orig/indra/SConstruct 2007-04-25 22:12:56.000000000 +0300
++++ linden/indra/SConstruct 2007-05-02 22:41:40.000000000 +0300
+@@ -183,13 +183,15 @@
+ if arch == 'x86_64' or arch == 'x86_64cross':
+ flags += '-DLL_FMOD=0 '
+ flags += '-DLL_X11=1 -DLL_GTK=1 '
+- client_external_libs += [ 'gtk-x11-2.0', 'elfio' ]
+- include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ]
+- include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0']
+- include_dirs += [ '../libraries/' + system_str + '/include/pango-1.0' ]
+- include_dirs += [ '../libraries/' + system_str + '/include/atk-1.0' ]
+- include_dirs += [ '../libraries/' + system_str + '/include/ELFIO' ]
+- include_dirs += [ '../libraries/' + system_str + '/include/llfreetype2' ]
++ client_external_libs += [ 'gtk-x11-2.0' ]
++ include_dirs += [ '/usr/include/gtk-2.0' ]
++ include_dirs += [ '/usr/include/glib-2.0' ]
++ include_dirs += [ '/usr/lib/glib-2.0/include' ]
++ include_dirs += [ '/usr/lib/gtk-2.0/include' ]
++ include_dirs += [ '/usr/include/pango-1.0' ]
++ include_dirs += [ '/usr/include/atk-1.0' ]
++ include_dirs += [ '/usr/include/freetype2' ]
++ include_dirs += [ '/usr/include/cairo' ]
+
+ # llmozlib stuff
+ if enable_mozlib:
+@@ -213,7 +215,7 @@
+ # ENVIRONMENT #
+ ################
+
+- gcc_bin = 'g++-3.4'
++ gcc_bin = 'g++'
+ # If you strip more aggressively than -S then the quality of crash-
+ # logger backtraces deteriorates.
+ strip_cmd = 'strip -S -o $TARGET $SOURCE'
Modified: applications/games/secondlife/pspec.xml
=================================================================
--- applications/games/secondlife/pspec.xml (original)
+++ applications/games/secondlife/pspec.xml Wed May 2 23:00:35 2007
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>Client for SecondLife</Summary>
<Summary xml:lang="tr">SecondLife istemcisi</Summary>
- <Archive sha1sum="53eaf7f88bc4e7ad56faf39169f81bc939af8e04" type="targz">http://s3.amazonaws.com/viewer-source-downloads/2007/04/slviewer-src-beta-1.14.1.1.tar.gz</Archive>
+ <Archive sha1sum="10a0f66a46376e669a4dab55d5a3ec0529e09bde" type="targz">http://s3.amazonaws.com/viewer-source-downloads/2007/04/slviewer-src-1.15.0.2.tar.gz</Archive>
<BuildDependencies>
<Dependency releaseFrom="5">jpeg</Dependency>
<Dependency>fmod</Dependency>
@@ -29,7 +29,7 @@
<Patches>
<Patch level="1">no-elfio.patch</Patch>
<Patch level="1">pardus-build.patch</Patch>
- <Patch level="1">slviewer-1.14.0.1-enable_fmod.patch</Patch>
+ <Patch level="1">slviewer-1.15.0.2-enable_fmod.patch</Patch>
</Patches>
</Source>
@@ -46,7 +46,7 @@
<Dependency versionFrom="1.1.1">openjpeg</Dependency>
<Dependency>curl</Dependency>
<Dependency>fmod</Dependency>
- <Dependency version="1.14.1.1_beta1">secondlife-artwork</Dependency>
+ <Dependency version="1.15.0.2">secondlife-artwork</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -74,6 +74,13 @@
</Package>
<History>
+ <Update release="10">
+ <Date>2007-05-02</Date>
+ <Version>1.15.0.2</Version>
+ <Comment>Stable bump</Comment>
+ <Name>Murat Şenel</Name>
+ <Email>muratasenel at gmail.com</Email>
+ </Update>
<Update release="9">
<Date>2007-04-04</Date>
<Version>1.14.1.1_beta1</Version>
Contrib-commits mesaj listesiyle ilgili
daha fazla bilgi