[Pkg-octave-commit] rev 415 - in trunk/packages/octplot/debian: . patches

Sat Jan 14 20:41:57 UTC 2006

Author: rafael
Date: 2006-01-14 20:41:56 +0000 (Sat, 14 Jan 2006)
New Revision: 415

Added:
   trunk/packages/octplot/debian/patches/ftgl-use-system-library.patch
Modified:
   trunk/packages/octplot/debian/changelog
   trunk/packages/octplot/debian/control
   trunk/packages/octplot/debian/patches/drop-distclean.patch
Log:
Added patch for using isntalled FTGL libraryinstead of the one shipped with
the upstream tarball 


Modified: trunk/packages/octplot/debian/changelog
===================================================================

--- trunk/packages/octplot/debian/changelog	2006-01-12 17:01:20 UTC (rev 414)
+++ trunk/packages/octplot/debian/changelog	2006-01-14 20:41:56 UTC (rev 415)
@@ -1,3 +1,17 @@
+octplot (0.3.0-2) unstable; urgency=low
+
+   NOT YET RELEASED!
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/patches/ftgl-use-system-library.patch: This patch changes the
+    upstream configure.in and src/Makefile.am to check for availability of
+    the FTGL library in the system.  This avoids the compilation of the
+    sources in the FTGL/ directory.
+  * debian/control: Added ftgl-dev to Build-Depends
+
+ --
+
 octplot (0.3.0-1) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere
@@ -12,7 +26,7 @@
 
   * Initial Release.
 
- -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Fri, 2 Dec 2005 21:08:43 -0100
+ -- Debian Octave Group <pkg-noctave-devel at lists.alioth.debian.org>  Fri, 2 Dec 2005 21:08:43 -0100
 
 Local Variables:
 debian-changelog-full-name: "Debian Octave Group"

Modified: trunk/packages/octplot/debian/control
===================================================================
--- trunk/packages/octplot/debian/control	2006-01-12 17:01:20 UTC (rev 414)
+++ trunk/packages/octplot/debian/control	2006-01-14 20:41:56 UTC (rev 415)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Build-Depends:  debhelper (>= 4.1.0), octave2.1-headers (>= 2.1.65), libfltk1.1-dev (>= 1.1.4), xlibmesa-gl-dev, cdbs
+Build-Depends:  debhelper (>= 4.1.0), octave2.1-headers (>= 2.1.65), libfltk1.1-dev (>= 1.1.4), ftgl-dev, xlibmesa-gl-dev, cdbs
 Standards-Version: 3.6.2
 
 Package: octplot
@@ -11,9 +11,9 @@
 Depends: ${octave:Depends}, ${shlibs:Depends}, octave-forge (>= 2004.07.07)
 Recommends: gs-gpl | postscript-viewer
 Description: graphical interface for Octave
- OctPlot is a system of drawing objects that can replace the traditional 
- Gnuplot graphical interface used by Octave to display data. It provides 
- quality postscript(TM) and OpenGL screen graphics for the Octave package. 
+ OctPlot is a system of drawing objects that can replace the traditional
+ Gnuplot graphical interface used by Octave to display data. It provides
+ quality postscript(TM) and OpenGL screen graphics for the Octave package.
  At present, only 2D graphics are supported, including surfaces, patch objects
- and zooming. Octplot can produce pdf, png and jpg files with the aid of 
+ and zooming. Octplot can produce pdf, png and jpg files with the aid of
  gs (ghostscript).

Modified: trunk/packages/octplot/debian/patches/drop-distclean.patch
===================================================================
--- trunk/packages/octplot/debian/patches/drop-distclean.patch	2006-01-12 17:01:20 UTC (rev 414)
+++ trunk/packages/octplot/debian/patches/drop-distclean.patch	2006-01-14 20:41:56 UTC (rev 415)
@@ -1,5 +1,17 @@
---- octplot-0.3.0/src/Makefile.in	2005-11-23 18:33:26.000000000 +0100
-+++ octplot-0.3.0.new/src/Makefile.in	2005-12-05 23:12:35.080533184 +0100
+diff -Nur octplot-0.3.0/Makefile.am octplot-0.3.0.new/Makefile.am
+--- octplot-0.3.0/Makefile.am	2006-01-14 20:26:06.099129000 +0100
++++ octplot-0.3.0.new/Makefile.am	2006-01-14 20:25:55.422752056 +0100
+@@ -11,6 +11,4 @@
+ EXTRA_DIST = ReleaseNotes.txt README.linux README.cygwin README.mac README
+ SUBDIRS = fonts src demos
+ 
+-distclean: clean
+-	rm -f *~
+-	rm -f configure Makefile.in
++CLEANFILES = *~
+diff -Nur octplot-0.3.0/Makefile.in octplot-0.3.0.new/Makefile.in
+--- octplot-0.3.0/Makefile.in	2006-01-14 20:59:52.563804104 +0100
++++ octplot-0.3.0.new/Makefile.in	2006-01-14 21:01:32.498611704 +0100
 @@ -43,7 +43,6 @@
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :

Added: trunk/packages/octplot/debian/patches/ftgl-use-system-library.patch
===================================================================
--- trunk/packages/octplot/debian/patches/ftgl-use-system-library.patch	2006-01-12 17:01:20 UTC (rev 414)
+++ trunk/packages/octplot/debian/patches/ftgl-use-system-library.patch	2006-01-14 20:41:56 UTC (rev 415)
@@ -0,0 +1,89 @@
+diff -Nur octplot-0.3.0/configure.in octplot-0.3.0.new/configure.in
+--- octplot-0.3.0/configure.in	2006-01-14 20:28:24.601073000 +0100
++++ octplot-0.3.0.new/configure.in	2006-01-14 20:38:47.148176520 +0100
+@@ -181,18 +181,45 @@
+ 
+ 
+ dnl -----------------------------------------------------------
+-dnl FTGL flags
++dnl FTGL settings
+ dnl
+ dnl
+ dnl
+ dnl
+ 
+-AC_CHECK_FT2([9.0.3],[],
+-             [AC_MSG_ERROR([FreeType2 is required to compile this library])])
++PKG_CONFIG=
++FTGL_CFLAGS=
++FTGL_LIBS=
++USE_LOCAL_FTGL=true
++
++AC_CHECK_PROGS(PKG_CONFIG, pkg-config)
++
++if test "$PKG_CONFIG" ; then
++    if $PKG_CONFIG ftgl ; then
++        AC_MSG_CHECKING([for ftgl])
++        FTGL_CFLAGS=`$PKG_CONFIG ftgl --cflags`
++        CFLAGS="$CFLAGS $FTGL_CFLAGS"
++        FTGL_LIBS=`$PKG_CONFIG ftgl --libs`
++        USE_LOCAL_FTGL=false
++        if test $USE_LOCAL_FTGL = false ; then
++            AC_MSG_RESULT([found])
++        else
++            AC_MSG_RESULT([not found])
++        fi
++    else
++        AC_CHECK_FT2([9.0.3],[],
++            [AC_MSG_ERROR([FreeType2 is required to compile this library])])
++        FTGL_CFLAGS=$FT2_CFLAGS
++        FTGL_LIBS=$FT2_LIBS
++        AC_MSG_WARN([File ftgl.pc not found.  Using local FTGL library])
++    fi
++else
++    AC_MSG_WARN([pkg-config program not found.  Using local FTGL library])
++fi
+ 
+-dnl the duplication of FTGL_LIBS is needed in cygwin since the linker
+-dnl is dependent on the order of the libs in the command line
+-LIBS="$LIBS $FT2_LIBS"
++AM_CONDITIONAL(USE_LOCAL_FTGL, test $USE_LOCAL_FTGL = true)
++
++LIBS="$LIBS $FTGL_LIBS"
+ 
+ AC_DEFINE_UNQUOTED(
+ 	MINPATH, 
+diff -Nur octplot-0.3.0/src/Makefile.am octplot-0.3.0.new/src/Makefile.am
+--- octplot-0.3.0.orig/src/Makefile.am
++++ octplot-0.3.0/src/Makefile.am
+@@ -3,8 +3,8 @@
+ 
+ destination_PROGRAMS  = octplot
+ 
+-octplot_LDFLAGS  = $(AM_LDFLAGS) $(FT2_LIBS)
+-octplot_CXXFLAGS = $(AM_CXXFLAGS) $(FT2_CFLAGS)
++octplot_LDFLAGS  = $(AM_LDFLAGS) $(FTGL_LIBS)
++octplot_CXXFLAGS = $(AM_CXXFLAGS) $(FTGL_CFLAGS)
+ 
+ octplot_SOURCES = \
+   axes.cpp             gl2ps.c           patch.h          prop_scalar.h \
+@@ -20,7 +20,10 @@
+   ftglfontmanager.cpp  op_com.cpp        prop_radio.h     text.h \
+   ftglfontmanager.h    op_com.h          prop_scalar.cpp  util.cpp \
+   line_plotter.h       line_plotter.cpp  patch.h          patch.cpp\
+-  mathutils.cpp	       mathutils.h       surface.cpp      surface.h \
++  mathutils.cpp	       mathutils.h       surface.cpp      surface.h
++
++if USE_LOCAL_FTGL
++octplot_SOURCES += \
+   FTGL/FTBBox.h                 FTGL/FTGLPolygonFont.cpp \
+   FTGL/FTBitmapGlyph.cpp        FTGL/FTGLPolygonFont.h \
+   FTGL/FTBitmapGlyph.h          FTGL/FTGLTextureFont.cpp \
+@@ -48,6 +51,7 @@
+   FTGL/FTGLOutlineFont.h        FTGL/FTVectoriser.cpp \
+   FTGL/FTGLPixmapFont.cpp       FTGL/FTVectoriser.h \
+   FTGL/FTGLPixmapFont.h
++endif
+ 
+ destination_SCRIPTS = \
+   octplot_command.oct __contourc__.oct \


