From 72b4ecd972cbade303cf7cf69986183a10feb118 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 18:28:03 +0200 Subject: fix host compile of librsvg, required for midori --- package/cairo/Makefile | 17 +++++++++++++++++ package/expat/Makefile | 7 ++++++- package/fontconfig/Makefile | 5 +++++ package/gdk-pixbuf/Makefile | 9 ++++++++- package/harfbuzz/Makefile | 12 +++++++++--- package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in | 18 ++++++++++++++++++ package/harfbuzz/patches/patch-src_harfbuzz_pc_in | 16 ++++++++++++++++ package/icu4c/Makefile | 4 +++- package/libpng/Makefile | 5 +++++ package/librsvg/Makefile | 3 ++- package/libxml2/Makefile | 1 - package/pango/Makefile | 14 +++++++++----- package/pixman/Makefile | 6 +++++- package/webkitgtk/Makefile | 14 ++++++++------ 14 files changed, 111 insertions(+), 20 deletions(-) create mode 100644 package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in create mode 100644 package/harfbuzz/patches/patch-src_harfbuzz_pc_in diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 80a1450d2..35fcf82cc 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -13,6 +13,7 @@ PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman PKG_DEPENDS+= libxrender PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib PKG_BUILDDEP+= libXext +HOST_BUILDDEP:= libpng-host pixman-host freetype-host fontconfig-host PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ PKG_OPTS:= dev @@ -21,10 +22,23 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --enable-ft=yes \ + --enable-png=yes \ + --enable-fc=yes \ + --enable-tee=no \ + --enable-xlib=no \ + --enable-pdf=no \ + --enable-quartz=no \ + --disable-test-surfaces \ + --disable-full-testing + ifeq (,$(filter arm,$(TARGET_ARCH))) TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS)) endif @@ -33,6 +47,8 @@ CONFIGURE_ARGS+= --enable-ft=yes \ --enable-tee=yes \ --enable-xlib=yes \ --enable-pdf=yes \ + --enable-png=yes \ + --enable-quartz=no \ --disable-test-surfaces \ --disable-full-testing @@ -41,4 +57,5 @@ cairo-install: ${CP} ${WRKINST}/usr/lib/libcairo*.so* ${IDIR_CAIRO}/usr/lib ${CP} ${WRKINST}/usr/lib/cairo/*.so* ${IDIR_CAIRO}/usr/lib/cairo +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/expat/Makefile b/package/expat/Makefile index 15f8b4d4a..804685815 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= expat PKG_VERSION:= 2.0.1 PKG_RELEASE:= 2 PKG_MD5SUM:= ee8b492592568805593f81f8cdf2a04c -PKG_DESCR:= a XML parsing library +PKG_DESCR:= XML parsing library PKG_SECTION:= libs PKG_URL:= http://expat.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} @@ -20,12 +20,17 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + libexpat-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/ +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index e76c543b7..79a3c793d 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs PKG_DEPENDS:= libxml2 PKG_BUILDDEP:= freetype libxml2 libiconv-tiny +HOST_BUILDDEP:= expat-host PKG_URL:= http://fontconfig.org/ PKG_SITES:= http://fontconfig.org/release/ PKG_OPTS:= dev @@ -21,10 +22,13 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto TARGET_LDFLAGS+= -liconv CONFIGURE_ARGS+= --with-arch=${ARCH} \ --enable-libxml2 \ @@ -35,4 +39,5 @@ fontconfig-install: ${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib $(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index 1eda79031..b243727f8 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -7,17 +7,23 @@ PKG_NAME:= gdk-pixbuf PKG_VERSION:= 2.24.0 PKG_RELEASE:= 2 PKG_MD5SUM:= bd7c2a9d23b573db467e39833f12103d -PKG_DESCR:= GDK pixbuf library +PKG_DESCR:= pixbuf library PKG_SECTION:= libs PKG_BUILDDEP:= libjpeg-turbo libtiff +HOST_BUILDDEP:= glib-host PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/ PKG_NEED_CXX:= 1 PKG_OPTS:= dev +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --disable-glibtest \ + --without-libtiff CONFIGURE_ENV+= gio_can_sniff=no gdk-pixbuf-install: @@ -29,4 +35,5 @@ gdk-pixbuf-install: $(CP) ./files/loaders.cache \ $(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile index 07a84a5b4..fbe1a6c3f 100644 --- a/package/harfbuzz/Makefile +++ b/package/harfbuzz/Makefile @@ -4,24 +4,29 @@ include $(TOPDIR)/rules.mk PKG_NAME:= harfbuzz -PKG_VERSION:= 0.9.9 -PKG_RELEASE:= 3 -PKG_MD5SUM:= e901ffe556d706b7d43b272f83be7f09 +PKG_VERSION:= 0.9.28 +PKG_RELEASE:= 1 +PKG_MD5SUM:= accbeb679f39d839038b95a87e40870e PKG_DESCR:= OpenType text shaping engine PKG_SECTION:= libs PKG_SITES:= http://www.freedesktop.org/software/harfbuzz/release/ PKG_DEPENDS:= libstdcxx cairo icu4c PKG_BUILDDEP:= libstdcxx cairo icu4c +HOST_BUILDDEP:= cairo-host icu4c-host PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !m68k DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + pre-install: $(INSTALL_DIR) $(WRKINST)/usr/include/harfbuzz $(CP) $(WRKBUILD)/src/hb-icu.h $(WRKINST)/usr/include/harfbuzz @@ -31,4 +36,5 @@ harfbuzz-install: $(CP) $(WRKINST)/usr/lib/libharfbuzz*.so* \ $(IDIR_HARFBUZZ)/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in b/package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in new file mode 100644 index 000000000..8cb50339d --- /dev/null +++ b/package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in @@ -0,0 +1,18 @@ +--- harfbuzz-0.9.28.orig/src/harfbuzz-icu.pc.in 2013-10-28 00:45:25.000000000 +0100 ++++ harfbuzz-0.9.28/src/harfbuzz-icu.pc.in 2014-05-23 18:08:32.000000000 +0200 +@@ -1,7 +1,4 @@ + prefix=%prefix% +-exec_prefix=%exec_prefix% +-libdir=%libdir% +-includedir=%includedir% + + Name: harfbuzz + Description: HarfBuzz text shaping library ICU integration +@@ -9,5 +6,5 @@ Version: %VERSION% + + Requires: harfbuzz + Requires.private: icu-uc +-Libs: -L${libdir} -lharfbuzz-icu +-Cflags: -I${includedir}/harfbuzz ++Libs: -L${prefix}/lib -lharfbuzz-icu ++Cflags: -I${prefix}/include/harfbuzz diff --git a/package/harfbuzz/patches/patch-src_harfbuzz_pc_in b/package/harfbuzz/patches/patch-src_harfbuzz_pc_in new file mode 100644 index 000000000..90b2faf8f --- /dev/null +++ b/package/harfbuzz/patches/patch-src_harfbuzz_pc_in @@ -0,0 +1,16 @@ +--- harfbuzz-0.9.28.orig/src/harfbuzz.pc.in 2013-10-28 00:45:25.000000000 +0100 ++++ harfbuzz-0.9.28/src/harfbuzz.pc.in 2014-05-23 18:08:04.000000000 +0200 +@@ -1,11 +1,8 @@ + prefix=%prefix% +-exec_prefix=%exec_prefix% +-libdir=%libdir% +-includedir=%includedir% + + Name: harfbuzz + Description: HarfBuzz text shaping library + Version: %VERSION% + +-Libs: -L${libdir} -lharfbuzz +-Cflags: -I${includedir}/harfbuzz ++Libs: -L${prefix}/lib -lharfbuzz ++Cflags: -I${prefix}/include/harfbuzz diff --git a/package/icu4c/Makefile b/package/icu4c/Makefile index 772e147b5..fe87c65b1 100644 --- a/package/icu4c/Makefile +++ b/package/icu4c/Makefile @@ -24,12 +24,14 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +CFLAGS_FOR_BUILD+= -fPIC +CXXFLAGS_FOR_BUILD+= -fPIC HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --enable-extras=no \ --enable-samples=no \ --enable-tests=no \ - --enable-shared=no \ --enable-dyload=no \ + --enable-shared=no \ --enable-static CONFIGURE_ARGS+= --with-cross-build=${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host/icu/source \ --enable-extras=no \ diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 5904d14aa..0a35c42e2 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -19,12 +19,17 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + libpng-install: ${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib ${CP} ${WRKINST}/usr/lib/libpng*.so* ${IDIR_LIBPNG}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/librsvg/Makefile b/package/librsvg/Makefile index 39eeaab5d..1776cd154 100644 --- a/package/librsvg/Makefile +++ b/package/librsvg/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= acdecdb9f08f3bf662a68bf7dafb8b82 PKG_DESCR:= SVG library PKG_BUILDDEP:= libcroco -HOST_BUILDDEP:= libcroco-host +HOST_BUILDDEP:= libcroco-host gdk-pixbuf-host pango-host PKG_SECTION:= libs PKG_URL:= https://wiki.gnome.org/action/show/Projects/LibRsvg?action=show&redirect=LibRsvg PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/ @@ -23,6 +23,7 @@ $(eval $(call HOST_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --enable-introspection=no CONFIGURE_ARGS+= --enable-introspection=no librsvg-install: diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 4bf5f7e7c..957a3a355 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -45,7 +45,6 @@ HOST_CONFIGURE_ARGS+= --with-python \ HOST_MAKE_FLAGS+= LDFLAGS=-lpthread AUTOTOOL_STYLE:= autoreconf -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_LDFLAGS+= -lpthread ifneq ($(ADK_PACKAGE_LIBXML2_PYTHON),) CONFIGURE_ARGS+= --with-python diff --git a/package/pango/Makefile b/package/pango/Makefile index 65fbb33f0..e13760d08 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -4,12 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pango -PKG_VERSION:= 1.36.1 +PKG_VERSION:= 1.36.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9e0d3a1ea395172f8c39ba98a4d2081a -PKG_DESCR:= pango library +PKG_MD5SUM:= d9532826e95bdb374355deebc42441bb +PKG_DESCR:= library for laying out and rendering of text PKG_SECTION:= libs PKG_BUILDDEP:= libXft glib cairo harfbuzz libstdcxx fontconfig +HOST_BUILDDEP:= cairo-host harfbuzz-host PKG_URL:= http://www.pango.org/ PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.36/} PKG_NEED_CXX:= 1 @@ -19,19 +20,22 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +HOST_STYLE:= auto CONFIGURE_ENV+= ac_cv_path_EGREP="grep -E" pango-install: $(INSTALL_DIR) $(IDIR_PANGO)/etc/pango - $(INSTALL_DIR) $(IDIR_PANGO)/usr/lib $(IDIR_PANGO)/usr/lib/pango/1.8.0/modules + $(INSTALL_DIR) $(IDIR_PANGO)/usr/lib/pango/1.8.0/modules $(INSTALL_DATA) ./files/pango.modules $(IDIR_PANGO)/etc/pango $(CP) $(WRKINST)/usr/lib/libpango*.so* $(IDIR_PANGO)/usr/lib $(CP) $(WRKINST)/usr/lib/pango/1.8.0/modules/*.so \ $(IDIR_PANGO)/usr/lib/pango/1.8.0/modules +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pixman/Makefile b/package/pixman/Makefile index 1068ac2e8..97c397b0f 100644 --- a/package/pixman/Makefile +++ b/package/pixman/Makefile @@ -10,6 +10,7 @@ PKG_MD5SUM:= eba449138b972fbf4547a8c152fea162 PKG_DESCR:= pixel manipulation library PKG_SECTION:= x11/libs PKG_BUILDDEP:= libpng +HOST_BUILDDEP:= libpng-host PKG_SITES:= http://www.cairographics.org/releases/ PKG_OPTS:= dev @@ -19,11 +20,13 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-gtk \ --disable-arm-iwmmxt @@ -31,4 +34,5 @@ pixman-install: ${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib ${CP} ${WRKINST}/usr/lib/libpixman-1.so* ${IDIR_PIXMAN}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile index b98149666..d007e78e1 100644 --- a/package/webkitgtk/Makefile +++ b/package/webkitgtk/Makefile @@ -4,16 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= webkitgtk -PKG_VERSION:= 2.4.0 +PKG_VERSION:= 2.4.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= c759bf11fe4cadd1268630f16a97f7b9 +PKG_MD5SUM:= da2b1b0f0863f3f21bdbc0476001589f PKG_DESCR:= web browser engine PKG_SECTION:= libs PKG_DEPENDS:= glib icu4c zlib libwebp libgtk libsoup -PKG_DEPENDS+= libsecret libxt +PKG_DEPENDS+= libsecret libxt harfbuzz PKG_DEPENDS+= gst-plugins-base gstreamer PKG_BUILDDEP:= glib icu4c zlib libwebp gtk+ -PKG_BUILDDEP+= libsoup libsecret libXt +PKG_BUILDDEP+= libsoup libsecret libXt harfbuzz PKG_BUILDDEP+= gst-plugins-base gstreamer PKG_URL:= http://www.webkitgtk.org/ PKG_SITES:= http://webkitgtk.org/releases/ @@ -32,12 +32,14 @@ CONFIGURE_ARGS+= --with-gtk=2.0 \ --disable-geolocation pre-build: - mkdir -p $(WRKBUILD)/DerivedSources/{webkit,webkitdom,InjectedBundle,Platform} + mkdir -p $(WRKBUILD)/DerivedSources/{webkit,webkitdom,InjectedBundle,Platform,ANGLE} mkdir -p $(WRKBUILD)/DerivedSources/WebKit2/webkit2gtk/webkit2 webkitgtk-install: $(INSTALL_DIR) $(IDIR_WEBKITGTK)/usr/lib - $(CP) $(WRKINST)/usr/lib/webkitgtk*.so* \ + $(CP) $(WRKINST)/usr/lib/libjavascriptcoregtk*.so* \ + $(IDIR_WEBKITGTK)/usr/lib + $(CP) $(WRKINST)/usr/lib/libwebkitgtk*.so* \ $(IDIR_WEBKITGTK)/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3