[openjpeg] - openjpeg-1.4
Rex Dieter
rdieter at fedoraproject.org
Mon Jan 3 21:05:27 UTC 2011
commit 9449f90dfa1931a02e8b0b2cebeb2789531cfea3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon Jan 3 15:04:56 2011 -0600
- openjpeg-1.4
.gitignore | 1 +
openjpeg-1.3-libm.patch | 14 --
openjpeg-1.3-reverse-bogus-aligned-malloc.patch | 21 ---
openjpeg-1.3-tcd_init_encode-alloc-fix.patch | 14 --
openjpeg-1.4-no_undefined.patch | 14 ++
openjpeg-20070717svn-codec-libtiff.patch | 12 --
openjpeg-20070717svn-mqc-optimize.patch | 31 ----
openjpeg-20070719svn-mqc-more-optimize.patch | 100 -----------
...070719svn-t1-t1_dec_sigpass_step-optimize.patch | 28 ---
...eg-20070719svn-t1-x86_64-flags-branchless.patch | 29 ---
openjpeg-20070821svn-t1-flags-stride.patch | 182 --------------------
openjpeg-20070821svn-t1-remove-macro.patch | 171 ------------------
openjpeg-20070821svn-t1-updateflags-x86_64.patch | 84 ---------
openjpeg-svn468-mj2-noscroll.patch | 42 -----
openjpeg-svn470-t1-flags-mmx.patch | 145 ----------------
openjpeg-svn480-cmake.patch | 45 -----
openjpeg-svn480-use-stdbool.patch | 12 --
openjpeg-svn501-create0-calloc.patch | 14 --
openjpeg-svn505-jp2_decode-NULL-deref.patch | 13 --
openjpeg.spec | 103 ++++-------
sources | 2 +-
21 files changed, 54 insertions(+), 1023 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fb7834c..1eba092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
openjpeg_v1_3.tar.gz
j2kp4files_v1_5.zip
+/openjpeg_v1_4_sources_r697.tgz
diff --git a/openjpeg-1.4-no_undefined.patch b/openjpeg-1.4-no_undefined.patch
new file mode 100644
index 0000000..16ba52a
--- /dev/null
+++ b/openjpeg-1.4-no_undefined.patch
@@ -0,0 +1,14 @@
+diff -up openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt.no_undefined openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt
+--- openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt.no_undefined 2011-01-02 12:14:45.000000000 -0600
++++ openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt 2011-01-03 11:00:00.467021827 -0600
+@@ -32,6 +32,10 @@ ENDIF(WIN32)
+ ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
+ SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+
++IF(UNIX)
++ TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m)
++ENDIF(UNIX)
++
+ # Install library
+ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
+ EXPORT OpenJPEGTargets
diff --git a/openjpeg.spec b/openjpeg.spec
index 636e2af..0d0b69b 100644
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -1,7 +1,4 @@
-# reset patch fuzz, rebasing patches will require delicate surgery -- Rex
-%global _default_patch_fuzz 2
-
## enable conformance tests, bloats srpm
# enable for rawhide only, should disable in production releases
%if 0%{?fedora} > 14
@@ -9,46 +6,28 @@
%endif
Name: openjpeg
-Version: 1.3
-Release: 10%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: JPEG 2000 command line tools
-Group: Applications/Multimedia
-License: BSD
-URL: http://www.openjpeg.org/
+Group: Applications/Multimedia
+License: BSD
+URL: http://code.google.com/p/openjpeg/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://www.openjpeg.org/openjpeg_v1_3.tar.gz
+Source0: http://openjpeg.googlecode.com/files/openjpeg_v1_4_sources_r697.tgz
%if 0%{?runcheck}
Source1: http://www.crc.ricoh.com/~gormish/jpeg2000conformance/j2kp4files_v1_5.zip
%endif
BuildRequires: cmake
BuildRequires: libtiff-devel
-BuildRequires: recode
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Patch1: openjpeg-20070717svn-codec-libtiff.patch
-Patch4: openjpeg-svn480-cmake.patch
-Patch5: openjpeg-svn480-use-stdbool.patch
-Patch6: openjpeg-1.3-tcd_init_encode-alloc-fix.patch
-Patch7: openjpeg-1.3-reverse-bogus-aligned-malloc.patch
-Patch44: openjpeg-svn468-mj2-noscroll.patch
-Patch21: openjpeg-20070717svn-mqc-optimize.patch
-Patch22: openjpeg-20070821svn-t1-remove-macro.patch
-Patch23: openjpeg-20070719svn-t1-x86_64-flags-branchless.patch
-Patch24: openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch
-Patch25: openjpeg-20070821svn-t1-flags-stride.patch
-Patch26: openjpeg-20070821svn-t1-updateflags-x86_64.patch
-Patch27: openjpeg-svn470-t1-flags-mmx.patch
-Patch28: openjpeg-20070719svn-mqc-more-optimize.patch
-Patch29: openjpeg-svn501-create0-calloc.patch
-Patch30: openjpeg-svn505-jp2_decode-NULL-deref.patch
-
## upstreamable patches
# libopenjpeg has undefined references, http://bugzilla.redhat.com/467661
-Patch50: openjpeg-1.3-libm.patch
+Patch50: openjpeg-1.4-no_undefined.patch
%description
OpenJPEG is an open-source JPEG 2000 codec written in C. It has been
@@ -70,45 +49,33 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
The %{name}-devel package contains libraries and header files for
developing applications that use OpenJPEG.
+
%prep
-%setup -q -n OpenJPEG_v1_3 %{?runcheck:-a 1}
+%setup -q -n openjpeg_v1_4_sources_r697 %{?runcheck:-a 1}
# Windows stuff, delete it, it slows down patch making
rm -rf jp3d
# Make sure we use system libraries
rm -rf libs
-%patch1 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch44 -p1
-%patch22 -p1
-%patch23 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch24 -p1
-%patch21 -p1
-%patch28 -p1
-%patch50 -p1 -b .libm
-%patch29 -p1
-%patch30 -p1
+
+%patch50 -p1 -b .no_undefined
# fix permissions
find . -type f -print0 | xargs -0 chmod a-x
-# fix charset
-recode latin1..utf8 ChangeLog
-
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%cmake \
+%{cmake} \
-DBUILD_EXAMPLES:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
+ %{?runcheck:-DBUILD_TESTING:BOOL=ON} \
-DJPEG2000_CONFORMANCE_DATA_ROOT:PATH=../J2KP4files/ \
+ -DOPENJPEG_INSTALL_BIN_DIR:PATH=%{_bindir} \
+ -DOPENJPEG_INSTALL_DATA_DIR:PATH=%{_datadir} \
+ -DOPENJPEG_INSTALL_INCLUDE_DIR:PATH=%{_includedir} \
+ -DOPENJPEG_INSTALL_LIB_DIR:PATH=%{_libdir} \
..
popd
@@ -117,20 +84,21 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
-make install/fast DESTDIR="%{buildroot}" -C %{_target_platform}
+
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
# HACK: until pkg-config support lands, temporarily provide
# openjpeg.h header in legacy location
-ln -s openjpeg/openjpeg.h %{buildroot}%{_includedir}/openjpeg.h
+ln -s openjpeg-1.4/openjpeg.h %{buildroot}%{_includedir}/openjpeg.h
+
+## unpackaged files
+# we use %%doc in -libs below instead
+rm -rfv %buildroot%{_docdir}/openjpeg-1.4/
%check
-## known failures (on rex's f13/x86_64 box anyway)
-#The following tests FAILED:
-# 24 - j2i-p0_07.j2k (SEGFAULT)
-## in mock, rawhide/f14, 20100707
-#The following tests FAILED:
-# 9 - j2i-p0_07.j2k (OTHER_FAULT)
+## known failures (on rex's f14/x86_64 box anyway)
+# lots, all raw image tests fail atm (command-line options need tweaking)
%if 0%{?runcheck}
make test -C %{_target_platform} ||:
%endif
@@ -147,26 +115,31 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%{_bindir}/extract_j2k_from_mj2
-%{_bindir}/frames_to_mj2
%{_bindir}/image_to_j2k
+%{_bindir}/j2k_dump
%{_bindir}/j2k_to_image
-%{_bindir}/mj2_to_frames
-%{_bindir}/wrap_j2k_in_mj2
+%{_mandir}/man1/image_to_j2k.1*
+%{_mandir}/man1/j2k_dump.1*
+%{_mandir}/man1/j2k_to_image.1*
%files libs
%defattr(-,root,root,-)
-%doc ChangeLog license.txt
-%{_libdir}/libopenjpeg.so.2*
+%doc CHANGES LICENSE
+%{_libdir}/libopenjpeg.so.1.4*
+%{_libdir}/openjpeg-1.4/
+%{_mandir}/man3/libopenjpeg.3*
%files devel
%defattr(-,root,root,-)
%{_includedir}/openjpeg.h
-%{_includedir}/openjpeg/
+%{_includedir}/openjpeg-1.4/
%{_libdir}/libopenjpeg.so
%changelog
+* Mon Jan 03 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.4-1
+- openjpeg-1.4
+
* Fri Oct 1 2010 Tomas Hoger <thoger at fedoraproject.org> - 1.3-10
- Use calloc in opj_image_create0 (SVN r501, rhbz#579548)
- Avoid NULL pointer deref in jp2_decode (SVN r505, rhbz#609385)
diff --git a/sources b/sources
index e16a9eb..173e9c9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f9a3ccfa91ac34b589e9bf7577ce8ff9 openjpeg_v1_3.tar.gz
27780ed3254e6eb763ebd718a8ccc340 j2kp4files_v1_5.zip
+7870bb84e810dec63fcf3b712ebb93db openjpeg_v1_4_sources_r697.tgz
More information about the scm-commits
mailing list