commit libjpeg6 for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package libjpeg6 for openSUSE:Factory checked in at Sat Feb 13 16:25:32 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/libjpeg6/libjpeg6.changes 2010-02-13 15:10:13.000000000 +0100 @@ -0,0 +1,205 @@ +------------------------------------------------------------------- +Sat Feb 13 14:07:53 UTC 2010 - coolo@novell.com + +- renamed libjpeg6 to keep around for compat + +------------------------------------------------------------------- +Tue Dec 15 19:35:07 CET 2009 - jengelh@medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- +Tue Nov 3 19:09:22 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- +Wed Jun 10 00:35:17 CEST 2009 - crrodriguez@suse.de + +- disable static libraries +- support DESTDIR + +------------------------------------------------------------------- +Wed Jan 14 09:03:29 CET 2009 - olh@suse.de + +- obsolete libjpeg-XXbit instead of jpeg-XXbit + +------------------------------------------------------------------- +Wed Dec 10 12:34:56 CET 2008 - olh@suse.de + +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) + +------------------------------------------------------------------- +Thu Dec 4 12:34:56 CET 2008 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + +------------------------------------------------------------------- +Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de + +- added baselibs.conf file to build xxbit packages + for multilib support + +------------------------------------------------------------------- +Wed Oct 10 14:31:54 CEST 2007 - nadvornik@suse.cz + +- do not add -fstack-protector explicitely + +------------------------------------------------------------------- +Mon Oct 23 02:16:36 CEST 2006 - dmueller@suse.de + +- remove unnecessary libtool .la file + +------------------------------------------------------------------- +Fri Mar 3 16:40:26 CET 2006 - nadvornik@suse.cz + +- fixed header file for C++ [#153600] + +------------------------------------------------------------------- +Wed Jan 25 21:30:23 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Jan 12 16:17:37 CET 2006 - nadvornik@suse.cz + +- compile with -fstack-protector + +------------------------------------------------------------------- +Wed Dec 15 19:55:17 CET 2004 - nadvornik@suse.cz + +- added jpegtran patch from http://sylvana.net/jpegcrop/ + +------------------------------------------------------------------- +Mon Aug 30 11:31:31 CEST 2004 - kukuk@suse.de + +- Fix wrong version of libjpeg-devel + +------------------------------------------------------------------- +Wed Aug 25 22:27:56 CEST 2004 - ro@suse.de + +- remove wrong provides + +------------------------------------------------------------------- +Wed Aug 25 11:43:05 CEST 2004 - kukuk@suse.de + +- Avoid /bin/sh PreRequires +- Create libjpeg-devel subpackage + +------------------------------------------------------------------- +Tue Feb 24 21:47:05 CET 2004 - kukuk@suse.de + +- Cleanup neededforbuild + +------------------------------------------------------------------- +Sat Jan 10 22:38:48 CET 2004 - adrian@suse.de + +- add %defattr and %run_ldconfig + +------------------------------------------------------------------- +Fri Jul 26 21:10:52 CEST 2002 - adrian@suse.de + +- fix neededforbuild + +------------------------------------------------------------------- +Wed Jun 19 12:20:16 CEST 2002 - nadvornik@suse.cz + +- patch to support old JPEG-in-TIFF encapsulations [bug #16408] + +------------------------------------------------------------------- +Fri May 31 14:19:40 CEST 2002 - meissner@suse.de + +- patch the included ltconfig so it does handle ppc64 correctly. + +------------------------------------------------------------------- +Tue Feb 5 16:23:40 CET 2002 - nadvornik@suse.cz + +- put defines like #define HAVE_STDLIB_H between + #ifdef JPEG_INTERNALS in jconfig.h because the same defines + are in kde config.h + +------------------------------------------------------------------- +Wed Jan 9 09:32:31 CET 2002 - nadvornik@suse.cz + +- used macros %{_lib} and %{_libdir} + +------------------------------------------------------------------- +Tue Dec 4 16:18:01 CET 2001 - nadvornik@suse.cz + +- added Provides: libjpeg-devel for compatibility [bug #11978] + +------------------------------------------------------------------- +Fri Nov 30 16:39:12 CET 2001 - nadvornik@suse.cz + +- fixed definition of INT32 in jmorecfg.h + +------------------------------------------------------------------- +Wed May 9 23:40:03 CEST 2001 - mfabian@suse.de + +- bzip2 sources + +------------------------------------------------------------------- +Mon Nov 20 17:32:23 CEST 2000 - ro@suse.de + +- own directory for seejpeg + +------------------------------------------------------------------- +Thu Oct 12 14:50:07 CEST 2000 - nadvornik@suse.cz + +- fixed Copyright +- ran "make test" + +------------------------------------------------------------------- +Wed May 17 08:51:55 CEST 2000 - nadvornik@suse.cz + +- fixed to compile +- changed Group tag + +------------------------------------------------------------------- +Tue Apr 4 14:53:34 CEST 2000 - nadvornik@suse.cz + +- fixed spec file + +------------------------------------------------------------------- +Tue Apr 4 11:21:34 CEST 2000 - nadvornik@suse.cz + +- fixed to compile +- added URL + +------------------------------------------------------------------- +Thu Mar 30 06:30:55 EST 2000 - jj@suse.de + +- added %{?suse_update_config:%{suse_update_config -f}} for s390 + +------------------------------------------------------------------- +Fri Feb 18 08:17:20 CET 2000 - ro@suse.de + +- set libjpeg-package version to 6.2.0 + +------------------------------------------------------------------- +Tue Jan 25 14:49:59 CET 2000 - ro@suse.de + +- update to 6b + +------------------------------------------------------------------- +Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de + +- ran old prepare_spec on spec file to switch to new prepare_spec. + +------------------------------------------------------------------- +Tue Nov 24 14:43:48 MET 1998 - ro@suse.de + +- moved to prefix /usr +- added libjpeg.so.6 link + +------------------------------------------------------------------- +Tue Nov 17 16:05:33 MET 1998 - ro@suse.de ++++ 8 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/libjpeg6/libjpeg6.changes calling whatdependson for head-i586 New: ---- baselibs.conf 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 libjpeg6.changes libjpeg6.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjpeg6.spec ++++++ # # spec file for package libjpeg6 (Version 6.2.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/ # Name: libjpeg6 License: BSD3c(or similar) Group: System/Libraries AutoReqProv: on Version: 6.2.0 Release: 1 Summary: JPEG libraries 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build # old name, but we do not provide/obsolete it as we only want to be moved in # when there is still software around needing the old interface and is not packaged Conflicts: libjpeg %description The libraries (static and dynamic) for the jpeg-graphics format. The sources are contained in the jpeg source package. %prep %setup -q -n jpeg-6b %patch %patch1 %patch2 %patch3 %patch4 %patch5 %patch6 -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} %check make test libdir=%{_libdir} %install #mkdir -p $RPM_BUILD_ROOT{%{_libdir},/usr/{include,bin}} #mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 %makeinstall libdir=%{_libdir} # remove everything not interested for compat rm -f $RPM_BUILD_ROOT/%{_libdir}/libjpeg.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libjpeg.so rm -fr $RPM_BUILD_ROOT/%_bindir rm -fr $RPM_BUILD_ROOT/%_includedir rm -fr $RPM_BUILD_ROOT/%_mandir %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %{_libdir}/libjpeg.so.62.0.0 %{_libdir}/libjpeg.so.62 %changelog ++++++ baselibs.conf ++++++ libjpeg6 ++++++ jpeg-6b-cplusplus.patch ++++++ Index: jpeglib.h =================================================================== --- jpeglib.h.orig +++ jpeglib.h @@ -13,6 +13,10 @@ #ifndef JPEGLIB_H #define JPEGLIB_H +#ifdef __cplusplus +extern "C" { +#endif + /* * First we include the configuration files that record how this * installation of the JPEG library is set up. jconfig.h can be @@ -1093,4 +1097,8 @@ struct jpeg_color_quantizer { long dummy #include "jerror.h" /* fetch error codes too */ #endif +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* JPEGLIB_H */ ++++++ jpeg-6b-destdir-1.patch ++++++ Submitted By: Andrew "Weibullguy" Rowland <darowland_at_ieee_dot_org> Date: 2008-02-18 Initial Package Version: 6b Origin: Self Description: Allows the use of DESTDIR when installing. Upstream Status: Not submitted. diff -Naur jpeg-6b-orig/makefile.cfg jpeg-6b/makefile.cfg --- jpeg-6b-orig/makefile.cfg 1998-03-21 19:08:57.000000000 +0000 +++ jpeg-6b/makefile.cfg 2008-02-18 17:07:38.000000000 +0000 @@ -191,25 +191,29 @@ # Installation rules: install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@ - $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg - $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg - $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran - $(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom - $(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom - $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(mandir)/$(manprefix)cjpeg.$(manext) - $(INSTALL_DATA) $(srcdir)/djpeg.1 $(mandir)/$(manprefix)djpeg.$(manext) - $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(mandir)/$(manprefix)jpegtran.$(manext) - $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext) - $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext) + $(INSTALL) -dvm755 $(DESTDIR)$(bindir)/$(binprefix) + $(INSTALL) -dvm755 $(DESTDIR)$(mandir)/$(manprefix) + $(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg + $(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg + $(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran + $(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom + $(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom + $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext) + $(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext) + $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext) + $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)rdjpgcom.$(manext) + $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext) install-lib: libjpeg.$(A) install-headers - $(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A) + $(INSTALL) -dvm755 $(DESTDIR)$(libdir) + $(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A) install-headers: jconfig.h - $(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h - $(INSTALL_DATA) $(srcdir)/jpeglib.h $(includedir)/jpeglib.h - $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(includedir)/jmorecfg.h - $(INSTALL_DATA) $(srcdir)/jerror.h $(includedir)/jerror.h + $(INSTALL) -dvm755 $(DESTDIR)$(includedir) + $(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h + $(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)/$(includedir)/jpeglib.h + $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)/$(includedir)/jmorecfg.h + $(INSTALL_DATA) $(srcdir)/jerror.h $(DESTDIR)/$(includedir)/jerror.h clean: $(RM) *.o *.lo libjpeg.a libjpeg.la ++++++ jpeg-6b-int32.patch ++++++ --- jmorecfg.h +++ jmorecfg.h @@ -158,7 +158,7 @@ /* INT32 must hold at least signed 32-bit values. */ #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ -typedef long INT32; +typedef int INT32; #endif /* Datatype used for image dimensions. The JPEG standard only supports ++++++ jpeg-6b-jconfig.patch ++++++ --- jconfig.cfg +++ jconfig.cfg @@ -1,22 +1,25 @@ /* jconfig.cfg --- source file edited by configure script */ /* see jconfig.doc 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 NEED_BSD_STRINGS #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-6b-jpegtran.patch ++++++ ++++ 1934 lines (skipped) ++++++ jpeg-6b-tiff-ojpeg.patch ++++++ --- jdhuff.c +++ jdhuff.c @@ -649,3 +649,35 @@ entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL; } } +/* + * 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 <marovich@hpl.hp.com>, 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; +} ++++++ jpeg-6b.dif ++++++ --- makefile.cfg +++ makefile.cfg @@ -17,7 +17,7 @@ binprefix = manprefix = manext = 1 -mandir = $(prefix)/man/man$(manext) +mandir = @mandir@/man$(manext) # The name of your C compiler: CC= @CC@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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