diff options
| -rw-r--r-- | package/Config.in | 1 | ||||
| -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.in | 1 |
5 files changed, 2 insertions, 5 deletions
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/x11r7/pixman/Config.in b/package/pixman/Config.in index 5cd138a22..5cd138a22 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 fbd0d2689..fbd0d2689 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 63e633d58..2e8158f30 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 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 |