changed, use libjpeg-turbo instead of libjpeg

3 files changed, 53 insertions, 0 deletions

diff --git a/tools/darwin/depends/config.site_ios.in b/tools/darwin/depends/config.site_ios.in
index a85f0aaae1..65bd842b62 100755
--- a/tools/darwin/depends/config.site_ios.in
+++ b/tools/darwin/depends/config.site_ios.in
@@ -91,3 +91,9 @@ fi
 if test "${PACKAGE_NAME}" = "libgcrypt" ; then
   export CFLAGS="${CFLAGS} -fgnu89-inline"
 fi
+
+# tweaks for libjpeg-turbo
+if test "${PACKAGE_NAME}" = "libjpeg-turbo" ; then
+  export CCAS="${AS}"
+fi
+
diff --git a/tools/darwin/depends/config.site_osx.in b/tools/darwin/depends/config.site_osx.in
index 2deebbc981..933c67aaf7 100644
--- a/tools/darwin/depends/config.site_osx.in
+++ b/tools/darwin/depends/config.site_osx.in
@@ -58,3 +58,9 @@ fi
 if test "${PACKAGE_NAME}" = "python" ; then
   export OPT="${CFLAGS}"
 fi
+
+# tweaks for libjpeg-turbo
+if test "${PACKAGE_NAME}" = "libjpeg-turbo" ; then
+  export NASM="@use_toolchain@/bin/yasm"
+fi
+
diff --git a/tools/darwin/depends/libjpeg-turbo/Makefile b/tools/darwin/depends/libjpeg-turbo/Makefile
new file mode 100644
index 0000000000..a420946c78
--- /dev/null
+++ b/tools/darwin/depends/libjpeg-turbo/Makefile
@@ -0,0 +1,41 @@
+include ../Makefile.include
+
+# lib name, version
+LIBNAME=libjpeg-turbo
+VERSION=svn711
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX) \
+  --with-jpeg8
+
+LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib
+
+CLEAN_FILES=$(ARCHIVE) $(SOURCE)
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+	$(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+	rm -rf $(SOURCE)
+	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+	echo $(SOURCE) > .gitignore
+	cd $(SOURCE); autoreconf -vif
+	cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+	make -j 1 -C $(SOURCE)
+
+.installed:
+	make -C $(SOURCE) install
+	touch $@
+
+clean:
+	make -C $(SOURCE) clean
+	rm -f .installed
+
+distclean::
+	rm -rf $(SOURCE) .installed