diff options
116 files changed, 276 insertions, 569 deletions
diff --git a/mk/mirrors.mk b/mk/mirrors.mk index accef2f39..e8c1aef10 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -16,21 +16,6 @@ MASTER_SITE_KERNEL?= \ ftp://www.kernel.org/pub/linux/ \ http://www.kernel.org/pub/linux/ \ -MASTER_SITE_XORG?= \ - http://www.x.org/releases/individual/xserver/ \ - http://www.x.org/releases/individual/proto/ \ - http://www.x.org/releases/individual/app/ \ - http://www.x.org/releases/individual/xcb/ \ - http://www.x.org/releases/individual/lib/ \ - http://www.x.org/releases/individual/driver/ \ - http://www.x.org/releases/individual/util/ \ - http://xorg.freedesktop.org/releases/individual/app/ \ - http://xorg.freedesktop.org/releases/individual/lib/ \ - http://xorg.freedesktop.org/releases/individual/driver/ \ - http://www.x.org/releases/X11R7.7/src/everything/ \ - http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \ - http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \ - MASTER_SITE_GNU?= \ http://ftp.gnu.org/gnu/ \ ftp://ftp.gnu.org/gnu/ \ diff --git a/mk/package.mk b/mk/package.mk index 2a7a8dd81..486b21b17 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -11,6 +11,8 @@ endif endif AUTOTOOL_ENV+= PATH='${HOST_PATH}' \ + PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \ + PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \ ${COMMON_ENV} CONFIGURE_ENV+= PATH='${TARGET_PATH}' \ diff --git a/package/bdftopcf/Makefile b/package/bdftopcf/Makefile index bdb9afe5f..b67637088 100644 --- a/package/bdftopcf/Makefile +++ b/package/bdftopcf/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= b9f172527fb78f1d02859f0e24675bfc0152ea589abab733a80a1256f6e91e69 PKG_DESCR:= font converter utility PKG_BUILDDEP:= libXfont PKG_SECTION:= x11/fonts -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/app/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile index 2102d98f1..d9fac7978 100644 --- a/package/bigreqsproto/Makefile +++ b/package/bigreqsproto/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_DESCR:= big requests extension headers PKG_SECTION:= dev/header PKG_HASH:= de68a1a9dd1a1219ad73531bff9f662bc62fcd777387549c43cd282399f4a6ea -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/proto/ PKG_OPTS:= dev devonly DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 4d85da167..82b3d14d8 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -45,10 +45,6 @@ HOST_CONFIGURE_ARGS+= --enable-ft=yes \ --disable-test-surfaces \ --disable-full-testing -ifeq (,$(filter arm,$(ADK_TARGET_ARCH))) -TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS)) -endif - ifneq ($(ADK_PACKAGE_CAIRO_WITH_XRENDER),) CONFIGURE_ARGS+= --enable-xlib-xrender=yes else diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile index ef64a0720..685ecdde8 100644 --- a/package/compositeproto/Makefile +++ b/package/compositeproto/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= 22195b7e50036440b1c6b3b2d63eb03dfa6e71c8a1263ed1f07b0f31ae7dad50 PKG_DESCR:= composite headers PKG_SECTION:= dev/header -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/proto/ PKG_OPTS:= dev devonly DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile index 600d0b258..b8eb18523 100644 --- a/package/damageproto/Makefile +++ b/package/damageproto/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= f65ccbf1de9750a527ea6e85694085b179f2d06495cbdb742b3edb2149fef303 PKG_DESCR:= x damage extension headers PKG_SECTION:= dev/header -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/proto/ PKG_OPTS:= dev devonly DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile index 2cd861e70..19c90dc8e 100644 --- a/package/dri2proto/Makefile +++ b/package/dri2proto/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= 7e65b031eaa6ebe23c75583d4abd993ded7add8009b4200a4db7aa10728b0f61 PKG_DESCR:= dri2 protocol headers PKG_SECTION:= dev/header -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/proto/ PKG_OPTS:= dev devonly DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/dri3proto/Makefile b/package/dri3proto/Makefile index 04f9905e7..f78b62cb1 100644 --- a/package/dri3proto/Makefile +++ b/package/dri3proto/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= e1a0dad3009ecde52c0bf44187df5f95cc9a7cc0e76dfc2f2bbf3e909fe03fa9 PKG_DESCR:= dri3 protocol headers PKG_SECTION:= dev/header -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/proto/ PKG_OPTS:= dev devonly DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile index 2bc2637d1..b7554b29a 100644 --- a/package/fixesproto/Makefile +++ b/package/fixesproto/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_DESCR:= xfixes extension headers PKG_SECTION:= dev/header PKG_HASH:= 67865a0e3cdc7dec1fd676f0927f7011ad4036c18eb320a2b41dbd56282f33b8 -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/proto/ PKG_OPTS:= dev devonly DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile index 1b8728857..1f4a9a1f1 100644 --- a/package/font-adobe-100dpi/Makefile +++ b/package/font-adobe-100dpi/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= x11/fonts PKG_DEPENDS:= font-util PKG_BUILDDEP:= font-util |