sync to 1.1.90 upstream, change 691

10 files changed, 712 insertions, 0 deletions

diff --git a/pkgscripts/Description.plist b/pkgscripts/Description.plist
new file mode 100644
index 0000000..3c0cc74
--- /dev/null
+++ b/pkgscripts/Description.plist
@@ -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>libjpeg-turbo</string>
+	<key>IFPkgDescriptionVersion</key>
+	<string>1.1.1</string>
+</dict>
+</plist>
diff --git a/pkgscripts/Info.plist b/pkgscripts/Info.plist
new file mode 100644
index 0000000..658de92
--- /dev/null
+++ b/pkgscripts/Info.plist
@@ -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>1.1.1, The libjpeg-turbo Project</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.libjpeg-turbo.libjpeg-turbo</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.1.1</string>
+	<key>IFMajorVersion</key>
+	<integer>1</integer>
+	<key>IFMinorVersion</key>
+	<integer>20110803</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 --git a/pkgscripts/deb-control b/pkgscripts/deb-control
new file mode 100644
index 0000000..77eb19e
--- /dev/null
+++ b/pkgscripts/deb-control
@@ -0,0 +1,28 @@
+Package: libjpeg-turbo
+Version: 1.1.1-20110803
+Section: misc
+Priority: optional
+Architecture: armel
+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 --git a/pkgscripts/libjpeg-turbo.spec b/pkgscripts/libjpeg-turbo.spec
new file mode 100644
index 0000000..e1e5891
--- /dev/null
+++ b/pkgscripts/libjpeg-turbo.spec
@@ -0,0 +1,108 @@
+%ifarch x86_64
+%define __lib lib64
+%else
+%define __lib lib
+%endif
+
+Summary: A SIMD-accelerated JPEG codec which provides both the libjpeg and TurboJPEG APIs
+Name: libjpeg-turbo
+Version: 1.1.1
+Vendor: The libjpeg-turbo Project
+URL: http://www.libjpeg-turbo.org
+Group: System Environment/Libraries
+#-->Source0: http://prdownloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
+Release: 20110803
+License: wxWindows Library License, v3.1
+BuildRoot: %{_blddir}/%{name}-buildroot-%{version}-%{release}
+Prereq: /sbin/ldconfig
+Provides: %{name} = %{version}-%{release}, turbojpeg = 2.00
+Obsoletes: turbojpeg
+
+%description
+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.
+
+#-->%prep
+#-->%setup -q
+
+#-->%build
+#-->./configure libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man JPEG_LIB_VERSION=62 SO_MAJOR_VERSION=62 SO_MINOR_VERSION=0 --with-pic
+#-->make DESTDIR=$RPM_BUILD_ROOT libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man
+
+%install
+
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man
+rm -f $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/*.la
+mkdir -p $RPM_BUILD_ROOT/usr/%{__lib}
+mv $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/libturbojpeg.* $RPM_BUILD_ROOT/usr/%{__lib}
+/sbin/ldconfig -n $RPM_BUILD_ROOT/opt/%{name}/%{__lib}
+/sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%{__lib}
+mkdir -p $RPM_BUILD_ROOT/usr/include
+mv $RPM_BUILD_ROOT/opt/%{name}/include/turbojpeg.h $RPM_BUILD_ROOT/usr/include
+ln -fs /usr/include/turbojpeg.h $RPM_BUILD_ROOT/opt/%{name}/include/
+ln -fs /usr/%{__lib}/libturbojpeg.a $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%doc %{_srcdir}/README-turbo.txt %{_srcdir}/README %{_srcdir}/libjpeg.txt %{_srcdir}/usage.txt %{_srcdir}/LICENSE.txt %{_srcdir}/LGPL.txt
+%dir /opt/%{name}
+%dir /opt/%{name}/bin
+/opt/%{name}/bin/cjpeg
+/opt/%{name}/bin/djpeg
+/opt/%{name}/bin/jpegtran
+/opt/%{name}/bin/jpgtest
+/opt/%{name}/bin/rdjpgcom
+/opt/%{name}/bin/wrjpgcom
+%dir /opt/%{name}/%{__lib}
+%ifarch x86_64
+%else
+/opt/%{name}/lib32
+%endif
+/opt/%{name}/%{__lib}/libjpeg.so.62.0.0
+/opt/%{name}/%{__lib}/libjpeg.so.62
+/opt/%{name}/%{__lib}/libjpeg.so
+/opt/%{name}/%{__lib}/libjpeg.a
+/opt/%{name}/%{__lib}/libturbojpeg.a
+/usr/%{__lib}/libturbojpeg.so
+/usr/%{__lib}/libturbojpeg.a
+/usr/include/turbojpeg.h
+%dir /opt/%{name}/include
+/opt/%{name}/include/jconfig.h
+/opt/%{name}/include/jerror.h
+/opt/%{name}/include/jmorecfg.h
+/opt/%{name}/include/jpeglib.h
+/opt/%{name}/include/turbojpeg.h
+%dir /opt/%{name}/man
+%dir /opt/%{name}/man/man1
+/opt/%{name}/man/man1/cjpeg.1*
+/opt/%{name}/man/man1/djpeg.1*
+/opt/%{name}/man/man1/jpegtran.1*
+/opt/%{name}/man/man1/rdjpgcom.1*
+/opt/%{name}/man/man1/wrjpgcom.1*
+
+%changelog
diff --git a/pkgscripts/makecygwinpkg b/pkgscripts/makecygwinpkg
new file mode 100644
index 0000000..2961543
--- /dev/null
+++ b/pkgscripts/makecygwinpkg
@@ -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=libjpeg-turbo
+VERSION=1.1.1
+SRCDIR=/home/tgall/libjpeg-turbo-android/wip
+
+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 --git a/pkgscripts/makedpkg b/pkgscripts/makedpkg
new file mode 100644
index 0000000..0ac669c
--- /dev/null
+++ b/pkgscripts/makedpkg
@@ -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=libjpeg-turbo
+VERSION=1.1.1
+BUILD=20110803
+DEBARCH=armel
+SRCDIR=/home/tgall/libjpeg-turbo-android/wip
+
+makedeb 0
+if [ "$DEBARCH" = "i386" ]; then makedeb 1; fi
+
+exit
diff --git a/pkgscripts/makemacpkg b/pkgscripts/makemacpkg
new file mode 100644
index 0000000..ac3a1cf
--- /dev/null
+++ b/pkgscripts/makemacpkg
@@ -0,0 +1,163 @@
+#!/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 [universal [32-bit build dir]]"
+	exit 1
+}
+
+UNIVERSAL=0
+
+PACKAGE_NAME=libjpeg-turbo
+VERSION=1.1.1
+BUILD=20110803
+SRCDIR=/home/tgall/libjpeg-turbo-android/wip
+BUILDDIR32=/home/tgall/libjpeg-turbo-android/wip/osxx86
+if [ $# -gt 0 ]; then
+	if [ "$1" = "universal" ]; then
+		UNIVERSAL=1
+		if [ $# -gt 1 ]; then BUILDDIR32=$2; fi
+	fi
+fi
+PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
+
+if [ -f $PACKAGE_NAME-$VERSION.dmg ]; then
+	rm -f $PACKAGE_NAME-$VERSION.dmg
+fi
+
+umask 022
+TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
+PKGROOT=$TMPDIR/pkg/Package_Root
+mkdir -p $PKGROOT
+mkdir -p $PKGROOT/opt/$PACKAGE_NAME/bin
+make install DESTDIR=$PKGROOT mandir=/opt/$PACKAGE_NAME/man
+rm -f $PKGROOT/opt/$PACKAGE_NAME/lib/*.la
+mkdir -p $PKGROOT/usr/lib
+mv $PKGROOT/opt/$PACKAGE_NAME/lib/libturbojpeg.* $PKGROOT/usr/lib
+mkdir -p $PKGROOT/usr/include
+mv $PKGROOT/opt/$PACKAGE_NAME/include/turbojpeg.h $PKGROOT/usr/include
+
+if [ $UNIVERSAL = 1 ]; then
+	if [ ! -d $BUILDDIR32 ]; then
+		echo ERROR: 32-bit build directory $BUILDDIR32 does not exist
+		exit 1
+	fi
+	if [ ! -f $BUILDDIR32/Makefile ]; then
+		echo ERROR: 32-bit build directory $BUILDDIR32 is not configured
+		exit 1
+	fi
+	mkdir -p $TMPDIR/dist.x86
+	pushd $BUILDDIR32
+	make install DESTDIR=$TMPDIR/dist.x86
+	popd
+	if [ ! -h $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib -a \
+		! -h $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib ]; then
+		lipo -create \
+			-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib \
+			-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib \
+			-output $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib
+	elif [ ! -h $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.62.0.0.dylib -a \
+		! -h $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.0.0.dylib ]; then
+		lipo -create \
+			-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.62.0.0.dylib \
+			-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.0.0.dylib \
+			-output $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.0.0.dylib
+	fi
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.a \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.a \
+		-output $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.a
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libturbojpeg.dylib \
+		-arch x86_64 $PKGROOT/usr/lib/libturbojpeg.dylib \
+		-output $PKGROOT/usr/lib/libturbojpeg.dylib
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libturbojpeg.a \
+		-arch x86_64 $PKGROOT/usr/lib/libturbojpeg.a \
+		-output $PKGROOT/usr/lib/libturbojpeg.a
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/cjpeg \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/cjpeg \
+		-output $PKGROOT/opt/$PACKAGE_NAME/bin/cjpeg
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/djpeg \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/djpeg \
+		-output $PKGROOT/opt/$PACKAGE_NAME/bin/djpeg
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/jpegtran \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran \
+		-output $PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/jpgtest \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/jpgtest \
+		-output $PKGROOT/opt/$PACKAGE_NAME/bin/jpgtest
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/rdjpgcom \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/rdjpgcom \
+		-output $PKGROOT/opt/$PACKAGE_NAME/bin/rdjpgcom
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/wrjpgcom \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/wrjpgcom \
+		-output $PKGROOT/opt/$PACKAGE_NAME/bin/wrjpgcom
+
+fi
+
+install_name_tool -id /opt/$PACKAGE_NAME/lib/libjpeg.62.dylib $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib
+install_name_tool -id libturbojpeg.dylib $PKGROOT/usr/lib/libturbojpeg.dylib
+
+ln -fs /usr/include/turbojpeg.h $PKGROOT/opt/$PACKAGE_NAME/include/
+ln -fs /usr/lib/libturbojpeg.a $PKGROOT/opt/$PACKAGE_NAME/lib/
+if [ ! -h $PKGROOT/opt/$PACKAGE_NAME/lib32 ]; then
+	ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib32
+fi
+if [ ! -h $PKGROOT/opt/$PACKAGE_NAME/lib64 ]; then
+	ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib64
+fi
+
+mkdir -p $PKGROOT/Library/Documentation/$PACKAGE_NAME
+chmod 1775 $PKGROOT/Library
+chmod 775 $PKGROOT/Library/Documentation 
+mkdir -p $TMPDIR/pkg/Resources 
+
+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 
+install -m 644 $SRCDIR/README-turbo.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/README-turbo.txt 
+install -m 644 $SRCDIR/README $PKGROOT/Library/Documentation/$PACKAGE_NAME/README 
+install -m 644 $SRCDIR/libjpeg.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/libjpeg.txt 
+install -m 644 $SRCDIR/usage.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/usage.txt 
+
+sudo chown -R root:admin $PKGROOT 
+sudo chown -R root:0 $PKGROOT/usr 
+cp $SRCDIR/release/License.rtf $SRCDIR/release/Welcome.rtf $SRCDIR/release/ReadMe.rtf $TMPDIR/pkg/Resources/ 
+
+mkdir $TMPDIR/dmg
+$PACKAGEMAKER -build -v -p $TMPDIR/dmg/$PACKAGE_NAME.pkg \
+	-f $PKGROOT -r $TMPDIR/pkg/Resources \
+	-i $TMPDIR/pkg/Info.plist -d $TMPDIR/pkg/Description.plist 
+install -m 644 $SRCDIR/release/uninstall.applescript $TMPDIR 
+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-$VERSION.dmg 
+cp $TMPDIR/$PACKAGE_NAME-$VERSION.dmg . 
+
+exit
diff --git a/pkgscripts/makesunpkg b/pkgscripts/makesunpkg
new file mode 100644
index 0000000..a62ef6f
--- /dev/null
+++ b/pkgscripts/makesunpkg
@@ -0,0 +1,137 @@
+#!/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 [combined [32-bit build dir.]]"
+	exit 1
+}
+
+COMBINED=0
+
+PACKAGE_NAME=libjpeg-turbo
+VERSION=1.1.1
+BUILD=20110803
+PKGARCH=armel
+SRCDIR=/home/tgall/libjpeg-turbo-android/wip
+BUILDDIR32=/home/tgall/libjpeg-turbo-android/wip/solx86
+if [ $# -gt 0 ]; then
+	if [ "$1" = "combined" ]; then
+		COMBINED=1
+		if [ $# -gt 1 ]; then	BUILDDIR32=$2; fi
+	fi
+fi
+
+umask 022
+TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
+rm -f $PACKAGE_NAME.pkg.bz2
+cp $SRCDIR/release/copyright $TMPDIR
+touch $TMPDIR/depend
+cp pkgscripts/pkginfo $TMPDIR/pkginfo 
+
+if [ "$PKGARCH" = "i386" ]; then
+	__LIB=lib
+else
+	__LIB=lib/$PKGARCH
+fi
+
+if [ $COMBINED = 1 ]; then
+	if [ ! -d $BUILDDIR32 ]; then
+		echo ERROR: 32-bit build directory $BUILDDIR32 does not exist
+		exit 1
+	fi
+	if [ ! -f $BUILDDIR32/Makefile ]; then
+		echo ERROR: 32-bit build directory $BUILDDIR32 is not configured
+		exit 1
+	fi
+	PWD=`pwd`
+	cd $BUILDDIR32
+	make install DESTDIR=$TMPDIR mandir=/opt/$PACKAGE_NAME/man AM_MAKEFLAGS="mandir=/opt/$PACKAGE_NAME/man"
+	cd $PWD
+fi
+# This mess is to work around a bug in /usr/ccs/bin/make
+make install DESTDIR=$TMPDIR libdir=/opt/$PACKAGE_NAME/$__LIB mandir=/opt/$PACKAGE_NAME/man AM_MAKEFLAGS="libdir=/opt/$PACKAGE_NAME/$__LIB mandir=/opt/$PACKAGE_NAME/man"
+rm -f $TMPDIR/opt/$PACKAGE_NAME/$__LIB/*.la
+mkdir -p $TMPDIR/opt/$PACKAGE_NAME/doc
+cp $SRCDIR/LICENSE.txt $SRCDIR/LGPL.txt $SRCDIR/README-turbo.txt $SRCDIR/README $SRCDIR/libjpeg.txt $SRCDIR/usage.txt $TMPDIR/opt/$PACKAGE_NAME/doc
+chmod 644 $TMPDIR/opt/$PACKAGE_NAME/doc/*
+
+cat >$TMPDIR/proto <<EOF
+i copyright
+i depend
+i pkginfo
+d none $PACKAGE_NAME 0755 root bin
+d none $PACKAGE_NAME/bin 0755 root bin
+f none $PACKAGE_NAME/bin/cjpeg 0755 root bin
+f none $PACKAGE_NAME/bin/djpeg 0755 root bin
+f none $PACKAGE_NAME/bin/jpegtran 0755 root bin
+f none $PACKAGE_NAME/bin/jpgtest 0755 root bin
+f none $PACKAGE_NAME/bin/rdjpgcom 0755 root bin
+f none $PACKAGE_NAME/bin/wrjpgcom 0755 root bin
+d none $PACKAGE_NAME/lib 0755 root bin
+EOF
+if [ $COMBINED = 1 ]; then
+cat >>$TMPDIR/proto <<EOF
+f none $PACKAGE_NAME/lib/libjpeg.so.62.0.0 0755 root bin
+s none $PACKAGE_NAME/lib/libjpeg.so.62=libjpeg.so.62.0.0
+s none $PACKAGE_NAME/lib/libjpeg.so=libjpeg.so.62.0.0
+f none $PACKAGE_NAME/lib/libjpeg.a 0644 root bin
+f none $PACKAGE_NAME/lib/libturbojpeg.so 0755 root bin
+f none $PACKAGE_NAME/lib/libturbojpeg.a 0644 root bin
+EOF
+fi
+if [ "${__LIB}" != "lib" ]; then
+echo d none $PACKAGE_NAME/${__LIB} 0755 root bin >>$TMPDIR/proto
+echo s none $PACKAGE_NAME/lib64=${__LIB} >>$TMPDIR/proto
+echo s none $PACKAGE_NAME/lib/64=$PKGARCH >>$TMPDIR/proto
+fi
+cat >>$TMPDIR/proto <<EOF
+f none $PACKAGE_NAME/${__LIB}/libjpeg.so.62.0.0 0755 root bin
+s none $PACKAGE_NAME/${__LIB}/libjpeg.so.62=libjpeg.so.62.0.0
+s none $PACKAGE_NAME/${__LIB}/libjpeg.so=libjpeg.so.62.0.0
+f none $PACKAGE_NAME/${__LIB}/libjpeg.a 0644 root bin
+f none $PACKAGE_NAME/${__LIB}/libturbojpeg.so 0755 root bin
+f none $PACKAGE_NAME/${__LIB}/libturbojpeg.a 0644 root bin
+s none $PACKAGE_NAME/lib32=lib
+d none $PACKAGE_NAME/man 0755 root bin
+d none $PACKAGE_NAME/man/man1 0755 root bin
+d none $PACKAGE_NAME/man/man1/cjpeg.1 0644 root bin
+d none $PACKAGE_NAME/man/man1/djpeg.1 0644 root bin
+d none $PACKAGE_NAME/man/man1/jpegtran.1 0644 root bin
+d none $PACKAGE_NAME/man/man1/rdjpgcom.1 0644 root bin
+d none $PACKAGE_NAME/man/man1/wrjpgcom.1 0644 root bin
+d none $PACKAGE_NAME/include 0755 root bin
+f none $PACKAGE_NAME/include/jconfig.h 0644 root bin
+f none $PACKAGE_NAME/include/jerror.h 0644 root bin
+f none $PACKAGE_NAME/include/jmorecfg.h 0644 root bin
+f none $PACKAGE_NAME/include/jpeglib.h 0644 root bin
+f none $PACKAGE_NAME/include/turbojpeg.h 0644 root bin
+d none $PACKAGE_NAME/doc 0755 root bin
+f none $PACKAGE_NAME/doc/LGPL.txt 0644 root bin
+f none $PACKAGE_NAME/doc/libjpeg.txt 0644 root bin
+f none $PACKAGE_NAME/doc/LICENSE.txt 0644 root bin
+f none $PACKAGE_NAME/doc/README 0644 root bin
+f none $PACKAGE_NAME/doc/README-turbo.txt 0644 root bin
+f none $PACKAGE_NAME/doc/usage.txt 0644 root bin
+EOF
+
+pkgmk -o -r $TMPDIR/opt -d $TMPDIR -a i386 -f $TMPDIR/proto
+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 --git a/pkgscripts/pkginfo b/pkgscripts/pkginfo
new file mode 100644
index 0000000..00e8d09
--- /dev/null
+++ b/pkgscripts/pkginfo
@@ -0,0 +1,16 @@
+ARCH=i386
+PKG=libjpeg-turbo
+NAME=libjpeg-turbo SDK and run time libraries
+VERSION=1.1.1,REV=20110803
+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 --git a/pkgscripts/uninstall b/pkgscripts/uninstall
new file mode 100644
index 0000000..6bf80e6
--- /dev/null
+++ b/pkgscripts/uninstall
@@ -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=libjpeg-turbo
+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