xlib_libpciaccess: Rename package to libpciaccess

While libpciaccess is part of the X libraries, it does not
depend upon X11 or any other X library.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index 6e202fe1d513a4467994d1e2723a7d1cd5b3a5a6..b441e6723be62c0e0a8998589b6f584e2a86d9b0 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,15 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2014.11"
 
+config BR2_PACKAGE_XLIB_LIBPCIACCESS
+       bool "xlib-libpciaccess option has been renamed"
+       depends on BR2_PACKAGE_XORG7
+       select BR2_LEGACY
+       select BR2_PACKAGE_LIBPCIACCESS
+       help
+         libpciaccess neither depends on X11 nor Xlib. Thus the
+         package has been renamed BR2_PACKAGE_LIBPCIACCESS
+
 config BR2_PACKAGE_LINUX_FIRMWARE_XC5000
        bool "Xceive xc5000 option has been renamed"
        select BR2_PACKAGE_LINUX_FIRMWARE_XCx000

diff --git a/package/Config.in b/package/Config.in
index 8b8a20f09927277bcae2ba46ac05b839137413e8..7b18715e848b2090bbd93d72fa4f8b47a11798eb 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -684,6 +684,7 @@ menu "Hardware handling"
        source "package/libllcp/Config.in"
        source "package/libmbim/Config.in"
        source "package/libnfc/Config.in"
+       source "package/libpciaccess/Config.in"
        source "package/libphidget/Config.in"
        source "package/libqmi/Config.in"
        source "package/libraw1394/Config.in"

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index a9c9171ccda1f4f25ef23f30dd161a7e894f9631..8f70db51c78df1ed1f04a3e6184a758a26f4dd42 100644 (file)
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -19,17 +19,12 @@ menu "DRM Drivers"
 
 config BR2_PACKAGE_LIBDRM_INTEL
        bool "intel"
-       depends on BR2_PACKAGE_XORG7
        select BR2_PACKAGE_LIBATOMIC_OPS
-       select BR2_PACKAGE_XLIB_LIBPCIACCESS
+       select BR2_PACKAGE_LIBPCIACCESS
        depends on BR2_i386 || BR2_x86_64
        help
          installs intel graphics driver
 
-comment "libdrm intel driver depends on X.org"
-       depends on BR2_i386 || BR2_x86_64
-       depends on !BR2_PACKAGE_XORG7
-
 config BR2_PACKAGE_LIBDRM_RADEON
        bool "radeon"
        help

diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 108ecdd7d21213988298f0e67a3512eafc7eabd3..28a801fea8165c7dde1e996238f5e9089c740508 100644 (file)
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -21,7 +21,7 @@ LIBDRM_CONF_OPTS = \
 
 ifeq ($(BR2_PACKAGE_LIBDRM_INTEL),y)
 LIBDRM_CONF_OPTS += --enable-intel
-LIBDRM_DEPENDENCIES += libatomic_ops xlib_libpciaccess
+LIBDRM_DEPENDENCIES += libatomic_ops libpciaccess
 else
 LIBDRM_CONF_OPTS += --disable-intel
 endif

diff --git a/package/libpciaccess/Config.in b/package/libpciaccess/Config.in
new file mode 100644 (file)
index 0000000..8b05ebf
--- /dev/null
+++ b/package/libpciaccess/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBPCIACCESS
+       bool "libpciaccess"
+       depends on BR2_LARGEFILE
+       help
+         X.Org libpciaccess
+
+comment "libpciaccess needs a toolchain w/ largefile"
+       depends on !BR2_LARGEFILE

diff --git a/package/libpciaccess/libpciaccess.mk b/package/libpciaccess/libpciaccess.mk
new file mode 100644 (file)
index 0000000..010707e
--- /dev/null
+++ b/package/libpciaccess/libpciaccess.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# libpciaccess
+#
+################################################################################
+
+LIBPCIACCESS_VERSION = 0.13.2
+LIBPCIACCESS_SOURCE = libpciaccess-$(LIBPCIACCESS_VERSION).tar.bz2
+LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
+LIBPCIACCESS_LICENSE = MIT
+LIBPCIACCESS_LICENSE_FILES = COPYING
+LIBPCIACCESS_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 1979a1321a1a4c2b787e832f4dbe62b7e995149c..357d4b4834b4242c8009093d882648ad2da1ece0 100644 (file)
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -52,7 +52,6 @@ if BR2_PACKAGE_XORG7
                source package/x11r7/xlib_libxkbfile/Config.in
                source package/x11r7/xlib_libxshmfence/Config.in
                source package/x11r7/xlib_xtrans/Config.in
-               source package/x11r7/xlib_libpciaccess/Config.in
        endmenu
        menu "X11R7 Applications"
                source package/x11r7/xapp_appres/Config.in

diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index 0c04756aef3afb9f9df081daac61f1a2d20deb23..dc2fabf404f8a936e6afc2e708711e2df66fe667 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
        depends on (BR2_i386 || BR2_x86_64)
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_XPROTO
-       select BR2_PACKAGE_XLIB_LIBPCIACCESS
+       select BR2_PACKAGE_LIBPCIACCESS
        select BR2_PACKAGE_LIBDRM
        select BR2_PACKAGE_LIBDRM_INTEL
        select BR2_PACKAGE_XLIB_LIBXRANDR

diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index 4e981c81e5f434db5554502a3163e678de455643..801cdae57e42cdaaf9ce046ec964b1e010562c8e 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -20,8 +20,8 @@ XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS = \
 
 XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \
        libdrm \
+       libpciaccess \
        xlib_libXrandr \
-       xlib_libpciaccess \
        xproto_fontsproto \
        xproto_xproto \
        xserver_xorg-server

diff --git a/package/x11r7/xlib_libpciaccess/Config.in b/package/x11r7/xlib_libpciaccess/Config.in
deleted file mode 100644 (file)
index 5f7d136..0000000
--- a/package/x11r7/xlib_libpciaccess/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBPCIACCESS
-       bool "libpciaccess"
-       depends on BR2_LARGEFILE
-       help
-         X.Org libpciaccess
-
-comment "libpciaccess needs a toolchain w/ largefile"
-       depends on !BR2_LARGEFILE

diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
deleted file mode 100644 (file)
index d065bf1..0000000
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# xlib_libpciaccess
-#
-################################################################################
-
-XLIB_LIBPCIACCESS_VERSION = 0.13.2
-XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
-XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBPCIACCESS_LICENSE = MIT
-XLIB_LIBPCIACCESS_LICENSE_FILES = COPYING
-XLIB_LIBPCIACCESS_INSTALL_STAGING = YES
-
-$(eval $(autotools-package))

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index e191dce60341ca1e13662d7a7cbca9b7b9d198ec..558124002faa3981e41e3653746ae477addd5019 100644 (file)
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_XSERVER_XORG_SERVER
        bool "xorg-server"
        select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
+       select BR2_PACKAGE_LIBPCIACCESS if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
        # We need a SHA1 implementation. If either openssl or
        # libgcrypt are already part of the build, we'll use one of
        # them, otherwise, use the small libsha1 library.
@@ -9,7 +10,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
        select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
        select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
-       select BR2_PACKAGE_XLIB_LIBPCIACCESS if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XLIB_LIBXAU
        select BR2_PACKAGE_XLIB_LIBXCURSOR

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index b269985b35f903246c1a379b164e80d6e84f27fb..6cbec15d0d182d656f6097136581f16c46e1569c 100644 (file)
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -63,7 +63,7 @@ XSERVER_XORG_SERVER_CONF_OPTS = --disable-config-hal \
 
 ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
-XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libpciaccess libdrm
+XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess libdrm
 else
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg
 endif