rpms/jasper/FC-3 jasper-1.701.0-GL-ac.patch, NONE, 1.1 jasper-1.701.0-memory_leak.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 jasper-1.701.0-GL.patch, 1.2, 1.3 jasper.spec, 1.6, 1.7

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Oct 18 14:53:03 UTC 2006 

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16971

Modified Files:
	.cvsignore jasper-1.701.0-GL.patch jasper.spec 
Added Files:
	jasper-1.701.0-GL-ac.patch jasper-1.701.0-memory_leak.patch 
Log Message:
* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
- memory leak (#207006)


jasper-1.701.0-GL-ac.patch:

--- NEW FILE jasper-1.701.0-GL-ac.patch ---
--- jasper-1.701.0.GEO/configure.ac.GL	2006-02-20 19:58:02.000000000 -0600
+++ jasper-1.701.0.GEO/configure.ac	2006-02-24 07:40:38.000000000 -0600
@@ -242,7 +242,7 @@
 OPENGL_LIBS=""
 if test $ENABLE_OPENGL = yes; then
 	if test $HAVE_OPENGL = no; then
-		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
+		TMPLIBS="-lglut"
 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
 	fi

jasper-1.701.0-memory_leak.patch:

--- NEW FILE jasper-1.701.0-memory_leak.patch ---
diff -ur jasper-1.701.0/src/libjasper/base/jas_stream.c jasper-1.701.0-local/src/libjasper/base/jas_stream.c
--- jasper-1.701.0/src/libjasper/base/jas_stream.c	2004-02-09 07:04:40.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/base/jas_stream.c	2005-10-23 02:08:06.145589016 +0530
@@ -361,11 +361,11 @@
 	}
 	obj->fd = -1;
 	obj->flags = 0;
-	obj->pathname[0] = '\0';
+	strncpy(obj->pathname, "jasXXXXXX", sizeof(obj->pathname));
 	stream->obj_ = obj;
 
 	/* Choose a file name. */
-	tmpnam(obj->pathname);
+	mkstemp(obj->pathname);
 
 	/* Open the underlying file. */
 	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
diff -ur jasper-1.701.0/src/libjasper/jpg/jpg_enc.c jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c
--- jasper-1.701.0/src/libjasper/jpg/jpg_enc.c	2004-02-09 07:04:41.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c	2005-10-23 02:09:02.526017888 +0530
@@ -331,6 +331,7 @@
 	rewind(output_file);
 	jpg_copyfiletostream(out, output_file);
 	fclose(output_file);
+	jas_matrix_destroy(src_mgr->data);
 	output_file = 0;
 
 	return 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:40:10 -0000	1.2
+++ .cvsignore	18 Oct 2006 14:52:33 -0000	1.3
@@ -1 +1,2 @@
+geojasper_src.zip
 jasper-1.701.0.zip

jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/jasper-1.701.0-GL.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper-1.701.0-GL.patch	31 Jan 2006 18:27:57 -0000	1.2
+++ jasper-1.701.0-GL.patch	18 Oct 2006 14:52:33 -0000	1.3
@@ -1,6 +1,6 @@
---- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
-+++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
-@@ -9465,7 +9465,7 @@
+--- jasper-1.701.0.GEO/configure.GL	2006-02-20 20:01:30.000000000 -0600
++++ jasper-1.701.0.GEO/configure	2006-02-24 07:40:46.000000000 -0600
+@@ -9464,7 +9464,7 @@
  OPENGL_LIBS=""
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/jasper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jasper.spec	31 Jan 2006 18:27:57 -0000	1.6
+++ jasper.spec	18 Oct 2006 14:52:33 -0000	1.7
@@ -5,25 +5,40 @@
 # koffice
 # netpbm
 
+# define to use GeoJasper
+#define geo 1
+
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 9%{?dist}
+Release: 15%{?dist}
 
 License: JasPer License Version 2.0
+%if "%{?geo:1}" == "1"
+%define  geojasper_ver 1.2.9
+URL:	 http://www.dimin.net/software/utils.html
+Source:  http://dimin.m6.net/software/utils/geojasper_src.zip
+Provides: geojasper = %{geojasper_ver}
+%else
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
+# autoconf/automake bits of patch1
+Patch2: jasper-1.701.0-GL-ac.patch
+# memory leak, see
+# http://gyachi.sourceforge.net/download.shtml
+# http://ayttm.sourceforge.net/files.shtml
+# http://ayttm.sourceforge.net/jasper-memory-leak-1.701.0.patch.gz
+Patch3: jasper-1.701.0-memory_leak.patch
 
+BuildRequires: automake 
 BuildRequires: libjpeg-devel
-BuildRequires: freeglut-devel
-# workaround: 
-#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
-#  http://bugzilla.redhat.com/bugzilla/179464
-BuildRequires: libGL-devel libGLU-devel
+# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
+BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -40,12 +55,24 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?geo:.GEO}
 
 %patch1 -p1 -b .GL
+%patch3 -p1 -b .memleak
+
+%if "%{?geo:1}" == "1"
+chmod +x configure configure.ac
+%patch2 -p1 -b .GL-ac
+libtoolize --force
+aclocal
+autoconf
+autoheader
+automake -a
+%endif
 
 
 %build
+
 %configure \
   --enable-shared \
   --disable-static 
@@ -67,24 +94,20 @@
 rm -f $RPM_BUILD_ROOT%{_bindir}/%{_target_platform}*
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
-# avoid conflict(s) with tomcat
-# not needed anymore, see bz #176773
-# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
-
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
 %{_bindir}/jiv
 %{_bindir}/imginfo
-%{_bindir}/jasper*
+%{_bindir}/*jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/*
-%{_includedir}/*
+%{_includedir}/jasper/
 %{_libdir}/lib*.so
 
 
@@ -98,6 +121,22 @@
 
 
 %changelog
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
+- memory leak (#207006)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-13
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-12
+- fixup build issues introduced by geojasper integration
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-10
+- support/use geojasper (optional, default no)
+- fc5: gcc/glibc respin
+
+* Fri Feb 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
 - workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
   (#179464)

More information about the scm-commits mailing list