Author: qboosh Date: Sat Jan 21 11:36:35 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.4 - removed outdated install patch (autotools and cmake support introduced upstream, both messy) - added libpng patch to fix build with libpng 1.5.x - added destdir,opt,link patch to partially fix ac/am usage ugliness
---- Files affected: packages/openjpeg: openjpeg.spec (1.8 -> 1.9) , openjpeg-destdir.patch (NONE -> 1.1) (NEW), openjpeg-libpng.patch (NONE -> 1.1) (NEW), openjpeg-link.patch (NONE -> 1.1) (NEW), openjpeg-opt.patch (NONE -> 1.1) (NEW), openjpeg-install.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/openjpeg/openjpeg.spec diff -u packages/openjpeg/openjpeg.spec:1.8 packages/openjpeg/openjpeg.spec:1.9 --- packages/openjpeg/openjpeg.spec:1.8 Sat Oct 23 16:07:13 2010 +++ packages/openjpeg/openjpeg.spec Sat Jan 21 12:36:30 2012 @@ -3,15 +3,28 @@ Summary: An open-source JPEG 2000 codec Summary(pl.UTF-8): Biblioteka kodująca i dekodująca format JPEG 2000 Name: openjpeg -Version: 1.3 -Release: 3 +Version: 1.4 +Release: 1 License: BSD Group: Libraries -Source0: http://openjpeg.googlecode.com/files/%{name}_v%{fver}.tar.gz -# Source0-md5: f9a3ccfa91ac34b589e9bf7577ce8ff9 -Patch0: %{name}-install.patch +#Source0Download: http://code.google.com/p/openjpeg/downloads/list +Source0: http://openjpeg.googlecode.com/files/%{name}_v%{fver}_sources_r697.tgz +# Source0-md5: 7870bb84e810dec63fcf3b712ebb93db +Patch0: %{name}-libpng.patch +Patch1: %{name}-destdir.patch +Patch2: %{name}-opt.patch +Patch3: %{name}-link.patch URL: http://www.openjpeg.org/ +BuildRequires: autoconf >= 2.65 +BuildRequires: automake BuildRequires: sed >= 4.0 +BuildRequires: lcms2-devel >= 2 +BuildRequires: libpng-devel +BuildRequires: libstdc++-devel +BuildRequires: libtiff-devel +BuildRequires: libtool >= 2:1.5 +BuildRequires: pkgconfig +BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -52,28 +65,45 @@ %description static -l pl.UTF-8 Statyczna biblioteka OpenJPEG. +%package progs +Summary: OpenJPEG codec programs +Summary(pl.UTF-8): Programy kodujące/dekodujące format OpenJPEG +Group: Applications/Graphics +Requires: %{name} = %{version}-%{release} + +%description progs +OpenJPEG codec programs. + +%description progs -l pl.UTF-8 +Programy kodujące/dekodujące format OpenJPEG. + %prep -%setup -q -n OpenJPEG_v%{fver} +%setup -q -n %{name}_v%{fver}_sources_r697 %patch0 -p1 - -sed 's/$(CC) -s/$(CC) $(CFLAGS) $(LDFLAGS)/' -i Makefile -sed 's/-lstdc++/-lm/' -i Makefile +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build -%{__make} \ - CC="%{__cc}" \ - CFLAGS="%{rpmcflags} %{rpmcppflags} -fPIC" \ - LDFLAGS="%{rpmldflags}" +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} +%configure \ + --enable-jpwl +# no --enable-jp3d here (see openjp3d.spec for it) + +%{__make} -j1 %install rm -rf $RPM_BUILD_ROOT + %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - INSTALL_LIBDIR=%{_libdir} \ - INSTALL_INCLUDE=%{_includedir} + DESTDIR=$RPM_BUILD_ROOT -cd $RPM_BUILD_ROOT%{_libdir} -ln -sf libopenjpeg.so.? libopenjpeg.so +# obsoleted by pkg-config +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libopenjpeg*.la %clean rm -rf $RPM_BUILD_ROOT @@ -83,17 +113,44 @@ %files %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libopenjpeg-*.*.*.*.so -%attr(755,root,root) %ghost %{_libdir}/libopenjpeg.so.2 +%doc CHANGES LICENSE +%attr(755,root,root) %{_libdir}/libopenjpeg.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libopenjpeg.so.1 +%attr(755,root,root) %{_libdir}/libopenjpeg_JPWL.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libopenjpeg_JPWL.so.1 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libopenjpeg.so -%{_includedir}/%{name}.h +%attr(755,root,root) %{_libdir}/libopenjpeg_JPWL.so +%{_includedir}/openjpeg-1.4 +%{_includedir}/openjpeg.h +%{_pkgconfigdir}/libopenjpeg1.pc +%{_pkgconfigdir}/libopenjpeg.pc +%{_mandir}/man3/JPWL_libopenjpeg.3* +%{_mandir}/man3/libopenjpeg.3* %files static %defattr(644,root,root,755) %{_libdir}/libopenjpeg.a +%{_libdir}/libopenjpeg_JPWL.a + +%files progs +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/JPWL_image_to_j2k +%attr(755,root,root) %{_bindir}/JPWL_j2k_to_image +%attr(755,root,root) %{_bindir}/extract_j2k_from_mj2 +%attr(755,root,root) %{_bindir}/frames_to_mj2 +%attr(755,root,root) %{_bindir}/image_to_j2k +%attr(755,root,root) %{_bindir}/j2k_dump +%attr(755,root,root) %{_bindir}/j2k_to_image +%attr(755,root,root) %{_bindir}/mj2_to_frames +%attr(755,root,root) %{_bindir}/wrap_j2k_in_mj2 +%{_mandir}/man1/JPWL_image_to_j2k.1* +%{_mandir}/man1/JPWL_j2k_to_image.1* +%{_mandir}/man1/image_to_j2k.1* +%{_mandir}/man1/j2k_dump.1* +%{_mandir}/man1/j2k_to_image.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -101,6 +158,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.9 2012/01/21 11:36:30 qboosh +- updated to 1.4 +- removed outdated install patch (autotools and cmake support introduced upstream, both messy) +- added libpng patch to fix build with libpng 1.5.x +- added destdir,opt,link patch to partially fix ac/am usage ugliness + Revision 1.8 2010/10/23 14:07:13 qboosh - pl - separated -static ================================================================ Index: packages/openjpeg/openjpeg-destdir.patch diff -u /dev/null packages/openjpeg/openjpeg-destdir.patch:1.1 --- /dev/null Sat Jan 21 12:36:35 2012 +++ packages/openjpeg/openjpeg-destdir.patch Sat Jan 21 12:36:30 2012 @@ -0,0 +1,65 @@ +--- openjpeg_v1_4_sources_r697/doc/Makefile.am.orig 2011-01-02 19:14:47.000000000 +0100 ++++ openjpeg_v1_4_sources_r697/doc/Makefile.am 2012-01-21 11:03:43.880417365 +0100 +@@ -20,25 +20,24 @@ + @cp man/man3/* . + + install-data-hook: +- $(INSTALL) -d $(doc_dir) +- $(INSTALL) -d ${mandir}/man1 ${mandir}/man3 ++ $(INSTALL) -d $(DESTDIR)$(doc_dir) ++ $(INSTALL) -d $(DESTDIR)${mandir}/man1 $(DESTDIR)${mandir}/man3 + if with_libjpwl +- @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) +- @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) ++ @(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) ++ @(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) + endif +- @(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) +- @(cd ${mandir}/man3 && $(RM) libopenjpeg* ) +- @gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 +- @cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1 +- @cp libopenjpeg.3.gz ${mandir}/man3 ++ @(cd $(DESTDIR)${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) ++ @(cd $(DESTDIR)${mandir}/man3 && $(RM) libopenjpeg* ) ++ @cp image_to_j2k.1 j2k_to_image.1 j2k_dump.1 $(DESTDIR)${mandir}/man1 ++ @cp libopenjpeg.3 $(DESTDIR)${mandir}/man3 + @$(RM) *\.gz + if with_libjpwl +- @(cd ${mandir}/man1 && \ +- $(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ +- $(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz) +- @(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz) ++ @(cd $(DESTDIR)${mandir}/man1 && \ ++ $(LN_S) image_to_j2k.1 JPWL_image_to_j2k.1 && \ ++ $(LN_S) j2k_to_image.1 JPWL_j2k_to_image.1) ++ @(cd $(DESTDIR)${mandir}/man3 && $(LN_S) libopenjpeg.3 JPWL_libopenjpeg.3) + endif +- @$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir) ++ @$(INSTALL) -m 644 ../LICENSE ../CHANGES $(DESTDIR)$(doc_dir) + + uninstall-hook: + @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \ +--- openjpeg_v1_4_sources_r697/Makefile.am.orig 2011-01-02 19:14:55.000000000 +0100 ++++ openjpeg_v1_4_sources_r697/Makefile.am 2012-01-21 11:11:21.210432678 +0100 +@@ -9,7 +9,7 @@ + + distclean-local: clean-local + +-pkgconf_dir = /usr/lib/pkgconfig ++pkgconf_dir = $(libdir)/pkgconfig + + install-data-hook: + @echo "" +@@ -19,9 +19,9 @@ + @echo "" + @echo "Installing: libopenjpeg1.pc $(pkgconf_dir)" + @echo "" +- @$(INSTALL) -d $(pkgconf_dir) +- @cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc +- @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \ ++ @$(INSTALL) -d $(DESTDIR)$(pkgconf_dir) ++ @cp libopenjpeg.pc $(DESTDIR)$(pkgconf_dir)/libopenjpeg1.pc ++ @(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc && \ + $(LN_S) libopenjpeg1.pc libopenjpeg.pc) + + uninstall-hook: ================================================================ Index: packages/openjpeg/openjpeg-libpng.patch diff -u /dev/null packages/openjpeg/openjpeg-libpng.patch:1.1 --- /dev/null Sat Jan 21 12:36:35 2012 +++ packages/openjpeg/openjpeg-libpng.patch Sat Jan 21 12:36:30 2012 @@ -0,0 +1,11 @@ +--- openjpeg_v1_4_sources_r697/codec/convert.c.orig 2011-01-02 19:14:52.000000000 +0100 ++++ openjpeg_v1_4_sources_r697/codec/convert.c 2012-01-21 10:57:18.020404446 +0100 +@@ -2432,7 +2432,7 @@ + * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. + * REQUIRED + */ +- png_set_compression_level(png, Z_BEST_COMPRESSION); ++ png_set_compression_level(png, 9 /*Z_BEST_COMPRESSION*/); + + if(prec == 16) mask = 0xffff; + else ================================================================ Index: packages/openjpeg/openjpeg-link.patch diff -u /dev/null packages/openjpeg/openjpeg-link.patch:1.1 --- /dev/null Sat Jan 21 12:36:35 2012 +++ packages/openjpeg/openjpeg-link.patch Sat Jan 21 12:36:30 2012 @@ -0,0 +1,89 @@ +--- openjpeg_v1_4_sources_r697/configure.ac.orig 2011-01-02 19:14:55.000000000 +0100 ++++ openjpeg_v1_4_sources_r697/configure.ac 2012-01-21 11:33:38.113810775 +0100 +@@ -64,7 +64,8 @@ + LIB_Z="" + AC_CHECK_LIB(z,inflate,LIB_Z="-lz",,) + # +-LIBS="$LIBS $LIB_MATH $LIB_Z" ++AC_SUBST([LIB_MATH]) ++AC_SUBST([LIB_Z]) + # + AC_PATH_PROG([PKGCONFIG], [pkg-config]) + # +@@ -136,7 +137,6 @@ + if test -n "$pngincludes" ; then + with_libpng="yes" + png_header_found="yes" +- LIBS="$LIBS $pnglibs" + AC_DEFINE(HAVE_LIBPNG, [1], [define to 1 if you have libpng]) + fi + fi +@@ -160,13 +160,6 @@ + test "$enable_tiff" = "no" && with_libtiff="no") + # + if test "x$with_libtiff" = xyes ; then +-#TIFF compiled with JPEG and JBIG support? +- libjpeg="" +- AC_CHECK_LIB(jpeg,jpeg_read_header,libjpeg=-ljpeg,,) +- libjbig="" +- AC_CHECK_LIB(jbig,jbg_enc_init,libjbig=-ljbig,,) +- libjbig85="" +- AC_CHECK_LIB(jbig85,jbg85_enc_init,libjbig85=-ljbig85,,) + #standard path + with_libtiff="no" + savedLIBS="$LIBS" +@@ -177,7 +170,6 @@ + AC_CHECK_HEADER(tiff.h,tiff_header_found="yes",,) + if test "$tiff_header_found" = "yes" ; then + with_libtiff="yes" +- LIBS="$LIBS -ltiff $libjpeg $libjbig $libjbig85" + AC_DEFINE(HAVE_LIBTIFF, [1], [define to 1 if you have libtiff]) + fi + fi +@@ -211,7 +203,7 @@ + AC_DEFINE(HAVE_LIBTIFF, [1], [define to 1 if you have libtiff]) + fi + fi +- LIBS="$savedLIBS $tifflibs $libjpeg $libjbig $libjbig85" ++ LIBS="$savedLIBS" + fi + fi + # +@@ -295,7 +287,7 @@ + lcms2includes="" + lcms2libs="" + fi +- LIBS="$savedLIBS $lcms2libs" ++ LIBS="$savedLIBS" + fi + # + AC_MSG_RESULT(lcms2 is usable:$with_liblcms2) +@@ -369,7 +361,7 @@ + lcms1includes="" + lcms1libs="" + fi +- LIBS="$savedLIBS $lcms1libs" ++ LIBS="$savedLIBS" + fi + AC_MSG_RESULT(lcms is usable:$with_liblcms1) + fi +--- openjpeg_v1_4_sources_r697/libopenjpeg/Makefile.am.orig 2012-01-21 11:34:33.197145953 +0100 ++++ openjpeg_v1_4_sources_r697/libopenjpeg/Makefile.am 2012-01-21 11:43:16.683830149 +0100 +@@ -7,6 +7,7 @@ + + AM_CPPFLAGS = -I.. -I. + ++libopenjpeg_la_LIBADD = $(LIB_MATH) + libopenjpeg_la_LDFLAGS = -no-undefined \ + -version-info $(CURRENT):$(BUILD):$(MINOR) + +--- openjpeg_v1_4_sources_r697/jpwl/Makefile.am.orig 2012-01-21 11:45:58.817168910 +0100 ++++ openjpeg_v1_4_sources_r697/jpwl/Makefile.am 2012-01-21 11:46:27.237169861 +0100 +@@ -5,6 +5,7 @@ + + lib_LTLIBRARIES = libopenjpeg_JPWL.la + ++libopenjpeg_JPWL_la_LIBADD = $(LIB_MATH) + libopenjpeg_JPWL_la_LDFLAGS = -no-undefined \ + -version-info $(CURRENT):$(BUILD):$(MINOR) + ================================================================ Index: packages/openjpeg/openjpeg-opt.patch diff -u /dev/null packages/openjpeg/openjpeg-opt.patch:1.1 --- /dev/null Sat Jan 21 12:36:35 2012 +++ packages/openjpeg/openjpeg-opt.patch Sat Jan 21 12:36:30 2012 @@ -0,0 +1,111 @@ +--- openjpeg_v1_4_sources_r697/libopenjpeg/Makefile.am.orig 2011-01-02 19:14:45.000000000 +0100 ++++ openjpeg_v1_4_sources_r697/libopenjpeg/Makefile.am 2012-01-21 11:28:33.590467246 +0100 +@@ -5,7 +5,7 @@ + + lib_LTLIBRARIES = libopenjpeg.la + +-INCLUDES = -I.. -I. ++AM_CPPFLAGS = -I.. -I. + + libopenjpeg_la_LDFLAGS = -no-undefined \ + -version-info $(CURRENT):$(BUILD):$(MINOR) +@@ -28,17 +28,15 @@ + dos2unix: + @$(DOS2UNIX) $(SRCS) $(INCLS) + +-COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 ++AM_CFLAGS = -Wall -ffast-math -std=c99 + + if with_sharedlibs +-COMPILERFLAGS += -DOPJ_EXPORTS ++AM_CFLAGS += -DOPJ_EXPORTS + else +-COMPILERFLAGS += -DOPJ_STATIC ++AM_CFLAGS += -DOPJ_STATIC + libopenjpeg_la_LDFLAGS += -static + endif + +-CFLAGS = $(COMPILERFLAGS) $(INCLUDES) +- + headerdir = openjpeg-$(MAJOR).$(MINOR) + + all-local: +--- openjpeg_v1_4_sources_r697/jp3d/libjp3dvm/Makefile.am.orig 2011-01-02 19:14:46.000000000 +0100 ++++ openjpeg_v1_4_sources_r697/jp3d/libjp3dvm/Makefile.am 2012-01-21 11:30:00.757136830 +0100 +@@ -27,18 +27,16 @@ + dos2unix: + @$(DOS2UNIX) $(SRCS) $(INCLS) + +-INCLUDES = -I../.. -I. +-COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 ++AM_CPPFLAGS = -I../.. -I. ++AM_CFLAGS = -Wall -ffast-math -std=c99 + + if with_sharedlibs +-COMPILERFLAGS += -DOPJ_EXPORTS ++AM_CFLAGS += -DOPJ_EXPORTS + else +-COMPILERFLAGS += -DOPJ_STATIC ++AM_CFLAGS += -DOPJ_STATIC + libopenjp3dvm_la_LDFLAGS += -static + endif + +-CFLAGS = $(COMPILERFLAGS) $(INCLUDES) +-#CFLAGS += -DJP3D_VERSION="\"$(MAJOR).$(MINOR).$(BUILD)\"" + + headerdir = openjpeg3d-$(MAJOR).$(MINOR) + +--- openjpeg_v1_4_sources_r697/jpwl/Makefile.am.orig 2011-01-02 19:14:48.000000000 +0100 ++++ openjpeg_v1_4_sources_r697/jpwl/Makefile.am 2012-01-21 11:45:58.817168910 +0100 +@@ -37,28 +37,28 @@ + dos2unix: + @$(DOS2UNIX) $(SRCS) $(INCLS) + +-COMPILERFLAGS = -Wall -ffast-math -std=c99 ++AM_CFLAGS = -Wall -ffast-math -std=c99 + + USERLIBS = +-INCLUDES = -I.. -I. -I../libopenjpeg -I../common ++AM_CPPFLAGS = -I.. -I. -I../libopenjpeg -I../common + + if with_libtiff +-INCLUDES += @tiffincludes@ ++AM_CPPFLAGS += @tiffincludes@ + USERLIBS += @tifflibs@ + endif + + if with_libpng +-INCLUDES += @pngincludes@ ++AM_CPPFLAGS += @pngincludes@ + USERLIBS += @pnglibs@ + endif + + if with_liblcms2 +-INCLUDES += @lcms2includes@ ++AM_CPPFLAGS += @lcms2includes@ + USERLIBS += @lcms2libs@ + endif + + if with_liblcms1 +-INCLUDES += @lcms1includes@ ++AM_CPPFLAGS += @lcms1includes@ + USERLIBS += @lcms1libs@ + endif + +@@ -70,13 +70,13 @@ + JPWL_image_to_j2k_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL + + if with_sharedlibs +-COMPILERFLAGS += -DOPJ_EXPORTS ++AM_CPPFLAGS += -DOPJ_EXPORTS + else +-COMPILERFLAGS += -DOPJ_STATIC ++AM_CPPFLAGS += -DOPJ_STATIC + libopenjpeg_JPWL_la_LDFLAGS += -static + endif + +-CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL ++AM_CPPFLAGS += -DUSE_JPWL + LDADD = ./libopenjpeg_JPWL.la $(USERLIBS) + + JPWL_j2k_to_image_SOURCES = ../common/getopt.c ../codec/index.c \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openjpeg/openjpeg.spec?r1=1.8&r2=1.9&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
