r38427 - in /packages/inventor/trunk: apps/demos/SceneViewer/ apps/demos/drop/ apps/demos/maze/ apps/demos/noodle/ apps/nodes/Decal/ apps/samples/widgets/ debian/patches/ libFL/ang/ libSoXt/ make/

smr at users.alioth.debian.org smr at users.alioth.debian.org
Mon Apr 25 08:42:28 UTC 2011 

Author: smr
Date: Mon Apr 25 08:42:24 2011
New Revision: 38427

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38427
Log:
Move more patches to debian/patches.

Added:
    packages/inventor/trunk/debian/patches/add-required-libs.patch
    packages/inventor/trunk/debian/patches/freetype.patch
    packages/inventor/trunk/debian/patches/main-correctness.patch
Removed:
    packages/inventor/trunk/apps/demos/SceneViewer/SceneViewer.c++
    packages/inventor/trunk/apps/demos/drop/drop.c++
    packages/inventor/trunk/apps/demos/maze/maze.c++
    packages/inventor/trunk/apps/demos/noodle/noodle.c++
    packages/inventor/trunk/apps/nodes/Decal/GNUmakefile
    packages/inventor/trunk/apps/samples/widgets/componentTest.c++
    packages/inventor/trunk/libFL/ang/GNUmakefile
    packages/inventor/trunk/libFL/ang/flfreetype.c
    packages/inventor/trunk/libFL/ang/flfreetype.h
    packages/inventor/trunk/libSoXt/GNUmakefile
    packages/inventor/trunk/make/ivcommondefs
    packages/inventor/trunk/make/ivcommonrules
Modified:
    packages/inventor/trunk/debian/patches/build-libinventor.patch
    packages/inventor/trunk/debian/patches/series

Added: packages/inventor/trunk/debian/patches/add-required-libs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/add-required-libs.patch?rev=38427&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/add-required-libs.patch (added)
+++ packages/inventor/trunk/debian/patches/add-required-libs.patch Mon Apr 25 08:42:24 2011
@@ -1,0 +1,23 @@
+--- inventor-2.1.5-10.orig/apps/nodes/Decal/GNUmakefile
++++ inventor-2.1.5-10/apps/nodes/Decal/GNUmakefile
+@@ -5,7 +5,7 @@ DSO = Decal.so
+ 
+ CXXFILES = Decal.c++
+ 
+-LLDLIBS = -lInventor -lInventorXt
++LLDLIBS = -lGL -lInventor -lInventorXt
+ 
+ all install: all_ivbin
+ 
+--- inventor-2.1.5-10.orig/lib/GNUmakefile
++++ inventor-2.1.5-10/lib/GNUmakefile
+@@ -1,8 +1,7 @@
+ 
+ LLDLIBS = \
+ 	-ljpeg -limage $(FLLIB) \
+-        -lX11 -lm \
+-        -lGLU -lGL
++	-lGLU -lGL -lX11 -ldl -lm
+ 
+ OBJECTS = \
+ 	./database/src/sb/projectors/SbProjectors.o \

Modified: packages/inventor/trunk/debian/patches/build-libinventor.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/build-libinventor.patch?rev=38427&op=diff
==============================================================================
--- packages/inventor/trunk/debian/patches/build-libinventor.patch (original)
+++ packages/inventor/trunk/debian/patches/build-libinventor.patch Mon Apr 25 08:42:24 2011
@@ -3,7 +3,7 @@
 
 --- inventor-2.1.5-10.orig/lib/GNUmakefile
 +++ inventor-2.1.5-10/lib/GNUmakefile
-@@ -1,14 +1,18 @@
+@@ -1,8 +1,13 @@
  IVDEPTH = ..
 -include $(IVDEPTH)/make/ivcommondefs
  
@@ -18,11 +18,160 @@
  
  LLDDSOOPTS += -L$(IVDEPTH)/libimage -L$(FLDIR)
  
+--- inventor-2.1.5-10.orig/libSoXt/GNUmakefile
++++ inventor-2.1.5-10/libSoXt/GNUmakefile
+@@ -1,7 +1,12 @@
+ IVDEPTH = ..
+-include $(IVDEPTH)/make/ivcommondefs
+ 
+-LIBDSO = libInventorXt.so
++LIBMAJOR = 0
++LIBMINOR = 0.0
++LIBNAME  = libInventorXt.so
++DSONAME  = $(LIBNAME).$(LIBMAJOR)
++LIBDSO   = $(LIBNAME).$(LIBMAJOR).$(LIBMINOR)
++
++include $(IVDEPTH)/make/ivcommondefs
+ 
  LLDLIBS = \
- 	-ljpeg -limage $(FLLIB) \
--        -lX11 -lm \
--        -lGLU -lGL
-+	-lGLU -lGL -lX11 -ldl -lm
+ 	-lXm -lXt -lXext -lXi -lX11 -lm \
+--- inventor-2.1.5-10.orig/make/ivcommonrules
++++ inventor-2.1.5-10/make/ivcommonrules
+@@ -23,6 +23,12 @@ LDIRT += $(SHAPEFILES)
  
- OBJECTS = \
- 	./database/src/sb/projectors/SbProjectors.o \
+ $(LIBDSO): $(LARCHIVE)
+ 	$(LD) $(LDDSOOPTS) $^ $(LDLIBS) $(POST_LDDSOOPTS) -o $@
++ifneq ($(LIBNAME),)
++	$(LN_S) $@ $(LIBNAME)
++endif
++ifneq ($(DSONAME),)
++	$(LN_S) $@ $(DSONAME)
++endif
+ 
+ $(LARCHIVE):
+ 	for i in $(SUBDIRS); do $(MAKE) -C$$i all || exit 1; done
+@@ -32,6 +38,12 @@ $(LARCHIVE):
+ install_ivlibdso: $(LIBDSO)
+ 	mkdir -p $(IVLIBDIR)
+ 	$(INSTALL) -m 755 $< $(IVLIBDIR)
++ifneq ($(LIBNAME),)
++	$(LN_S) $< $(IVLIBDIR)/$(LIBNAME)
++endif
++ifneq ($(DSONAME),)
++	$(LN_S) $< $(IVLIBDIR)/$(DSONAME)
++endif
+ 
+ 	if [ "$(LIBTYPE)" = "debug" ]; then \
+ 	  mkdir -p $(IVDLIBDIR); \
+@@ -101,22 +113,12 @@ install_ivbin: $(PROGRAM)
+ install_ivscript:
+ 	mkdir -p $(IVBINDIR)
+ 	$(INSTALL) -m 755 $(SCRIPT) $(IVBINDIR)
+-	if [ "$(IVPREFIX)" != "/usr" ]; then \
+-	  (cd $(IVBINDIR) && \
+-	  sed -e 's#/usr#'"$(IVPREFIX)"'#g' $(SCRIPT) > tmp && \
+-	  mv tmp $(SCRIPT)); \
+-	fi
+ 
+ install_ivdemo: $(DEMO)
+ 	mkdir -p $(IVDEMOBINDIR) $(IVDEMODATADIR)
+ 	$(INSTALL) -m 755 $(DEMO) $(IVDEMOBINDIR)
+ 	if [ -e $(DEMO).RUNME ]; then \
+ 	  $(INSTALL) -m 755 $(DEMO).RUNME $(IVDEMOBINDIR); \
+-	  if [ "$(IVPREFIX)" != "/usr" ]; then \
+-	    (cd $(IVDEMOBINDIR) && \
+-	    sed -e 's#/usr#'"$(IVPREFIX)"'#g' $(DEMO).RUNME > tmp && \
+-	    mv tmp $(DEMO).RUNME); \
+-	  fi; \
+ 	fi
+ 	if [ -e $(DEMO).about ]; then \
+ 	  $(INSTALL) -m 644 $(DEMO).about $(IVDEMOBINDIR); \
+@@ -132,4 +134,4 @@ all_ivbin: $(LIBDSO) $(PROGRAM) $(PROGRA
+ 		$(BUNDLE)
+ 
+ TARGETS += $(LIBDSO) $(PROGRAM) $(PROGRAMS_1) $(PROGRAMS_2) $(PROGRAMS_EXT) \
+-		$(ARCHIVE) $(DSO) $(BUNDLE)
++		$(ARCHIVE) $(DSO) $(BUNDLE) $(LIBNAME)
+--- inventor-2.1.5-10.orig/make/ivcommondefs
++++ inventor-2.1.5-10/make/ivcommondefs
+@@ -54,10 +54,18 @@ C++ = /usr/bin/g++
+ LD  = /usr/bin/g++
+ 
+ INSTALL = /usr/bin/install
++LN_S = ln -sf
+ 
+ # MKDEPOPT = -MD
+ 
+-GLDDSOOPTS = -shared -Wl,--whole-archive
++# The linker flag '-z defs' enforces symbol resolution at build time,
++# with the goal of catching any missing library reference [Policy 10.2].
++#
++
++GLDDSOOPTS = -shared -Wl,--whole-archive -Wl,-z,defs
++ifneq ($(DSONAME),)
++GLDDSOOPTS += -Wl,-soname=$(DSONAME) 
++endif
+ POST_LDDSOOPTS = -Wl,--no-whole-archive
+ 
+ endif
+@@ -184,23 +192,46 @@ MAKEMANDIRS = $(IVMANDIR)/makeManDirs
+ #
+ 
+ IVPREFIX = /usr
+-LCXXOPTS += -DIVPREFIX=\"$(IVPREFIX)\"
+-LCOPTS += -DIVPREFIX=\"$(IVPREFIX)\"
++_BINDIR = $(IVPREFIX)/bin
++_LIBDIR = $(IVPREFIX)/lib
++_HDRTOP = $(IVPREFIX)/include/Inventor
++_MAN1DIR = $(IVPREFIX)/share/man/man1
++_MAN3DIR = $(IVPREFIX)/share/man/man3
++_FONTPATH = $(IVPREFIX)/share/inventor/fonts
++_HELPDIR = $(IVPREFIX)/share/inventor/help
++_DATADIR = $(IVPREFIX)/share/inventor/data/models
++_MATERIALSDIR = $(IVPREFIX)/share/inventor/data/materials
++_TEXTURESDIR = $(IVPREFIX)/share/inventor/data/textures
++_DEMOBINDIR = $(IVPREFIX)/lib/inventor
++_DEMODATADIR = $(IVPREFIX)/share/inventor/data/demos
+ 
+-IVBINDIR = $(IVROOT)/$(IVPREFIX)/bin
+-IVLIBDIR = $(IVROOT)/$(IVPREFIX)/lib
++IVBINDIR = $(IVROOT)$(_BINDIR)
++IVLIBDIR = $(IVROOT)$(_LIBDIR)
+ IVDLIBDIR = $(IVLIBDIR)/InventorDebug
+-IVHDRTOP = $(IVROOT)/$(IVPREFIX)/include/Inventor
++IVHDRTOP = $(IVROOT)$(_HDRTOP)
+ IVHDRDIR = $(IVHDRTOP)/$(HDRSUBDIR)
+-IVMAN1DIR = $(IVROOT)/$(IVPREFIX)/man/man1
+-IVMAN3DIR = $(IVROOT)/$(IVPREFIX)/man/man3
+-IVHELPDIR = $(IVROOT)/$(IVPREFIX)/share/help
+-IVDATADIR = $(IVROOT)/$(IVPREFIX)/share/data/models
+-IVDEMODIR = $(IVROOT)/$(IVPREFIX)/demos
+-IVDEMOBINDIR = $(IVDEMODIR)/Inventor
+-IVDEMODATADIR = $(IVDEMODIR)/data/Inventor
+-
+-
++IVMAN1DIR = $(IVROOT)$(_MAN1DIR)
++IVMAN3DIR = $(IVROOT)$(_MAN3DIR)
++IVHELPDIR = $(IVROOT)$(_HELPDIR)
++IVDATADIR = $(IVROOT)$(_DATADIR)
++IVMATERIALSDIR = $(IVROOT)$(_MATERIALSDIR)
++IVTEXTURESDIR = $(IVROOT)$(_TEXTURESDIR)
++IVDEMOBINDIR = $(IVROOT)$(_DEMOBINDIR)
++IVDEMODATADIR = $(IVROOT)$(_DEMODATADIR)
++
++# Set "local" C++ defines to specify pathnames.
++#
++LCXXDEFS = -DIVBINDIR=\"$(_BINDIR)\" \
++	-DIVLIBDIR=\"$(_LIBDIR)\" \
++	-DIVHDRTOP=\"$(_HDRTOP)\" \
++	-DIVFONTPATH=\"$(_FONTPATH)\" \
++	-DIVHELPDIR=\"$(_HELPDIR)\" \
++	-DIVDATADIR=\"$(_DATADIR)\" \
++	-DIVMATERIALSDIR=\"$(_MATERIALSDIR)\" \
++	-DIVTEXTURESDIR=\"$(_TEXTURESDIR)\" \
++	-DIVDEMOBINDIR=\"$(_DEMOBINDIR)\" \
++	-DIVDEMODATADIR=\"$(_DEMODATADIR)\" \
++	-DPDFVIEWER=\"xpdf\"
+ 
+ #
+ # Locate installed Inventor libraries when linking applications.

Added: packages/inventor/trunk/debian/patches/freetype.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/freetype.patch?rev=38427&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/freetype.patch (added)
+++ packages/inventor/trunk/debian/patches/freetype.patch Mon Apr 25 08:42:24 2011
@@ -1,0 +1,87 @@
+--- inventor-2.1.5-10.orig/libFL/ang/flfreetype.h
++++ inventor-2.1.5-10/libFL/ang/flfreetype.h
+@@ -1,7 +1,8 @@
+ #ifndef __flfreetype_h_
+ #define __flfreetype_h_
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #ifndef __fl_h_
+ #include "fl.h"
+--- inventor-2.1.5-10.orig/libFL/ang/GNUmakefile
++++ inventor-2.1.5-10/libFL/ang/GNUmakefile
+@@ -1,12 +1,16 @@
+ IVDEPTH = ../..
+ include $(IVDEPTH)/make/ivcommondefs
+ 
++LCDEFS = $(LCXXDEFS)
++
+ ARCHIVE = libFL.a
+ 
+ LCINCS += -I/usr/include/freetype2
+ 
+ CFILES = fl.c flclient.c flfreetype.c
+ 
++CFLAGS += -Wall -g
++
+ all install: link all_ivbin
+ 
+ link:
+--- inventor-2.1.5-10.orig/libFL/ang/flfreetype.c
++++ inventor-2.1.5-10/libFL/ang/flfreetype.c
+@@ -130,6 +130,8 @@ _flFTGetScalableBitmap(FLfontStruct *_fs
+ {
+   FLscalableBitmap *bit3;
+ 
++  TRACE(("unfinished code called"));
++
+   /* TODO */
+   bit3 = NULL;
+ 
+@@ -202,6 +204,8 @@ _flFTGetBitmap(FLfontStruct *_fs, GLuint
+   bbox_height = BM_TRUNC(face->bbox.yMax - face->bbox.yMin);
+ 
+   if (glyph->format == ft_glyph_format_outline) {    
++    TRACE(("  creating bitmap from outline glyph\n"));
++
+     pitch     = (width + 7) >> 3;
+     size      = pitch * height; 
+     pitch2    = ((width + (PIXEL_ROW_ALIGNMENT << 3) - 1) >> 5) << 2;
+@@ -217,7 +221,7 @@ _flFTGetBitmap(FLfontStruct *_fs, GLuint
+     bit3->height    = bit2.rows;
+     bit3->xorig     = bearing_x;
+     bit3->yorig     = height - bearing_y;
+-    bit3->xmove     = width > 0 ? width : (bbox_width / 2.0);
++    bit3->xmove     = width > 0 ? width : 10; /*(bbox_width / 2.0);*/
+     bit3->ymove     = 0.0;
+     bit3->bitmap    = (GLubyte *) malloc(size2 * sizeof(GLubyte));
+ 
+@@ -235,6 +239,7 @@ _flFTGetBitmap(FLfontStruct *_fs, GLuint
+     free(bit2.buffer);
+   }
+   else {
++    TRACE(("  creating bitmap from non-outline glyph\n"));
+     bit3->width     = glyph->bitmap.width;
+     bit3->height    = glyph->bitmap.rows;
+     bit3->xorig     = bearing_x;
+@@ -244,6 +249,18 @@ _flFTGetBitmap(FLfontStruct *_fs, GLuint
+     bit3->bitmap    = glyph->bitmap.buffer;
+   }
+ 
++  /* debugging added by Steve, 2001-08-14 */
++  TRACE(("  glyph->metrics.horiBearingX = %d\n", glyph->metrics.horiBearingX));
++  TRACE(("  glyph->metrics.width = %d\n", glyph->metrics.width ));
++  TRACE(("  left = %d\n", left ));
++  TRACE(("  right = %d\n", right ));
++  TRACE(("  width = %d\n", width ));
++  TRACE(("  height = %d\n", height ));
++  TRACE(("  face->bbox.xMax = %d\n", face->bbox.xMax ));
++  TRACE(("  face->bbox.xMin = %d\n", face->bbox.xMin ));
++  TRACE(("  bit3->xmove = %d\n", bit3->xmove ));
++  TRACE(("  bbox_width = %d\n", bbox_width ));
++
+   return bit3;
+ }
+ 

Added: packages/inventor/trunk/debian/patches/main-correctness.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/main-correctness.patch?rev=38427&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/main-correctness.patch (added)
+++ packages/inventor/trunk/debian/patches/main-correctness.patch Mon Apr 25 08:42:24 2011
@@ -1,0 +1,72 @@
+Description: Fix some const correctness
+Author: Steve M. Robbins <smr at debian.org>
+
+--- inventor-2.1.5-10.orig/apps/samples/widgets/componentTest.c++
++++ inventor-2.1.5-10/apps/samples/widgets/componentTest.c++
+@@ -60,7 +60,7 @@ void usage(char *name)
+ }
+ 
+ int
+-main(unsigned int argc, char *argv[])
++main(int argc, char *argv[])
+ {
+     if (argc != 2)
+ 	usage(argv[0]);
+@@ -85,4 +85,5 @@ main(unsigned int argc, char *argv[])
+     XtRealizeWidget(mainWindow);
+     
+     SoXt::mainLoop();
++    return 0;
+ }
+--- inventor-2.1.5-10.orig/apps/demos/textomatic/textomatic.c++
++++ inventor-2.1.5-10/apps/demos/textomatic/textomatic.c++
+@@ -548,4 +548,5 @@ main(int argc, char **argv)
+ 
+     SoXt::show(w);
+     SoXt::mainLoop();
++    return 0;
+ }
+--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/SceneViewer.c++
++++ inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.c++
+@@ -230,4 +230,5 @@ main(int argc, char **argv)
+     // Loop forever
+     //
+     SoXt::mainLoop();
++    return 0;
+ }
+--- inventor-2.1.5-10.orig/apps/demos/maze/maze.c++
++++ inventor-2.1.5-10/apps/demos/maze/maze.c++
+@@ -1332,5 +1332,6 @@ main(int argc, char *argv[])
+ 
+     SoXt::show(mainWindow);
+     SoXt::mainLoop();
++    return 0;
+ }
+ 
+--- inventor-2.1.5-10.orig/apps/demos/noodle/noodle.c++
++++ inventor-2.1.5-10/apps/demos/noodle/noodle.c++
+@@ -679,5 +679,6 @@ main(int argc, char **argv)
+     SoXt::show(mainWindow);
+ 
+     SoXt::mainLoop();
++    return 0;
+ }
+ 
+--- inventor-2.1.5-10.orig/apps/demos/drop/drop.c++
++++ inventor-2.1.5-10/apps/demos/drop/drop.c++
+@@ -93,6 +93,7 @@ main( int, char **argv )
+     // Enter the Xt event loop
+     SoXt::show( appWindow );
+     SoXt::mainLoop();
++    return 0;
+ }
+ 
+ 
+--- inventor-2.1.5-10.orig/apps/tools/ivview/ivview.c++
++++ inventor-2.1.5-10/apps/tools/ivview/ivview.c++
+@@ -1170,4 +1170,5 @@ main(int argc, char **argv)
+     setBusyCursor(FALSE);
+     
+     SoXt::mainLoop();
++    return 0;
+ }

Modified: packages/inventor/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/series?rev=38427&op=diff
==============================================================================
--- packages/inventor/trunk/debian/patches/series (original)
+++ packages/inventor/trunk/debian/patches/series Mon Apr 25 08:42:24 2011
@@ -1,10 +1,13 @@
 configurability.patch
 buildman.patch
 build-libinventor.patch
+add-required-libs.patch
 endianness.patch
 ivman.patch
 use-tcsh.patch
 const-correctness.patch
+main-correctness.patch
 socalcparse.patch
 bison-workaround.patch
 forward-declare.patch
+freetype.patch

More information about the debian-science-commits mailing list