Use package/libdrm instead of package/x11r7/libdrm

diff --git a/package/Config.in b/package/Config.in
index b653cfc94051cd5609e63b3756286d689d72334e..573823b2db5d4c37b6b4a99d7aeb4ed371b85512 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -329,6 +329,7 @@ comment "X libraries and helper libraries"
 source "package/atk/Config.in"
 source "package/cairo/Config.in"
 source "package/pango/Config.in"
+source "package/libdrm/Config.in"
 source "package/libglib12/Config.in"
 source "package/libglib2/Config.in"
 source "package/libgtk12/Config.in"

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 3ef30997146812359834d723ed56c80cf5189682..8a67975ac86caf6658a773c52ca291a59b0f7e2a 100644 (file)
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -2,5 +2,6 @@ config BR2_PACKAGE_LIBDRM
        bool "libdrm"
        default n
        help
-
-       http://dri.freedesktop.org/libdrm/
+         Direct Rendering Manager
+       
+         http://dri.freedesktop.org/libdrm/

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 1d6aa17ae9f3fe4cd3de10da824f335840529cd3..229a42688600708b0b0c3dd5911a081c4c4ccdfb 100644 (file)
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -14,7 +14,6 @@ if BR2_PACKAGE_XORG7
                source package/x11r7/xserver_xorg-server/Config.in
        endmenu
        menu "X11R7 Libraries"
-               source package/x11r7/libdrm/Config.in
                source package/x11r7/libxcb/Config.in
                source package/x11r7/mesa3d/Config.in
                source package/x11r7/pthread-stubs/Config.in

diff --git a/package/x11r7/libdrm/Config.in b/package/x11r7/libdrm/Config.in
deleted file mode 100644 (file)
index 68b91fd..0000000
--- a/package/x11r7/libdrm/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_LIBDRM
-       bool "libdrm"
-       default n
-       help
-               Direct Rendering Manager
-               
-               http://dri.freedesktop.org/
-

diff --git a/package/x11r7/libdrm/libdrm.mk b/package/x11r7/libdrm/libdrm.mk
deleted file mode 100644 (file)
index 8e7fffc..0000000
--- a/package/x11r7/libdrm/libdrm.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#############################################################
-#
-# libdrm
-#
-#############################################################
-LIBDRM_VERSION = 2.3.0
-LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
-LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
-
-LIBDRM_INSTALL_STAGING = YES
-
-LIBDRM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-$(eval $(call AUTOTARGETS,libdrm))
-