Hello community,
here is the log from the commit of package libjpeg7 for openSUSE:Factory
checked in at Mon Mar 1 17:58:50 CET 2010.
--------
New Changes file:
--- /dev/null 2009-09-30 08:50:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/libjpeg7/libjpeg7.changes 2010-03-01 15:58:55.000000000 +0100
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Mon Mar 1 14:58:30 UTC 2010 - coolo@novell.com
+
+- split out jpegv7 to support update path
+
calling whatdependson for head-i586
New:
----
baselibs.conf
jpeg-7.0.0-int32.patch
jpeg-7.0.0-jconfig.patch
jpeg-7.0.0-tiff-ojpeg.patch
jpegsrc.v7.tar.bz2
libjpeg7.changes
libjpeg7.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libjpeg7.spec ++++++
#
# spec file for package libjpeg7 (Version 7.0.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: libjpeg7
License: BSD3c(or similar)
Group: Productivity/Graphics/Convertors
AutoReqProv: on
%define major_version 7
Version: 7.0.0
Release: 2
Summary: Independent JPEG Group's JPEG Software
Url: http://www.ijg.org/
Source0: jpegsrc.v%{major_version}.tar.bz2
Source1: baselibs.conf
Patch0: jpeg-%{version}-jconfig.patch
Patch1: jpeg-%{version}-tiff-ojpeg.patch
Patch2: jpeg-%{version}-int32.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Software to implement JPEG image compression and decompression. JPEG
(pronounced "jay-peg") is a standardized compression method for
full-color and grayscale images. JPEG is intended for compressing
"real-world" scenes (most of the time these are pictures that have been
scanned-in with a scanner or taken with a digital camera). Cartoons and
other nonrealistic images are not its strong suit. It should be noted
that JPEG output is not necessarily the same as its input. If this is a
factor for you, do not use it. With typical real-world scenes, JPEG can
achieve high compression rates without noticeable differences. If you
can accept pictures of lower quality, JPEG can achieve amazingly high
compression rates.
There are some library functions available for reading and writing JPEG
files. The 'cjpeg' and 'djpeg' applications use the library to make
conversions between JPEG and other popular graphic file formats
possible. The JPEG library is meant to be used within other
applications.
Cjpeg compresses the input file, or standard input if no filename is
given, and produces a JPEG/JFIF file as standard output. Currently
supported input file formats include: PPM (PBMPLUS color format), PGM
(PBMPLUS Grayscale format), BMP, GIF, Targa, and RLE (Utah Raster
Toolkit Format) (RLE is only supported if the RLE library is
available). Djpeg decompresses a JPEG file into one of the above
mentioned formats.
Authors:
--------
Tom Lane
Philip Gladstone
Luis Ortiz
Jim Boucher
Lee Crocker
George Phillips
Davide Rossi
Ge' Weijers
%prep
%setup -q -n jpeg-%{major_version}
%patch0
%patch1
%patch2 -p1
%build
%configure --disable-static --enable-shared --with-pic
%{__make} %{?jobs:-j%jobs} libdir=%{_libdir}
%check
make test libdir=%{_libdir}
%install
%makeinstall libdir=%{_libdir}
rm -f $RPM_BUILD_ROOT/%{_libdir}/libjpeg.la $RPM_BUILD_ROOT/%{_libdir}/libjpeg.so
rm -rf $RPM_BUILD_ROOT/%{_includedir}
rm -rf $RPM_BUILD_ROOT/%{_mandir} $RPM_BUILD_ROOT/%{_bindir}
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%{_libdir}/libjpeg.so.%{version}
%{_libdir}/libjpeg.so.%{major_version}
%changelog
++++++ baselibs.conf ++++++
libjpeg7
++++++ jpeg-7.0.0-int32.patch ++++++
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
#endif
#endif
++++++ jpeg-7.0.0-jconfig.patch ++++++
Index: jconfig.cfg
===================================================================
--- jconfig.cfg.orig
+++ jconfig.cfg
@@ -1,12 +1,18 @@
/* jconfig.cfg --- source file edited by configure script */
/* see jconfig.txt for explanations */
+/* Define this if you get warnings about undefined structures. */
+#undef INCOMPLETE_TYPES_BROKEN
+
#undef HAVE_PROTOTYPES
#undef HAVE_UNSIGNED_CHAR
#undef HAVE_UNSIGNED_SHORT
#undef void
#undef const
#undef CHAR_IS_UNSIGNED
+
+#ifdef JPEG_INTERNALS
+
#undef HAVE_STDDEF_H
#undef HAVE_STDLIB_H
#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
#undef INLINE
++++++ jpeg-7.0.0-tiff-ojpeg.patch ++++++
Index: jdhuff.c
===================================================================
--- jdhuff.c.orig
+++ jdhuff.c
@@ -1307,3 +1307,35 @@ jinit_huff_decoder (j_decompress_ptr cin
}
}
}
+/*
+ * BEWARE OF KLUDGE: This subroutine is a hack for decoding illegal JPEG-in-
+ * TIFF encapsulations produced by Microsoft's Wang Imaging
+ * for Windows application with the public-domain TIFF Library. Based upon an
+ * examination of selected output files, this program apparently divides a JPEG
+ * bit-stream into consecutive horizontal TIFF "strips", such that the JPEG
+ * encoder's/decoder's DC coefficients for each image component are reset before
+ * each "strip". Moreover, a "strip" is not necessarily encoded in a multiple
+ * of 8 bits, so one must sometimes discard 1-7 bits at the end of each "strip"
+ * for alignment to the next input-Byte storage boundary. IJG JPEG Library
+ * decoder state is not normally exposed to client applications, so this sub-
+ * routine provides the TIFF Library with a "hook" to make these corrections.
+ * It should be called after "jpeg_start_decompress()" and before
+ * "jpeg_finish_decompress()", just before decoding each "strip" using
+ * "jpeg_read_raw_data()" or "jpeg_read_scanlines()".
+ *
+ * This kludge is not sanctioned or supported by the Independent JPEG Group, and
+ * future changes to the IJG JPEG Library might invalidate it. Do not send bug
+ * reports about this code to IJG developers. Instead, contact the author for
+ * advice: Scott B. Marovich , Hewlett-Packard Labs, 6/01.
+ */
+GLOBAL(void)
+jpeg_reset_huff_decode (register j_decompress_ptr cinfo,register float *refbw)
+{ register huff_entropy_ptr entropy = (huff_entropy_ptr)cinfo->entropy;
+ register int ci = 0;
+
+ /* Re-initialize DC predictions */
+ do entropy->saved.last_dc_val[ci] = -refbw[ci << 1];
+ while (++ci < cinfo->comps_in_scan);
+ /* Discard encoded input bits, up to the next Byte boundary */
+ entropy->bitstate.bits_left &= ~7;
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
