Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/6d2a834c845600ae82b1291f8af4415c5b93c48d
...commit
http://git.netsurf-browser.org/toolchains.git/commit/6d2a834c845600ae82b1291f8af4415c5b93c48d
...tree
http://git.netsurf-browser.org/toolchains.git/tree/6d2a834c845600ae82b1291f8af4415c5b93c48d
The branch, chris/libimagequant has been updated
via 6d2a834c845600ae82b1291f8af4415c5b93c48d (commit)
from a0011f684de60a4af0bf300a782a5225edd39b79 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=6d2a834c845600ae82b1291f8af4415c5b93c48d
commit 6d2a834c845600ae82b1291f8af4415c5b93c48d
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Add libimagequant
diff --git a/sdk/Makefile b/sdk/Makefile
index 3adbb0d..c3389fe 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -34,6 +34,7 @@ VERSION_LIBCARES := 1.10.0
VERSION_LIBCURL := 7.45.0
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
+VERSION_LIBIMAGEQUANT := 2.6.0
VERSION_LIBCF := CVS-20130415
VERSION_LIBEXPAT := 2.1.0
VERSION_LDG := 2.32
@@ -118,7 +119,7 @@ ifeq ($(TARGET),m5475-atari-mint)
endif
ifeq ($(TARGET),ppc-amigaos)
- SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
spidermonkey.d $(COMMON_SDK_ITEMS) libjpeg.d)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
libimagequant.d spidermonkey.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--enable-threaded-resolver LIBS=-lpthread
VERSION_SPIDERMONKEY := 1.7.0
@@ -132,7 +133,7 @@ ifeq ($(TARGET),i686-w64-mingw32)
endif
ifeq ($(TARGET),m68k-unknown-amigaos)
- SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
$(COMMON_SDK_ITEMS) libjpeg.d)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
libimagequant.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-ssl --with-zlib
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
@@ -341,6 +342,25 @@ $(BUILDSTEPS)/libpbl-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/pbl_$(VERSION
$(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz:
$(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)" $@
+# libimagequant
+$(BUILDSTEPS)/libimagequant.d: $(BUILDSTEPS)/builddir.d
$(BUILDSTEPS)/libimagequant-src.d
+ mkdir -p $(BUILDDIR)/libimagequant
+ cd $(BUILDDIR)/libimagequant && tar xaf
$(SOURCEDIR)/$(VERSION_LIBIMAGEQUANT).tar.gz
+ for p in `ls $(RECIPES)/patches/libimagequant/*.p` ; do $(PATCH) -d
$(BUILDDIR)/libimagequant/pngquant-$(VERSION_LIBIMAGEQUANT) -p0 <$$p ; done
+ifneq ($(realpath $(RECIPES)/patches/libimagequant/$(TARGET)),)
+ for p in `ls $(RECIPES)/patches/libimagequant/$(TARGET)/*.p` ; do
$(PATCH) -d $(BUILDDIR)/libimagequant/pngquant-$(VERSION_LIBIMAGEQUANT) -p0
<$$p ; done
+endif
+ cd $(BUILDDIR)/libimagequant/pngquant-$(VERSION_LIBIMAGEQUANT)/lib &&
$(env) make PREFIX=$(GCCSDK_INSTALL_ENV)
+ cp
$(BUILDDIR)/libimagequant/pngquant-$(VERSION_LIBIMAGEQUANT)/lib/libimagequant.h
$(GCCSDK_INSTALL_ENV)/include/libimagequant.h
+ cp
$(BUILDDIR)/libimagequant/pngquant-$(VERSION_LIBIMAGEQUANT)/lib/libimagequant.a
$(GCCSDK_INSTALL_ENV)/lib/libimagequant.a
+ touch $@
+
+$(BUILDSTEPS)/libimagequant-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/$(VERSION_LIBIMAGEQUANT).tar.gz
+ touch $@
+
+$(SOURCEDIR)/$(VERSION_LIBIMAGEQUANT).tar.gz:
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://github.com/pornel/pngquant/archive/$(subst $(SOURCEDIR)/,,$@)" $@
+
# OpenSSL
$(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d
$(BUILDSTEPS)/openssl-src.d
mkdir -p $(BUILDDIR)/openssl
diff --git a/sdk/recipes/patches/libimagequant/lib.configure.p
b/sdk/recipes/patches/libimagequant/lib.configure.p
new file mode 100644
index 0000000..61371ac
--- /dev/null
+++ b/sdk/recipes/patches/libimagequant/lib.configure.p
@@ -0,0 +1,11 @@
+--- lib/configure 2016-01-24 15:46:08.000000000 +0000
++++ lib/configure 2016-04-23 13:46:21.163220781 +0100
+@@ -5,7 +5,7 @@ PREFIX="/usr/local"
+ VERSION=$(grep LIQ_VERSION_STRING libimagequant.h | grep -Eo "2\.[0-9.]+")
+
+ DEBUG=
+-SSE=auto
++SSE=no
+ OPENMP=
+ EXTRA_CFLAGS=
+ EXTRA_LDFLAGS=
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 24 +++++++++++++++++++--
sdk/recipes/patches/libimagequant/lib.configure.p | 11 ++++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 sdk/recipes/patches/libimagequant/lib.configure.p
diff --git a/sdk/Makefile b/sdk/Makefile
index 3adbb0d..c3389fe 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -34,6 +34,7 @@ VERSION_LIBCARES := 1.10.0
VERSION_LIBCURL := 7.45.0
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
+VERSION_LIBIMAGEQUANT := 2.6.0
VERSION_LIBCF := CVS-20130415
VERSION_LIBEXPAT := 2.1.0
VERSION_LDG := 2.32
@@ -118,7 +119,7 @@ ifeq ($(TARGET),m5475-atari-mint)
endif
ifeq ($(TARGET),ppc-amigaos)
- SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
spidermonkey.d $(COMMON_SDK_ITEMS) libjpeg.d)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
libimagequant.d spidermonkey.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--enable-threaded-resolver LIBS=-lpthread
VERSION_SPIDERMONKEY := 1.7.0
@@ -132,7 +133,7 @@ ifeq ($(TARGET),i686-w64-mingw32)
endif
ifeq ($(TARGET),m68k-unknown-amigaos)
- SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
$(COMMON_SDK_ITEMS) libjpeg.d)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
libimagequant.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-ssl --with-zlib
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
@@ -341,6 +342,25 @@ $(BUILDSTEPS)/libpbl-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/pbl_$(VERSION
$(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz:
$(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)" $@
+# libimagequant
+$(BUILDSTEPS)/libimagequant.d: $(BUILDSTEPS)/builddir.d
$(BUILDSTEPS)/libimagequant-src.d
+ mkdir -p $(BUILDDIR)/libimagequant
+ cd $(BUILDDIR)/libimagequant && tar xaf
$(SOURCEDIR)/$(VERSION_LIBIMAGEQUANT).tar.gz
+ for p in `ls $(RECIPES)/patches/libimagequant/*.p` ; do $(PATCH) -d
$(BUILDDIR)/libimagequant/pngquant-$(VERSION_LIBIMAGEQUANT) -p0 <$$p ; done
+ifneq ($(realpath $(RECIPES)/patches/libimagequant/$(TARGET)),)
+ for p in `ls $(RECIPES)/patches/libimagequant/$(TARGET)/*.p` ; do
$(PATCH) -d $(BUILDDIR)/libimagequant/pngquant-$(VERSION_LIBIMAGEQUANT) -p0
<$$p ; done
+endif
+ cd $(BUILDDIR)/libimagequant/pngquant-$(VERSION_LIBIMAGEQUANT)/lib &&
$(env) make PREFIX=$(GCCSDK_INSTALL_ENV)
+ cp
$(BUILDDIR)/libimagequant/pngquant-$(VERSION_LIBIMAGEQUANT)/lib/libimagequant.h
$(GCCSDK_INSTALL_ENV)/include/libimagequant.h
+ cp
$(BUILDDIR)/libimagequant/pngquant-$(VERSION_LIBIMAGEQUANT)/lib/libimagequant.a
$(GCCSDK_INSTALL_ENV)/lib/libimagequant.a
+ touch $@
+
+$(BUILDSTEPS)/libimagequant-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/$(VERSION_LIBIMAGEQUANT).tar.gz
+ touch $@
+
+$(SOURCEDIR)/$(VERSION_LIBIMAGEQUANT).tar.gz:
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://github.com/pornel/pngquant/archive/$(subst $(SOURCEDIR)/,,$@)" $@
+
# OpenSSL
$(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d
$(BUILDSTEPS)/openssl-src.d
mkdir -p $(BUILDDIR)/openssl
diff --git a/sdk/recipes/patches/libimagequant/lib.configure.p
b/sdk/recipes/patches/libimagequant/lib.configure.p
new file mode 100644
index 0000000..61371ac
--- /dev/null
+++ b/sdk/recipes/patches/libimagequant/lib.configure.p
@@ -0,0 +1,11 @@
+--- lib/configure 2016-01-24 15:46:08.000000000 +0000
++++ lib/configure 2016-04-23 13:46:21.163220781 +0100
+@@ -5,7 +5,7 @@ PREFIX="/usr/local"
+ VERSION=$(grep LIQ_VERSION_STRING libimagequant.h | grep -Eo "2\.[0-9.]+")
+
+ DEBUG=
+-SSE=auto
++SSE=no
+ OPENMP=
+ EXTRA_CFLAGS=
+ EXTRA_LDFLAGS=
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
