Hello community,
here is the log from the commit of package libjpeg-turbo for openSUSE:Factory
checked in at Mon Sep 19 21:12:21 CEST 2011.
--------
--- libjpeg-turbo/libjpeg-turbo.changes 2011-03-03 14:00:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/libjpeg-turbo/libjpeg-turbo.changes 2011-05-19 14:48:04.000000000 +0200
@@ -1,0 +2,23 @@
+Thu May 19 14:44:56 CEST 2011 - pgajdos@suse.cz
+
+- updated to 1.1.1:
+ * Fixed a 1-pixel error in row 0, column 21 of the luminance
+ plane generated by tjEncodeYUV().
+ * libjpeg-turbo's accelerated Huffman decoder previously
+ ignored unexpected markers found in the middle of the
+ JPEG data stream during decompression. It will now
+ hand off decoding of a particular block to the unaccelerated
+ Huffman decoder if an unexpected marker is found, so that
+ the unaccelerated Huffman decoder can generate an appropriate
+ warning.
+ * Fixed a bug in jpeg_read_coefficients() whereby it would
+ not initialize cinfo->image_width and cinfo->image_height
+ if libjpeg v7 or v8 emulation was enabled. This specifically
+ caused the jpegoptim program to fail if it was linked against
+ a version of libjpeg-turbo that was built with libjpeg v7 or
+ v8 emulation.
+ * Eliminated excessive I/O overhead that occurred when reading
+ BMP files in cjpeg.
+ *
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libjpeg-turbo-1.1.0-int32.patch
libjpeg-turbo-1.1.0-tiff-ojpeg.patch
libjpeg-turbo-1.1.0.tar.bz2
New:
----
libjpeg-turbo-1.1.1-int32.patch
libjpeg-turbo-1.1.1-tiff-ojpeg.patch
libjpeg-turbo-1.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libjpeg-turbo.spec ++++++
--- /var/tmp/diff_new_pack.WJFNp4/_old 2011-09-19 21:12:16.000000000 +0200
+++ /var/tmp/diff_new_pack.WJFNp4/_new 2011-09-19 21:12:16.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package libjpeg-turbo
+# spec file for package jpeg-turbo
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -20,7 +20,7 @@
%define major 62
%define minor 0
%define micro 0
-%define srcver 1.1.0
+%define srcver 1.1.1
%define libver %{major}.%{minor}.%{micro}
# major number of library from jpeg8
%define cmajor 8
@@ -33,7 +33,7 @@
Release: 1
Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
Url: http://sourceforge.net/projects/libjpeg-turbo
-BuildRequires: gcc-c++ nasm
+BuildRequires: nasm gcc-c++
Provides: jpeg = %{version}
Obsoletes: jpeg
Conflicts: jpeg%{major}
@@ -53,7 +53,6 @@
License: BSD3c(or similar)
Summary: The MMX/SSE accelerated JPEG compression/decompression library
Version: %{libver}
-Release: 2
Provides: libjpeg6 = %{version}
Obsoletes: libjpeg6
Group: System/Libraries
@@ -75,11 +74,9 @@
Michael Mauldin
%package -n libjpeg%{major}-devel
-
License: BSD3c(or similar)
Summary: Development Tools for applications which will use the Libjpeg Library
Version: %{libver}
-Release: 2
Group: Development/Libraries/C and C++
Requires: libjpeg%{major} = %{version}
Provides: libjpeg-devel = %{version}
++++++ libjpeg-turbo-1.1.0-int32.patch -> libjpeg-turbo-1.1.1-int32.patch ++++++
++++++ libjpeg-turbo-1.1.0-tiff-ojpeg.patch -> libjpeg-turbo-1.1.1-tiff-ojpeg.patch ++++++
++++++ libjpeg-turbo-1.1.0.tar.bz2 -> libjpeg-turbo-1.1.1.tar.bz2 ++++++
++++ 1859 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/BUILDING.txt new/libjpeg-turbo-1.1.1/BUILDING.txt
--- old/libjpeg-turbo-1.1.0/BUILDING.txt 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/BUILDING.txt 2011-05-18 05:51:06.000000000 +0200
@@ -12,21 +12,25 @@
-- libtool 1.4 or later
-- NASM
- * 0.98 or later is required for a 32-bit build
- * NASM 2.05 or later is required for a 64-bit build
+ * 0.98, or 2.01 or later is required for a 32-bit build
+ * NASM 2.00 or later is required for a 64-bit build
* NASM 2.07 or later is required for a 64-bit build on OS X. This can be
obtained from MacPorts (http://www.macports.org/).
- The NASM 2.05 RPMs do not work on older Linux systems, such as Red Hat
- Enterprise Linux 4. On such systems, you can easily build and install NASM
- 2.05 from the source RPM by executing the following as root:
+ The binary RPMs released by the NASM project do not work on older Linux
+ systems, such as Red Hat Enterprise Linux 4. On such systems, you can
+ easily build and install NASM from a source RPM by downloading one of the
+ SRPMs from
+
+ http://www.nasm.us/pub/nasm/releasebuilds
+
+ and executing the following as root:
ARCH=`uname -m`
- wget http://www.nasm.us/pub/nasm/releasebuilds/2.05.01/nasm-2.05.01-1.src.rpm
- rpmbuild --rebuild nasm-2.05.01-1.src.rpm
- rpm -Uvh /usr/src/redhat/RPMS/$ARCH/nasm-2.05.01-1.$ARCH.rpm
+ rpmbuild --rebuild nasm-{version}.src.rpm
+ rpm -Uvh /usr/src/redhat/RPMS/$ARCH/nasm-{version}.$ARCH.rpm
- NOTE: NASM build will fail if texinfo is not installed.
+ NOTE: the NASM build will fail if texinfo is not installed.
-- GCC v4.1 or later recommended for best performance
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/CMakeLists.txt new/libjpeg-turbo-1.1.1/CMakeLists.txt
--- old/libjpeg-turbo-1.1.0/CMakeLists.txt 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/CMakeLists.txt 2011-05-18 05:51:06.000000000 +0200
@@ -5,7 +5,7 @@
cmake_minimum_required(VERSION 2.6)
project(libjpeg-turbo C)
-set(VERSION 1.1.0)
+set(VERSION 1.1.1)
if(MINGW OR CYGWIN)
execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE BUILD)
@@ -32,17 +32,11 @@
message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}")
-if(NOT DEFINED WITH_SIMD)
- set(WITH_SIMD 1)
-endif()
-
-if(NOT DEFINED WITH_ARITH_ENC)
- set(WITH_ARITH_ENC 1)
-endif()
-
-if(NOT DEFINED WITH_ARITH_DEC)
- set(WITH_ARITH_DEC 1)
-endif()
+option(WITH_SIMD "Include SIMD extensions" TRUE)
+option(WITH_ARITH_ENC "Include arithmetic encoding support" TRUE)
+option(WITH_ARITH_DEC "Include arithmetic decoding support" TRUE)
+option(WITH_JPEG7 "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b)" FALSE)
+option(WITH_JPEG8 "Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b)" FALSE)
if(WITH_ARITH_ENC)
set(C_ARITH_CODING_SUPPORTED 1)
@@ -184,13 +178,13 @@
add_executable(cjpeg-static cjpeg.c cdjpeg.c rdbmp.c rdgif.c rdppm.c rdswitch.c
rdtarga.c)
set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS
- "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED")
+ "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED -DUSE_SETMODE")
target_link_libraries(cjpeg-static jpeg-static)
add_executable(djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrbmp.c wrgif.c
wrppm.c wrtarga.c)
set_property(TARGET djpeg-static PROPERTY COMPILE_FLAGS
- "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED")
+ "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED -DUSE_SETMODE")
target_link_libraries(djpeg-static jpeg-static)
add_executable(jpegtran-static jpegtran.c cdjpeg.c rdswitch.c transupp.c)
@@ -301,24 +295,26 @@
# Installer
#
-set(INST_NAME ${CMAKE_PROJECT_NAME})
-
if(MSVC)
set(INST_PLATFORM "Visual C++")
+ set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-vc)
+ set(INST_DIR ${CMAKE_PROJECT_NAME})
elseif(MINGW)
set(INST_PLATFORM GCC)
- set(INST_NAME ${INST_NAME}-gcc)
+ set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-gcc)
+ set(INST_DIR ${CMAKE_PROJECT_NAME}-gcc)
set(INST_DEFS -DGCC)
endif()
if(64BIT)
set(INST_PLATFORM "${INST_PLATFORM} 64-bit")
set(INST_NAME ${INST_NAME}64)
+ set(INST_DIR ${INST_DIR}64)
set(INST_DEFS ${INST_DEFS} -DWIN64)
endif()
if(MSVC_IDE)
- set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=$(OutDir)\\")
+ set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=${CMAKE_CFG_INTDIR}\\")
else()
set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=")
endif()
@@ -327,7 +323,8 @@
add_custom_target(installer
makensis -nocd ${INST_DEFS} libjpeg-turbo.nsi
- DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static
+ DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom
+ cjpeg djpeg jpegtran jpgtest
SOURCES libjpeg-turbo.nsi)
install(TARGETS jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom jpgtest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/ChangeLog.txt new/libjpeg-turbo-1.1.1/ChangeLog.txt
--- old/libjpeg-turbo-1.1.0/ChangeLog.txt 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/ChangeLog.txt 2011-05-18 05:51:06.000000000 +0200
@@ -1,3 +1,39 @@
+1.1.1
+=====
+
+[1] Fixed a 1-pixel error in row 0, column 21 of the luminance plane generated
+by tjEncodeYUV().
+
+[2] libjpeg-turbo's accelerated Huffman decoder previously ignored unexpected
+markers found in the middle of the JPEG data stream during decompression. It
+will now hand off decoding of a particular block to the unaccelerated Huffman
+decoder if an unexpected marker is found, so that the unaccelerated Huffman
+decoder can generate an appropriate warning.
+
+[3] Older versions of MinGW64 prefixed symbol names with underscores by
+default, which differed from the behavior of 64-bit Visual C++. MinGW64 1.0
+has adopted the behavior of 64-bit Visual C++ as the default, so to accommodate
+this, the libjpeg-turbo SIMD function names are no longer prefixed with an
+underscore when building with MinGW64. This means that, when building
+libjpeg-turbo with older versions of MinGW64, you will now have to add
+-fno-leading-underscore to the CFLAGS.
+
+[4] Fixed a regression bug in the NSIS script that caused the Windows installer
+build to fail when using the Visual Studio IDE.
+
+[5] Fixed a bug in jpeg_read_coefficients() whereby it would not initialize
+cinfo->image_width and cinfo->image_height if libjpeg v7 or v8 emulation was
+enabled. This specifically caused the jpegoptim program to fail if it was
+linked against a version of libjpeg-turbo that was built with libjpeg v7 or v8
+emulation.
+
+[6] Eliminated excessive I/O overhead that occurred when reading BMP files in
+cjpeg.
+
+[7] Eliminated errors in the output of cjpeg on Windows that occurred when the
+application was invoked using I/O redirection (cjpeg <inputfile >output.jpg).
+
+
1.1.0
=====
@@ -18,7 +54,7 @@
[3] Ported jpgtest.cxx to pure C to avoid the need for a C++ compiler.
[4] Fixed visual artifacts in grayscale JPEG compression caused by a typo in
-the RGB-to-chrominance lookup tables.
+the RGB-to-luminance lookup tables.
[5] The Windows distribution packages now include the libjpeg run-time programs
(cjpeg, etc.)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/Makefile.am new/libjpeg-turbo-1.1.1/Makefile.am
--- old/libjpeg-turbo-1.1.0/Makefile.am 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/Makefile.am 2011-05-18 05:51:06.000000000 +0200
@@ -169,15 +169,19 @@
rm -f *_GRAYQ[0-9]*.bmp
rm -f *_GRAYQ[0-9]*.ppm
rm -f *_GRAYQ[0-9]*.jpg
+ rm -f *_GRAY.yuv
rm -f *_420Q[0-9]*.bmp
rm -f *_420Q[0-9]*.ppm
rm -f *_420Q[0-9]*.jpg
+ rm -f *_420.yuv
rm -f *_422Q[0-9]*.bmp
rm -f *_422Q[0-9]*.ppm
rm -f *_422Q[0-9]*.jpg
+ rm -f *_422.yuv
rm -f *_444Q[0-9]*.bmp
rm -f *_444Q[0-9]*.ppm
rm -f *_444Q[0-9]*.jpg
+ rm -f *_444.yuv
if X86_64
@@ -207,11 +211,12 @@
TMPDIR=`mktemp -d /tmp/${PACKAGE_NAME}-build.XXXXXX`; \
mkdir -p $$TMPDIR/RPMS; \
ln -fs `pwd` $$TMPDIR/BUILD; \
- rm -f ${PACKAGE_NAME}.${RPMARCH}.rpm; \
+ rm -f ${PACKAGE_NAME}-${VERSION}.${RPMARCH}.rpm; \
rpmbuild -bb --define "_blddir $$TMPDIR/buildroot" \
--define "_topdir $$TMPDIR" --define "_srcdir ${srcdir}" \
- --target ${RPMARCH} libjpeg-turbo.spec; \
- cp $$TMPDIR/RPMS/${RPMARCH}/${PACKAGE_NAME}-${VERSION}-${BUILD}.${RPMARCH}.rpm ${PACKAGE_NAME}.${RPMARCH}.rpm; \
+ --target ${RPMARCH} pkgscripts/libjpeg-turbo.spec; \
+ cp $$TMPDIR/RPMS/${RPMARCH}/${PACKAGE_NAME}-${VERSION}-${BUILD}.${RPMARCH}.rpm \
+ ${PACKAGE_NAME}-${VERSION}.${RPMARCH}.rpm; \
rm -rf $$TMPDIR
srpm: dist-gzip
@@ -221,38 +226,38 @@
mkdir -p $$TMPDIR/BUILD; \
mkdir -p $$TMPDIR/SOURCES; \
mkdir -p $$TMPDIR/SPECS; \
- rm -f ${PACKAGE_NAME}.src.rpm; \
+ rm -f ${PACKAGE_NAME}-${VERSION}.src.rpm; \
cp ${PACKAGE_NAME}-${VERSION}.tar.gz $$TMPDIR/SOURCES; \
- cat libjpeg-turbo.spec | sed s/%{_blddir}/%{_tmppath}/g \
+ cat pkgscripts/libjpeg-turbo.spec | sed s/%{_blddir}/%{_tmppath}/g \
| sed s@%{_srcdir}/@@g | sed s/#--\>//g \
- >$$TMPDIR/SPECS/libjpeg-turbo.spec; \
+ > $$TMPDIR/SPECS/libjpeg-turbo.spec; \
rpmbuild -bs --define "_topdir $$TMPDIR" $$TMPDIR/SPECS/libjpeg-turbo.spec; \
- cp $$TMPDIR/SRPMS/${PACKAGE_NAME}-${VERSION}-${BUILD}.src.rpm ${PACKAGE_NAME}.src.rpm; \
+ cp $$TMPDIR/SRPMS/${PACKAGE_NAME}-${VERSION}-${BUILD}.src.rpm \
+ ${PACKAGE_NAME}-${VERSION}.src.rpm; \
rm -rf $$TMPDIR
deb: all
- sh $(srcdir)/release/makedpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \
- ${DEBARCH} ${srcdir}
+ sh pkgscripts/makedpkg
if X86_64
udmg: all
- sh makemacpkg universal ${BUILDDIR32}
+ sh pkgscripts/makemacpkg universal ${BUILDDIR32}
endif
dmg: all
- sh makemacpkg
+ sh pkgscripts/makemacpkg
if X86_64
csunpkg: all
- sh makesunpkg combined ${BUILDDIR32}
+ sh pkgscripts/makesunpkg combined ${BUILDDIR32}
endif
sunpkg: all
- sh makesunpkg
+ sh pkgscripts/makesunpkg
cygwinpkg: all
- sh $(srcdir)/release/makecygwinpkg ${PACKAGE_NAME} ${VERSION} ${srcdir}
+ sh pkgscripts/makecygwinpkg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/configure.ac new/libjpeg-turbo-1.1.1/configure.ac
--- old/libjpeg-turbo-1.1.0/configure.ac 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/configure.ac 2011-05-18 05:51:06.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.56])
-AC_INIT([libjpeg-turbo], [1.1.0])
+AC_INIT([libjpeg-turbo], [1.1.1])
BUILD=`date +%Y%m%d`
AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
@@ -98,14 +98,6 @@
[AC_DEFINE([NEED_BSD_STRINGS], 1,
[Define if you have BSD-like bzero and bcopy])])
-# Set flags to indicate platform
-case "$host_os" in
- cygwin* | mingw* | pw32* | interix*)
- is_win32=1
- ;;
-esac
-AM_CONDITIONAL([IS_WIN32], [test "x$is_win32" = "x1"])
-
AC_MSG_CHECKING([libjpeg API version])
AC_ARG_VAR(JPEG_LIB_VERSION, [libjpeg API version (62, 70, or 80)])
if test "x$JPEG_LIB_VERSION" = "x"; then
@@ -206,7 +198,7 @@
# SIMD is optional
AC_ARG_WITH([simd],
- AC_HELP_STRING([--without-simd],[Omit accelerated SIMD routines.]))
+ AC_HELP_STRING([--without-simd],[Omit SIMD extensions.]))
if test "x${with_simd}" != "xno"; then
# Check if we're on a supported CPU
AC_MSG_CHECKING([if we have SIMD optimisations for cpu type])
@@ -260,9 +252,16 @@
# jconfig.h is a minimal version that allows this package to be built
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_HEADERS([jconfig.h])
-AC_CONFIG_FILES([libjpeg-turbo.spec:release/libjpeg-turbo.spec.in])
-AC_CONFIG_FILES([makemacpkg:release/makemacpkg.in])
-AC_CONFIG_FILES([makesunpkg:release/makesunpkg.in])
+AC_CONFIG_FILES([pkgscripts/libjpeg-turbo.spec:release/libjpeg-turbo.spec.in])
+AC_CONFIG_FILES([pkgscripts/makecygwinpkg:release/makecygwinpkg.in])
+AC_CONFIG_FILES([pkgscripts/makedpkg:release/makedpkg.in])
+AC_CONFIG_FILES([pkgscripts/deb-control:release/deb-control.in])
+AC_CONFIG_FILES([pkgscripts/makemacpkg:release/makemacpkg.in])
+AC_CONFIG_FILES([pkgscripts/Description.plist:release/Description.plist.in])
+AC_CONFIG_FILES([pkgscripts/Info.plist:release/Info.plist.in])
+AC_CONFIG_FILES([pkgscripts/uninstall:release/uninstall.in])
+AC_CONFIG_FILES([pkgscripts/makesunpkg:release/makesunpkg.in])
+AC_CONFIG_FILES([pkgscripts/pkginfo:release/pkginfo.in])
AC_CONFIG_FILES([libjpeg.map])
AC_CONFIG_FILES([Makefile simd/Makefile])
AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/jccolor.c new/libjpeg-turbo-1.1.1/jccolor.c
--- old/libjpeg-turbo-1.1.0/jccolor.c 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/jccolor.c 2011-05-18 05:51:06.000000000 +0200
@@ -3,7 +3,7 @@
*
* Copyright (C) 1991-1996, Thomas G. Lane.
* Copyright 2009 Pierre Ossman for Cendio AB
- * Copyright 2009 D. R. Commander
+ * Copyright 2009-2011 D. R. Commander
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
@@ -259,6 +259,7 @@
JDIMENSION output_row, int num_rows)
{
#if BITS_IN_JSAMPLE != 8
+ my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
register INT32 * ctab = cconvert->rgb_ycc_tab;
#endif
register JSAMPROW inptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/jcmaster.c new/libjpeg-turbo-1.1.1/jcmaster.c
--- old/libjpeg-turbo-1.1.0/jcmaster.c 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/jcmaster.c 2011-05-18 05:51:06.000000000 +0200
@@ -75,7 +75,9 @@
JDIMENSION jd_samplesperrow;
#if JPEG_LIB_VERSION >= 70
+#if JPEG_LIB_VERSION >= 80
if (!transcode_only)
+#endif
jpeg_calc_jpeg_dimensions(cinfo);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/jdhuff.c new/libjpeg-turbo-1.1.1/jdhuff.c
--- old/libjpeg-turbo-1.1.0/jdhuff.c 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/jdhuff.c 2011-05-18 05:51:06.000000000 +0200
@@ -623,6 +623,7 @@
if (val0 == 0xFF) { \
buffer++; \
if (val1 != 0) { \
+ cinfo->unread_marker = val1; \
buffer -= 2; \
get_buffer &= ~0xFF; \
} \
@@ -739,6 +740,11 @@
}
}
+ if (cinfo->unread_marker != 0) {
+ cinfo->unread_marker = 0;
+ return FALSE;
+ }
+
br_state.bytes_in_buffer -= (buffer - br_state.next_input_byte);
br_state.next_input_byte = buffer;
BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
@@ -778,7 +784,8 @@
usefast = 0;
}
- if (cinfo->src->bytes_in_buffer < BUFSIZE * cinfo->blocks_in_MCU)
+ if (cinfo->src->bytes_in_buffer < BUFSIZE * cinfo->blocks_in_MCU
+ || cinfo->unread_marker != 0)
usefast = 0;
/* If we've run out of data, just leave the MCU set to zeroes.
@@ -787,9 +794,10 @@
if (! entropy->pub.insufficient_data) {
if (usefast) {
- if (!decode_mcu_fast(cinfo, MCU_data)) return FALSE;
+ if (!decode_mcu_fast(cinfo, MCU_data)) goto use_slow;
}
else {
+ use_slow:
if (!decode_mcu_slow(cinfo, MCU_data)) return FALSE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/jdtrans.c new/libjpeg-turbo-1.1.1/jdtrans.c
--- old/libjpeg-turbo-1.1.0/jdtrans.c 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/jdtrans.c 2011-05-18 05:51:06.000000000 +0200
@@ -99,6 +99,11 @@
/* This is effectively a buffered-image operation. */
cinfo->buffered_image = TRUE;
+#if JPEG_LIB_VERSION >= 80
+ /* Compute output image dimensions and related values. */
+ jpeg_core_output_dimensions(cinfo);
+#endif
+
/* Entropy decoding: either Huffman or arithmetic coding. */
if (cinfo->arith_code) {
#ifdef D_ARITH_CODING_SUPPORTED
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/jmemmgr.c new/libjpeg-turbo-1.1.1/jmemmgr.c
--- old/libjpeg-turbo-1.1.0/jmemmgr.c 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/jmemmgr.c 2011-05-18 05:51:06.000000000 +0200
@@ -37,6 +37,15 @@
#endif
+LOCAL(size_t)
+round_up_pow2 (size_t a, size_t b)
+/* a rounded up to the next multiple of b, i.e. ceil(a/b)*b */
+/* Assumes a >= 0, b > 0, and b is a power of 2 */
+{
+ return ((a + b - 1) & (~(b - 1)));
+}
+
+
/*
* Some important notes:
* The allocation routines provided here must never return NULL.
@@ -265,7 +274,7 @@
* and so that algorithms can straddle outside the proper area up
* to the next alignment.
*/
- sizeofobject = jround_up(sizeofobject, ALIGN_SIZE);
+ sizeofobject = round_up_pow2(sizeofobject, ALIGN_SIZE);
/* Check for unsatisfiable request (do now to ensure no overflow below) */
if ((SIZEOF(small_pool_hdr) + sizeofobject + ALIGN_SIZE - 1) > MAX_ALLOC_CHUNK)
@@ -354,7 +363,7 @@
* algorithms can straddle outside the proper area up to the next
* alignment.
*/
- sizeofobject = jround_up(sizeofobject, ALIGN_SIZE);
+ sizeofobject = round_up_pow2(sizeofobject, ALIGN_SIZE);
/* Check for unsatisfiable request (do now to ensure no overflow below) */
if ((SIZEOF(large_pool_hdr) + sizeofobject + ALIGN_SIZE - 1) > MAX_ALLOC_CHUNK)
@@ -420,7 +429,7 @@
/* Make sure each row is properly aligned */
if ((ALIGN_SIZE % SIZEOF(JSAMPLE)) != 0)
out_of_memory(cinfo, 5); /* safety check */
- samplesperrow = (JDIMENSION)jround_up(samplesperrow, (2 * ALIGN_SIZE) / SIZEOF(JSAMPLE));
+ samplesperrow = (JDIMENSION)round_up_pow2(samplesperrow, (2 * ALIGN_SIZE) / SIZEOF(JSAMPLE));
/* Calculate max # of rows allowed in one allocation chunk */
ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/jpegint.h new/libjpeg-turbo-1.1.1/jpegint.h
--- old/libjpeg-turbo-1.1.0/jpegint.h 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/jpegint.h 2011-05-18 05:51:06.000000000 +0200
@@ -375,7 +375,7 @@
/* Utility routines in jutils.c */
EXTERN(long) jdiv_round_up JPP((long a, long b));
-EXTERN(size_t) jround_up JPP((size_t a, size_t b));
+EXTERN(long) jround_up JPP((long a, long b));
EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
JSAMPARRAY output_array, int dest_row,
int num_rows, JDIMENSION num_cols));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/jpegut.c new/libjpeg-turbo-1.1.1/jpegut.c
--- old/libjpeg-turbo-1.1.0/jpegut.c 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/jpegut.c 2011-05-18 05:51:06.000000000 +0200
@@ -219,7 +219,7 @@
}}
#define checkval255(v) { \
- if(v<254 && !(v==217 && i==0 && j==21)) { \
+ if(v<254) { \
printf("\nComp. %s at %d,%d should be 255, not %d\n", #v, i, j, v); \
retval=0; goto bailout; \
}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/jutils.c new/libjpeg-turbo-1.1.1/jutils.c
--- old/libjpeg-turbo-1.1.0/jutils.c 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/jutils.c 2011-05-18 05:51:06.000000000 +0200
@@ -77,8 +77,8 @@
}
-GLOBAL(size_t)
-jround_up (size_t a, size_t b)
+GLOBAL(long)
+jround_up (long a, long b)
/* Compute a rounded up to next multiple of b, ie, ceil(a/b)*b */
/* Assumes a >= 0, b > 0 */
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/rdbmp.c new/libjpeg-turbo-1.1.1/rdbmp.c
--- old/libjpeg-turbo-1.1.0/rdbmp.c 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/rdbmp.c 2011-05-18 05:51:06.000000000 +0200
@@ -3,6 +3,7 @@
*
* Copyright (C) 1994-1996, Thomas G. Lane.
* Modified 2009-2010 by Guido Vollbeding.
+ * Modified 2011 by Siarhei Siamashka.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
@@ -220,10 +221,9 @@
{
bmp_source_ptr source = (bmp_source_ptr) sinfo;
register FILE *infile = source->pub.input_file;
- register int c;
register JSAMPROW out_ptr;
JSAMPARRAY image_ptr;
- JDIMENSION row, col;
+ JDIMENSION row;
cd_progress_ptr progress = (cd_progress_ptr) cinfo->progress;
/* Read the data into a virtual array in input-file row order. */
@@ -237,11 +237,11 @@
((j_common_ptr) cinfo, source->whole_image,
row, (JDIMENSION) 1, TRUE);
out_ptr = image_ptr[0];
- for (col = source->row_width; col > 0; col--) {
- /* inline copy of read_byte() for speed */
- if ((c = getc(infile)) == EOF)
- ERREXIT(cinfo, JERR_INPUT_EOF);
- *out_ptr++ = (JSAMPLE) c;
+ if (fread(out_ptr, 1, source->row_width, infile) != source->row_width) {
+ if (feof(infile))
+ ERREXIT(cinfo, JERR_INPUT_EOF);
+ else
+ ERREXIT(cinfo, JERR_FILE_READ);
}
}
if (progress != NULL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/Description.plist.in new/libjpeg-turbo-1.1.1/release/Description.plist.in
--- old/libjpeg-turbo-1.1.0/release/Description.plist.in 1970-01-01 01:00:00.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/Description.plist.in 2011-05-18 05:51:04.000000000 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IFPkgDescriptionDescription</key>
+ <string>A SIMD-accelerated JPEG codec which provides both the libjpeg and TurboJPEG APIs</string>
+ <key>IFPkgDescriptionTitle</key>
+ <string>@PACKAGE_NAME@</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>@VERSION@</string>
+</dict>
+</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/Description.plist.tmpl new/libjpeg-turbo-1.1.1/release/Description.plist.tmpl
--- old/libjpeg-turbo-1.1.0/release/Description.plist.tmpl 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/Description.plist.tmpl 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IFPkgDescriptionDescription</key>
- <string>A SIMD-accelerated JPEG codec which provides both the libjpeg and TurboJPEG APIs</string>
- <key>IFPkgDescriptionTitle</key>
- <string>{__APPNAME}</string>
- <key>IFPkgDescriptionVersion</key>
- <string>{__VERSION}</string>
-</dict>
-</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/Info.plist.in new/libjpeg-turbo-1.1.1/release/Info.plist.in
--- old/libjpeg-turbo-1.1.0/release/Info.plist.in 1970-01-01 01:00:00.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/Info.plist.in 2011-05-18 05:51:04.000000000 +0200
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>@VERSION@, The libjpeg-turbo Project</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.libjpeg-turbo.libjpeg-turbo</string>
+ <key>CFBundleShortVersionString</key>
+ <string>@VERSION@</string>
+ <key>IFMajorVersion</key>
+ <integer>1</integer>
+ <key>IFMinorVersion</key>
+ <integer>@BUILD@</integer>
+ <key>IFPkgFlagAllowBackRev</key>
+ <false/>
+ <key>IFPkgFlagAuthorizationAction</key>
+ <string>AdminAuthorization</string>
+ <key>IFPkgFlagBackgroundAlignment</key>
+ <string>topleft</string>
+ <key>IFPkgFlagBackgroundScaling</key>
+ <string>none</string>
+ <key>IFPkgFlagDefaultLocation</key>
+ <string>/</string>
+ <key>IFPkgFlagFollowLinks</key>
+ <true/>
+ <key>IFPkgFlagInstallFat</key>
+ <false/>
+ <key>IFPkgFlagIsRequired</key>
+ <false/>
+ <key>IFPkgFlagOverwritePermissions</key>
+ <false/>
+ <key>IFPkgFlagRelocatable</key>
+ <false/>
+ <key>IFPkgFlagRestartAction</key>
+ <string>NoRestart</string>
+ <key>IFPkgFlagRootVolumeOnly</key>
+ <true/>
+ <key>IFPkgFlagUpdateInstalledLanguages</key>
+ <false/>
+ <key>IFPkgFormatVersion</key>
+ <real>0.10000000149011612</real>
+</dict>
+</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/Info.plist.tmpl new/libjpeg-turbo-1.1.1/release/Info.plist.tmpl
--- old/libjpeg-turbo-1.1.0/release/Info.plist.tmpl 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/Info.plist.tmpl 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleGetInfoString</key>
- <string>{__VERSION}, The libjpeg-turbo Project</string>
- <key>CFBundleIdentifier</key>
- <string>com.libjpeg-turbo.libjpeg-turbo</string>
- <key>CFBundleShortVersionString</key>
- <string>{__VERSION}</string>
- <key>IFMajorVersion</key>
- <integer>1</integer>
- <key>IFMinorVersion</key>
- <integer>{__BUILD}</integer>
- <key>IFPkgFlagAllowBackRev</key>
- <false/>
- <key>IFPkgFlagAuthorizationAction</key>
- <string>AdminAuthorization</string>
- <key>IFPkgFlagBackgroundAlignment</key>
- <string>topleft</string>
- <key>IFPkgFlagBackgroundScaling</key>
- <string>none</string>
- <key>IFPkgFlagDefaultLocation</key>
- <string>/</string>
- <key>IFPkgFlagFollowLinks</key>
- <true/>
- <key>IFPkgFlagInstallFat</key>
- <false/>
- <key>IFPkgFlagIsRequired</key>
- <false/>
- <key>IFPkgFlagOverwritePermissions</key>
- <false/>
- <key>IFPkgFlagRelocatable</key>
- <false/>
- <key>IFPkgFlagRestartAction</key>
- <string>NoRestart</string>
- <key>IFPkgFlagRootVolumeOnly</key>
- <true/>
- <key>IFPkgFlagUpdateInstalledLanguages</key>
- <false/>
- <key>IFPkgFormatVersion</key>
- <real>0.10000000149011612</real>
-</dict>
-</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/deb-control.in new/libjpeg-turbo-1.1.1/release/deb-control.in
--- old/libjpeg-turbo-1.1.0/release/deb-control.in 1970-01-01 01:00:00.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/deb-control.in 2011-05-18 05:51:04.000000000 +0200
@@ -0,0 +1,28 @@
+Package: @PACKAGE_NAME@
+Version: @VERSION@-@BUILD@
+Section: misc
+Priority: optional
+Architecture: @DEBARCH@
+Essential: no
+Maintainer: The libjpeg-turbo Project [http://www.libjpeg-turbo.org]
+Description: A SIMD-accelerated JPEG codec which provides both the libjpeg and TurboJPEG APIs
+ libjpeg-turbo is a derivative of libjpeg which uses SIMD instructions (MMX,
+ SSE2, etc.) to accelerate baseline JPEG compression and decompression on x86
+ and x86-64 systems. On such systems, libjpeg-turbo is generally 2-4x as fast
+ as the unmodified version of libjpeg, all else being equal. libjpeg-turbo
+ also includes a wrapper library which implements the TurboJPEG API used by
+ VirtualGL and TurboVNC.
+ .
+ libjpeg-turbo was originally based on libjpeg/SIMD by Miyasaka Masaru, but
+ the TigerVNC and VirtualGL projects made numerous enhancements to the codec
+ in 2009, including improved support for Mac OS X, 64-bit support, support
+ for 32-bit and big endian pixel formats (RGBX, XBGR, etc.), accelerated
+ Huffman encoding/decoding, and various bug fixes. The goal was to produce a
+ fully open source codec that could replace the partially closed source
+ TurboJPEG/IPP codec used by VirtualGL and TurboVNC. libjpeg-turbo generally
+ performs in the range of 80-120% of TurboJPEG/IPP. It is faster in some
+ areas but slower in others.
+ .
+ In early 2010, libjpeg-turbo spun off into its own independent project, with
+ the goal of making high-speed JPEG compression/decompression technology
+ available to a broader range of users and developers.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/deb-control.tmpl new/libjpeg-turbo-1.1.1/release/deb-control.tmpl
--- old/libjpeg-turbo-1.1.0/release/deb-control.tmpl 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/deb-control.tmpl 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-Package: {__PKGNAME}
-Version: {__VERSION}-{__BUILD}
-Section: misc
-Priority: optional
-Architecture: {__ARCH}
-Essential: no
-Maintainer: The libjpeg-turbo Project [http://libjpeg-turbo.VirtualGL.org]
-Description: A SIMD-accelerated JPEG codec which provides both the libjpeg and TurboJPEG APIs
- libjpeg-turbo is a derivative of libjpeg which uses SIMD instructions (MMX,
- SSE2, etc.) to accelerate baseline JPEG compression and decompression on x86
- and x86-64 systems. On such systems, libjpeg-turbo is generally 2-4x as fast
- as the unmodified version of libjpeg, all else being equal. libjpeg-turbo
- also includes a wrapper library which implements the TurboJPEG API used by
- VirtualGL and TurboVNC.
- .
- libjpeg-turbo was originally based on libjpeg/SIMD by Miyasaka Masaru, but
- the TigerVNC and VirtualGL projects made numerous enhancements to the codec
- in 2009, including improved support for Mac OS X, 64-bit support, support
- for 32-bit and big endian pixel formats (RGBX, XBGR, etc.), accelerated
- Huffman encoding/decoding, and various bug fixes. The goal was to produce a
- fully open source codec that could replace the partially closed source
- TurboJPEG/IPP codec used by VirtualGL and TurboVNC. libjpeg-turbo generally
- performs in the range of 80-120% of TurboJPEG/IPP. It is faster in some
- areas but slower in others.
- .
- In early 2010, libjpeg-turbo spun off into its own independent project, with
- the goal of making high-speed JPEG compression/decompression technology
- available to a broader range of users and developers.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/libjpeg-turbo.nsi.in new/libjpeg-turbo-1.1.1/release/libjpeg-turbo.nsi.in
--- old/libjpeg-turbo-1.1.0/release/libjpeg-turbo.nsi.in 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/libjpeg-turbo.nsi.in 2011-05-18 05:51:04.000000000 +0200
@@ -1,7 +1,7 @@
!include x64.nsh
Name "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@"
OutFile "@CMAKE_BINARY_DIR@\${BUILDDIR}@INST_NAME@.exe"
-InstallDir c:\@INST_NAME@
+InstallDir c:\@INST_DIR@
SetCompressor bzip2
@@ -45,12 +45,12 @@
!else
File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}jpeg@DLL_VERSION@.dll"
!endif
- File "@CMAKE_BINARY_DIR@\sharedlib\cjpeg.exe"
- File "@CMAKE_BINARY_DIR@\sharedlib\djpeg.exe"
- File "@CMAKE_BINARY_DIR@\sharedlib\jpegtran.exe"
- File "@CMAKE_BINARY_DIR@\jpgtest.exe"
- File "@CMAKE_BINARY_DIR@\rdjpgcom.exe"
- File "@CMAKE_BINARY_DIR@\wrjpgcom.exe"
+ File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}cjpeg.exe"
+ File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}djpeg.exe"
+ File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}jpegtran.exe"
+ File "@CMAKE_BINARY_DIR@\${BUILDDIR}jpgtest.exe"
+ File "@CMAKE_BINARY_DIR@\${BUILDDIR}rdjpgcom.exe"
+ File "@CMAKE_BINARY_DIR@\${BUILDDIR}wrjpgcom.exe"
SetOutPath $INSTDIR\lib
!ifdef GCC
File "@CMAKE_BINARY_DIR@\libturbojpeg.dll.a"
@@ -77,12 +77,12 @@
File "@CMAKE_SOURCE_DIR@\LICENSE.txt"
File "@CMAKE_SOURCE_DIR@\usage.txt"
- WriteRegStr HKLM "SOFTWARE\@INST_NAME@ @VERSION@" "Install_Dir" "$INSTDIR"
+ WriteRegStr HKLM "SOFTWARE\@INST_DIR@ @VERSION@" "Install_Dir" "$INSTDIR"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_NAME@ @VERSION@" "DisplayName" "@CMAKE_PROJECT_NAME@ SDK v@VERSION@ for @INST_PLATFORM@"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_NAME@ @VERSION@" "UninstallString" '"$INSTDIR\uninstall_@VERSION@.exe"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_NAME@ @VERSION@" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_NAME@ @VERSION@" "NoRepair" 1
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_DIR@ @VERSION@" "DisplayName" "@CMAKE_PROJECT_NAME@ SDK v@VERSION@ for @INST_PLATFORM@"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_DIR@ @VERSION@" "UninstallString" '"$INSTDIR\uninstall_@VERSION@.exe"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_DIR@ @VERSION@" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_DIR@ @VERSION@" "NoRepair" 1
WriteUninstaller "uninstall_@VERSION@.exe"
SectionEnd
@@ -95,8 +95,8 @@
SetShellVarContext all
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_NAME@ @VERSION@"
- DeleteRegKey HKLM "SOFTWARE\@INST_NAME@ @VERSION@"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_DIR@ @VERSION@"
+ DeleteRegKey HKLM "SOFTWARE\@INST_DIR@ @VERSION@"
!ifdef GCC
Delete $INSTDIR\bin\libjpeg-@DLL_VERSION@.dll
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/libjpeg-turbo.spec.in new/libjpeg-turbo-1.1.1/release/libjpeg-turbo.spec.in
--- old/libjpeg-turbo-1.1.0/release/libjpeg-turbo.spec.in 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/libjpeg-turbo.spec.in 2011-05-18 05:51:04.000000000 +0200
@@ -8,7 +8,7 @@
Name: @PACKAGE_NAME@
Version: @VERSION@
Vendor: The libjpeg-turbo Project
-URL: http://libjpeg-turbo.VirtualGL.org
+URL: http://www.libjpeg-turbo.org
Group: System Environment/Libraries
#-->Source0: http://prdownloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
Release: @BUILD@
@@ -43,7 +43,7 @@
#-->%setup -q
#-->%build
-#-->configure libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man JPEG_LIB_VERSION=@JPEG_LIB_VERSION@ SO_MAJOR_VERSION=@SO_MAJOR_VERSION@ SO_MINOR_VERSION=@SO_MINOR_VERSION@ --with-pic
+#-->./configure libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man JPEG_LIB_VERSION=@JPEG_LIB_VERSION@ SO_MAJOR_VERSION=@SO_MAJOR_VERSION@ SO_MINOR_VERSION=@SO_MINOR_VERSION@ --with-pic
#-->make DESTDIR=$RPM_BUILD_ROOT libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man
%install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/makecygwinpkg new/libjpeg-turbo-1.1.1/release/makecygwinpkg
--- old/libjpeg-turbo-1.1.0/release/makecygwinpkg 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/makecygwinpkg 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-trap onexit INT
-trap onexit TERM
-trap onexit EXIT
-
-TMPDIR=
-
-onexit()
-{
- if [ ! "$TMPDIR" = "" ]; then
- rm -rf $TMPDIR
- fi
-}
-
-usage()
-{
- echo "$0 <package name> <version> <source dir.>"
- exit 1
-}
-
-if [ $# -lt 3 ]; then usage $0; fi
-PACKAGE_NAME=$1
-VERSION=$2
-SRCDIR=$3
-
-umask 022
-rm -f $PACKAGE_NAME-$VERSION-cygwin.tar.bz2
-TMPDIR=`mktemp -d /tmp/ljtbuild.XXXXXX`
-__PWD=`pwd`
-make install DESTDIR=$TMPDIR/pkg mandir=/opt/$PACKAGE_NAME/man
-rm $TMPDIR/pkg/opt/$PACKAGE_NAME/lib/*.la
-DOCDIR=$TMPDIR/pkg/usr/share/doc/$PACKAGE_NAME-$VERSION
-mkdir -p $DOCDIR
-install -m 644 $SRCDIR/README-turbo.txt $DOCDIR
-install -m 644 $SRCDIR/README $DOCDIR
-install -m 644 $SRCDIR/libjpeg.txt $DOCDIR
-install -m 644 $SRCDIR/usage.txt $DOCDIR
-install -m 644 $SRCDIR/LICENSE.txt $DOCDIR
-install -m 644 $SRCDIR/LGPL.txt $DOCDIR
-ln -fs lib $TMPDIR/pkg/opt/$PACKAGE_NAME/lib32
-cd $TMPDIR/pkg
-tar cfj ../$PACKAGE_NAME-$VERSION-cygwin.tar.bz2 *
-cd $__PWD
-mv $TMPDIR/*.tar.bz2 .
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/makecygwinpkg.in new/libjpeg-turbo-1.1.1/release/makecygwinpkg.in
--- old/libjpeg-turbo-1.1.0/release/makecygwinpkg.in 1970-01-01 01:00:00.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/makecygwinpkg.in 2011-05-18 05:51:04.000000000 +0200
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -u
+set -e
+trap onexit INT
+trap onexit TERM
+trap onexit EXIT
+
+TMPDIR=
+
+onexit()
+{
+ if [ ! "$TMPDIR" = "" ]; then
+ rm -rf $TMPDIR
+ fi
+}
+
+PACKAGE_NAME=@PACKAGE_NAME@
+VERSION=@VERSION@
+SRCDIR=@abs_top_srcdir@
+
+umask 022
+rm -f $PACKAGE_NAME-$VERSION-cygwin.tar.bz2
+TMPDIR=`mktemp -d /tmp/ljtbuild.XXXXXX`
+__PWD=`pwd`
+make install DESTDIR=$TMPDIR/pkg mandir=/opt/$PACKAGE_NAME/man
+rm $TMPDIR/pkg/opt/$PACKAGE_NAME/lib/*.la
+DOCDIR=$TMPDIR/pkg/usr/share/doc/$PACKAGE_NAME-$VERSION
+mkdir -p $DOCDIR
+install -m 644 $SRCDIR/README-turbo.txt $DOCDIR
+install -m 644 $SRCDIR/README $DOCDIR
+install -m 644 $SRCDIR/libjpeg.txt $DOCDIR
+install -m 644 $SRCDIR/usage.txt $DOCDIR
+install -m 644 $SRCDIR/LICENSE.txt $DOCDIR
+install -m 644 $SRCDIR/LGPL.txt $DOCDIR
+ln -fs lib $TMPDIR/pkg/opt/$PACKAGE_NAME/lib32
+cd $TMPDIR/pkg
+tar cfj ../$PACKAGE_NAME-$VERSION-cygwin.tar.bz2 *
+cd $__PWD
+mv $TMPDIR/*.tar.bz2 .
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/makedpkg new/libjpeg-turbo-1.1.1/release/makedpkg
--- old/libjpeg-turbo-1.1.0/release/makedpkg 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/makedpkg 1970-01-01 01:00:00.000000000 +0100
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-trap onexit INT
-trap onexit TERM
-trap onexit EXIT
-
-TMPDIR=
-
-onexit()
-{
- if [ ! "$TMPDIR" = "" ]; then
- sudo rm -rf $TMPDIR
- fi
-}
-
-usage()
-{
- echo "$0 <package name> <version> <build> <DEB architecture> <source dir.>"
- exit 1
-}
-
-makedeb()
-{
- SUPPLEMENT=$1
- DIRNAME=$PACKAGE_NAME
-
- if [ $SUPPLEMENT = 1 ]; then
- PACKAGE_NAME=$PACKAGE_NAME\32
- DEBARCH=amd64
- __LIB=lib32
- else
- __LIB=lib
- fi
-
- umask 022
- rm -f $PACKAGE_NAME\_$DEBARCH.deb
- TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
- mkdir $TMPDIR/DEBIAN
- (cat $SRCDIR/release/deb-control.tmpl | sed s/{__PKGNAME}/$PACKAGE_NAME/g \
- | sed s/{__VERSION}/$VERSION/g | sed s/{__BUILD}/$BUILD/g \
- | sed s/{__ARCH}/$DEBARCH/g > $TMPDIR/DEBIAN/control)
-
- make install prefix=$TMPDIR/opt/$DIRNAME libdir=$TMPDIR/opt/$DIRNAME/$__LIB mandir=$TMPDIR/opt/$DIRNAME/man
- rm -f $TMPDIR/opt/$DIRNAME/$__LIB/*.la
-
- if [ $SUPPLEMENT = 1 ]; then
- rm -rf $TMPDIR/opt/$DIRNAME/include
- rm -rf $TMPDIR/opt/$DIRNAME/man
- rm -rf $TMPDIR/opt/$DIRNAME/bin
- fi
-
- mkdir -p $TMPDIR/usr/$__LIB
- mv $TMPDIR/opt/$DIRNAME/$__LIB/libturbojpeg.* $TMPDIR/usr/$__LIB
- ln -fs /usr/$__LIB/libturbojpeg.a $TMPDIR/opt/$DIRNAME/$__LIB/
- /sbin/ldconfig -n $TMPDIR/opt/$DIRNAME/$__LIB
- /sbin/ldconfig -n $TMPDIR/usr/$__LIB
-
- if [ ! $SUPPLEMENT = 1 ]; then
- if [ "$DEBARCH" = "amd64" ]; then
- ln -fs lib $TMPDIR/opt/$DIRNAME/lib64
- else
- if [ ! "$__LIB" = "lib32" ]; then
- ln -fs lib $TMPDIR/opt/$DIRNAME/lib32
- fi
- fi
- mkdir -p $TMPDIR/usr/include
- mv $TMPDIR/opt/$DIRNAME/include/turbojpeg.h $TMPDIR/usr/include
- ln -fs /usr/include/turbojpeg.h $TMPDIR/opt/$DIRNAME/include/
- mkdir -p $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
- install -m 644 $SRCDIR/LICENSE.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
- install -m 644 $SRCDIR/LGPL.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
- install -m 644 $SRCDIR/README-turbo.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
- install -m 644 $SRCDIR/README $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
- install -m 644 $SRCDIR/libjpeg.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
- install -m 644 $SRCDIR/usage.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
- fi
-
- sudo chown -Rh root:root $TMPDIR/*
- dpkg -b $TMPDIR $PACKAGE_NAME\_$DEBARCH.deb
-}
-
-if [ $# -lt 5 ]; then usage $0; fi
-PACKAGE_NAME=$1
-VERSION=$2
-BUILD=$3
-DEBARCH=$4
-SRCDIR=$5
-
-makedeb 0
-if [ "$DEBARCH" = "i386" ]; then makedeb 1; fi
-
-exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/makedpkg.in new/libjpeg-turbo-1.1.1/release/makedpkg.in
--- old/libjpeg-turbo-1.1.0/release/makedpkg.in 1970-01-01 01:00:00.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/makedpkg.in 2011-05-18 05:51:04.000000000 +0200
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+set -u
+set -e
+trap onexit INT
+trap onexit TERM
+trap onexit EXIT
+
+TMPDIR=
+
+onexit()
+{
+ if [ ! "$TMPDIR" = "" ]; then
+ sudo rm -rf $TMPDIR
+ fi
+}
+
+makedeb()
+{
+ SUPPLEMENT=$1
+ DIRNAME=$PACKAGE_NAME
+
+ if [ $SUPPLEMENT = 1 ]; then
+ PACKAGE_NAME=$PACKAGE_NAME\32
+ DEBARCH=amd64
+ __LIB=lib32
+ else
+ __LIB=lib
+ fi
+
+ umask 022
+ rm -f $PACKAGE_NAME\_$VERSION\_$DEBARCH.deb
+ TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
+ mkdir $TMPDIR/DEBIAN
+ cp pkgscripts/deb-control $TMPDIR/DEBIAN/control
+
+ make install prefix=$TMPDIR/opt/$DIRNAME libdir=$TMPDIR/opt/$DIRNAME/$__LIB mandir=$TMPDIR/opt/$DIRNAME/man
+ rm -f $TMPDIR/opt/$DIRNAME/$__LIB/*.la
+
+ if [ $SUPPLEMENT = 1 ]; then
+ rm -rf $TMPDIR/opt/$DIRNAME/include
+ rm -rf $TMPDIR/opt/$DIRNAME/man
+ rm -rf $TMPDIR/opt/$DIRNAME/bin
+ fi
+
+ mkdir -p $TMPDIR/usr/$__LIB
+ mv $TMPDIR/opt/$DIRNAME/$__LIB/libturbojpeg.* $TMPDIR/usr/$__LIB
+ ln -fs /usr/$__LIB/libturbojpeg.a $TMPDIR/opt/$DIRNAME/$__LIB/
+ /sbin/ldconfig -n $TMPDIR/opt/$DIRNAME/$__LIB
+ /sbin/ldconfig -n $TMPDIR/usr/$__LIB
+
+ if [ ! $SUPPLEMENT = 1 ]; then
+ if [ "$DEBARCH" = "amd64" ]; then
+ ln -fs lib $TMPDIR/opt/$DIRNAME/lib64
+ else
+ if [ ! "$__LIB" = "lib32" ]; then
+ ln -fs lib $TMPDIR/opt/$DIRNAME/lib32
+ fi
+ fi
+ mkdir -p $TMPDIR/usr/include
+ mv $TMPDIR/opt/$DIRNAME/include/turbojpeg.h $TMPDIR/usr/include
+ ln -fs /usr/include/turbojpeg.h $TMPDIR/opt/$DIRNAME/include/
+ mkdir -p $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
+ install -m 644 $SRCDIR/LICENSE.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
+ install -m 644 $SRCDIR/LGPL.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
+ install -m 644 $SRCDIR/README-turbo.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
+ install -m 644 $SRCDIR/README $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
+ install -m 644 $SRCDIR/libjpeg.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
+ install -m 644 $SRCDIR/usage.txt $TMPDIR/usr/share/doc/$DIRNAME-$VERSION
+ fi
+
+ sudo chown -Rh root:root $TMPDIR/*
+ dpkg -b $TMPDIR $PACKAGE_NAME\_$VERSION\_$DEBARCH.deb
+}
+
+PACKAGE_NAME=@PACKAGE_NAME@
+VERSION=@VERSION@
+BUILD=@BUILD@
+DEBARCH=@DEBARCH@
+SRCDIR=@abs_top_srcdir@
+
+makedeb 0
+if [ "$DEBARCH" = "i386" ]; then makedeb 1; fi
+
+exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/makemacpkg.in new/libjpeg-turbo-1.1.1/release/makemacpkg.in
--- old/libjpeg-turbo-1.1.0/release/makemacpkg.in 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/makemacpkg.in 2011-05-18 05:51:04.000000000 +0200
@@ -26,8 +26,8 @@
PACKAGE_NAME=@PACKAGE_NAME@
VERSION=@VERSION@
BUILD=@BUILD@
-SRCDIR=@srcdir@
-BUILDDIR32=@srcdir@/osxx86
+SRCDIR=@abs_top_srcdir@
+BUILDDIR32=@abs_top_srcdir@/osxx86
if [ $# -gt 0 ]; then
if [ "$1" = "universal" ]; then
UNIVERSAL=1
@@ -36,8 +36,8 @@
fi
PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
-if [ -f $PACKAGE_NAME.dmg ]; then
- rm -f $PACKAGE_NAME.dmg
+if [ -f $PACKAGE_NAME-$VERSION.dmg ]; then
+ rm -f $PACKAGE_NAME-$VERSION.dmg
fi
umask 022
@@ -134,15 +134,9 @@
chmod 775 $PKGROOT/Library/Documentation
mkdir -p $TMPDIR/pkg/Resources
-(cat $SRCDIR/release/Description.plist.tmpl | sed s/{__VERSION}/$VERSION/g \
- | sed s/{__APPNAME}/$PACKAGE_NAME/g \
- > $TMPDIR/pkg/Description.plist)
-(cat $SRCDIR/release/Info.plist.tmpl | sed s/{__VERSION}/$VERSION/g \
- | sed s/{__BUILD}/$BUILD/g > $TMPDIR/pkg/Info.plist)
-(cat $SRCDIR/release/uninstall.sh.tmpl \
- | sed s/{__APPNAME}/$PACKAGE_NAME/g \
- > $PKGROOT/opt/$PACKAGE_NAME/bin/uninstall)
-chmod 755 $PKGROOT/opt/$PACKAGE_NAME/bin/uninstall
+cp pkgscripts/Description.plist $TMPDIR/pkg/
+cp pkgscripts/Info.plist $TMPDIR/pkg/
+install -m 755 pkgscripts/uninstall $PKGROOT/opt/$PACKAGE_NAME/bin/
install -m 644 $SRCDIR/LICENSE.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/LICENSE.txt
install -m 644 $SRCDIR/LGPL.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/LGPL.txt
@@ -163,8 +157,7 @@
sudo osacompile -t APPL -o "$TMPDIR/dmg/Uninstall $PACKAGE_NAME.app" $TMPDIR/uninstall.applescript
sudo chown -R $USER "$TMPDIR/dmg/Uninstall $PACKAGE_NAME.app"
hdiutil create -fs HFS+ -volname $PACKAGE_NAME-$VERSION \
- -srcfolder "$TMPDIR/dmg" \
- $TMPDIR/$PACKAGE_NAME.dmg
-cp $TMPDIR/$PACKAGE_NAME.dmg .
+ -srcfolder "$TMPDIR/dmg" $TMPDIR/$PACKAGE_NAME-$VERSION.dmg
+cp $TMPDIR/$PACKAGE_NAME-$VERSION.dmg .
exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/makesunpkg.in new/libjpeg-turbo-1.1.1/release/makesunpkg.in
--- old/libjpeg-turbo-1.1.0/release/makesunpkg.in 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/makesunpkg.in 2011-05-18 05:51:04.000000000 +0200
@@ -27,8 +27,8 @@
VERSION=@VERSION@
BUILD=@BUILD@
PKGARCH=@DEBARCH@
-SRCDIR=@srcdir@
-BUILDDIR32=@srcdir@/solx86
+SRCDIR=@abs_top_srcdir@
+BUILDDIR32=@abs_top_srcdir@/solx86
if [ $# -gt 0 ]; then
if [ "$1" = "combined" ]; then
COMBINED=1
@@ -41,9 +41,7 @@
rm -f $PACKAGE_NAME.pkg.bz2
cp $SRCDIR/release/copyright $TMPDIR
touch $TMPDIR/depend
-cat $SRCDIR/release/pkginfo.tmpl | sed s/{__VERSION}/$VERSION/g \
- | sed s/{__BUILD}/$BUILD/g | sed s/{__APPNAME}/$PACKAGE_NAME/g \
- | sed s/{__PKGNAME}/$PACKAGE_NAME/g > $TMPDIR/pkginfo
+cp pkgscripts/pkginfo $TMPDIR/pkginfo
if [ "$PKGARCH" = "i386" ]; then
__LIB=lib
@@ -132,8 +130,8 @@
EOF
pkgmk -o -r $TMPDIR/opt -d $TMPDIR -a i386 -f $TMPDIR/proto
-pkgtrans -s $TMPDIR $TMPDIR/$PACKAGE_NAME.pkg $PACKAGE_NAME
-bzip2 $TMPDIR/$PACKAGE_NAME.pkg
-cp $TMPDIR/$PACKAGE_NAME.pkg.bz2 .
+pkgtrans -s $TMPDIR $TMPDIR/$PACKAGE_NAME-$VERSION.pkg $PACKAGE_NAME
+bzip2 $TMPDIR/$PACKAGE_NAME-$VERSION.pkg
+cp $TMPDIR/$PACKAGE_NAME-$VERSION.pkg.bz2 .
exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/pkginfo.in new/libjpeg-turbo-1.1.1/release/pkginfo.in
--- old/libjpeg-turbo-1.1.0/release/pkginfo.in 1970-01-01 01:00:00.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/pkginfo.in 2011-05-18 05:51:04.000000000 +0200
@@ -0,0 +1,16 @@
+ARCH=i386
+PKG=@PACKAGE_NAME@
+NAME=@PACKAGE_NAME@ SDK and run time libraries
+VERSION=@VERSION@,REV=@BUILD@
+SUNW_PKGVERS=1.0
+DESC=A SIMD-accelerated JPEG codec which provides both the libjpeg and TurboJPEG APIs
+VENDOR=The libjpeg-turbo Project
+HOTLINE=http://www.libjpeg-turbo.org
+EMAIL=information@libjpeg-turbo.org
+MAXINST=1
+CATEGORY=application
+BASEDIR=/opt
+CLASSES=none
+SUNW_PKG_ALLZONES=true
+SUNW_PKG_HOLLOW=false
+SUNW_PKG_THISZONE=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/pkginfo.tmpl new/libjpeg-turbo-1.1.1/release/pkginfo.tmpl
--- old/libjpeg-turbo-1.1.0/release/pkginfo.tmpl 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/pkginfo.tmpl 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-ARCH=i386
-PKG={__PKGNAME}
-NAME={__APPNAME} SDK and run time libraries
-VERSION={__VERSION},REV={__BUILD}
-SUNW_PKGVERS=1.0
-DESC=A SIMD-accelerated JPEG codec which provides both the libjpeg and TurboJPEG APIs
-VENDOR=The libjpeg-turbo Project
-HOTLINE=http://libjpeg-turbo.VirtualGL.org
-EMAIL=information@virtualgl.org
-MAXINST=1
-CATEGORY=application
-BASEDIR=/opt
-CLASSES=none
-SUNW_PKG_ALLZONES=true
-SUNW_PKG_HOLLOW=false
-SUNW_PKG_THISZONE=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/uninstall.in new/libjpeg-turbo-1.1.1/release/uninstall.in
--- old/libjpeg-turbo-1.1.0/release/uninstall.in 1970-01-01 01:00:00.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/uninstall.in 2011-05-18 05:51:04.000000000 +0200
@@ -0,0 +1,77 @@
+# Copyright (C)2009-2011 D. R. Commander
+# Copyright (C)2009 Sun Microsystems, Inc.
+#
+# This library is free software and may be redistributed and/or modified under
+# the terms of the wxWindows Library License, Version 3.1 or (at your option)
+# any later version. The full license is in the LICENSE.txt file included
+# with this distribution.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# wxWindows Library License for more details.
+
+#!/bin/sh
+
+error()
+{
+ echo $1
+ exit -1
+}
+
+if [ ! "`id -u`" = "0" ]; then
+ error "This command must be run as root"
+fi
+
+PKGNAME=@PACKAGE_NAME@
+MACPKGNAME=com.$PKGNAME.$PKGNAME
+RCPT=/Library/Receipts/$PKGNAME.pkg
+
+LSBOM=
+if [ -d $RCPT ]; then
+ LSBOM='lsbom -s -f -l '$RCPT'/Contents/Archive.bom'
+else
+ LSBOM='pkgutil --files '$MACPKGNAME
+fi
+
+echo Removing files ...
+$LSBOM >/dev/null || error "Could not list package contents"
+RETCODE=0
+PWD=`pwd`
+cd /
+$LSBOM | while read line; do
+ if [ ! -d "$line" ]; then rm "$line" 2>&1 || RETCODE=-1; fi
+done
+cd $PWD
+
+echo Removing directories ...
+rmdir /opt/$PKGNAME/bin 2>&1 || RETCODE=-1
+if [ -d /opt/$PKGNAME/bin ]; then
+ rmdir /opt/$PKGNAME/bin 2>&1 || RETCODE=-1
+fi
+if [ -d /opt/$PKGNAME/lib ]; then
+ rmdir /opt/$PKGNAME/lib 2>&1 || RETCODE=-1
+fi
+if [ -d /opt/$PKGNAME/include ]; then
+ rmdir /opt/$PKGNAME/include 2>&1 || RETCODE=-1
+fi
+rm /opt/$PKGNAME/lib32 2>&1 || RETCODE=-1
+rm /opt/$PKGNAME/lib64 2>&1 || RETCODE=-1
+if [ -d /opt/$PKGNAME/man/man1 ]; then
+ rmdir /opt/$PKGNAME/man/man1 2>&1 || RETCODE=-1
+fi
+if [ -d /opt/$PKGNAME/man ]; then
+ rmdir /opt/$PKGNAME/man 2>&1 || RETCODE=-1
+fi
+rmdir /opt/$PKGNAME 2>&1 || RETCODE=-1
+rmdir /Library/Documentation/$PKGNAME 2>&1 || RETCODE=-1
+
+if [ -d $RCPT ]; then
+ echo Removing package receipt $RCPT ...
+ rm -r $RCPT 2>&1 || RETCODE=-1
+else
+ echo Forgetting package $MACPKGNAME
+ pkgutil --forget $MACPKGNAME
+fi
+
+exit $RETCODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/release/uninstall.sh.tmpl new/libjpeg-turbo-1.1.1/release/uninstall.sh.tmpl
--- old/libjpeg-turbo-1.1.0/release/uninstall.sh.tmpl 2011-02-27 01:10:52.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/release/uninstall.sh.tmpl 1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-# Copyright (C)2009-2010 D. R. Commander
-# Copyright (C)2009 Sun Microsystems, Inc.
-#
-# This library is free software and may be redistributed and/or modified under
-# the terms of the wxWindows Library License, Version 3.1 or (at your option)
-# any later version. The full license is in the LICENSE.txt file included
-# with this distribution.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# wxWindows Library License for more details.
-
-#!/bin/sh
-
-error()
-{
- echo $1
- exit -1
-}
-
-if [ ! "`id -u`" = "0" ]; then
- error "This command must be run as root"
-fi
-
-PKGNAME={__APPNAME}
-MACPKGNAME=com.$PKGNAME.$PKGNAME
-RCPT=/Library/Receipts/$PKGNAME.pkg
-
-LSBOM=
-if [ -d $RCPT ]; then
- LSBOM='lsbom -s -f -l '$RCPT'/Contents/Archive.bom'
-else
- LSBOM='pkgutil --files '$MACPKGNAME
-fi
-
-echo Removing files ...
-$LSBOM >/dev/null || error "Could not list package contents"
-RETCODE=0
-PWD=`pwd`
-cd /
-$LSBOM | while read line; do
- if [ ! -d "$line" ]; then rm "$line" 2>&1 || RETCODE=-1; fi
-done
-cd $PWD
-
-echo Removing directories ...
-rmdir /opt/$PKGNAME/bin 2>&1 || RETCODE=-1
-if [ -d /opt/$PKGNAME/bin ]; then
- rmdir /opt/$PKGNAME/bin 2>&1 || RETCODE=-1
-fi
-if [ -d /opt/$PKGNAME/lib ]; then
- rmdir /opt/$PKGNAME/lib 2>&1 || RETCODE=-1
-fi
-if [ -d /opt/$PKGNAME/include ]; then
- rmdir /opt/$PKGNAME/include 2>&1 || RETCODE=-1
-fi
-rm /opt/$PKGNAME/lib32 2>&1 || RETCODE=-1
-rm /opt/$PKGNAME/lib64 2>&1 || RETCODE=-1
-if [ -d /opt/$PKGNAME/man/man1 ]; then
- rmdir /opt/$PKGNAME/man/man1 2>&1 || RETCODE=-1
-fi
-if [ -d /opt/$PKGNAME/man ]; then
- rmdir /opt/$PKGNAME/man 2>&1 || RETCODE=-1
-fi
-rmdir /opt/$PKGNAME 2>&1 || RETCODE=-1
-rmdir /Library/Documentation/$PKGNAME 2>&1 || RETCODE=-1
-
-if [ -d $RCPT ]; then
- echo Removing package receipt $RCPT ...
- rm -r $RCPT 2>&1 || RETCODE=-1
-else
- echo Forgetting package $MACPKGNAME
- pkgutil --forget $MACPKGNAME
-fi
-
-exit $RETCODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/sharedlib/CMakeLists.txt new/libjpeg-turbo-1.1.1/sharedlib/CMakeLists.txt
--- old/libjpeg-turbo-1.1.0/sharedlib/CMakeLists.txt 2011-02-27 01:10:55.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/sharedlib/CMakeLists.txt 2011-05-18 05:51:05.000000000 +0200
@@ -40,13 +40,13 @@
add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdbmp.c ../rdgif.c ../rdppm.c
../rdswitch.c ../rdtarga.c)
set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS
- "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED")
+ "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED -DUSE_SETMODE")
target_link_libraries(cjpeg jpeg)
add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
../wrbmp.c ../wrgif.c ../wrppm.c ../wrtarga.c)
set_property(TARGET djpeg PROPERTY COMPILE_FLAGS
- "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED")
+ "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED -DUSE_SETMODE")
target_link_libraries(djpeg jpeg)
add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/simd/CMakeLists.txt new/libjpeg-turbo-1.1.1/simd/CMakeLists.txt
--- old/libjpeg-turbo-1.1.0/simd/CMakeLists.txt 2011-02-27 01:10:55.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/simd/CMakeLists.txt 2011-05-18 05:51:05.000000000 +0200
@@ -10,10 +10,6 @@
-I${CMAKE_CURRENT_SOURCE_DIR}/)
endif()
-if(MSVC)
- set(NAFLAGS ${NAFLAGS} -DMSVC)
-endif()
-
# This only works if building from the command line. There is currently no way
# to set a variable's value based on the build type when using the MSVC IDE.
if(CMAKE_BUILD_TYPE STREQUAL "Debug"
@@ -36,7 +32,7 @@
endif()
if(MSVC_IDE)
- set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/$(OutDir)")
+ set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
else()
set(OBJDIR ${CMAKE_CURRENT_BINARY_DIR})
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/simd/jsimdext.inc new/libjpeg-turbo-1.1.1/simd/jsimdext.inc
--- old/libjpeg-turbo-1.1.0/simd/jsimdext.inc 2011-02-27 01:10:55.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/simd/jsimdext.inc 2011-05-18 05:51:05.000000000 +0200
@@ -48,9 +48,7 @@
;
%define SEG_TEXT .text align=16 public use64 class=CODE
%define SEG_CONST .rdata align=16 public use64 class=CONST
-%ifdef MSVC
%define EXTN(name) name ; foo() -> foo
-%endif
%elifdef OBJ32 ; ----(nasm -fobj -DOBJ32 ...)----------
; * Borland C++ (Win32)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libjpeg-turbo-1.1.0/turbojpegl.c new/libjpeg-turbo-1.1.1/turbojpegl.c
--- old/libjpeg-turbo-1.1.0/turbojpegl.c 2011-02-27 01:10:56.000000000 +0100
+++ new/libjpeg-turbo-1.1.1/turbojpegl.c 2011-05-18 05:51:06.000000000 +0200
@@ -300,6 +300,7 @@
}
*size=yuvsize;
cinfo->next_scanline+=height;
+ jpeg_abort_compress(&j->cinfo);
}
else
{
@@ -315,11 +316,10 @@
jpeg_write_scanlines(&j->cinfo, &row_pointer[j->cinfo.next_scanline],
j->cinfo.image_height-j->cinfo.next_scanline);
}
- }
- jpeg_finish_compress(&j->cinfo);
- if(!(flags&TJ_YUV))
+ jpeg_finish_compress(&j->cinfo);
*size=TJBUFSIZE(j->cinfo.image_width, j->cinfo.image_height)
-(unsigned long)(j->jdms.free_in_buffer);
+ }
bailout:
if(j->cinfo.global_state>CSTATE_START) jpeg_abort_compress(&j->cinfo);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org