summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Config.in2
-rw-r--r--package/Makefile2
-rw-r--r--package/libX11/Makefile5
-rw-r--r--package/libXfont/Config.in3
-rw-r--r--package/libXfont/Makefile1
-rw-r--r--package/xkbcomp/Config.in6
-rw-r--r--package/xkbcomp/Makefile28
-rw-r--r--package/xkeyboard-config/Config.in6
-rw-r--r--package/xkeyboard-config/Makefile28
-rw-r--r--package/xorg-server/Config.in3
-rw-r--r--package/xorg-server/Makefile22
11 files changed, 103 insertions, 3 deletions
diff --git a/package/Config.in b/package/Config.in
index 3db9a7631..ddfc591ce 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -475,6 +475,8 @@ source "package/libXpm/Config.in"
source "package/libXt/Config.in"
source "package/pixman/Config.in"
source "package/xf86dga/Config.in"
+source "package/xkbcomp/Config.in"
+source "package/xkeyboard-config/Config.in"
endmenu
endmenu
diff --git a/package/Makefile b/package/Makefile
index 079405854..b6bb33f03 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -399,6 +399,8 @@ package-$(ADK_PACKAGE_XFSPROGS) += xfsprogs
package-$(ADK_PACKAGE_XINETD) += xinetd
package-$(ADK_PACKAGE_XCMISCPROTO) += xcmiscproto
package-$(ADK_PACKAGE_XEXTPROTO) += xextproto
+package-$(ADK_PACKAGE_XKBCOMP) += xkbcomp
+package-$(ADK_PACKAGE_XKEYBOARD_CONFIG) += xkeyboard-config
package-$(ADK_PACKAGE_XF86_VIDEO_GEODE) += xf86-video-geode
package-$(ADK_PACKAGE_XF86DGA) += xf86dga
package-$(ADK_PACKAGE_XF86DGAPROTO) += xf86dgaproto
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index b2c3ab1ff..4b7bd701d 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libX11
PKG_VERSION:= 1.1.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 2feb39a0de6f05b25c308268691d960c
PKG_DESCR:= X11 client-side library
PKG_SECTION:= x11
@@ -26,7 +26,8 @@ BUILD_STYLE= auto
INSTALL_STYLE= auto confprog
post-install:
- ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib
+ ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11
${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/
+ ${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXfont/Config.in b/package/libXfont/Config.in
index 68aacfc92..b8553405a 100644
--- a/package/libXfont/Config.in
+++ b/package/libXfont/Config.in
@@ -1,6 +1,7 @@
config ADK_PACKAGE_LIBXFONT
- prompt "libxfont................................ X keyboard library"
+ prompt "libxfont................................ X font library"
tristate
default n
+ select ADK_PACKAGE_LIBFREETYPE
help
http://www.x.org
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index fdb5df17f..e540394e1 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -11,6 +11,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= cb202f7b1af5fc95a7f35f0a62e52e6e
PKG_DESCR:= X font Library
PKG_SECTION:= x11
+PKG_DEPENDS:= libfreetype
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/xkbcomp/Config.in b/package/xkbcomp/Config.in
new file mode 100644
index 000000000..f71cf8268
--- /dev/null
+++ b/package/xkbcomp/Config.in
@@ -0,0 +1,6 @@
+config ADK_PACKAGE_XKBCOMP
+ prompt "xkbcomp........................... X11 keyboard compiler"
+ tristate
+ default n
+ help
+ http://www.x.org
diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile
new file mode 100644
index 000000000..ac4b88a1b
--- /dev/null
+++ b/package/xkbcomp/Makefile
@@ -0,0 +1,28 @@
+# $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:= xkbcomp
+PKG_VERSION:= 1.0.5
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 10e6661a35aa994a9aa73ded0cf70259
+PKG_DESCR:= x11 keyboard compiler
+PKG_SECTION:= x11
+PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/everything/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XKBCOMP,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XKBCOMP}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/xkbcomp ${IDIR_XKBCOMP}/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xkeyboard-config/Config.in b/package/xkeyboard-config/Config.in
new file mode 100644
index 000000000..2abb16055
--- /dev/null
+++ b/package/xkeyboard-config/Config.in
@@ -0,0 +1,6 @@
+config ADK_PACKAGE_XKEYBOARD_CONFIG
+ prompt "xkeyboard-config............................ X keyboard config"
+ tristate
+ default n
+ help
+ http://www.x.org
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
new file mode 100644
index 000000000..0f537114b
--- /dev/null
+++ b/package/xkeyboard-config/Makefile
@@ -0,0 +1,28 @@
+# $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:= xkeyboard-config
+PKG_VERSION:= 1.6
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 889e6e10eb7449bf33a5423c40369da5
+PKG_DESCR:= X keyboard config
+PKG_SECTION:= x11
+PKG_SITES:= http://xlibs.freedesktop.org/xkbdesc/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XKEYBOARD_CONFIG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE= gnu
+BUILD_STYLE= auto
+INSTALL_STYLE= auto
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
+ ${CP} ${WRKINST}/usr/share/X11/xkb/* ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/Config.in b/package/xorg-server/Config.in
index b3dc66880..99409a37b 100644
--- a/package/xorg-server/Config.in
+++ b/package/xorg-server/Config.in
@@ -2,6 +2,9 @@ config ADK_PACKAGE_XORG_SERVER
prompt "xorg-server............................... X server"
tristate
default n
+ select ADK_PACKAGE_XKBCOMP
+ select ADK_PACKAGE_XKEYBOARD_CONFIG
+ select ADK_PACKAGE_LIBOPENSSL
select ADK_PACKAGE_LIBXKBFILE
select ADK_PACKAGE_LIBX11
select ADK_PACKAGE_LIBICE
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 9dd2ed8ec..2b6be24a2 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -11,6 +11,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 7aca5d0dc8b824d3dff6140e381e03df
PKG_DESCR:= Xorg server
PKG_SECTION:= x11
+PKG_DEPENDS:= libopenssl
PKG_URL:= http://www.x.org
PKG_SITES:= ${MASTER_SITE_XORG}
@@ -32,6 +33,27 @@ CONFIGURE_ARGS+= --disable-xinerama \
--disable-afb \
--disable-xephyr \
--disable-xsdl \
+ --enable-freetype \
+ --disable-kdrive-vesa \
+ --disable-xfbdev \
+ --disable-xfake \
+ --disable-xsdl \
+ --disable-afb \
+ --disable-cfb \
+ --disable-mfb \
+ --disable-xnest \
+ --disable-xvfb \
+ --disable-xf86bigfont \
+ --disable-glx \
+ --disable-aiglx \
+ --enable-xv \
+ --disable-xvmc \
+ --disable-dri \
+ --disable-xace \
+ --disable-xephyr \
+ --with-xkb-output=/tmp \
+ --with-os-vendor=OpenADK \
+ --with-vendor-web="http://www.openadk.org" \
--enable-builtin-fonts
BUILD_STYLE= auto
INSTALL_STYLE= auto
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:10:39 +0000