[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. byteme/1.20.7-1-10-g91941d4
The following commit has been merged in the master branch: commit 3c54c1de320e35ac078b656b5d5fd9da359978b5 Author: Robin Cornelius [EMAIL PROTECTED] Date: Thu May 22 22:02:07 2008 +0100 Sync executable status on dpatch files diff --git a/debian/patches/_keep_statbars_from_overshooting.patch.dpatch b/debian/patches/_keep_statbars_from_overshooting.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/0001_possible_crash_and_leak_llassetstorage.patch.dpatch b/debian/patches/0001_possible_crash_and_leak_llassetstorage.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/0001_possible_crash_in_llviewerpartssim.dpatch b/debian/patches/0001_possible_crash_in_llviewerpartssim.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/1294_llworkerthread_when_terminating_program.patch.dpatch b/debian/patches/1294_llworkerthread_when_terminating_program.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/1857_apr_thread_mutex_nested.patch.dpatch b/debian/patches/1857_apr_thread_mutex_nested.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/2003_possible_crash_draganddrop.patch.dpatch b/debian/patches/2003_possible_crash_draganddrop.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/21_VWR_2488_Standalone_build_fixes.dpatch b/debian/patches/21_VWR_2488_Standalone_build_fixes.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/22_build_more_approprate_binary_name.dpatch b/debian/patches/22_build_more_approprate_binary_name.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/24_always_test_vectorize.dpatch b/debian/patches/24_always_test_vectorize.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/24_fix_64bit_times.dpatch b/debian/patches/24_fix_64bit_times.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/2543_possible_crash_in_group_voting_propsals.patch.dpatch b/debian/patches/2543_possible_crash_in_group_voting_propsals.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/2683_possible_crash_update_speaker_list.patch.dpatch b/debian/patches/2683_possible_crash_update_speaker_list.patch.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/34_dont_hide_symbols.dpatch b/debian/patches/34_dont_hide_symbols.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/38_build_opensource_without_crashlogger.dpatch b/debian/patches/38_build_opensource_without_crashlogger.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/4022_jpeg_error_gracefully.dpatch b/debian/patches/4022_jpeg_error_gracefully.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/50_get_cpu_clock_count_for_more_than_just_i386.dpatch b/debian/patches/50_get_cpu_clock_count_for_more_than_just_i386.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/51_fix_vectorize.dpatch b/debian/patches/51_fix_vectorize.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/52_standalone_expat_headers.dpatch b/debian/patches/52_standalone_expat_headers.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/55_fix_the_locales.dpatch b/debian/patches/55_fix_the_locales.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/55_use_system_locale.dpatch b/debian/patches/55_use_system_locale.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/59_need_llpreprocessor_to_access_endian_macros.dpatch b/debian/patches/59_need_llpreprocessor_to_access_endian_macros.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/60_use_system_headers_for_apr-1.dpatch b/debian/patches/60_use_system_headers_for_apr-1.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/60_use_system_xulrunner.dpatch b/debian/patches/60_use_system_xulrunner.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/61_use_debain_cares_1.5.1.dpatch b/debian/patches/61_use_debain_cares_1.5.1.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/68_use_system_headers_for_openjpeg.dpatch b/debian/patches/68_use_system_headers_for_openjpeg.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch b/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/71_use_debian_alternatives_for_www_browser.dpatch b/debian/patches/71_use_debian_alternatives_for_www_browser.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/75_use_debian-included_fonts.dpatch b/debian/patches/75_use_debian-included_fonts.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/79_use_debian_channel.dpatch b/debian/patches/79_use_debian_channel.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/VWR-1815_top_corner_fix.dpatch b/debian/patches/VWR-1815_top_corner_fix.dpatch old
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. byteme/1.20.7-1-10-g91941d4
The following commit has been merged in the master branch:
commit 86b70162823912e9768bbc5579ccd9743002a975
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Thu May 29 12:35:54 2008 +0100
revert code to pre patched version in tree
diff --git a/indra/SConstruct b/indra/SConstruct
index 1fbb686..bfc30aa 100644
--- a/indra/SConstruct
+++ b/indra/SConstruct
@@ -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
@@ -177,6 +180,8 @@ if standalone:
'packages: %s' % ' '.join(missing))
sys.exit(2)
+
+
#
# ITERATE TARGETS #
#
diff --git a/indra/llaudio/audioengine_fmod.cpp
b/indra/llaudio/audioengine_fmod.cpp
index 271074e..2142e67 100644
--- a/indra/llaudio/audioengine_fmod.cpp
+++ b/indra/llaudio/audioengine_fmod.cpp
@@ -335,6 +335,13 @@ void LLAudioEngine_FMOD::initWind()
void LLAudioEngine_FMOD::cleanupWind()
{
+#if LL_RELEASE_FOR_DOWNLOAD
+ // This hack exists because fmod likes to occasionally hang forever
+ // when shutting down for no apparent reason.
+ llwarns Hack, skipping audio engine cleanup llendflush;
+ return;
+#endif
+
if (gWindDSP)
{
FSOUND_DSP_SetActive(gWindDSP, FALSE);
diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
index 0ffa838..00b0e30 100644
--- a/indra/llimage/llimagejpeg.cpp
+++ b/indra/llimage/llimagejpeg.cpp
@@ -35,6 +35,8 @@
#include llerror.h
+static jmp_buf gSetjmpBuffer;
+
LLImageJPEG::LLImageJPEG()
:
LLImageFormatted(IMG_CODEC_JPEG),
@@ -77,6 +79,14 @@ BOOL LLImageJPEG::updateData()
jerr.emit_message = LLImageJPEG::errorEmitMessage;
// Conditionally emit a trace or warning message
jerr.output_message = LLImageJPEG::errorOutputMessage; //
Routine that actually outputs a trace or error message
+ // Establish the setjmp return context mSetjmpBuffer. Used by library
to abort.
+ if( setjmp(gSetjmpBuffer) )
+ {
+ // If we get here, the JPEG code has signaled an error.
+ jpeg_destroy_decompress(cinfo);
+ return FALSE;
+ }
+
try
{
// Now we can initialize the JPEG decompression object.
@@ -209,6 +219,14 @@ BOOL LLImageJPEG::decode(LLImageRaw* raw_image, F32
decode_time)
jerr.output_message = LLImageJPEG::errorOutputMessage; //
Routine that actually outputs a trace or error message
+ // Establish the setjmp return context mSetjmpBuffer. Used by library
to abort.
+ if( setjmp(gSetjmpBuffer) )
+ {
+ // If we get here, the JPEG code has signaled an error.
+ jpeg_destroy_decompress(cinfo);
+ return FALSE;
+ }
+
try
{
// Now we can initialize the JPEG decompression object.
diff --git a/indra/llimagej2coj/llimagej2coj.cpp
b/indra/llimagej2coj/llimagej2coj.cpp
index 478cc84..27601c0 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -416,9 +416,15 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C base)
/* open a byte stream */
cio = opj_cio_open((opj_common_ptr)dinfo, base.getData(),
base.getDataSize());
- /* decode the stream and fill the image structure */
- image = opj_decode(dinfo, cio);
+ /* decode the stream and fill the image structure, also fill in an
additional
+ structure to get the decoding result. This structure is a bit
unusual in that
+ it is not received through opj, but still has some dynamically
allocated fields
+ that need to be cleared up at the end by calling a destroy function.
*/
+ opj_codestream_info_t cinfo;
+ memset(cinfo, 0, sizeof(opj_codestream_info_t));
+ image = opj_decode_with_info(dinfo, cio, cinfo);
+
/* close the byte stream */
opj_cio_close(cio);
diff --git a/indra/llmedia/llmediaimplgstreamer.cpp
b/indra/llmedia/llmediaimplgstreamer.cpp
index 5bf30d9..4ec4477 100644
--- a/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/indra/llmedia/llmediaimplgstreamer.cpp
@@ -623,4 +623,25 @@ setVolume(float volume)
return false;
}
+bool LLMediaImplGStreamer::isPaused()
+{
+
+ if(getStatus() == LLMediaBase::STATUS_PAUSED)
+ return true;
+
+ return false;
+
+}
+
+bool LLMediaImplGStreamer::isPlaying()
+{
+
+ if(getStatus() == LLMediaBase::STATUS_STARTED)
+ return true;
+
+ return false;
+
+}
+
+
#endif // LL_GSTREAMER_ENABLED
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 9693df4..bdde8f7 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. byteme/1.20.7-1-10-g91941d4
The following commit has been merged in the master branch:
commit d5f4bd76a5f52aa76548fa3bf80e649cd0240cf9
Merge: 86b70162823912e9768bbc5579ccd9743002a975
a23d494f59180e6bc067665d1768d93611a7f528
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Thu May 29 12:36:32 2008 +0100
Merge branch 'upstream'
diff --combined indra/newview/llstartup.cpp
index 82ed8b3,4dca600..864e7f9
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@@ -645,9 -645,6 +645,9 @@@ BOOL idle_startup(
LLViewerMedia::initClass();
LLViewerParcelMedia::initClass();
+ if (gAudiop)
+ gAudiop-InitStreamer();
+
if (gViewerWindow)
{
audio_update_volume(true);
@@@ -1227,7 -1224,7 +1227,7 @@@
sAuthUriNum++;
std::ostringstream s;
LLString::format_map_t args;
- args[[NUMBER]] = sAuthUriNum + 1;
+ args[[NUMBER]] = llformat(%d, sAuthUriNum +
1);
auth_desc = LLTrans::getString(LoginAttempt,
args).c_str();
LLStartUp::setStartupState(
STATE_LOGIN_AUTHENTICATE );
return do_normal_idle;
@@@ -2332,7 -2329,7 +2332,7 @@@
gDebugView-mFastTimerView-setVisible(TRUE);
#endif
- LLAppViewer::instance()-startMainloopTimeout();
+ LLAppViewer::instance()-initMainloopTimeout(Mainloop Init);
return do_normal_idle;
}
--
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. byteme/1.20.7-1-10-g91941d4
The following commit has been merged in the master branch:
commit 0daa831af103cf4305dd61636b9e80cc7c946dd9
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Thu May 29 12:43:27 2008 +0100
Commence the big package name change to comply with trademarks
diff --git a/debian/changelog b/debian/changelog
index 0d958c8..666e472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+slviewer (1.20.8-1) experimental; urgency=low
+
+ * New Upstream Version
+
+ -- Robin Cornelius [EMAIL PROTECTED] Thu, 29 May 2008 12:36:33 +0100
+
slviewer (1.20.7-1) experimental; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index f46509b..25c49a8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: slviewer
+Source: omvviewer
Section: games
Priority: extra
Maintainer: Secondlife Debian Team [EMAIL PROTECTED]
@@ -8,25 +8,31 @@ Standards-Version: 3.7.2
XS-Vcs-Svn: svn://slupdate.byteme.org.uk/slviewer/slviewer/trunk
XS-Vcs-Browser: http://slupdate.byteme.org.uk/
-Package: slviewer
+Package: omvviewer
Architecture: i386 amd64 powerpc
-Depends: ${misc:Depends}, ${shlibs:Depends}, slviewer-data (=
${binary:Version}), slviewer-artwork (= 1.20.4.0), ttf-kochi-mincho,
ttf-dejavu, libc-ares1
+Depends: ${misc:Depends}, ${shlibs:Depends}, omvviewer-data (=
${binary:Version}), slviewer-artwork (= 1.20.4.0), ttf-kochi-mincho,
ttf-dejavu, libc-ares1
Recommends: libgstreamer0.10-0, libgstreamer-plugins-base0.10-0
-Conflicts: libcares2
-Description: Second Life grid client
- This package contains the Second Life client for connecting to
- Second Life server grids
+Replaces: slviewer
+Description: Open Metaverse Viewer
+ A client for conecting to 3D virtual worlds such as SecondLife(tm)
+ or servers operating the OpenSim package. This client is based on
+ the offical version from Linden Labs, with the addition of patches
+ to enable cleaner integration with Debian and stability and bug fixes
+ .
+ The package is renamed to avoid use of Linden Lab's trademarks
-Package: slviewer-dbg
+Package: omvviewer-dbg
Architecture: i386 amd64 powerpc
-Depends: slviewer (= ${binary:Version})
+Depends: omvviewer (= ${binary:Version})
+Replaces: slviewer-dbg
Description: Second Life grid client
- This package contains the debug symbols for the slviewer binary
- of the Second Life client for connecting to Second Life server grids
-
-Package: slviewer-data
+ This package contains the debug symbols for the omvviewer and should
+ be installed to enabled debugging of the application
+
+Package: omvviewer-data
Architecture: all
-Recommends: slviewer
-Description: Datafiles for slviewer
- This package contains the static datafiles needed by a Second Life
- client to connect to a Second Life server grid
+Recommends: omvviewer
+Replaces: slviewer-data
+Description: Datafiles for Open Metaverse viewer
+ This package contains the static datafiles needed by a Open
+ Metaverse client to connect to a grid service such as Secondlife(tm)
diff --git a/debian/omvviewer-data.dirs b/debian/omvviewer-data.dirs
new file mode 100644
index 000..ba8aad9
--- /dev/null
+++ b/debian/omvviewer-data.dirs
@@ -0,0 +1 @@
+usr/share/omvviewer
\ No newline at end of file
diff --git a/debian/slviewer-data.install b/debian/omvviewer-data.install
similarity index 100%
rename from debian/slviewer-data.install
rename to debian/omvviewer-data.install
diff --git a/debian/slviewer.6 b/debian/omvviewer.6
similarity index 100%
rename from debian/slviewer.6
rename to debian/omvviewer.6
diff --git a/debian/omvviewer.README.Debian b/debian/omvviewer.README.Debian
new file mode 100644
index 000..6069fdc
--- /dev/null
+++ b/debian/omvviewer.README.Debian
@@ -0,0 +1,42 @@
+
+-- Fonts --
+
+As the fonts used in the upstream viewer cannot be distributed with
+Debian, the default fonts have been changed as follows:
+FontMonospace:
/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
+FontSansSerif:
/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+FontSansSerifFallback: /usr/share/fonts/truetype/kochi/kochi-mincho.ttf
+FontSansSerifBold:
/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
+
+These can be overridden in your settings.xml (see ~/.secondlife) as per usual.
+Multiple fallback fonts (i.e. for when FontSansSerif doesn't have the requested
+character set) can be listed, separated by ;.
+
+At the moment, fonts must be listed by full pathname.
+
+Suggestions for other default fallback fonts, or just a better font selection,
+are very welcome in the Debian Bugtracking System.
+
+-- External www-browser --
+
+The default behaviour of Secondlife is to call launch.sh to run an external web
+browser. The behaviour is modified in the Debian package so that the viewer
will
+first look for the environmental variable BROSWER and run that if found. If not
+found it will directly call the symbolic link
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. byteme/1.20.7-1-10-g91941d4
The following commit has been merged in the master branch:
commit c803ca1e721a201201c4c5ec9b63e6c3fcd5a6b4
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Thu May 29 12:50:21 2008 +0100
Sync with my svn changes for trademark removal, sync patches and set all
dpatch files to not have exectuable set
diff --git a/debian/control b/debian/control
index 25c49a8..5fae8f8 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ XS-Vcs-Browser: http://slupdate.byteme.org.uk/
Package: omvviewer
Architecture: i386 amd64 powerpc
-Depends: ${misc:Depends}, ${shlibs:Depends}, omvviewer-data (=
${binary:Version}), slviewer-artwork (= 1.20.4.0), ttf-kochi-mincho,
ttf-dejavu, libc-ares1
+Depends: ${misc:Depends}, ${shlibs:Depends}, omvviewer-data (=
${binary:Version}), omvviewer-artwork (= 1.20.8.0), ttf-kochi-mincho,
ttf-dejavu, libc-ares1
Recommends: libgstreamer0.10-0, libgstreamer-plugins-base0.10-0
Replaces: slviewer
Description: Open Metaverse Viewer
diff --git a/debian/patches/_keep_statbars_from_overshooting.patch.dpatch
b/debian/patches/_keep_statbars_from_overshooting.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/_valgrind_wild_vars.dpatch
b/debian/patches/_valgrind_wild_vars.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/0001_possible_crash_and_leak_llassetstorage.patch.dpatch
b/debian/patches/0001_possible_crash_and_leak_llassetstorage.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/0001_possible_crash_in_llviewerpartssim.dpatch
b/debian/patches/0001_possible_crash_in_llviewerpartssim.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/1294_llworkerthread_when_terminating_program.patch.dpatch
b/debian/patches/1294_llworkerthread_when_terminating_program.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/1857_apr_thread_mutex_nested.patch.dpatch
b/debian/patches/1857_apr_thread_mutex_nested.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/2003_possible_crash_draganddrop.patch.dpatch
b/debian/patches/2003_possible_crash_draganddrop.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/21_VWR_2488_Standalone_build_fixes.dpatch
b/debian/patches/21_VWR_2488_Standalone_build_fixes.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/22_build_more_approprate_binary_name.dpatch
b/debian/patches/22_build_more_approprate_binary_name.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/22_build_more_approprate_binary_name.dpatch~
b/debian/patches/22_build_more_approprate_binary_name.dpatch~
deleted file mode 100644
index 91eb19b..000
--- a/debian/patches/22_build_more_approprate_binary_name.dpatch~
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## name the binary slviewer.dpatch by [EMAIL PROTECTED]
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
[EMAIL PROTECTED]@
-
-Index: ./indra/SConstruct
-===
./indra/SConstruct (revision 344)
-+++ ./indra/SConstruct (working copy)
-@@ -643,7 +643,7 @@
- ##
- # BUILD NEWVIEW #
- ##
--output_bin = 'newview/secondlife-' + arch + '-bin'
-+output_bin = 'newview/slviewer'
-
- external_libs = client_external_libs + common_external_libs
-
diff --git a/debian/patches/24_always_test_vectorize.dpatch
b/debian/patches/24_always_test_vectorize.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/24_fix_64bit_times.dpatch
b/debian/patches/24_fix_64bit_times.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/2543_possible_crash_in_group_voting_propsals.patch.dpatch
b/debian/patches/2543_possible_crash_in_group_voting_propsals.patch.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/2683_possible_crash_update_speaker_list.patch.dpatch
b/debian/patches/2683_possible_crash_update_speaker_list.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/34_dont_hide_symbols.dpatch
b/debian/patches/34_dont_hide_symbols.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/38_build_opensource_without_crashlogger.dpatch
b/debian/patches/38_build_opensource_without_crashlogger.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/4022_jpeg_error_gracefully.dpatch
b/debian/patches/4022_jpeg_error_gracefully.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/50_get_cpu_clock_count_for_more_than_just_i386.dpatch
b/debian/patches/50_get_cpu_clock_count_for_more_than_just_i386.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/51_fix_vectorize.dpatch
b/debian/patches/51_fix_vectorize.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/52_standalone_expat_headers.dpatch
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. byteme/1.20.7-1-10-g91941d4
The following commit has been merged in the master branch: commit d4a883656ad9e81d2101221ea4afcc0b4ac8990e Author: Robin Cornelius [EMAIL PROTECTED] Date: Thu May 29 12:53:11 2008 +0100 Correct name package in changelog diff --git a/debian/changelog b/debian/changelog index 666e472..fa38a9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -slviewer (1.20.8-1) experimental; urgency=low +omvviewer (1.20.8-1) experimental; urgency=low * New Upstream Version +Rename package omvviewer for trademark compliance - -- Robin Cornelius [EMAIL PROTECTED] Thu, 29 May 2008 12:36:33 +0100 + -- Robin Cornelius [EMAIL PROTECTED] Thu, 29 May 2008 12:36:33 +0100 slviewer (1.20.7-1) experimental; urgency=low -- 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. byteme/1.20.7-1-10-g91941d4
The following commit has been merged in the master branch:
commit c68bf8cc6e8cf317c8769bbb03a769f2b8aa5371
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Thu May 29 13:26:16 2008 +0100
Revert upstream files to clean copies
diff --git a/indra/llaudio/audioengine_fmod.cpp
b/indra/llaudio/audioengine_fmod.cpp
index 2142e67..271074e 100644
--- a/indra/llaudio/audioengine_fmod.cpp
+++ b/indra/llaudio/audioengine_fmod.cpp
@@ -335,13 +335,6 @@ void LLAudioEngine_FMOD::initWind()
void LLAudioEngine_FMOD::cleanupWind()
{
-#if LL_RELEASE_FOR_DOWNLOAD
- // This hack exists because fmod likes to occasionally hang forever
- // when shutting down for no apparent reason.
- llwarns Hack, skipping audio engine cleanup llendflush;
- return;
-#endif
-
if (gWindDSP)
{
FSOUND_DSP_SetActive(gWindDSP, FALSE);
diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
index 00b0e30..0ffa838 100644
--- a/indra/llimage/llimagejpeg.cpp
+++ b/indra/llimage/llimagejpeg.cpp
@@ -35,8 +35,6 @@
#include llerror.h
-static jmp_buf gSetjmpBuffer;
-
LLImageJPEG::LLImageJPEG()
:
LLImageFormatted(IMG_CODEC_JPEG),
@@ -79,14 +77,6 @@ BOOL LLImageJPEG::updateData()
jerr.emit_message = LLImageJPEG::errorEmitMessage;
// Conditionally emit a trace or warning message
jerr.output_message = LLImageJPEG::errorOutputMessage; //
Routine that actually outputs a trace or error message
- // Establish the setjmp return context mSetjmpBuffer. Used by library
to abort.
- if( setjmp(gSetjmpBuffer) )
- {
- // If we get here, the JPEG code has signaled an error.
- jpeg_destroy_decompress(cinfo);
- return FALSE;
- }
-
try
{
// Now we can initialize the JPEG decompression object.
@@ -219,14 +209,6 @@ BOOL LLImageJPEG::decode(LLImageRaw* raw_image, F32
decode_time)
jerr.output_message = LLImageJPEG::errorOutputMessage; //
Routine that actually outputs a trace or error message
- // Establish the setjmp return context mSetjmpBuffer. Used by library
to abort.
- if( setjmp(gSetjmpBuffer) )
- {
- // If we get here, the JPEG code has signaled an error.
- jpeg_destroy_decompress(cinfo);
- return FALSE;
- }
-
try
{
// Now we can initialize the JPEG decompression object.
diff --git a/indra/llimagej2coj/llimagej2coj.cpp
b/indra/llimagej2coj/llimagej2coj.cpp
index 27601c0..478cc84 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -416,15 +416,9 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C base)
/* open a byte stream */
cio = opj_cio_open((opj_common_ptr)dinfo, base.getData(),
base.getDataSize());
+ /* decode the stream and fill the image structure */
+ image = opj_decode(dinfo, cio);
- /* decode the stream and fill the image structure, also fill in an
additional
- structure to get the decoding result. This structure is a bit
unusual in that
- it is not received through opj, but still has some dynamically
allocated fields
- that need to be cleared up at the end by calling a destroy function.
*/
- opj_codestream_info_t cinfo;
- memset(cinfo, 0, sizeof(opj_codestream_info_t));
- image = opj_decode_with_info(dinfo, cio, cinfo);
-
/* close the byte stream */
opj_cio_close(cio);
diff --git a/indra/llmedia/llmediaimplgstreamer.cpp
b/indra/llmedia/llmediaimplgstreamer.cpp
index 4ec4477..5bf30d9 100644
--- a/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/indra/llmedia/llmediaimplgstreamer.cpp
@@ -623,25 +623,4 @@ setVolume(float volume)
return false;
}
-bool LLMediaImplGStreamer::isPaused()
-{
-
- if(getStatus() == LLMediaBase::STATUS_PAUSED)
- return true;
-
- return false;
-
-}
-
-bool LLMediaImplGStreamer::isPlaying()
-{
-
- if(getStatus() == LLMediaBase::STATUS_STARTED)
- return true;
-
- return false;
-
-}
-
-
#endif // LL_GSTREAMER_ENABLED
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index bdde8f7..9693df4 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1617,11 +1617,6 @@ BOOL LLScrollListCtrl::setSelectedByValue(const LLSD
value, BOOL selected)
BOOL LLScrollListCtrl::isSelected(const LLSD value) const
{
- if (!getCanSelect())
- {
- return NULL;
- }
-
item_list::const_iterator iter;
for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
{
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
index 8d91415..ae87aa1 100644
--- a/indra/llvfs/lldir_win32.cpp
+++ b/indra/llvfs/lldir_win32.cpp
@@ -58,10 +58,6 @@
[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. byteme/1.20.7-1-10-g91941d4
The following commit has been merged in the master branch:
commit 91941d490a73382ef6fb1d797ff0e761753ea8cd
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Thu May 29 18:04:56 2008 +0100
Update packaging to reflect trademark compliance changes and build fails it
produced due to references to old slviewer
diff --git a/debian/control b/debian/control
index 5fae8f8..c0b3322 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ XS-Vcs-Browser: http://slupdate.byteme.org.uk/
Package: omvviewer
Architecture: i386 amd64 powerpc
-Depends: ${misc:Depends}, ${shlibs:Depends}, omvviewer-data (=
${binary:Version}), omvviewer-artwork (= 1.20.8.0), ttf-kochi-mincho,
ttf-dejavu, libc-ares1
+Depends: ${misc:Depends}, ${shlibs:Depends}, omvviewer-data (=
${binary:Version}), omvviewer-artwork (= 1.20.8), ttf-kochi-mincho,
ttf-dejavu, libc-ares1
Recommends: libgstreamer0.10-0, libgstreamer-plugins-base0.10-0
Replaces: slviewer
Description: Open Metaverse Viewer
diff --git a/debian/omvviewer-data.install b/debian/omvviewer-data.install
index 20f39ae..64c4537 100644
--- a/debian/omvviewer-data.install
+++ b/debian/omvviewer-data.install
@@ -1,11 +1,11 @@
-indra/newview/featuretable_linux.txt usr/share/secondlife
-indra/newview/gpu_table.txt usr/share/secondlife
-indra/newview/app_settings/ usr/share/secondlife
-indra/newview/res/ usr/share/secondlife
-indra/newview/skins/ usr/share/secondlife
-scripts/messages/message_template.msg usr/share/secondlife/app_settings
-etc/message.xml usr/share/secondlife/app_settings
-indra/newview/linux_tools/launch_url.sh usr/share/secondlife/
+indra/newview/featuretable_linux.txt usr/share/omvviewer
+indra/newview/gpu_table.txt usr/share/omvviewer
+indra/newview/app_settings/ usr/share/omvviewer
+indra/newview/res/ usr/share/omvviewer
+indra/newview/skins/ usr/share/omvviewer
+scripts/messages/message_template.msg usr/share/omvviewer/app_settings
+etc/message.xml usr/share/omvviewer/app_settings
+indra/newview/linux_tools/launch_url.sh usr/share/omvviewer
diff --git a/debian/omvviewer.manpages b/debian/omvviewer.manpages
index 7c9f97a..cd418fb 100644
--- a/debian/omvviewer.manpages
+++ b/debian/omvviewer.manpages
@@ -1 +1 @@
-debian/slviewer.6
+debian/omvviewer.6
diff --git a/debian/omvviewer.manpages b/debian/omvviewer.manpages~
similarity index 100%
copy from debian/omvviewer.manpages
copy to debian/omvviewer.manpages~
diff --git a/debian/omvviewer.menu b/debian/omvviewer.menu
index 5b5dcc7..a3ea875 100644
--- a/debian/omvviewer.menu
+++ b/debian/omvviewer.menu
@@ -1,3 +1,3 @@
?package(slviewer):needs=x11 section=Games/Simulation\
- title=Open Metaverse Viewer command=/usr/bin/slviewer \
+ title=Open Metaverse Viewer command=/usr/bin/omvviewer \
icon=/usr/share/pixmaps/viewericon.xpm
diff --git a/debian/rules b/debian/rules
index 7537675..3ed04e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ binary-arch: build-arch install-arch
dh_installdocs -s
dh_installmenu -s
dh_installman -s
- dh_strip -s --dbg-package=slviewer-dbg
+ dh_strip -s --dbg-package=omvviewer-dbg
dh_compress -s
dh_fixperms -s
dh_installdeb -s
--
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
