[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.8-16-g79a8c8e

2008-06-09 Thread Robin Cornelius 
The following commit has been merged in the master branch:
commit b74cfab6c48937b17012ddd7f0b070f2b740703e
Merge: b37efee7284f723e634150a0f59bcd785ebd869c 
03d41ac184c99f784e58d16fbec9c5ece6080cbe
Author: Robin Cornelius [EMAIL PROTECTED]
Date:   Mon Jun 9 19:40:53 2008 +0100

Merge branch 'upstream'

diff --combined indra/SConstruct
index bfc30aa,9353317..af14c93
--- a/indra/SConstruct
+++ b/indra/SConstruct
@@@ -163,9 -163,6 +163,9 @@@ standalone_net_pkgs = 
  'libssl',
  ]
  
 +if enable_gstreamer:
 +standalone_pkgs.append( 'gstreamer-0.10' )
 +
  def pkgconfig(opt, pkgs=None):
  if pkgs is None:
  pkgs = standalone_pkgs + standalone_net_pkgs
@@@ -180,8 -177,6 +180,8 @@@ if standalone
'packages: %s' % ' '.join(missing))
  sys.exit(2)
  
 +
 +
  #
  # ITERATE TARGETS   #
  #
@@@ -213,7 -208,7 +213,7 @@@ for build_target in targets
  try:
  build_dir_prefix = os.environ['TEMP_BUILD_DIR']
  except:
 -build_dir_prefix = '/tmp/' + os.environ['USER']
 +build_dir_prefix = '/tmp/'
  
  build_dir = build_dir_prefix + os.getcwd() + '/' + system_str + '-' + 
build_target + '-' + buildtype
  
@@@ -354,7 -349,7 +354,7 @@@
  strip_cmd = 
'/opt/crosstool/gcc-4.0.2-glibc-2.3.6/x86_64-unknown-linux-gnu/x86_64-unknown-linux-gnu/bin/strip
 -S -o $TARGET $SOURCE'
  
  else:
- gcc_bin = 'g++-3.4'
+ gcc_bin = 'g++-4.1'
  
  # Are we using the Intel compiler?
  if gcc_bin.find('icpc') = 0:
@@@ -375,8 -370,8 +375,8 @@@
  releasenoopt_cflags = cflags + '-O0 '
  releasenoopt_cxxflags = cxxflags + '-O0 '
  releasenoopt_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 '
- releasefordownload_cflags = cflags + '-O2 '
- releasefordownload_cxxflags = cxxflags + '-O2 '
+ releasefordownload_cflags = cflags + '-O2 -fno-stack-protector '
+ releasefordownload_cxxflags = cxxflags + '-O2 -fno-stack-protector '
  releasefordownload_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 
-DLL_RELEASE_FOR_DOWNLOAD=1 '
  
  
@@@ -481,6 -476,7 +481,7 @@@
  env['ENV']['DISTCC_HOSTS'] = hosts
  env['ENV']['USER'] = os.environ['USER']
  env['ENV']['HOME'] = os.environ['HOME']
+ #env['ENV']['SSH_AUTH_SOCK'] = os.environ['SSH_AUTH_SOCK']
  
  if enable_colorgcc:
  env['ENV']['PATH'] = os.environ['PATH']

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and 
OpenSim grids

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.8-16-g79a8c8e

2008-06-09 Thread Robin Cornelius 
The following commit has been merged in the master branch:
commit 8a560fb687312f0db12386ee693f70d8b14b2276
Author: Robin Cornelius [EMAIL PROTECTED]
Date:   Mon Jun 9 19:41:50 2008 +0100

Correct my email address

diff --git a/debian/changelog b/debian/changelog
index fa38a9e..c2723c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+omvviewer (1.20.9-1) experimental; urgency=low
+
+  * New Upstream Version
+
+ -- Robin Cornelius [EMAIL PROTECTED]  Mon, 09 Jun 2008 19:40:54 +0100
+
 omvviewer (1.20.8-1) experimental; urgency=low
 
   * New Upstream Version

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and 
OpenSim grids

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.8-16-g79a8c8e

2008-06-09 Thread Robin Cornelius 
The following commit has been merged in the master branch:
commit 79a8c8ee0be962b2fe114bb399ed7b9898cc44aa
Author: Robin Cornelius [EMAIL PROTECTED]
Date:   Mon Jun 9 19:47:04 2008 +0100

Add texture cache patch

diff --git a/debian/patches/_no_texture_cache_madness.dpatch 
b/debian/patches/_no_texture_cache_madness.dpatch
new file mode 100755
index 000..b8cd7b3
--- /dev/null
+++ b/debian/patches/_no_texture_cache_madness.dpatch
@@ -0,0 +1,80 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Less texture cache madness.dpatch by  [EMAIL PROTECTED]
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+
+diff --git a/indra/newview/lltexturecache.cpp 
b/indra/newview/lltexturecache.cpp
+index 8240f77..b2bd12c 100644
+--- a/indra/newview/lltexturecache.cpp
 b/indra/newview/lltexturecache.cpp
+@@ -477,12 +477,36 @@ bool LLTextureCacheRemoteWorker::doRead()
+   }
+   }
+ #else
++  std::string filename = mCache-getTextureFileName(mID);
++  S32 filesize = ll_apr_file_size(filename+.j2c, 
mCache-getFileAPRPool());
++  if(filesize==0)
++  {
++  mDataSize = -1;
++  return true;
++  }
++
++  mReadData = new U8[mBytesToRead];
++  
++  S32 bytes_read = ll_apr_file_read_ex(filename+.j2c, 
mCache-getFileAPRPool(), mReadData, 0, mDataSize);
++  
++  if (bytes_read != mDataSize)
++  {
++  llwarns  LLTextureCacheWorker:mID
++incorrect number of bytes read 
from header:   bytes_read
++/   mDataSize  llendl;
++  mDataSize = -1; // failed
++  return true;
++  }
++
++  return true;
++
++
+   llassert_always(idx = 0);
+   llassert_always(mOffset  TEXTURE_CACHE_ENTRY_SIZE);
+   S32 offset = idx * TEXTURE_CACHE_ENTRY_SIZE + mOffset;
+   S32 size = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
+   mReadData = new U8[size];
+-  S32 bytes_read = 
ll_apr_file_read_ex(mCache-mHeaderDataFileName, mCache-getFileAPRPool(),
++  bytes_read = ll_apr_file_read_ex(mCache-mHeaderDataFileName, 
mCache-getFileAPRPool(),
+   
 mReadData, offset, size);
+   if (bytes_read != size)
+   {
+@@ -617,6 +641,19 @@ bool LLTextureCacheRemoteWorker::doWrite()
+   S32 idx = -1;
+ 
+   // No LOCAL state for write()
++
++  std::string filename = mCache-getTextureFileName(mID);
++
++  S32 bytes_written = ll_apr_file_write_ex(filename+.j2c, 
mCache-getFileAPRPool(), mWriteData, 0, mDataSize);
++
++  if (bytes_written = 0)
++  {
++  llwarns  LLTextureCacheWorker: missing entry:   mID  
llendl;
++  mDataSize = -1; // failed
++  return true;
++  }
++
++  return true;
+   
+   if (mState == INIT)
+   {
+@@ -696,6 +733,9 @@ bool LLTextureCacheRemoteWorker::doWrite()
+   S32 bytes_written = 
ll_apr_file_write_ex(mCache-mHeaderDataFileName, mCache-getFileAPRPool(),
+   
 mWriteData, offset, size);
+ 
++  
++
++
+   if (bytes_written = 0)
+   {
+   llwarns  LLTextureCacheWorker: missing entry:   
mID  llendl;
diff --git a/debian/patches/00list b/debian/patches/00list
index a0a9136..d0c7088 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -96,3 +96,4 @@ VWR-1815_top_corner_fix.dpatch
 VWR-5697_fix_startup_paths.dpatch
 VWR-7271_fix_mutlist_for_amd64.dpatch
 _valgrind_wild_vars.dpatch
+_no_texture_cache_madness.dpatch

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and 
OpenSim grids

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits