浏览代码

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

Daniel Laird 17 年之前
父节点
当前提交
46f4188446
共有 5 个文件被更改,包括 2 次插入5 次删除
  1. 1 0
      package/Config.in
  2. 0 0
      package/pixman/Config.in
  3. 0 0
      package/pixman/pixman-0.10.0-no-tests.patch
  4. 1 4
      package/pixman/pixman.mk
  5. 0 1
      package/x11r7/Config.in

+ 1 - 0
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"

+ 0 - 0
package/x11r7/pixman/Config.in → package/pixman/Config.in


+ 0 - 0
package/x11r7/pixman/pixman-0.10.0-no-tests.patch → package/pixman/pixman-0.10.0-no-tests.patch


+ 1 - 4
package/x11r7/pixman/pixman.mk → 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))

+ 0 - 1
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