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>
This commit is contained in:
Bernd Kuhls 2014-10-18 19:41:30 +02:00 committed by Thomas Petazzoni
parent e4a436f5e4
commit bfd87877fe
12 changed files with 31 additions and 27 deletions

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -1,4 +1,4 @@
config BR2_PACKAGE_XLIB_LIBPCIACCESS
config BR2_PACKAGE_LIBPCIACCESS
bool "libpciaccess"
depends on BR2_LARGEFILE
help

View File

@ -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))

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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))

View File

@ -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

View File

@ -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