summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Config.in4
-rw-r--r--package/Makefile2
-rw-r--r--package/atftp/files/atftp.postinst6
-rwxr-xr-xpackage/atftp/ipkg/files/postinst8
-rw-r--r--package/base-files/Makefile1
-rw-r--r--package/dhcpv6/ipkg/files/conffiles4
-rw-r--r--package/libXv/Config.in6
-rw-r--r--package/libXv/Makefile29
-rw-r--r--package/mplayer/Makefile4
-rw-r--r--package/ruby/Makefile3
-rw-r--r--package/xf86-video-geode/Makefile8
-rw-r--r--package/xf86-video-geode/ipkg/xf86-video-geode.control4
-rw-r--r--package/xorg-server/Config.in2
-rw-r--r--package/xorg-server/Makefile52
14 files changed, 83 insertions, 50 deletions
diff --git a/package/Config.in b/package/Config.in
index 7122921dc..d8b1e1d2e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -452,7 +452,7 @@ source "package/zlib/Config.in"
endmenu
menu "X"
-depends ADK_XORG
+depends ADK_X11
source "package/xorg-server/Config.in"
source "package/xf86-video-geode/Config.in"
@@ -460,6 +460,7 @@ menu "X Libraries"
source "package/libICE/Config.in"
source "package/libSM/Config.in"
source "package/libX11/Config.in"
+source "package/libXv/Config.in"
source "package/libXdmcp/Config.in"
source "package/libXext/Config.in"
source "package/libXfont/Config.in"
@@ -471,6 +472,7 @@ source "package/libXaw/Config.in"
source "package/libXmu/Config.in"
source "package/libXpm/Config.in"
source "package/libXt/Config.in"
+source "package/libXxf86dga/Config.in"
source "package/pixman/Config.in"
source "package/xf86dga/Config.in"
source "package/xkbcomp/Config.in"
diff --git a/package/Makefile b/package/Makefile
index 8a26c7113..85e840fd9 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -206,10 +206,12 @@ package-$(ADK_PACKAGE_LIBX11) += libX11
package-$(ADK_PACKAGE_LIBXAU) += libXau
package-$(ADK_PACKAGE_LIBXAW) += libXaw
package-$(ADK_PACKAGE_LIBXPM) += libXpm
+package-$(ADK_PACKAGE_LIBXV) += libXv
package-$(ADK_PACKAGE_LIBXDMCP) += libXdmcp
package-$(ADK_PACKAGE_LIBXEXT) += libXext
package-$(ADK_PACKAGE_LIBXFONT) += libXfont
package-$(ADK_PACKAGE_LIBXKBFILE) += libxkbfile
+package-$(ADK_PACKAGE_LIBXXF86DGA) += libXxf86dga
package-$(ADK_PACKAGE_LIBXML2) += libxml2
package-$(ADK_PACKAGE_LIBXMU) += libXmu
package-$(ADK_PACKAGE_LIBXSLT) += libxslt
diff --git a/package/atftp/files/atftp.postinst b/package/atftp/files/atftp.postinst
new file mode 100644
index 000000000..dddd0b0d1
--- /dev/null
+++ b/package/atftp/files/atftp.postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+grep -q '^tftp[[:space:]]*69/tcp' ${IPKG_INSTROOT}/etc/services 2>/dev/null
+if [ $? -ne 0 ]; then
+ echo "tftp 69/tcp" >>${IPKG_INSTROOT}/etc/services
+ echo "tftp 69/udp" >>${IPKG_INSTROOT}/etc/services
+fi
diff --git a/package/atftp/ipkg/files/postinst b/package/atftp/ipkg/files/postinst
deleted file mode 100755
index 35a2c3b36..000000000
--- a/package/atftp/ipkg/files/postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env mksh
-grep -q '^tftp[[:space:]]*69/tcp' ${IPKG_INSTROOT}/etc/services 2>/dev/null
-if [ $? -ne 0 ]; then
- echo "tftp 69/tcp" >>${IPKG_INSTROOT}/etc/services
- echo "tftp 69/udp" >>${IPKG_INSTROOT}/etc/services
- echo "tftp-mcast 1758/tcp" >>${IPKG_INSTROOT}/etc/services
- echo "tftp-mcast 1758/udp" >>${IPKG_INSTROOT}/etc/services
-fi
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1fdcc39a5..ad3b60e10 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -52,6 +52,7 @@ endif
mkdir -p $(IDIR_BASE_FILES)/usr/lib
mkdir -p $(IDIR_BASE_FILES)/usr/bin
chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
+ chmod 600 $(IDIR_BASE_FILES)/etc/shadow
ln -sf ../tmp/resolv.conf $(IDIR_BASE_FILES)/etc/resolv.conf
ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab
rm -rf $(IDIR_BASE_FILES)/var
diff --git a/package/dhcpv6/ipkg/files/conffiles b/package/dhcpv6/ipkg/files/conffiles
deleted file mode 100644
index 267baa94d..000000000
--- a/package/dhcpv6/ipkg/files/conffiles
+++ /dev/null
@@ -1,4 +0,0 @@
-/etc/dhcpd6/dhcpd6.conf
-/etc/dhcpd6/leases6.conf
-/etc/dhcpd6/partial_leases6.conf
-/etc/dhcp6/sollicit.conf
diff --git a/package/libXv/Config.in b/package/libXv/Config.in
new file mode 100644
index 000000000..59cf46b96
--- /dev/null
+++ b/package/libXv/Config.in
@@ -0,0 +1,6 @@
+config ADK_PACKAGE_LIBXV
+ prompt "libXv................................. X library"
+ tristate
+ default n
+ help
+ http://www.x.org
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
new file mode 100644
index 000000000..e8e9c9e2a
--- /dev/null
+++ b/package/libXv/Makefile
@@ -0,0 +1,29 @@
+# $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:= libXv
+PKG_VERSION:= 1.0.4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= c2ce7e6651b3a8fdfefb2c53dea431fc
+PKG_DESCR:= X11 Xvideo extensions
+PKG_SECTION:= x11
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXV,libxv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= --disable-malloc0returnsnull
+BUILD_STYLE= auto
+INSTALL_STYLE= auto
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_LIBXV}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libXv.so* ${IDIR_LIBXV}/usr/lib/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 05c104037..b8ef3ade5 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -25,7 +25,7 @@ $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
-ifeq (${ADK_X11},y)
+ifeq ($(ADK_X11),y)
CONFIGURE_ARG:= --enable-x11
else
CONFIGURE_ARG:= --disable-x11
@@ -83,7 +83,7 @@ pre-configure:
--disable-ftp \
--disable-v4l2 \
--disable-ivtv \
- --enable-vidix-internal \
+ --disable-vidix-internal \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
--disable-freetype \
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 76d35b1ee..871d23a31 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -33,9 +33,8 @@ post-configure:
echo "socket" >> ${WRKBUILD}/ext/Setup
post-install:
- ${INSTALL_DIR} ${IDIR_RUBY}/usr
rm -rf ${WRKINST}/usr/lib/site_ruby
find ${WRKINST}/usr -name "*.h" -delete
- ${CP} ${WRKINST}/usr ${IDIR_RUBY}/usr
+ ${CP} ${WRKINST}/usr ${IDIR_RUBY}/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index b5699a1d1..2807fee11 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -6,9 +6,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xf86-video-geode
-PKG_VERSION:= 2.11.2
-PKG_RELEASE:= 1
-PKG_MD5SUM:= dc9cbe88f38f82e27dbfb66f9f99fc98
+PKG_VERSION:= 2.10.1
+PKG_RELEASE:= 2
+PKG_MD5SUM:= 4e331f6f608f23b64f0a5354908af09a
PKG_DESCR:= X11 driver for AMD Geode VGA chip
PKG_SECTION:= x11
PKG_DEPENDS:= xorg-server
@@ -24,7 +24,7 @@ INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers
- ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \
+ ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/geode_drv.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
deleted file mode 100644
index 4c3537a0b..000000000
--- a/package/xf86-video-geode/ipkg/xf86-video-geode.control
+++ /dev/null
@@ -1,4 +0,0 @@
-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 99409a37b..23dfc56a8 100644
--- a/package/xorg-server/Config.in
+++ b/package/xorg-server/Config.in
@@ -3,6 +3,7 @@ config ADK_PACKAGE_XORG_SERVER
tristate
default n
select ADK_PACKAGE_XKBCOMP
+ select ADK_PACKAGE_LIBXV
select ADK_PACKAGE_XKEYBOARD_CONFIG
select ADK_PACKAGE_LIBOPENSSL
select ADK_PACKAGE_LIBXKBFILE
@@ -20,5 +21,6 @@ config ADK_PACKAGE_XORG_SERVER
select ADK_PACKAGE_LIBXT
select ADK_PACKAGE_PIXMAN
select ADK_PACKAGE_XF86DGA
+ select ADK_PACKAGE_LIBXXF86DGA
help
http://www.x.org
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 2b6be24a2..9256b48dc 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -17,44 +17,46 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --disable-xinerama \
+CONFIGURE_ARGS+= \
+ --enable-builtin-fonts \
+ --enable-dga \
+ --enable-xorg \
+ --enable-xv \
+ --disable-afb \
--disable-aiglx \
- --disable-dga \
+ --disable-cfb \
+ --disable-config-hal \
+ --disable-cup \
+ --disable-evi \
+ --disable-dpms \
--disable-dri \
+ --disable-dri2 \
+ --disable-freetype \
--disable-glx \
- --disable-xnest \
- --disable-config-hal \
- --disable-xvfb \
+ --disable-kdrive-vesa \
--disable-mfb \
- --disable-cfb \
- --disable-afb \
+ --disable-xace \
--disable-xephyr \
- --disable-xsdl \
- --enable-freetype \
- --disable-kdrive-vesa \
- --disable-xfbdev \
+ --disable-xevie \
+ --disable-xf86bigfont \
+ --disable-xf86misc \
+ --disable-xf86vidmode \
--disable-xfake \
- --disable-xsdl \
- --disable-afb \
- --disable-cfb \
- --disable-mfb \
+ --disable-xfbdev \
+ --disable-xinerama \
--disable-xnest \
+ --disable-xprint \
+ --disable-xsdl \
+ --disable-xselinux \
+ --disable-xcsecurity \
--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
+ --with-vendor-web="http://www.openadk.org"
BUILD_STYLE= auto
INSTALL_STYLE= auto
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 05:29:51 +0000