diff --git a/ChangeLog.txt b/ChangeLog.txt
index fb148caa..4b3db1ee 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -33,6 +33,12 @@ successfully decompressed by libjpeg-turbo without additional work on the part
of the application. An application can still override the Huffman tables, for
instance to re-use tables from a previous frame of the same video.
+[4] The Mac packaging system now uses pkgbuild and productbuild rather than
+PackageMaker (which is obsolete and no longer supported.) This means that
+OS X 10.6 "Snow Leopard" or later must be used when packaging libjpeg-turbo,
+although the packages produced can be installed on OS X 10.5 "Leopard" or
+later. OS X 10.4 "Tiger" is no longer supported.
+
1.3.1
=====
diff --git a/configure.ac b/configure.ac
index 4173f25d..ff5cf668 100644
--- a/configure.ac
+++ b/configure.ac
@@ -530,8 +530,6 @@ AC_CONFIG_FILES([pkgscripts/libjpeg-turbo.spec.tmpl:release/libjpeg-turbo.spec.i
AC_CONFIG_FILES([pkgscripts/makecygwinpkg.tmpl:release/makecygwinpkg.in])
AC_CONFIG_FILES([pkgscripts/makedpkg.tmpl:release/makedpkg.in])
AC_CONFIG_FILES([pkgscripts/makemacpkg.tmpl: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.tmpl:release/uninstall.in])
if test "x$with_turbojpeg" != "xno"; then
AC_CONFIG_FILES([tjbenchtest])
diff --git a/release/Description.plist.in b/release/Description.plist.in
deleted file mode 100644
index 46a5bceb..00000000
--- a/release/Description.plist.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- IFPkgDescriptionDescription
- A SIMD-accelerated JPEG codec that provides both the libjpeg and TurboJPEG APIs
- IFPkgDescriptionTitle
- @PACKAGE_NAME@
- IFPkgDescriptionVersion
- @VERSION@
-
-
diff --git a/release/Distribution.xml b/release/Distribution.xml
new file mode 100644
index 00000000..ee73ab00
--- /dev/null
+++ b/release/Distribution.xml
@@ -0,0 +1,24 @@
+
+
+ libjpeg-turbo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ libjpeg-turbo.pkg
+
diff --git a/release/Info.plist.in b/release/Info.plist.in
deleted file mode 100755
index 05750791..00000000
--- a/release/Info.plist.in
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
- CFBundleGetInfoString
- @VERSION@, The libjpeg-turbo Project
- CFBundleIdentifier
- com.libjpeg-turbo.libjpeg-turbo
- CFBundleShortVersionString
- @VERSION@
- IFMajorVersion
- 1
- IFMinorVersion
- @BUILD@
- IFPkgFlagAllowBackRev
-
- IFPkgFlagAuthorizationAction
- AdminAuthorization
- IFPkgFlagBackgroundAlignment
- topleft
- IFPkgFlagBackgroundScaling
- none
- IFPkgFlagDefaultLocation
- /
- IFPkgFlagFollowLinks
-
- IFPkgFlagInstallFat
-
- IFPkgFlagIsRequired
-
- IFPkgFlagOverwritePermissions
-
- IFPkgFlagRelocatable
-
- IFPkgFlagRestartAction
- NoRestart
- IFPkgFlagRootVolumeOnly
-
- IFPkgFlagUpdateInstalledLanguages
-
- IFPkgFormatVersion
- 0.10000000149011612
-
-
diff --git a/release/ReadMe.rtf b/release/ReadMe.rtf
deleted file mode 100644
index 2ae48780..00000000
--- a/release/ReadMe.rtf
+++ /dev/null
@@ -1,13 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww26380\viewh15840\viewkind0
-\deftab720
-\pard\pardeftab720\ql\qnatural
-
-\f0\fs24 \cf0 libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON) to accelerate baseline JPEG compression and decompression on x86, x86-64, and ARM systems. On such systems, libjpeg-turbo is generally 2-4x as fast as libjpeg, all else being equal. On other types of systems, libjpeg-turbo can still outperform libjpeg by a significant amount, by virtue of its highly-optimized Huffman coding routines. In many cases, the performance of libjpeg-turbo rivals that of proprietary high-speed JPEG codecs.\
-\
-libjpeg-turbo implements both the traditional libjpeg API as well as the less powerful but more straightforward TurboJPEG API. libjpeg-turbo also features colorspace extensions that allow it to compress from/decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.), as well as a full-featured Java interface.\
-\
-libjpeg-turbo was originally based on libjpeg/SIMD, an MMX-accelerated derivative of libjpeg v6b developed by Miyasaka Masaru. The TigerVNC and VirtualGL projects made numerous enhancements to the codec in 2009, and in early 2010, libjpeg-turbo spun off into an independent project, with the goal of making high-speed JPEG compression/decompression technology available to a broader range of users and developers.\
-}
\ No newline at end of file
diff --git a/release/ReadMe.txt b/release/ReadMe.txt
new file mode 100644
index 00000000..b9f6ca57
--- /dev/null
+++ b/release/ReadMe.txt
@@ -0,0 +1,5 @@
+libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON) to accelerate baseline JPEG compression and decompression on x86, x86-64, and ARM systems. On such systems, libjpeg-turbo is generally 2-4x as fast as libjpeg, all else being equal. On other types of systems, libjpeg-turbo can still outperform libjpeg by a significant amount, by virtue of its highly-optimized Huffman coding routines. In many cases, the performance of libjpeg-turbo rivals that of proprietary high-speed JPEG codecs.
+
+libjpeg-turbo implements both the traditional libjpeg API as well as the less powerful but more straightforward TurboJPEG API. libjpeg-turbo also features colorspace extensions that allow it to compress from/decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.), as well as a full-featured Java interface.
+
+libjpeg-turbo was originally based on libjpeg/SIMD, an MMX-accelerated derivative of libjpeg v6b developed by Miyasaka Masaru. The TigerVNC and VirtualGL projects made numerous enhancements to the codec in 2009, and in early 2010, libjpeg-turbo spun off into an 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/release/makemacpkg.in b/release/makemacpkg.in
index 65abdefe..16c18deb 100644
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -11,7 +11,7 @@ TMPDIR=
onexit()
{
if [ ! "$TMPDIR" = "" ]; then
- sudo rm -rf $TMPDIR
+ rm -rf $TMPDIR
fi
}
@@ -78,7 +78,6 @@ while [ $# -gt 0 ]; do
esac
shift
done
-PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
if [ -f $PACKAGE_NAME-$VERSION.dmg ]; then
rm -f $PACKAGE_NAME-$VERSION.dmg
@@ -245,21 +244,20 @@ if [ "$PREFIX" = "/opt/libjpeg-turbo" -a "$LIBDIR" = "/opt/libjpeg-turbo/lib" ];
fi
fi
-chmod 1775 $PKGROOT/Library
-chmod 775 $PKGROOT/Library/Documentation
-mkdir -p $TMPDIR/pkg/Resources
+mkdir -p $TMPDIR/pkg
-cp pkgscripts/Description.plist $TMPDIR/pkg/
-cp pkgscripts/Info.plist $TMPDIR/pkg/
install -m 755 pkgscripts/uninstall $PKGROOT/$BINDIR/
-sudo chown -R root:admin $PKGROOT
-cp $SRCDIR/release/License.rtf $SRCDIR/release/Welcome.rtf $SRCDIR/release/ReadMe.rtf $TMPDIR/pkg/Resources/
+find $PKGROOT -type f | while read file; do xattr -c $file; done
+
+cp $SRCDIR/release/License.rtf $SRCDIR/release/Welcome.rtf $SRCDIR/release/ReadMe.txt $TMPDIR/pkg/
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
+pkgbuild --root $PKGROOT --version $VERSION.$BUILD \
+ --identifier com.libjpeg-turbo.libjpeg-turbo $TMPDIR/pkg/$PACKAGE_NAME.pkg
+productbuild --distribution $SRCDIR/release/Distribution.xml \
+ --package-path $TMPDIR/pkg/ --resources $TMPDIR/pkg/ \
+ $TMPDIR/dmg/$PACKAGE_NAME.pkg
hdiutil create -fs HFS+ -volname $PACKAGE_NAME-$VERSION \
-srcfolder "$TMPDIR/dmg" $TMPDIR/$PACKAGE_NAME-$VERSION.dmg
cp $TMPDIR/$PACKAGE_NAME-$VERSION.dmg .