rpms/jasper
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- revert jasper to jaspertool rename (#176773)

Browse Source 
- actually use/apply GL patch
This commit is contained in:
Rex Dieter 2006-01-31 16:11:35 +00:00
parent 89b65bb4b5
commit 5564610d34
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jasper-1.701.0-GL.patch
View File

@ -1,14 +1,3 @@
--- jasper-1.701.0/configure.ac.GL 2004-02-08 19:41:29.000000000 -0600
+++ jasper-1.701.0/configure.ac 2005-10-18 08:09:24.000000000 -0500
@@ -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 $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
fi
--- jasper-1.701.0/configure.GL 2004-02-08 19:44:12.000000000 -0600 --- 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 +++ jasper-1.701.0/configure 2005-10-18 08:09:38.000000000 -0500
@@ -9465,7 +9465,7 @@ @@ -9465,7 +9465,7 @@
@ -16,7 +5,7 @@
if test $ENABLE_OPENGL = yes; then if test $ENABLE_OPENGL = yes; then
if test $HAVE_OPENGL = no; 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 -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
+ TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS" + TMPLIBS="-lglut"
echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
if test "${ac_cv_lib_glut_glutInit+set}" = set; then if test "${ac_cv_lib_glut_glutInit+set}" = set; then

21
jasper.spec
View File

@ -1,4 +1,3 @@
# $Id$
# NOTE: packages can use jasper: # NOTE: packages can use jasper:
# ImageMagick # ImageMagick
@ -10,13 +9,15 @@ Summary: Implementation of the JPEG-2000 standard, Part 1
Name: jasper Name: jasper
Group: System Environment/Libraries Group: System Environment/Libraries
Version: 1.701.0 Version: 1.701.0
Release: 7%{?dist} Release: 8%{?dist}
License: JasPer License Version 2.0 License: JasPer License Version 2.0
URL: http://www.ece.uvic.ca/~mdadams/jasper/ URL: http://www.ece.uvic.ca/~mdadams/jasper/
Source: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip Source: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: jasper-1.701.0-GL.patch
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: freeglut-devel BuildRequires: freeglut-devel
@ -37,6 +38,8 @@ Requires: libjpeg-devel
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .GL
%build %build
%configure \ %configure \
@ -46,7 +49,7 @@ Requires: libjpeg-devel
make %{?_smp_mflags} make %{?_smp_mflags}
%check %check ||:
make check make check
@ -61,13 +64,17 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/%{_target_platform}*
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
# avoid conflict(s) with tomcat # avoid conflict(s) with tomcat
mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool # not needed anymore, see bz #176773
# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYRIGHT LICENSE NEWS README %doc COPYRIGHT LICENSE NEWS README
%{_bindir}/* %{_bindir}/imgcmp
%{_bindir}/jiv
%{_bindir}/imginfo
%{_bindir}/jasper*
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%files devel %files devel
@ -87,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
- revert jasper to jaspertool rename (#176773)
- actually use/apply GL patch
* Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7 * Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7
- GL patch to remove libGL dependancy (using only freeglut) - GL patch to remove libGL dependancy (using only freeglut)