rpms/plplot/devel plplot-5.7.4-octave.patch, NONE, 1.1 plplot.spec, 1.38, 1.39 plplot-5.6.1-octave.patch, 1.4, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Wed Oct 17 03:36:56 UTC 2007
Author: orion
Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6051
Modified Files:
plplot.spec
Added Files:
plplot-5.7.4-octave.patch
Removed Files:
plplot-5.6.1-octave.patch
Log Message:
* Tue Oct 16 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-4
- Add patch from svn to fix octave bindings for octave 2.9.15, drop
old version
plplot-5.7.4-octave.patch:
--- NEW FILE plplot-5.7.4-octave.patch ---
diff -ur --new-file --exclude .svn plplot-5.7.4/bindings/octave/demos/CMakeLists.txt plplot/bindings/octave/demos/CMakeLists.txt
--- plplot-5.7.4/bindings/octave/demos/CMakeLists.txt 2007-08-13 18:37:12.000000000 -0600
+++ plplot/bindings/octave/demos/CMakeLists.txt 2007-10-16 21:26:32.000000000 -0600
@@ -69,6 +69,7 @@
x24c.m
x25c.m
x26c.m
+x28c.m
lena.img
)
diff -ur --new-file --exclude .svn plplot-5.7.4/bindings/octave/demos/Makefile.in plplot/bindings/octave/demos/Makefile.in
--- plplot-5.7.4/bindings/octave/demos/Makefile.in 2007-08-13 18:37:12.000000000 -0600
+++ plplot/bindings/octave/demos/Makefile.in 1969-12-31 17:00:00.000000000 -0700
@@ -1,690 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-# bindings/octave/demos/Makefile.am for PLplot
-###
-### Process this file with automake to produce Makefile.in
-###
-# Copyright (C) 2002 Alan W. Irwin
-# Copyright (C) 2002, 2003 Joao Cardoso
-# Copyright (C) 2003, 2004 Rafael Laboissiere
-#
-# This file is part of PLplot.
-#
-# PLplot is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; version 2 of the License.
-#
-# PLplot is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with the file PLplot; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = bindings/octave/demos
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/cf/ac_pkg_swig.m4 \
- $(top_srcdir)/cf/ac_python_devel.m4 \
- $(top_srcdir)/cf/acinclude.m4 $(top_srcdir)/cf/docbook.m4 \
- $(top_srcdir)/cf/gnome.m4 $(top_srcdir)/cf/gnu-make.m4 \
- $(top_srcdir)/cf/gtk.m4 $(top_srcdir)/cf/pkg.m4 \
- $(top_srcdir)/cf/double.ac $(top_srcdir)/cf/rpath.ac \
- $(top_srcdir)/cf/instdirs.ac $(top_srcdir)/cf/c++.ac \
- $(top_srcdir)/cf/f77.ac $(top_srcdir)/cf/f95.ac \
- $(top_srcdir)/cf/libtool.ac $(top_srcdir)/cf/python.ac \
- $(top_srcdir)/cf/java.ac $(top_srcdir)/cf/swig.ac \
- $(top_srcdir)/cf/octave.ac $(top_srcdir)/cf/tcl.ac \
- $(top_srcdir)/cf/pdl.ac $(top_srcdir)/cf/pthread.ac \
- $(top_srcdir)/cf/freetype.ac $(top_srcdir)/cf/unicode.ac \
- $(top_srcdir)/cf/csiro.ac $(top_srcdir)/cf/pkg-config.ac \
- $(top_srcdir)/cf/drivers-init.ac $(top_srcdir)/cf/cgm.ac \
- $(top_srcdir)/cf/gcw.ac $(top_srcdir)/cf/gd.ac \
- $(top_srcdir)/cf/gnome.ac $(top_srcdir)/cf/linuxvga.ac \
- $(top_srcdir)/cf/xwin.ac $(top_srcdir)/cf/tk.ac \
- $(top_srcdir)/cf/psttf.ac $(top_srcdir)/cf/wingcc.ac \
- $(top_srcdir)/cf/aqt.ac $(top_srcdir)/cf/wxwidgets.ac \
- $(top_srcdir)/cf/drivers-finish.ac $(top_srcdir)/cf/test.ac \
- $(top_srcdir)/cf/docbook.ac $(top_srcdir)/cf/summary.ac \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h \
- $(top_builddir)/include/plConfig.h \
- $(top_builddir)/include/plDevs.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(examples_octavedir)"
-examples_octaveDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(examples_octave_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AQTINCCMD = @AQTINCCMD@
-AQTLIBCMD = @AQTLIBCMD@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BASE = @BASE@
-BASE_HTML = @BASE_HTML@
-BASE_INFO = @BASE_INFO@
-BASE_MAN = @BASE_MAN@
-BUILD_DIR = @BUILD_DIR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CDINCCMD = @CDINCCMD@
-CDLIBCMD = @CDLIBCMD@
-CFLAGS = @CFLAGS@
-CONFTEST = @CONFTEST@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CPP_SOVERSION = @CPP_SOVERSION@
-CSALIBS = @CSALIBS@
-CSIRO_SOVERSION = @CSIRO_SOVERSION@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATA_DIR = @DATA_DIR@
-DB2X_TEXIXML = @DB2X_TEXIXML@
-DB2X_XSLTPROC = @DB2X_XSLTPROC@
-DB_SS_HTML_PUBID = @DB_SS_HTML_PUBID@
-DB_SS_PRINT_PUBID = @DB_SS_PRINT_PUBID@
-DEFINE_PL_DOUBLE = @DEFINE_PL_DOUBLE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRNAME = @DIRNAME@
-DLLTOOL = @DLLTOOL@
-DLNAME_LIBPLPLOT = @DLNAME_LIBPLPLOT@
-DLNAME_LIBPLPLOTD = @DLNAME_LIBPLPLOTD@
-DLNAME_LIBPLPLOTTCLTK = @DLNAME_LIBPLPLOTTCLTK@
-DLNAME_LIBPLPLOTTCLTKD = @DLNAME_LIBPLPLOTTCLTKD@
-DOCBOOK2X_INC = @DOCBOOK2X_INC@
-DOCBOOK_DTD_PUBID = @DOCBOOK_DTD_PUBID@
-DOC_DIR = @DOC_DIR@
-DRV_DIR = @DRV_DIR@
-DRV_HARDDIR = @DRV_HARDDIR@
-DSSSL_DTD_PUBID = @DSSSL_DTD_PUBID@
-DVIPS = @DVIPS@
-DYNAMIC_DRIVERS = @DYNAMIC_DRIVERS@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXAMPLES_DIRECTORIES = @EXAMPLES_DIRECTORIES@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-F77_SOVERSION = @F77_SOVERSION@
-F95_SOVERSION = @F95_SOVERSION@
-FC = @FC@
-FCFLAGS = @FCFLAGS@
-FFLAGS = @FFLAGS@
-FREETYPEINCCMD = @FREETYPEINCCMD@
-FREETYPELIBCMD = @FREETYPELIBCMD@
-GCWTHREAD_CFLAGS = @GCWTHREAD_CFLAGS@
-GCWTHREAD_LIBS = @GCWTHREAD_LIBS@
-GCW_CFLAGS = @GCW_CFLAGS@
-GCW_LIBS = @GCW_LIBS@
-GDI32INCCMD = @GDI32INCCMD@
-GDI32LIBCMD = @GDI32LIBCMD@
-GDINCCMD = @GDINCCMD@
-GDLIBCMD = @GDLIBCMD@
[...5429 lines suppressed...]
use_plplot_path = plplot_octave_path;
-use_plplot_i = findstr (LOADPATH, use_plplot_path);
-if (!isempty (use_plplot_i))
- LOADPATH (use_plplot_i(1):use_plplot_i(1)+length(use_plplot_path)-1)= "";
- LOADPATH = strrep (LOADPATH, "::", ":");
+# Strip of trailing // for octave >= 2.9
+if (!exist("LOADPATH"))
+ use_plplot_path = use_plplot_path(1:end-2);
+endif
+if (exist("LOADPATH"))
+ use_plplot_i = findstr (LOADPATH, use_plplot_path);
+ if (!isempty (use_plplot_i))
+ LOADPATH (use_plplot_i(1):use_plplot_i(1)+length(use_plplot_path)-1)= "";
+ LOADPATH = strrep (LOADPATH, "::", ":");
+ endif
+else
+ rmpath(genpath(use_plplot_path));
endif
if (strcmp (use_plplot_state, "on"))
- LOADPATH = [use_plplot_path, ":", LOADPATH];
+ if (exist("LOADPATH"))
+ LOADPATH = [use_plplot_path, ":", LOADPATH];
+ else
+ addpath(genpath(use_plplot_path));
+ endif
plplot_stub;
elseif (strcmp (use_plplot_state, "off"))
- LOADPATH = [LOADPATH, ":", use_plplot_path];
+ if (exist("LOADPATH"))
+ LOADPATH = [LOADPATH, ":", use_plplot_path];
+ else
+ addpath(genpath(use_plplot_path),"-end");
+ endif
endif
use_plplot_lcd = pwd;
diff -ur --new-file --exclude .svn plplot-5.7.4/bindings/octave/PLplot/xlabel.m plplot/bindings/octave/PLplot/xlabel.m
--- plplot-5.7.4/bindings/octave/PLplot/xlabel.m 2007-08-13 18:37:12.000000000 -0600
+++ plplot/bindings/octave/PLplot/xlabel.m 2007-10-16 21:26:34.000000000 -0600
@@ -38,8 +38,10 @@
__pl.xlabel = __pl_matstr(__pl.xlabel, text, strm);
endif
- if (automatic_replot)
- __pl_plotit;
+ if (exist("automatic_replot"))
+ if (automatic_replot)
+ __pl_plotit;
+ endif
endif
endfunction
diff -ur --new-file --exclude .svn plplot-5.7.4/bindings/octave/PLplot/xticks.m plplot/bindings/octave/PLplot/xticks.m
--- plplot-5.7.4/bindings/octave/PLplot/xticks.m 2007-08-13 18:37:12.000000000 -0600
+++ plplot/bindings/octave/PLplot/xticks.m 2007-10-16 21:26:34.000000000 -0600
@@ -55,8 +55,10 @@
endif
endif
- if (automatic_replot)
- __pl_plotit;
+ if (exist("automatic_replot"))
+ if (automatic_replot)
+ __pl_plotit;
+ endif
endif
endfunction
diff -ur --new-file --exclude .svn plplot-5.7.4/bindings/octave/PLplot/ylabel.m plplot/bindings/octave/PLplot/ylabel.m
--- plplot-5.7.4/bindings/octave/PLplot/ylabel.m 2007-08-13 18:37:12.000000000 -0600
+++ plplot/bindings/octave/PLplot/ylabel.m 2007-10-16 21:26:34.000000000 -0600
@@ -38,8 +38,10 @@
__pl.ylabel = __pl_matstr(__pl.ylabel, text, strm);
endif
- if (automatic_replot)
- __pl_plotit;
+ if (exist("automatic_replot"))
+ if (automatic_replot)
+ __pl_plotit;
+ endif
endif
endfunction
diff -ur --new-file --exclude .svn plplot-5.7.4/bindings/octave/PLplot/yticks.m plplot/bindings/octave/PLplot/yticks.m
--- plplot-5.7.4/bindings/octave/PLplot/yticks.m 2007-08-13 18:37:12.000000000 -0600
+++ plplot/bindings/octave/PLplot/yticks.m 2007-10-16 21:26:34.000000000 -0600
@@ -55,8 +55,10 @@
endif
endif
- if (automatic_replot)
- __pl_plotit;
+ if (exist("automatic_replot"))
+ if (automatic_replot)
+ __pl_plotit;
+ endif
endif
endfunction
diff -ur --new-file --exclude .svn plplot-5.7.4/bindings/octave/PLplot/zlabel.m plplot/bindings/octave/PLplot/zlabel.m
--- plplot-5.7.4/bindings/octave/PLplot/zlabel.m 2007-08-13 18:37:12.000000000 -0600
+++ plplot/bindings/octave/PLplot/zlabel.m 2007-10-16 21:26:34.000000000 -0600
@@ -38,8 +38,10 @@
__pl.zlabel = __pl_matstr(__pl.zlabel, text, strm);
endif
- if (automatic_replot)
- __pl_plotit;
+ if (exist("automatic_replot"))
+ if (automatic_replot)
+ __pl_plotit;
+ endif
endif
endfunction
diff -ur --new-file --exclude .svn plplot-5.7.4/bindings/octave/plplot_octave.h.in plplot/bindings/octave/plplot_octave.h.in
--- plplot-5.7.4/bindings/octave/plplot_octave.h.in 2007-08-13 18:37:12.000000000 -0600
+++ plplot/bindings/octave/plplot_octave.h.in 2007-10-16 21:26:34.000000000 -0600
@@ -1,4 +1,4 @@
-/* $Id: plplot_octave.h.in 7715 2007-06-15 07:49:19Z andrewross $
+/* $Id: plplot_octave.h.in 7932 2007-10-15 11:56:37Z andrewross $
* jc: this is a massaged plplot.h
*
* Copyright (C) 2004 Joao Cardoso
@@ -490,6 +490,7 @@
#define plmeshc c_plmeshc
#define plmkstrm c_plmkstrm
#define plmtex c_plmtex
+#define plmtex3 c_plmtex3
#define plot3d c_plot3d
#define plot3dc c_plot3dc
#define plparseopts c_plparseopts
@@ -501,6 +502,7 @@
#define plprec c_plprec
#define plpsty c_plpsty
#define plptex c_plptex
+#define plptex3 c_plptex3
#define plreplot c_plreplot
#define plrgb c_plrgb
#define plrgb1 c_plrgb1
@@ -986,6 +988,11 @@
void c_plmtex(const char *side, PLFLT disp, PLFLT pos, PLFLT just,
const char *text); //%name plmtex
+/* Prints out "text" at specified position relative to viewport (3D) */
+
+void c_plmtex3(const char *side, PLFLT disp, PLFLT pos, PLFLT just,
+ const char *text); //%name plmtex3
+
/* Plots a 3-d representation of the function z[x][y]. */
void c_plot3d(PLFLT *x, PLFLT *y, PLFLT **z,
@@ -1052,6 +1059,10 @@
void c_plptex(PLFLT x, PLFLT y, PLFLT dx, PLFLT dy, PLFLT just, const char *text); //%name plptex
+/* Prints out "text" at world cooordinate (x,y,z). */
+
+void c_plptex3(PLFLT wx, PLFLT wy, PLFLT wz, PLFLT dx, PLFLT dy, PLFLT dz, PLFLT sx, PLFLT sy, PLFLT sz, PLFLT just, const char *text); //%name plptex3
+
/* Replays contents of plot buffer to current device/file. */
void c_plreplot(void); //%name plreplot
--- plplot-5.7.4/test/test_octave.sh.in 2007-08-13 18:37:15.000000000 -0600
+++ plplot/test/test_octave.sh.in 2007-10-16 17:12:47.000000000 -0600
@@ -31,7 +31,7 @@
export LD_LIBRARY_PATH=$TOPDIR/src:$TOPDIR/lib/csa:$TOPDIR/lib/nn
# Launch an Octave script that exercises all the demos
-$octave -f -q -p $octavedir <<EOF
+$octave -f -q -p $octavedir <<EOF 2> test.error
plplot_stub;
t = split("$options", "-"); t(1,:)="";
for i=1:rows(t)
@@ -55,7 +55,7 @@
#(and should probably be dropped anyway since the map stuff is not
#in the API that is supposed to be common to all front ends.)
failed = [];
-for i=[1:13 15 16 18 20:26 ];
+for i=[1:13 15 16 18 20:26 28 ];
cmd = sprintf("x%.2dc",i);
t = split("$options", "-"); t(1,:)="";
for j=1:rows(t)
@@ -85,6 +85,13 @@
endif
EOF
status_code=$?
+cat test.error
if [ "$status_code" -ne 0 ]; then
exit $status_code
fi
+# Look for any PLPLOT ERROR messages from plwarn that do not result in an
+# exit code.
+is_error=`grep -l 'PLPLOT ERROR' test.error`
+if test -n "$is_error"; then
+ exit 1
+fi
Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- plplot.spec 23 Aug 2007 21:40:44 -0000 1.38
+++ plplot.spec 17 Oct 2007 03:36:23 -0000 1.39
@@ -1,18 +1,18 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
%{!?build_doc:%define build_doc 0}
-%{!?with_octave:%define with_octave 0}
+%{!?with_octave:%define with_octave 1}
Name: plplot
Version: 5.7.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
License: LGPLv2+
URL: http://plplot.sourceforge.net/
Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
-Patch1: plplot-5.6.1-octave.patch
+Patch1: plplot-5.7.4-octave.patch
Patch2: plplot-5.7.4-info.patch
Patch5: plplot-5.7.2-multilib.patch
Patch6: plplot-5.7.3-jni.patch
@@ -29,8 +29,10 @@
%endif
%if %{with_octave}
BuildRequires: octave-devel
+%define build_octave %{nil}
%else
Obsoletes: %{name}-octave < %{version}-%{release}
+%define build_octave -DENABLE_octave:BOOL=OFF
%endif
BuildRequires: java-devel, libgcj-devel
BuildRequires: freetype-devel, qhull-devel , ncurses-devel
@@ -199,7 +201,7 @@
%prep
%setup -q
-%patch1 -p1 -b .octave
+%patch1 -p1 -b .octave -E
%patch2 -p1 -b .orig
%patch5 -p1 -b .multilib
%patch6 -p1 -b .jni
@@ -213,6 +215,7 @@
export FFLAGS="$RPM_OPT_FLAGS"
%cmake .. \
%{build_ada} \
+ %{build_octave} \
-DENABLE_pdl:BOOL=ON \
-DHAVE_PTHREAD:BOOL=ON \
-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
@@ -483,6 +486,10 @@
%{_libdir}/pkgconfig/plplotd-wxwidgets.pc
%changelog
+* Tue Oct 16 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-4
+- Add patch from svn to fix octave bindings for octave 2.9.15, drop
+ old version
+
* Thu Aug 23 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-3
- Add perl sub-package for PDL/plpot examples
--- plplot-5.6.1-octave.patch DELETED ---
More information about the fedora-extras-commits
mailing list