diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
| commit | 92623154c7b3edde7bf4812530e4db9de2779283 (patch) | |
| tree | 4d9a5df1ec44939ce4731af80a56471643eaf815 /package/pixman | |
| parent | 4090002fc466e4319c95ab214c3f92ecc7b59184 (diff) | |
| parent | 933e74c07231e815bbfd9ed90073308eaf253a00 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/mpfr/Makefile
Diffstat (limited to 'package/pixman')
| -rw-r--r-- | package/pixman/Makefile | 9 | ||||
| -rw-r--r-- | package/pixman/patches/patch-ltmain_sh | 14 |
2 files changed, 13 insertions, 10 deletions
diff --git a/package/pixman/Makefile b/package/pixman/Makefile index 50b61a3a9..2b136ec07 100644 --- a/package/pixman/Makefile +++ b/package/pixman/Makefile @@ -4,11 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pixman -PKG_VERSION:= 0.16.2 +PKG_VERSION:= 0.20.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 02bd3669f53c404c19980d5efb6f86fb +PKG_MD5SUM:= a923c20af88e469ac29ba42cfedb88c2 PKG_DESCR:= Pixel manipulation library PKG_SECTION:= x11/libs +PKG_BUILDDEP:= libpng PKG_SITES:= http://www.cairographics.org/releases/ PKG_SUBPKGS:= PIXMAN PIXMAN_DEV @@ -24,9 +25,11 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,PIXMAN_DEV,pixman-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PIXMAN_DEV},${PKGSC_PIXMAN_DEV},${PKG_OPTS})) +TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) + pixman-install: ${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib - ${CP} ${WRKINST}/usr/lib/libpixman-1.so* ${IDIR_PIXMAN}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libpixman-1.so* ${IDIR_PIXMAN}/usr/lib pixman-dev-install: ${INSTALL_DIR} ${IDIR_PIXMAN_DEV}/usr/include diff --git a/package/pixman/patches/patch-ltmain_sh b/package/pixman/patches/patch-ltmain_sh index b38645c65..73aa1dfdd 100644 --- a/package/pixman/patches/patch-ltmain_sh +++ b/package/pixman/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- pixman-0.16.2.orig/ltmain.sh 2009-04-23 02:27:43.000000000 +0200 -+++ pixman-0.16.2/ltmain.sh 2011-01-14 20:10:48.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +--- pixman-0.20.2.orig/ltmain.sh 2010-10-30 23:18:32.000000000 +0200 ++++ pixman-0.20.2/ltmain.sh 2011-04-07 15:05:45.000000000 +0200 +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" |