aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Daniel Laird <danieljlaird@hotmail.com>2008-08-26 16:27:25 +0000
committerGravatar Daniel Laird <danieljlaird@hotmail.com>2008-08-26 16:27:25 +0000
commit46f418844695525302df1905c0fe27d27c6fc484 (patch)
treef4ed590c0e779a6fef9eca97a790b76465059371
parentb46329c9479e4801b8eaa6828c5c32ccef81d53f (diff)
downloadbuildroot-46f418844695525302df1905c0fe27d27c6fc484.tar.gz
buildroot-46f418844695525302df1905c0fe27d27c6fc484.tar.bz2
Move pixman from package/x11r7/pixman to package/pixman
Means we can now bounce cairo to 1.6.x series. pixman is not dependant on x libraries what so over so removed the dependencies section. Daniel Laird
-rw-r--r--package/Config.in1
-rw-r--r--package/pixman/Config.in (renamed from package/x11r7/pixman/Config.in)0
-rw-r--r--package/pixman/pixman-0.10.0-no-tests.patch (renamed from package/x11r7/pixman/pixman-0.10.0-no-tests.patch)0
-rw-r--r--package/pixman/pixman.mk (renamed from package/x11r7/pixman/pixman.mk)5
-rw-r--r--package/x11r7/Config.in1
5 files changed, 2 insertions, 5 deletions
diff --git a/package/Config.in b/package/Config.in
index 16d059b9b3..9e174bfce6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -330,6 +330,7 @@ source "package/libart/Config.in"
source "package/libpng/Config.in"
source "package/libungif/Config.in"
source "package/lite/Config.in"
+source "package/pixman/Config.in"
source "package/sdl/Config.in"
source "package/sdl_image/Config.in"
source "package/sdl_mixer/Config.in"
diff --git a/package/x11r7/pixman/Config.in b/package/pixman/Config.in
index 5cd138a22f..5cd138a22f 100644
--- a/package/x11r7/pixman/Config.in
+++ b/package/pixman/Config.in
diff --git a/package/x11r7/pixman/pixman-0.10.0-no-tests.patch b/package/pixman/pixman-0.10.0-no-tests.patch
index fbd0d26892..fbd0d26892 100644
--- a/package/x11r7/pixman/pixman-0.10.0-no-tests.patch
+++ b/package/pixman/pixman-0.10.0-no-tests.patch
diff --git a/package/x11r7/pixman/pixman.mk b/package/pixman/pixman.mk
index 63e633d58c..2e8158f301 100644
--- a/package/x11r7/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -3,7 +3,6 @@
# pixman
#
################################################################################
-
PIXMAN_VERSION = 0.10.0
PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
PIXMAN_SITE = http://cairographics.org/releases/
@@ -12,6 +11,4 @@ PIXMAN_INSTALL_STAGING = YES
PIXMAN_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
PIXMAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install install-data
-PIXMAN_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
-
-$(eval $(call AUTOTARGETS,package/x11r7,pixman))
+$(eval $(call AUTOTARGETS,package,pixman))
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index f677f47faf..e0c77c7665 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -15,7 +15,6 @@ if BR2_PACKAGE_XORG7
menu "X11R7 Libraries"
source package/x11r7/libxcb/Config.in
source package/x11r7/mesa3d/Config.in
- source package/x11r7/pixman/Config.in
source package/x11r7/pthread-stubs/Config.in
source package/x11r7/xlib_libFS/Config.in
source package/x11r7/xlib_libICE/Config.in