From 46f418844695525302df1905c0fe27d27c6fc484 Mon Sep 17 00:00:00 2001 From: Daniel Laird Date: Tue, 26 Aug 2008 16:27:25 +0000 Subject: 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 --- package/Config.in | 1 + package/pixman/Config.in | 7 +++++++ package/pixman/pixman-0.10.0-no-tests.patch | 11 +++++++++++ package/pixman/pixman.mk | 14 ++++++++++++++ package/x11r7/Config.in | 1 - package/x11r7/pixman/Config.in | 7 ------- package/x11r7/pixman/pixman-0.10.0-no-tests.patch | 11 ----------- package/x11r7/pixman/pixman.mk | 17 ----------------- 8 files changed, 33 insertions(+), 36 deletions(-) create mode 100644 package/pixman/Config.in create mode 100644 package/pixman/pixman-0.10.0-no-tests.patch create mode 100644 package/pixman/pixman.mk delete mode 100644 package/x11r7/pixman/Config.in delete mode 100644 package/x11r7/pixman/pixman-0.10.0-no-tests.patch delete mode 100644 package/x11r7/pixman/pixman.mk diff --git a/package/Config.in b/package/Config.in index 16d059b9b..9e174bfce 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/pixman/Config.in b/package/pixman/Config.in new file mode 100644 index 000000000..5cd138a22 --- /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 index 000000000..fbd0d2689 --- /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 index 000000000..2e8158f30 --- /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 f677f47fa..e0c77c766 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 diff --git a/package/x11r7/pixman/Config.in b/package/x11r7/pixman/Config.in deleted file mode 100644 index 5cd138a22..000000000 --- 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 index fbd0d2689..000000000 --- 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 index 63e633d58..000000000 --- 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)) -- cgit v1.2.3