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

diff --git a/package/Config.in b/package/Config.in
index 16d059b9b3e5abaea6a9f1412b46b9c9e396df19..9e174bfce6240ded72ef8c32ac756c2ea7b32164 100644 (file)
--- 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/pixman/Config.in b/package/pixman/Config.in
new file mode 100644 (file)
index 0000000..5cd138a
--- /dev/null
+++ b/package/pixman/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PIXMAN
+       bool "pixman"
+       help
+               Cairo pixel manager
+
+               http://cairographics.org/releases/
+

diff --git a/package/pixman/pixman-0.10.0-no-tests.patch b/package/pixman/pixman-0.10.0-no-tests.patch
new file mode 100644 (file)
index 0000000..fbd0d26
--- /dev/null
+++ b/package/pixman/pixman-0.10.0-no-tests.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in.orig 2008-05-23 14:04:37.000000000 +0000
++++ b/Makefile.in      2008-05-23 14:04:50.000000000 +0000
+@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pixman test
++SUBDIRS = pixman
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = pixman-1.pc
+ USERNAME = $$USER

diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
new file mode 100644 (file)
index 0000000..2e8158f
--- /dev/null
+++ b/package/pixman/pixman.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# pixman
+#
+################################################################################
+PIXMAN_VERSION = 0.10.0
+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_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install install-data
+
+$(eval $(call AUTOTARGETS,package,pixman))

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index f677f47fafaffe779f0e1d9719d9c707bf19ab68..e0c77c7665edbc8e3ddacc545aadf714dc4b084b 100644 (file)
--- 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

diff --git a/package/x11r7/pixman/Config.in b/package/x11r7/pixman/Config.in
deleted file mode 100644 (file)
index 5cd138a..0000000
--- a/package/x11r7/pixman/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_PIXMAN
-       bool "pixman"
-       help
-               Cairo pixel manager
-
-               http://cairographics.org/releases/
-

diff --git a/package/x11r7/pixman/pixman-0.10.0-no-tests.patch b/package/x11r7/pixman/pixman-0.10.0-no-tests.patch
deleted file mode 100644 (file)
index fbd0d26..0000000
--- a/package/x11r7/pixman/pixman-0.10.0-no-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in.orig 2008-05-23 14:04:37.000000000 +0000
-+++ b/Makefile.in      2008-05-23 14:04:50.000000000 +0000
-@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pixman test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- USERNAME = $$USER

diff --git a/package/x11r7/pixman/pixman.mk b/package/x11r7/pixman/pixman.mk
deleted file mode 100644 (file)
index 63e633d..0000000
--- a/package/x11r7/pixman/pixman.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-#
-# pixman
-#
-################################################################################
-
-PIXMAN_VERSION = 0.10.0
-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_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install install-data
-
-PIXMAN_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
-
-$(eval $(call AUTOTARGETS,package/x11r7,pixman))