Commit 46f41884 authored by Daniel Laird's avatar Daniel Laird
Browse files

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
parent b46329c9

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -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"

package/x11r7/pixman/pixman.mk→package/pixman/pixman.mk

+1 −4
Original line number Diff line number Diff line
@@ -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))

package/x11r7/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -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