commit jpeg for openSUSE:Factory
Hello community, here is the log from the commit of package jpeg for openSUSE:Factory checked in at Thu Feb 11 19:09:36 CET 2010. -------- --- jpeg/jpeg.changes 2009-12-15 19:37:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/jpeg/jpeg.changes 2010-02-09 08:59:49.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Feb 8 14:22:58 CET 2010 - pgajdos@suse.cz + +- updated to version 7.0.0 [bnc#561161]; summary from change.log + file: + * New scaled DCTs implemented. + * cjpeg -quality option has been extended for support of separate + quality settings for luminance and chrominance + * Added -nosmooth option to cjpeg, complementary to djpeg. + * Support arithmetic entropy encoding and decoding. + * jpegtran has a new "lossless" cropping feature. + * Implement -perfect option in jpegtran, new API function + jtransform_perfect_transform() in transupp. + * Add -raw option to rdjpgcom not to mangle the output. +- removed upstreamed/obsoleted patches +- libjpeg package renamed to libjpeg7 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- jpeg-6b-cplusplus.patch jpeg-6b-destdir-1.patch jpeg-6b-int32.patch jpeg-6b-jconfig.patch jpeg-6b-jpegtran.patch jpeg-6b-tiff-ojpeg.patch jpeg-6b.dif jpegsrc.v6b.tar.bz2 New: ---- jpeg-7.0.0-int32.patch jpeg-7.0.0-jconfig.patch jpeg-7.0.0-tiff-ojpeg.patch jpegsrc.v7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jpeg.spec ++++++ --- /var/tmp/diff_new_pack.iEb635/_old 2010-02-11 19:08:48.000000000 +0100 +++ /var/tmp/diff_new_pack.iEb635/_new 2010-02-11 19:08:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package jpeg (Version 6b) +# spec file for package jpeg (Version 7.0.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,19 +22,16 @@ License: BSD3c(or similar) Group: Productivity/Graphics/Convertors AutoReqProv: on -Version: 6b -Release: 883 +%define major_version 7 +Version: 7.0.0 +Release: 1 Summary: Independent JPEG Group's JPEG Software Url: http://www.ijg.org/ -Source: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.bz2 -Source2: baselibs.conf -Patch: jpeg-6b.dif -Patch1: jpeg-6b-int32.patch -Patch2: jpeg-6b-jconfig.patch -Patch3: jpeg-6b-tiff-ojpeg.patch -Patch4: jpeg-6b-jpegtran.patch -Patch5: jpeg-6b-cplusplus.patch -Patch6: http://svn.cross-lfs.org/svn/repos/patches/jpeg/jpeg-6b-destdir-1.patch +Source0: jpegsrc.v%{major_version}.tar.bz2 +Source1: baselibs.conf +Patch0: %{name}-%{version}-jconfig.patch +Patch1: %{name}-%{version}-tiff-ojpeg.patch +Patch2: %{name}-%{version}-int32.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,10 +74,9 @@ Davide Rossi <jpeg-info@uunet.uu.net> Ge' Weijers <jpeg-info@uunet.uu.net> -%package -n libjpeg +%package -n libjpeg%{major_version} + License: BSD3c(or similar) -Version: 6.2.0 -Release: 883 Summary: JPEG libraries Group: System/Libraries AutoReqProv: on @@ -90,7 +86,7 @@ %endif # -%description -n libjpeg +%description -n libjpeg%{major_version} The libraries (static and dynamic) for the jpeg-graphics format. The sources are contained in the jpeg source package. @@ -103,11 +99,9 @@ %package -n libjpeg-devel License: BSD3c(or similar) -Version: 6.2.0 -Release: 149 Summary: Development Tools for applications which will use the Libjpeg Library Group: Development/Libraries/C and C++ -Requires: libjpeg = 6.2.0 +Requires: libjpeg%{major_version} = %{version} # bug437293 %ifarch ppc64 Obsoletes: libjpeg-devel-64bit @@ -122,20 +116,13 @@ %prep -%setup -q -n jpeg-6b -%patch +%setup -q -n jpeg-%{major_version} +%patch0 %patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -p1 +%patch2 -p1 %build %{?suse_update_config:%{suse_update_config -f}} -sed -e 's/powerpc/flowerpower/' < ltconfig > ltconfig.new -mv ltconfig.new ltconfig -chmod u+x ltconfig %configure --disable-static --enable-shared --with-pic %{__make} %{?jobs:-j%jobs} libdir=%{_libdir} @@ -143,29 +130,27 @@ make test libdir=%{_libdir} %install -#mkdir -p $RPM_BUILD_ROOT{%{_libdir},/usr/{include,bin}} -#mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 %makeinstall libdir=%{_libdir} rm -f $RPM_BUILD_ROOT/%{_libdir}/libjpeg.la %clean rm -rf $RPM_BUILD_ROOT -%post -n libjpeg -p /sbin/ldconfig +%post -n libjpeg%{major_version} -p /sbin/ldconfig -%postun -n libjpeg -p /sbin/ldconfig +%postun -n libjpeg%{major_version} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc README coderules.doc install.doc usage.doc -%doc filelist.doc jconfig.doc structure.doc wizard.doc +%doc README change.log coderules.txt filelist.txt libjpeg.txt +%doc jconfig.txt structure.txt usage.txt wizard.txt /usr/bin/* %doc %{_mandir}/man1/* -%files -n libjpeg +%files -n libjpeg%{major_version} %defattr(-,root,root) -%{_libdir}/libjpeg.so.62.0.0 -%{_libdir}/libjpeg.so.62 +%{_libdir}/libjpeg.so.%{version} +%{_libdir}/libjpeg.so.%{major_version} %files -n libjpeg-devel %defattr(-,root,root) ++++++ jpeg-6b-int32.patch -> jpeg-7.0.0-int32.patch ++++++ --- jpeg/jpeg-6b-int32.patch 2006-12-19 00:16:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/jpeg/jpeg-7.0.0-int32.patch 2010-02-09 08:59:48.000000000 +0100 @@ -1,11 +1,13 @@ ---- jmorecfg.h -+++ jmorecfg.h -@@ -158,7 +158,7 @@ - /* INT32 must hold at least signed 32-bit values. */ - +Index: jpeg-7/jmorecfg.h +=================================================================== +--- jpeg-7.orig/jmorecfg.h ++++ jpeg-7/jmorecfg.h +@@ -161,7 +161,7 @@ typedef short INT16; #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ + #ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */ + #ifndef QGLOBAL_H /* Qt defines it in qglobal.h */ -typedef long INT32; +typedef int INT32; #endif - - /* Datatype used for image dimensions. The JPEG standard only supports + #endif + #endif ++++++ jpeg-6b-jconfig.patch -> jpeg-7.0.0-jconfig.patch ++++++ --- jpeg/jpeg-6b-jconfig.patch 2006-12-19 00:16:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/jpeg/jpeg-7.0.0-jconfig.patch 2010-02-08 14:51:25.000000000 +0100 @@ -1,8 +1,10 @@ ---- jconfig.cfg +Index: jconfig.cfg +=================================================================== +--- jconfig.cfg.orig +++ jconfig.cfg -@@ -1,22 +1,25 @@ +@@ -1,12 +1,18 @@ /* jconfig.cfg --- source file edited by configure script */ - /* see jconfig.doc for explanations */ + /* see jconfig.txt for explanations */ +/* Define this if you get warnings about undefined structures. */ +#undef INCOMPLETE_TYPES_BROKEN @@ -18,13 +20,14 @@ + #undef HAVE_STDDEF_H #undef HAVE_STDLIB_H - #undef NEED_BSD_STRINGS + #undef HAVE_LOCALE_H +@@ -14,10 +20,6 @@ #undef NEED_SYS_TYPES_H #undef NEED_FAR_POINTERS #undef NEED_SHORT_EXTERNAL_NAMES -/* Define this if you get warnings about undefined structures. */ -#undef INCOMPLETE_TYPES_BROKEN - +- -#ifdef JPEG_INTERNALS #undef RIGHT_SHIFT_IS_UNSIGNED ++++++ jpeg-6b-tiff-ojpeg.patch -> jpeg-7.0.0-tiff-ojpeg.patch ++++++ --- jpeg/jpeg-6b-tiff-ojpeg.patch 2006-12-19 00:16:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/jpeg/jpeg-7.0.0-tiff-ojpeg.patch 2010-02-08 14:51:26.000000000 +0100 @@ -1,7 +1,9 @@ ---- jdhuff.c +Index: jdhuff.c +=================================================================== +--- jdhuff.c.orig +++ jdhuff.c -@@ -649,3 +649,35 @@ - entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL; +@@ -1307,3 +1307,35 @@ jinit_huff_decoder (j_decompress_ptr cin + } } } +/* ++++++ jpegsrc.v6b.tar.bz2 -> jpegsrc.v7.tar.bz2 ++++++ ++++ 90198 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de