packages: openjpeg/openjpeg-opt.patch, openjpeg/openjpeg.spec, openjpeg/ope...

qboosh qboosh at pld-linux.org
Sun Mar 11 10:12:50 CET 2012 

Author: qboosh                       Date: Sun Mar 11 09:12:50 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.5.0
- updated opt patch
- removed obsolete libpng,destdir,link patches

---- Files affected:
packages/openjpeg:
   openjpeg-opt.patch (1.1 -> 1.2) , openjpeg.spec (1.10 -> 1.11) , openjpeg-destdir.patch (1.1 -> NONE)  (REMOVED), openjpeg-libpng.patch (1.1 -> NONE)  (REMOVED), openjpeg-link.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/openjpeg/openjpeg-opt.patch
diff -u packages/openjpeg/openjpeg-opt.patch:1.1 packages/openjpeg/openjpeg-opt.patch:1.2
--- packages/openjpeg/openjpeg-opt.patch:1.1	Sat Jan 21 12:36:30 2012
+++ packages/openjpeg/openjpeg-opt.patch	Sun Mar 11 10:12:44 2012
@@ -1,111 +1,11 @@
---- 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 @@
+--- openjpeg-1.5.0/configure.ac.orig	2012-02-07 11:49:55.000000000 +0100
++++ openjpeg-1.5.0/configure.ac	2012-03-11 08:12:35.345867322 +0100
+@@ -477,8 +477,6 @@
+ if test "x${want_debug}" = "xyes" ; then
+    OPJ_COMPILER_FLAG([-g])
+    OPJ_COMPILER_FLAG([-O0])
+-else
+-   OPJ_COMPILER_FLAG([-O3])
+ fi
  
- 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 \

================================================================
Index: packages/openjpeg/openjpeg.spec
diff -u packages/openjpeg/openjpeg.spec:1.10 packages/openjpeg/openjpeg.spec:1.11
--- packages/openjpeg/openjpeg.spec:1.10	Sat Jan 21 12:46:28 2012
+++ packages/openjpeg/openjpeg.spec	Sun Mar 11 10:12:44 2012
@@ -1,27 +1,23 @@
 # $Revision$, $Date$
-%define fver    %(echo %{version} | tr . _)
 Summary:	An open-source JPEG 2000 codec
 Summary(pl.UTF-8):	Biblioteka kodująca i dekodująca format JPEG 2000
 Name:		openjpeg
-Version:	1.4
+Version:	1.5.0
 Release:	1
 License:	BSD
 Group:		Libraries
 #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
+Source0:	http://openjpeg.googlecode.com/files/%{name}-%{version}.tar.gz
+# Source0-md5:	e5d66193ddfa59a87da1eb08ea86293b
+Patch0:		%{name}-opt.patch
 URL:		http://www.openjpeg.org/
 BuildRequires:	autoconf >= 2.65
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	lcms2-devel >= 2
 BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
-BuildRequires:	libtool >= 2:1.5
-BuildRequires:	pkgconfig
+BuildRequires:	libtool >= 2:2.0
+BuildRequires:	pkgconfig >= 1:0.22
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,23 +72,22 @@
 Programy kodujące/dekodujące format OpenJPEG.
 
 %prep
-%setup -q -n %{name}_v%{fver}_sources_r697
+%setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-jpwl
-# no --enable-jp3d here (see openjp3d.spec for it)
+	--disable-silent-rules \
+	--enable-jpwl \
+	--enable-mj2
+# no --enable-jpip here (see openjpip.spec for it)
 
-%{__make} -j1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -102,6 +97,8 @@
 
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libopenjpeg*.la
+# packaged as doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/openjpeg-1.5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,11 +118,12 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libopenjpeg.so
 %attr(755,root,root) %{_libdir}/libopenjpeg_JPWL.so
-%{_includedir}/openjpeg-1.4
+%{_includedir}/openjpeg-1.5
 %{_includedir}/openjpeg.h
 %{_pkgconfigdir}/libopenjpeg1.pc
 %{_pkgconfigdir}/libopenjpeg.pc
-%{_mandir}/man3/JPWL_libopenjpeg.3*
+%{_pkgconfigdir}/libopenjpeg-jpwl.pc
+%{_mandir}/man3/jpwl_libopenjpeg.3*
 %{_mandir}/man3/libopenjpeg.3*
 
 %files static
@@ -144,8 +142,8 @@
 %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/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*
@@ -156,6 +154,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2012/03/11 09:12:44  qboosh
+- updated to 1.5.0
+- updated opt patch
+- removed obsolete libpng,destdir,link patches
+
 Revision 1.10  2012/01/21 11:46:28  qboosh
 - g++ nor sed 4 not needed
 - completed previous changelog entry (soname changes, openjpeg_JPWL)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openjpeg/openjpeg-opt.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openjpeg/openjpeg.spec?r1=1.10&r2=1.11&f=u

More information about the pld-cvs-commit mailing list