summaryrefslogtreecommitdiff
path: root/package/x11r7/pixman
diff options
context:
space:
mode:
authorJohn Voltz <john.voltz@gmail.com>2008-03-06 18:36:12 +0000
committerJohn Voltz <john.voltz@gmail.com>2008-03-06 18:36:12 +0000
commit1a2b4af3fb5fcac12d6c9f56963d1fcc3db92b80 (patch)
tree4234e4b0b12da77755228e612841f3fb11f85a48 /package/x11r7/pixman
parenteda9b0fe87303011e8b54b01ae8ad0eca44ded0c (diff)
updated xorg to version 7.3 and added all of the fonts
Diffstat (limited to 'package/x11r7/pixman')
-rw-r--r--package/x11r7/pixman/Config.in8
-rw-r--r--package/x11r7/pixman/pixman-0.9.6-libdir-la.patch77
-rw-r--r--package/x11r7/pixman/pixman-0.9.6-no-tests.patch11
-rw-r--r--package/x11r7/pixman/pixman.mk15
4 files changed, 111 insertions, 0 deletions
diff --git a/package/x11r7/pixman/Config.in b/package/x11r7/pixman/Config.in
new file mode 100644
index 000000000..339fe85e5
--- /dev/null
+++ b/package/x11r7/pixman/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PIXMAN
+ bool "pixman"
+ default n
+ help
+ Cairo pixel manager
+
+ http://cairographics.org/releases/
+
diff --git a/package/x11r7/pixman/pixman-0.9.6-libdir-la.patch b/package/x11r7/pixman/pixman-0.9.6-libdir-la.patch
new file mode 100644
index 000000000..d920275e1
--- /dev/null
+++ b/package/x11r7/pixman/pixman-0.9.6-libdir-la.patch
@@ -0,0 +1,77 @@
+--- libdaemon/ltmain.sh.orig 2004-11-23 09:19:19.000000000 -0700
++++ libdaemon/ltmain.sh 2007-01-13 14:36:53.000000000 -0700
+@@ -231,8 +231,9 @@
+ # line option must be used.
+ if test -z "$tagname"; then
+ $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit $EXIT_FAILURE
++ $echo "$modename: defaulting to \`CC'"
++ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
++# exit $EXIT_FAILURE
+ # else
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
+@@ -2279,8 +2280,14 @@
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+- dir="$libdir"
+- absdir="$libdir"
++ # Adding 'libdir' from the .la file to our library search paths
++ # breaks crosscompilation horribly. We cheat here and don't add
++ # it, instead adding the path where we found the .la. -CL
++ dir="$abs_ladir"
++ absdir="$abs_ladir"
++ libdir="$abs_ladir"
++ #dir="$libdir"
++ #absdir="$libdir"
+ fi
+ else
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+@@ -2754,6 +2761,16 @@
+ esac
+ if grep "^installed=no" $deplib > /dev/null; then
+ path="$absdir/$objdir"
++# This interferes with crosscompilation. -CL
++# else
++# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++# if test -z "$libdir"; then
++# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
++# exit 1
++# fi
++# if test "$absdir" != "$libdir"; then
++# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++# fi
+ else
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+@@ -5141,6 +5158,10 @@
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
++ # Replacing uninstalled with installed can easily break crosscompilation,
++ # since the installed path is generally the wrong architecture. -CL
++ newdependency_libs="$newdependency_libs $deplib"
++ continue
+ case $deplib in
+ *.la)
+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+@@ -5459,10 +5480,13 @@
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+- if test "$inst_prefix_dir" = "$destdir"; then
+- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+- exit $EXIT_FAILURE
+- fi
++ #
++ # This breaks install into our staging area. -PB
++ #
++ # if test "$inst_prefix_dir" = "$destdir"; then
++ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++ # exit $EXIT_FAILURE
++ # fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
diff --git a/package/x11r7/pixman/pixman-0.9.6-no-tests.patch b/package/x11r7/pixman/pixman-0.9.6-no-tests.patch
new file mode 100644
index 000000000..271a42676
--- /dev/null
+++ b/package/x11r7/pixman/pixman-0.9.6-no-tests.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in.orig 2008-01-30 12:56:25.000000000 -0500
++++ b/Makefile.in 2008-01-30 12:56:38.000000000 -0500
+@@ -198,7 +198,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = pixman test
++SUBDIRS = pixman
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = pixman-1.pc
+ RELEASE_OR_SNAPSHOT = $$(if test "x$(CAIRO_VERSION_MINOR)" = "x$$(echo "$(CAIRO_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi)
diff --git a/package/x11r7/pixman/pixman.mk b/package/x11r7/pixman/pixman.mk
new file mode 100644
index 000000000..c2508c061
--- /dev/null
+++ b/package/x11r7/pixman/pixman.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# pixman
+#
+################################################################################
+
+PIXMAN_VERSION = 0.9.6
+PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
+PIXMAN_SITE = http://cairographics.org/releases/
+PIXMAN_AUTORECONF = NO
+PIXMAN_INSTALL_STAGING = YES
+PIXMAN_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
+PIXMAN_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
+
+$(eval $(call AUTOTARGETS,package/x11r7,pixman))