summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-03-12 17:28:18 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-03-12 17:28:18 +0100
commit7d633c663e95826dd5f9dfc1d2cdbcd8ddbf5968 (patch)
tree9b62f39aca7f395ce3c3ad5f285d311a2bbfc8d4 /package
parent1390c5863daa190d47dbfae41377f5c0656f2c0e (diff)
parenta509d9b1251bc1db6450b2b1c28da5dee6574362 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/font-adobe-100dpi/Makefile2
-rw-r--r--package/font-adobe-75dpi/Makefile2
-rw-r--r--package/font-bh-100dpi/Makefile2
-rw-r--r--package/font-bh-75dpi/Makefile2
-rw-r--r--package/font-bh-lucidatypewriter-100dpi/Makefile2
-rw-r--r--package/font-bh-lucidatypewriter-75dpi/Makefile2
-rw-r--r--package/font-bh-ttf/Makefile2
-rw-r--r--package/font-bh-type1/Makefile2
-rw-r--r--package/font-bitstream-100dpi/Makefile2
-rw-r--r--package/font-bitstream-75dpi/Makefile2
-rw-r--r--package/font-bitstream-type1/Makefile2
-rw-r--r--package/font-misc-misc/Makefile2
-rw-r--r--package/font-xfree86-type1/Makefile2
-rw-r--r--package/lvm/patches/patch-libdm_Makefile_in25
-rw-r--r--package/pkgmaker2
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h11
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c29
17 files changed, 79 insertions, 14 deletions
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index d41034333..1e97fa654 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_ADOBE_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index 2af0aa60c..a59275335 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_ADOBE_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile
index e70fb4810..3accee27e 100644
--- a/package/font-bh-100dpi/Makefile
+++ b/package/font-bh-100dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile
index e3e3aa3d4..04e6f1a25 100644
--- a/package/font-bh-75dpi/Makefile
+++ b/package/font-bh-75dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile
index 9d8635e55..be19a95d1 100644
--- a/package/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-100dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile
index a84ebb107..cfb5b1892 100644
--- a/package/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-75dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile
index 5d816443f..12582a873 100644
--- a/package/font-bh-ttf/Makefile
+++ b/package/font-bh-ttf/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_TTF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile
index 81ff1c74c..122a0a9a4 100644
--- a/package/font-bh-type1/Makefile
+++ b/package/font-bh-type1/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
index efb8e66a2..56869767b 100644
--- a/package/font-bitstream-100dpi/Makefile
+++ b/package/font-bitstream-100dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BITSTREAM_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
index 6a7dcae13..07b3edfd5 100644
--- a/package/font-bitstream-75dpi/Makefile
+++ b/package/font-bitstream-75dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BITSTREAM_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile
index 4672b2463..a6618b5e0 100644
--- a/package/font-bitstream-type1/Makefile
+++ b/package/font-bitstream-type1/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BITSTREAM_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
index 1c16cf0c5..f60f867ad 100644
--- a/package/font-misc-misc/Makefile
+++ b/package/font-misc-misc/Makefile
@@ -13,6 +13,8 @@ PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_MISC_MISC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile
index 41e6c0d34..74f1a8aef 100644
--- a/package/font-xfree86-type1/Makefile
+++ b/package/font-xfree86-type1/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_XFREE86_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index 259f0f9d3..52a52a0fd 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,6 +1,27 @@
--- LVM2.2.02.61.orig/libdm/Makefile.in 2009-10-02 21:10:36.000000000 +0200
-+++ LVM2.2.02.61/libdm/Makefile.in 2010-03-03 19:48:02.316248648 +0100
-@@ -73,26 +73,32 @@ install: $(INSTALL_TYPE) install_include
++++ LVM2.2.02.61/libdm/Makefile.in 2010-03-08 06:27:03.000000000 +0100
+@@ -35,9 +35,7 @@ SOURCES =\
+
+ INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
+
+-ifeq ("@STATIC_LINK@", "yes")
+ LIB_STATIC = $(interface)/libdevmapper.a
+-endif
+
+ ifeq ("@LIB_SUFFIX@","dylib")
+ LIB_SHARED = $(interface)/libdevmapper.dylib
+@@ -60,9 +58,7 @@ device-mapper: all
+
+ INSTALL_TYPE = install_dynamic
+
+-ifeq ("@STATIC_LINK@", "yes")
+- INSTALL_TYPE += install_static
+-endif
++INSTALL_TYPE += install_static
+
+ ifeq ("@PKGCONFIG@", "yes")
+ INSTALL_TYPE += install_pkgconfig
+@@ -73,26 +69,32 @@ install: $(INSTALL_TYPE) install_include
install_device-mapper: install
install_include:
diff --git a/package/pkgmaker b/package/pkgmaker
index ccd619ac5..ea89424e7 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -43,7 +43,7 @@ done
for dn in */Makefile; do
dn=${dn%/*}
# skip if we take care of this one manually
- [[ -s $dn/Config.in.manual ]] && continue
+ [[ $dn != "base-files" ]] && [[ -s $dn/Config.in.manual ]] && continue
pbar="Pass 2: $dn ..."
print -nu2 "$pbar\r"
cd $dn
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
new file mode 100644
index 000000000..91c04f1ec
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
@@ -0,0 +1,11 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/dri/sarea.h 2009-02-10 08:23:28.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/dri/sarea.h 2010-03-08 19:21:40.000000000 +0100
+@@ -42,6 +42,8 @@
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+ #define SAREA_MAX 0x2000
++#elif defined(__mips__)
++#define SAREA_MAX 0x4000
+ #elif defined(__ia64__)
+ #define SAREA_MAX 0x10000 /* 64kB */
+ #else
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
index d28b1e4e4..8c93131b1 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
@@ -1,5 +1,5 @@
--- xorg-server-1.7.5.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-02-16 01:24:23.000000000 +0100
-+++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c 2010-03-07 16:38:06.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c 2010-03-08 21:31:20.000000000 +0100
@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL;
Bool
xf86EnableIO(void)
@@ -9,17 +9,24 @@
int fd;
unsigned int ioBase_phys;
#endif
-@@ -537,6 +537,13 @@ xf86EnableIO(void)
- ioperm(0x40,4,0); /* trap access to the timer chip */
- ioperm(0x60,4,0); /* trap access to the keyboard controller */
- # endif
-+#else
+@@ -524,6 +524,20 @@ xf86EnableIO(void)
+ #endif
+ }
+ close(fd);
++#elif defined(__mips__)
+ fd = open("/dev/mem", O_RDWR);
-+ if (IOPortBase == NULL) {
-+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
++ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0x1fd00000);
++ if (IOPortBase == MAP_FAILED) {
++ xf86Msg(X_WARNING,
++ "xf86EnableIOPorts: Failed to map iobase (%s)\n",
++ strerror(errno));
++ return FALSE;
+ }
+ close(fd);
- #endif
- ExtendedEnabled = TRUE;
-
++ xf86Msg(X_WARNING,
++ "xf86EnableIOPorts: map iobase (%x)\n",
++ IOPortBase);
+ #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
+ if (ioperm(0, 1024, 1) || iopl(3)) {
+ if (errno == ENODEV)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 06:33:35 +0000