kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge patch-bd into patch-ae since we're now patching configure.ac rather

Browse source 
than configure ...
This commit is contained in:
Tobias Nygren 2008-02-01 10:18:52 +00:00 committed by Thomas Klausner
parent e978acc095
commit be740fb985
3 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modular-xorg-server14/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.5 2008/02/01 10:08:30 tnn2 Exp $
$NetBSD: distinfo,v 1.6 2008/02/01 10:18:52 tnn2 Exp $
SHA1 (MesaLib-7.0.3-rc1.tar.gz) = d7a3df914d29959b10f61b667347d5616cf942cf
RMD160 (MesaLib-7.0.3-rc1.tar.gz) = f03a55d77975a227af05d67d6608065762ebcbce
@ -10,7 +10,7 @@ SHA1 (patch-aa) = 4656120430dd69d6340a4bcfb9720bb5909ef1a8
SHA1 (patch-ab) = 7f4fda050d8a7af1aee0269dfb9ade92e4ee3b6a
SHA1 (patch-ac) = 4f58829af00c7077a99c1495b8915917fa943929
SHA1 (patch-ad) = 55589b213e5d3a620a4949cc2eee044143a25ca3
SHA1 (patch-ae) = 61b140e783833aaa25e7078316a7ccedf540b819
SHA1 (patch-ae) = c7a0fb56b940d8ff35881dae1c73ea105cd26a90
SHA1 (patch-af) = d9f7ac2b59a2b75c4d7d3bf6a65a24f115ad58f9
SHA1 (patch-ag) = 3853bc70e3c79f7ddd71feae40e312bbac05e7df
SHA1 (patch-ah) = 48a66f9869d86231c2c5770728888b67fbf250d6
@ -27,4 +27,3 @@ SHA1 (patch-av) = eb5b0ffc3f88bef85c3a1d0e3b44c772f6170f33
SHA1 (patch-ba) = 97582e367f4cb74713b23be05b4833f01f462033
SHA1 (patch-bb) = e9e0c4230bbb3842b3263f18e0f99a93f674c664
SHA1 (patch-bc) = b7d2d8a8603b01853b1e078dd0c7cbe78c8e4bd0
SHA1 (patch-bd) = 001c1ea796e834eb94a89550dfefa9d9cbcf78d5

21
modular-xorg-server14/patches/patch-ae
View file

@ -1,8 +1,19 @@
$NetBSD: patch-ae,v 1.3 2008/01/31 17:07:40 bsadewitz Exp $
$NetBSD: patch-ae,v 1.4 2008/02/01 10:18:52 tnn2 Exp $
--- configure.ac.orig 2008-01-31 01:55:44.000000000 -0500
--- configure.ac.orig 2008-01-31 07:55:44.000000000 +0100
+++ configure.ac
@@ -292,6 +292,7 @@ case $host_cpu in
@@ -278,7 +278,9 @@ case $host_cpu in
alpha*)
ALPHA_VIDEO=yes
case $host_os in
- *netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;
+ *netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO])
+ SYS_LIBS=-lalpha
+ ;;
esac
GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
;;
@@ -292,6 +294,7 @@ case $host_cpu in
darwin*) use_x86_asm="no" ;;
*linux*) DEFAULT_INT10=vm86 ;;
*freebsd*) AC_DEFINE(USE_DEV_IO) ;;
@ -10,7 +21,7 @@ $NetBSD: patch-ae,v 1.3 2008/01/31 17:07:40 bsadewitz Exp $
*netbsd*) AC_DEFINE(USE_I386_IOPL)
SYS_LIBS=-li386
;;
@@ -1373,7 +1374,7 @@ return 0;}
@@ -1373,7 +1376,7 @@ return 0;}
;;
esac
;;
@ -19,7 +30,7 @@ $NetBSD: patch-ae,v 1.3 2008/01/31 17:07:40 bsadewitz Exp $
XORG_OS="freebsd"
XORG_OS_SUBDIR="bsd"
case $host_cpu in
@@ -1488,7 +1489,14 @@ return 0;}
@@ -1488,7 +1491,14 @@ return 0;}
;;
sparc*)
xorg_bus_sparcpci="yes"

12
modular-xorg-server14/patches/patch-bd
View file

@ -1,12 +0,0 @@
$NetBSD: patch-bd,v 1.1 2008/01/13 05:02:24 tnn2 Exp $
--- configure.orig 2008-01-13 02:10:29.000000000 +0100
+++ configure
@@ -26177,6 +26177,7 @@ case $host_cpu in
ALPHA_VIDEO=yes
case $host_os in
*netbsd*)
+ SYS_LIBS=-lalpha
cat >>confdefs.h <<\_ACEOF
#define USE_ALPHA_PIO 1
_ACEOF