summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/.template/Makefile3
-rw-r--r--package/Config.in8
-rw-r--r--package/font-bitstream-100dpi/Makefile28
-rw-r--r--package/font-bitstream-75dpi/Makefile28
-rw-r--r--package/font-misc-misc/Makefile29
-rw-r--r--package/font-util/Makefile28
-rw-r--r--package/font-xfree86-type1/Makefile28
-rw-r--r--package/xorg-server/Makefile7
-rw-r--r--scripts/scan-pkgs.sh11
9 files changed, 167 insertions, 3 deletions
diff --git a/package/.template/Makefile b/package/.template/Makefile
index 67d1cc183..32c24923c 100644
--- a/package/.template/Makefile
+++ b/package/.template/Makefile
@@ -31,6 +31,7 @@ INSTALL_STYLE:= auto
# please install all files and directories to the package dir
post-install:
$(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ $(IDIR_@UPKG@)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \
+ $(IDIR_@UPKG@)/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/Config.in b/package/Config.in
index 736875423..0185c0d1e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -569,10 +569,18 @@ endmenu
menu "X Applications"
source "package/evilwm/Config.in"
+source "package/font-util/Config.in"
source "package/rxvt-unicode/Config.in"
source "package/xauth/Config.in"
endmenu
+menu "X Fonts"
+source "package/font-bitstream-75dpi/Config.in"
+source "package/font-bitstream-100dpi/Config.in"
+source "package/font-misc-misc/Config.in"
+source "package/font-xfree86-type1/Config.in"
+endmenu
+
menu "X Libraries"
source "package/libICE/Config.in"
source "package/libICE/Config.in.lib"
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
new file mode 100644
index 000000000..05cff3d1a
--- /dev/null
+++ b/package/font-bitstream-100dpi/Makefile
@@ -0,0 +1,28 @@
+# 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:= font-bitstream-100dpi
+PKG_VERSION:= 1.0.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 823c3c2a1a2307bdca5961145e3db37d
+PKG_DESCR:= X fonts
+PKG_SECTION:= x11
+PKG_URL:= http://www.x.org/
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FONT_BITSTREAM_100DPI,$(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_FONT_BITSTREAM_100DPI)/usr/share/fonts/X11/100dpi
+ $(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
+ $(IDIR_FONT_BITSTREAM_100DPI)/usr/share/fonts/X11/100dpi
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
new file mode 100644
index 000000000..a58f28fef
--- /dev/null
+++ b/package/font-bitstream-75dpi/Makefile
@@ -0,0 +1,28 @@
+# 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:= font-bitstream-75dpi
+PKG_VERSION:= 1.0.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= f8e982bcaaed199fdac03e9fc12b2952
+PKG_DESCR:= X fonts
+PKG_SECTION:= x11
+PKG_URL:= http://www.x.org/
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FONT_BITSTREAM_75DPI,$(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_FONT_BITSTREAM_75DPI)/usr/share/fonts/X11/75dpi
+ $(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
+ $(IDIR_FONT_BITSTREAM_75DPI)/usr/share/fonts/X11/75dpi
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
new file mode 100644
index 000000000..deba7e3f3
--- /dev/null
+++ b/package/font-misc-misc/Makefile
@@ -0,0 +1,29 @@
+# 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:= font-misc-misc
+PKG_VERSION:= 1.1.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 047eae4d061f17d96213c4e78f7abccb
+PKG_DESCR:= X fonts
+PKG_SECTION:= x11
+PKG_BUILDDEP+= font-util
+PKG_URL:= http://www.x.org/
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FONT_MISC_MISC,$(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_FONT_MISC_MISC)/usr/share/fonts/X11/misc
+ $(CP) ${WRKINST}/usr/share/fonts/X11/misc/* \
+ $(IDIR_FONT_MISC_MISC)/usr/share/fonts/X11/misc
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
new file mode 100644
index 000000000..eb89dd3e3
--- /dev/null
+++ b/package/font-util/Makefile
@@ -0,0 +1,28 @@
+# 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:= font-util
+PKG_VERSION:= 1.1.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 171ebfd3733aeae3af91ad57d126d29d
+PKG_DESCR:= font util
+PKG_SECTION:= libs
+PKG_URL:= http://www.x.org/
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,FONT_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
+ ${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
+ ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile
new file mode 100644
index 000000000..a2960a494
--- /dev/null
+++ b/package/font-xfree86-type1/Makefile
@@ -0,0 +1,28 @@
+# 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:= font-xfree86-type1
+PKG_VERSION:= 1.0.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 785f2b6e8d6d0dafec08b8d4c54ae2e3
+PKG_DESCR:= X fonts
+PKG_SECTION:= x11
+PKG_URL:= http://www.x.org/
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FONT_XFREE86_TYPE1,$(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_FONT_XFREE86_TYPE1)/usr/share/fonts/X11/Type1
+ $(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \
+ $(IDIR_FONT_XFREE86_TYPE1)/usr/share/fonts/X11/Type1
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 39f44c7c2..1b604fbe4 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xorg-server
PKG_VERSION:= 1.7.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9
PKG_DESCR:= Xorg server
PKG_SECTION:= x11
@@ -23,6 +23,7 @@ $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE}
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= V=1
CONFIGURE_ARGS+= \
+ --with-fontdir=/usr/share/fonts/X11 \
--enable-dga \
--enable-xorg \
--enable-xv \
@@ -47,13 +48,15 @@ CONFIGURE_ARGS+= \
--disable-xvmc \
--with-xkb-output=/tmp \
--with-os-vendor=OpenADK \
- --with-vendor-web="http://www.openadk.org"
+ --with-vendor-web="http://openadk.org"
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
post-install:
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/{extensions,fonts,linux,multimedia}
+ ${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \
+ $(IDIR_XORG_SERVER)/usr/lib/xorg/
${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin
${CP} ${WRKINST}/usr/lib/xorg/modules/*.so \
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 9af693c08..b546e5f8c 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -86,6 +86,10 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
NEED_GPERF="$NEED_GPERF eglibc"
fi
+if [[ -n $ADK_PACKAGE_FONT-BITSTREAM-100DPI ]]; then
+ NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi"
+fi
+
if [[ -n $NEED_GETTEXT ]]; then
if ! which xgettext >/dev/null 2>&1; then
echo >&2 You need gettext to build $NEED_GETTEXT
@@ -114,6 +118,13 @@ if [[ -n $NEED_SSLDEV ]]; then
fi
fi
+if [[ -n $NEED_MKFONTDIR ]]; then
+ if ! which mkfontdir >/dev/null 2>&1; then
+ echo >&2 You need mkfontdir to build $NEED_MKFONTDIR
+ out=1
+ fi
+fi
+
if [[ -n $NEED_INTL ]]; then
if ! which intltool-update >/dev/null 2>&1; then
echo >&2 You need intltool-update to build $NEED_INTL
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:05:41 +0000