[SCM] freewrl packaging branch, master, updated. 7cf414d7349f2192ab879d5f0e146e31b5443211
rzr-guest at users.alioth.debian.org
rzr-guest at users.alioth.debian.org
Sat Mar 20 14:45:25 UTC 2010
The following commit has been merged in the master branch:
commit 7cf414d7349f2192ab879d5f0e146e31b5443211
Author: Stephen Zander <gibreel at debian.org>
Date: Sat Sep 15 23:46:01 2001 -0700
Imported Debian patch 0.29-1
diff --git a/Browser.pm b/Browser.pm
index 4e915a5..c9eabc8 100644
--- a/Browser.pm
+++ b/Browser.pm
@@ -55,8 +55,6 @@ require 'VRML/Events.pm';
require 'VRML/Config.pm';
require 'VRML/URL.pm';
-if ($VRML::PLUGIN{NETSCAPE}) { require 'VRML/PluginGlue.pm'; }
-
package VRML::Browser;
use File::Basename;
use strict vars;
@@ -91,10 +89,6 @@ sub load_file {
print "File: $file URL: $url\n" if $VRML::verbose::scene;
my $t = VRML::URL::get_absolute($file);
-
- # Required due to changes in VRML::URL::get_absolute in URL.pm:
- if (!$t) { die "File $file was not found"; }
-
unless($t =~ /^#VRML V2.0/s) {
if($t =~ /^#VRML V1.0/s) {
print "Sorry, this file is according to VRML V1.0, I only know V2.0";
@@ -128,8 +122,8 @@ sub get_backend { return $_[0]{BE} }
sub eventloop {
my($this) = @_;
## my $seqcnt = 0;
+ # print "eventloop ";
while(!$this->{BE}->quitpressed) {
- # print "eventloop\n";
$this->tick();
# Skip 1st image, which may not be good
if( $main::seq && $main::saving && ++$main::seqcnt )
@@ -179,8 +173,6 @@ sub eventloop {
}
}
}
-
- if ($VRML::PLUGIN{NETSCAPE}) { PluginGlue::close_fd($VRML::PLUGIN{socket}); }
$this->{BE}->close_screen();
}
@@ -266,7 +258,7 @@ sub replaceWorld {
my @newnodes = ();
my $n;
- # print "replaceWorld, string is $string\n";
+ print "replaceWorld, string is $string\n";
# lets go and create the new node array from the nodes as sent in.
for $n (split(' ',$string)) {
@@ -275,17 +267,29 @@ sub replaceWorld {
}
$this->clear_scene();
+print "1\n";
+
$this->{Scene} = VRML::Scene->new($this->{EV},"from replaceWorld");
+print "2\n";
+
$this->{Scene}->set_browser($this);
+print "3\n";
$this->{Scene}->topnodes(\@newnodes);
+print "4\n";
+
prepare ($this);
+print "4.5\n";
+
# go through the Bindables...
for $n (@newnodes) {
$this->{Scene}->replaceWorld_Bindable($n);
}
+print "5\n";
+
# and, take care of keeping the viewpoints active...
$this->{Scene}->register_vps($this);
+print "6\n";
}
@@ -312,12 +316,9 @@ sub createVrmlFromURL {
$url = "$wurl\/$url";
}
+
print "File: $file URL: $url\n" if $VRML::verbose::scene;
my $t = VRML::URL::get_absolute($url);
-
- # Required due to changes in VRML::URL::get_absolute in URL.pm:
- if (!$t) { die "File $file was not found"; }
-
unless($t =~ /^#VRML V2.0/s) {
if($t =~ /^#VRML V1.0/s) {
print "Sorry, this file is according to VRML V1.0, I only know V2.0\n"; exit (1);
@@ -512,29 +513,23 @@ END {
# Private stuff
{
+local $SIG{__DIE__} = undef;
+my $clk_tck;
+eval {$clk_tck = POSIX::CLK_TCK;} or
+ $clk_tck = POSIX::sysconf(POSIX::_SC_CLK_TCK);
my $ind = 0;
-#JAS - RH7.1 Perl does not have this routine defined off of the
-# CD. Every system that I have seen (SGI, Sun Linux) returns 100 for
-# the CLK_TCK, so I am just substituting this value here. IT only
-# affects the FPS, from what I can see.
-#my $start = (POSIX::times())[0] / &POSIX::CLK_TCK;
-
-# BUG FIX: Tobias Hintze <th at hbs-solutions.de> found that the fps
-# calc could divide by zero on fast machines, thus the need for
-# the check now.
-
-my $start = (POSIX::times())[0] / 100;
+my $start = (POSIX::times())[0] / $clk_tck;
my $add = time() - $start; $start += $add;
sub get_timestamp {
- my $ticks = (POSIX::times())[0] / 100; # Get clock ticks
+ my $ticks = (POSIX::times())[0] / $clk_tck; # Get clock ticks
$ticks += $add;
+ print "TICK: $ticks\n"
+ if $VRML::verbose;
if(!$_[0]) {
$ind++;;
if($ind == 25) {
$ind = 0;
- if ($ticks != $start) {
- $FPS = 25/($ticks-$start);
- }
+ $FPS = 25/($ticks-$start);
# print "Fps: ",$FPS,"\n";
pmeasures();
$start = $ticks;
@@ -599,7 +594,7 @@ sub check_displayed {
sub reserve {
my($object) = @_;
my $str = "$object";
- #print "Handle::reserve, reserving $str type ", ref($object), "\n";
+ # print "Handle::reserve, reserving $str type ", ref($object), "\n";
if(!defined $S{$str}) {
$S{$str} = [$object, 0];
@@ -618,13 +613,13 @@ sub release {
sub get {
my($handle) = @_;
return NULL if $handle eq "NULL";
- #print "handle get ", $S{$handle}[0], " ref ", ref($S{$handle}[0]), "\n";
- # print " type ",$S{$handle}[0]{Type},"\n";
- # print " typeName ",$S{$handle}[0]{TypeName},"\n";
if(!exists $S{$handle}) {
print "Nonexistent VRML Node Handle!\n";
exit (1);
}
+ # print "handle get ", $S{$handle}[0], " ref ", ref($S{$handle}[0]), "\n";
+ # print " type ",$S{$handle}[0]{Type},"\n";
+ # print " typeName ",$S{$handle}[0]{TypeName},"\n";
return $S{$handle}[0];
}
sub check {
diff --git a/JS/js/prcpucfg.h b/JS/js/prcpucfg.h
index 79363df..f55d02f 100644
--- a/JS/js/prcpucfg.h
+++ b/JS/js/prcpucfg.h
@@ -333,9 +333,6 @@
#elif __i386__
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
-#elif __alpha__
-#define IS_LITTLE_ENDIAN 1
-#undef IS_BIG_ENDIAN
#else
#error "linux cpu architecture not supported by prcpucfg.h"
#endif
diff --git a/JS/js/prosdep.h b/JS/js/prosdep.h
index 844ba34..0cce2a2 100644
--- a/JS/js/prosdep.h
+++ b/JS/js/prosdep.h
@@ -39,7 +39,7 @@
#include "prunixos.h"
/* Get endian-ness */
-#include "prcpucfg.h"
+#include <prcpucfg.h>
/*
* Hack alert!
diff --git a/VRMLRend.pm b/VRMLRend.pm
index ca05e34..fce60d6 100644
--- a/VRMLRend.pm
+++ b/VRMLRend.pm
@@ -317,7 +317,7 @@ Cylinder => '
Cone => '
-/*==================================================================
+/*==================================================================*
May 10th 2001, Alain Gagnon.
This block of code was fixed from the original because of normals.
y axis
@@ -350,7 +350,7 @@ To understand these variables is to understand this code.
theta : the angle located at T.
gamma : the angle located at G.
-===================================================================*/
+*===================================================================*/
int div = horiz_div;
int d_div = div * 2;
diff --git a/app.pl b/app.pl
index de6cbbe..fb656b5 100644
--- a/app.pl
+++ b/app.pl
@@ -11,7 +11,6 @@ for((),events,
# qw/tief be events scene/
) { ${"VRML::verbose::$_"} = 1; }
-use blib "/home/tjl/c/VRML";
use VRML::Browser;
$xmin = 0;
diff --git a/debian/changelog b/debian/changelog
index 9d1740f..c22c2af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,42 @@
+freewrl (0.29-1) unstable; urgency=medium
+
+ * New upstream source
+ * Fix build dependencies, Closes: #108813
+ * REALLY Fixed CLK_TCK macro breakage caused by perl upgrade, Closes: #108926
+ * Remove -L/usr/local/lib from build instructions, Closes: #110441
+ * Added lost dependency on libwww-perl, Closes: #110814
+
+ -- Stephen Zander <gibreel at debian.org> Sat, 15 Sep 2001 23:46:01 -0700
+
+freewrl (0.28.2-1) unstable; urgency=low
+
+ * New upstream source
+ * Updated for policy 3.5.1 and the new perl packaging policy, Closes: #80702
+ * Removed suggestion for missing package, Closes: #63361
+ * Removed menu entry, Closes: #66351
+ * Fixed CLK_TCK macro breakage caused by perl upgrade, Closes: #88719
+
+ -- Stephen Zander <gibreel at debian.org> Mon, 13 Aug 2001 22:43:18 -0700
+
+freewrl (0.26-1) unstable; urgency=low
+
+ * New upstream source.
+ * Fixed references to prcpucfg.h so they now find the right file,
+ Closes: #64533
+ * Correctly recognise Linux on alpha, Closes: #72840
+
+ -- Stephen Zander <gibreel at debian.org> Sun, 1 Oct 2000 18:17:06 -0700
+
+freewrl (0.23-1) unstable; urgency=low
+
+ * New upstream source
+ * Changed depndency on mesag to libgl, Closes: #57128
+ * Now provide vrml-browser, Closes: #52809
+ * Build configuration changed upstream, Closes: #60953
+ * Closing unreproducable bug, Closes: #42590
+
+ -- Stephen Zander <gibreel at debian.org> Mon, 22 May 2000 01:19:19 -0700
+
freewrl (0.20.a1-3) unstable; urgency=low
* New maintainer.
@@ -74,7 +113,4 @@ freewrl (0.14-1) unstable; urgency=low
-- John Lapeyre <lapeyre at physics.arizona.edu> Fri, 31 Jul 1998 13:04:33 -0700
-Local variables:
-mode: debian-changelog
-add-log-mailing-address: "gibreel at debian.org"
-End:
+
diff --git a/debian/control b/debian/control
index 6c9e648..bb8d4c2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,14 @@ Source: freewrl
Section: net
Priority: optional
Maintainer: Stephen Zander <gibreel at debian.org>
-Standards-Version: 3.0.1
+Standards-Version: 3.5.1
+Build-Depends: debhelper (>= 3.0.5), perl (>= 5.6.1), libjpeg62-dev, xlibmesa-dev, xlibs-dev, libpng2-dev, libttf-dev
Package: freewrl
Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, libhtml-parser-perl
-Suggests: netscape, xswallow
+Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl
+Provides: vrml-browser
+Suggests: netscape
Description: vrml browser and netscape plugin
freewrl includes a standalone vrml browser, which
also browses url's from the command line.
diff --git a/debian/mime b/debian/mime
new file mode 100644
index 0000000..6caf183
--- /dev/null
+++ b/debian/mime
@@ -0,0 +1 @@
+x-world/x-vrml; freewrl -url '%u' ; test=test -n "$DISPLAY"; description=VRML world; nametemplate=%s.wrl
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 1c30965..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-if [ -x /usr/sbin/install-mime ]
-then
- install-mime --install --package=freewrl --content="x-world/x-vrml" \
- --description="VRML world" --nametemplate="%s.wrl" \
- --test='test -n "$DISPLAY"' \
- --view="/usr/bin/freewrl -url '%u' "
-fi
-
-if test -x /usr/bin/update-menus; then update-menus; fi
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index f5ccda3..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-if test -x /usr/bin/update-menus; then update-menus; fi
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644
index b48caaf..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-if [ -x /usr/sbin/install-mime ]
-then
- /usr/sbin/install-mime --remove --package=freewrl
-fi
-
-#DEBHELPER#
-
diff --git a/debian/rules b/debian/rules
index 2d038ca..385ba65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,55 +1,54 @@
#!/usr/bin/make -f
+# -*-makefile-*-
+# debian/rules file for freewrl
-package=freewrl
+export DH_COMPAT=2
-prefix=$(PWD)/debian/tmp/usr
-srcdir=FreeWRL-0.20
+ifndef PERL
+PERL := /usr/bin/perl
+endif
-docs=$(patsubst %, $(srcdir)/%, README INSTALL GOALS ARCHITECTURE \
- CREDITS GOALS INTERPRETATION NODES NICEVRML)
-examples=$(patsubst %, $(srcdir)/%, tests pt jt bt examples eai speed nodes)
+package := $(shell sed -ne 's/^Package: *//p' debian/control)
+prefix := $(PWD)/debian/$(package)/usr
-build:
- make -C $(srcdir)/JS/js
- cd $(srcdir); perl Makefile.PL INSTALLDIRS=perl \
- PREFIX=$(prefix) \
- INSTALLMAN1DIR=$(prefix)/share/man/man1 \
- INSTALLMAN3DIR=$(prefix)/share/man/man3
- make -C $(srcdir)
- touch build
+examples := tests pt jt bt eai speed nodes
+docs := README* GOALS ARCHITECTURE CREDITS GOALS \
+ INTERPRETATION NODES
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+ $(MAKE) -C JS/js XCFLAGS=-fPIC
+ $(PERL) Makefile.PL INSTALLDIRS=vendor PERL=$(PERL)
+ $(MAKE) LD_RUN_PATH= LDFLAGS= LDDLFLAGS=-shared
+ touch $@
clean: checkroot
- -rm -f build
- -make -C $(srcdir) clean
- -make -C $(srcdir)/JS/js clean
- -rm -rf $(srcdir)/JS/js/Linux_All_DBG.OBJ
- -cd $(srcdir); rm Makefile.old Makefile
- -cd $(srcdir); rm -rf blib
- -cd $(srcdir); rm -f JS/*.o JPEG/*.o Text/*.o PNG/*.o *.o OpenGL/*.o
+ rm -f build-stamp
+ -$(MAKE) distclean
+ -$(MAKE) -C JS/js clean
dh_clean
binary-indep: checkroot build
-# There are no architecture-independent files to be uploaded
-# generated by this package. If there were any they would be
-# made here.
-
binary-arch: checkroot build
- -rm -rf debian/tmp
+ dh_clean
dh_installdirs
- make -C $(srcdir) pure_perl_install
+
+ $(MAKE) pure_install PREFIX=$(prefix)
+
+ dh_installdocs $(docs)
dh_installexamples $(examples)
- dh_installdocs DOCS/* $(docs)
dh_installchangelogs
dh_installmenu
+ dh_installmime
dh_strip
dh_compress
dh_fixperms
- dh_shlibdeps
dh_perl
- dh_gencontrol
- dh_makeshlibs
+ dh_shlibdeps
dh_installdeb
+ dh_gencontrol
dh_md5sums
dh_builddeb
@@ -59,8 +58,4 @@ checkroot:
dh_testdir
dh_testroot
-.PHONY: binary binary-arch binary-indep clean checkroot
-
-
-
-
+.PHONY: binary binary-arch binary-indep clean checkroot build
diff --git a/tests/AddRemove/standalone b/tests/AddRemove/standalone
index 4f99852..5e01c18 100755
--- a/tests/AddRemove/standalone
+++ b/tests/AddRemove/standalone
@@ -1,2 +1,3 @@
+#!/bin/sh
freewrl -eai localhost:2000 root.wrl -best &
appletviewer add-remove1.html
diff --git a/tests/CreateTest/standalone b/tests/CreateTest/standalone
index c013262..4651638 100755
--- a/tests/CreateTest/standalone
+++ b/tests/CreateTest/standalone
@@ -1,2 +1,3 @@
+#!/bin/sh
nice freewrl null.wrl -eai localhost:2000 -best &
appletviewer create-test.html
diff --git a/tests/Tic-Tac-Toe/standalone b/tests/Tic-Tac-Toe/standalone
index 7eccb59..498836d 100755
--- a/tests/Tic-Tac-Toe/standalone
+++ b/tests/Tic-Tac-Toe/standalone
@@ -1,2 +1,3 @@
+#!/bin/sh
nice freewrl tictactoe-eai.wrl -eai localhost:2000 -best &
appletviewer tictactoe-eai.html
diff --git a/tests/Tiny3D/standalone b/tests/Tiny3D/standalone
index aa2fcab..48bb68a 100755
--- a/tests/Tiny3D/standalone
+++ b/tests/Tiny3D/standalone
@@ -1,3 +1,4 @@
+#!/bin/sh
# make sure both freewrl and the appletviewer are in
# your path...
diff --git a/vrml.conf b/vrml.conf
index 3aa234c..13f39b6 100644
--- a/vrml.conf
+++ b/vrml.conf
@@ -5,14 +5,9 @@
%VRML_CONFIG = (
# OpenGL (or Mesa) libraries, defines and includes (e.g. -I/usr/OpenGL...).
- # for IRIX, the following 2 lines should be used.
- # OPENGL_LIBS => '-L/usr/lib32 -lGL -lGLU -lXext -lX11',
- # OPENGL_DEFINE => '',
-
- # for Linux, try the following: (see the INSTALL.html for more info)
- OPENGL_DEFINE => '-DXF86V4',
- OPENGL_LIBS => '-L/usr/lib -L/usr/X11R6/lib -lGL -lGLU -lXext -lX11 -lXxf86vm',
- OPENGL_INC => '-I/usr/X11R6/include/',
+ OPENGL_LIBS => '-L/usr/X11R6/lib -lGL -lGLU -lXext -lX11',
+ OPENGL_DEFINE => '',
+ OPENGL_INC => '',
# JPEG libraries & includes
JPEG_LIBS => '-ljpeg',
@@ -26,12 +21,6 @@
PNG_DEFINE => '',
# Freetype things
- # for IRIX, the following 3 lines should be used:
- # FREETYPE_LIBS => '-L/usr/freetype/lib32 -lttf',
- # FREETYPE_INC => '-I/usr/freeware/include',
- # FREETYPE_DEFINE => '',
-
- # for Linux, the following should be used:
FREETYPE_LIBS => '-lttf',
FREETYPE_INC => '-I/usr/include/freetype',
FREETYPE_DEFINE => '',
--
freewrl packaging
More information about the pkg-multimedia-commits
mailing list