summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-30 22:47:32 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-30 22:47:32 +0200
commit5157a34410fe9eff94d5de7100cbc3659d6c4fcb (patch)
tree6c38d36e2c3f8910a2087711fd31fbc8da143965
parent37175a9783c561c8a3f94b6818dabf512c3674e9 (diff)
add geode x11 driver
- add the driver for alix1c x11 support - fix some x11 related dependencies - enable pkg-config fixups globally I hope it doesn't break anything confprog might be deleted later
-rw-r--r--mk/pkg-bottom.mk4
-rw-r--r--package/Config.in2
-rw-r--r--package/Makefile1
-rw-r--r--package/libSM/Config.in1
-rw-r--r--package/libfontenc/Config.in1
-rw-r--r--package/xf86-video-geode/Config.in6
-rw-r--r--package/xf86-video-geode/Makefile27
-rw-r--r--package/xf86-video-geode/ipkg/xf86-video-geode.control4
-rw-r--r--package/xorg-server/Config.in13
9 files changed, 55 insertions, 4 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 1f366ab53..caae6b853 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -115,12 +115,12 @@ else
@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
@exit 1
endif
-ifneq ($(filter confprog,${INSTALL_STYLE}),)
+#ifneq ($(filter confprog,${INSTALL_STYLE}),)
for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \
[[ -e $$a ]] || continue; \
$(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \
done
-endif
+#endif
@env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE)
@if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \
cd '${STAGING_DIR}'; \
diff --git a/package/Config.in b/package/Config.in
index 01188dde5..87022ea21 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -456,6 +456,7 @@ endmenu
menu "X"
depends ADK_XORG
source "package/xorg-server/Config.in"
+source "package/xf86-video-geode/Config.in"
menu "X Libraries"
source "package/libICE/Config.in"
@@ -474,7 +475,6 @@ source "package/libXpm/Config.in"
source "package/libXt/Config.in"
source "package/pixman/Config.in"
source "package/xf86dga/Config.in"
-source "package/xproto/Config.in"
endmenu
endmenu
diff --git a/package/Makefile b/package/Makefile
index 2cecd6d2d..4fb421de7 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -397,6 +397,7 @@ package-$(ADK_PACKAGE_XFSPROGS) += xfsprogs
package-$(ADK_PACKAGE_XINETD) += xinetd
package-$(ADK_PACKAGE_XCMISCPROTO) += xcmiscproto
package-$(ADK_PACKAGE_XEXTPROTO) += xextproto
+package-$(ADK_PACKAGE_XF86_VIDEO_GEODE) += xf86-video-geode
package-$(ADK_PACKAGE_XF86DGA) += xf86dga
package-$(ADK_PACKAGE_XF86DGAPROTO) += xf86dgaproto
package-$(ADK_PACKAGE_XPROTO) += xproto
diff --git a/package/libSM/Config.in b/package/libSM/Config.in
index 650563a61..e247147ee 100644
--- a/package/libSM/Config.in
+++ b/package/libSM/Config.in
@@ -2,5 +2,6 @@ config ADK_PACKAGE_LIBSM
prompt "libSM................................... X library"
tristate
default n
+ select ADK_PACKAGE_LIBUUID
help
http://www.x.org
diff --git a/package/libfontenc/Config.in b/package/libfontenc/Config.in
index 1cf91edba..966bd7d22 100644
--- a/package/libfontenc/Config.in
+++ b/package/libfontenc/Config.in
@@ -1,7 +1,6 @@
config ADK_PACKAGE_LIBFONTENC
prompt "libfontenc.............................. X font encoding library"
tristate
- select ADK_PACKAGE_XPROTO
select ADK_PACKAGE_ZLIB
default n
help
diff --git a/package/xf86-video-geode/Config.in b/package/xf86-video-geode/Config.in
new file mode 100644
index 000000000..1505d48f1
--- /dev/null
+++ b/package/xf86-video-geode/Config.in
@@ -0,0 +1,6 @@
+config ADK_PACKAGE_XF86_VIDEO_GEODE
+ prompt "xf86-video-geode........................... X11 driver for AMD Geode"
+ tristate
+ default n
+ help
+ http://www.x.org
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
new file mode 100644
index 000000000..0c57d851f
--- /dev/null
+++ b/package/xf86-video-geode/Makefile
@@ -0,0 +1,27 @@
+# $Id$
+#-
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= xf86-video-geode
+PKG_VERSION:= 2.11.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= dc9cbe88f38f82e27dbfb66f9f99fc98
+MASTER_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE)))
+
+CONFIGURE_STYLE= gnu
+BUILD_STYLE= auto
+INSTALL_STYLE= auto
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers
+ ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \
+ ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-video-geode/ipkg/xf86-video-geode.control b/package/xf86-video-geode/ipkg/xf86-video-geode.control
new file mode 100644
index 000000000..4c3537a0b
--- /dev/null
+++ b/package/xf86-video-geode/ipkg/xf86-video-geode.control
@@ -0,0 +1,4 @@
+Package: xf86-video-geode
+Priority: optional
+Section: x11
+Description: X.org library
diff --git a/package/xorg-server/Config.in b/package/xorg-server/Config.in
index f9cc2a6a8..b3dc66880 100644
--- a/package/xorg-server/Config.in
+++ b/package/xorg-server/Config.in
@@ -4,5 +4,18 @@ config ADK_PACKAGE_XORG_SERVER
default n
select ADK_PACKAGE_LIBXKBFILE
select ADK_PACKAGE_LIBX11
+ select ADK_PACKAGE_LIBICE
+ select ADK_PACKAGE_LIBSM
+ select ADK_PACKAGE_LIBXEXT
+ select ADK_PACKAGE_LIBXFONT
+ select ADK_PACKAGE_LIBFONTENC
+ select ADK_PACKAGE_LIBPCIACCESS
+ select ADK_PACKAGE_LIBXAU
+ select ADK_PACKAGE_LIBXAW
+ select ADK_PACKAGE_LIBXMU
+ select ADK_PACKAGE_LIBXPM
+ select ADK_PACKAGE_LIBXT
+ select ADK_PACKAGE_PIXMAN
+ select ADK_PACKAGE_XF86DGA
help
http://www.x.org