Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=dacf8392010f7eb6df7b19aef57cf11ed1d337af
commit dacf8392010f7eb6df7b19aef57cf11ed1d337af
Author: crazy <[EMAIL PROTECTED]>
Date: Thu Jan 17 02:34:21 2008 +0100
xorg-server-1.4.0.90-1-i686
* Version bump
* added 4 new patches to fix linking problems etc =)
* dmx is back , as of 1.4.0.90-2 it will be an own subpackage
* but first I need to fix other things for #1970
diff --git a/source/x11/xorg-server/1.4-fix-dmx-build.patch
b/source/x11/xorg-server/1.4-fix-dmx-build.patch
new file mode 100644
index 0000000..07f43ab
--- /dev/null
+++ b/source/x11/xorg-server/1.4-fix-dmx-build.patch
@@ -0,0 +1,19 @@
+diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c
+index d644b5d..83f8a4a 100644
+--- a/hw/dmx/dmxinput.c
++++ b/hw/dmx/dmxinput.c
+@@ -105,3 +105,14 @@ void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr
pWindow)
+ if (!dmxInput->detached && dmxInput->updateWindowInfo)
+ dmxInput->updateWindowInfo(dmxInput, type, pWindow);
+ }
++
++int
++NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
++{
++ return BadRequest;
++}
++
++void
++DeleteInputDeviceRequest(DeviceIntPtr pDev)
++{
++}
diff --git a/source/x11/xorg-server/1.4-fix-dmx-link.patch
b/source/x11/xorg-server/1.4-fix-dmx-link.patch
new file mode 100644
index 0000000..909442d
--- /dev/null
+++ b/source/x11/xorg-server/1.4-fix-dmx-link.patch
@@ -0,0 +1,12 @@
+diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
+index 002ea11..15dc281 100644
+--- a/hw/dmx/Makefile.am
++++ b/hw/dmx/Makefile.am
+@@ -87,6 +87,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
+ $(GLX_LIBS) \
+ input/libdmxinput.a \
+ config/libdmxconfig.a \
++ @XSERVER_LIBS@ \
+ @DMXMODULES_LIBS@
+
+ # Man page
diff --git a/source/x11/xorg-server/1.4-fix-kdrive-automake.patch
b/source/x11/xorg-server/1.4-fix-kdrive-automake.patch
new file mode 100644
index 0000000..cdc436e
--- /dev/null
+++ b/source/x11/xorg-server/1.4-fix-kdrive-automake.patch
@@ -0,0 +1,12 @@
+diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
+index 5803644..71d3403 100644
+--- a/hw/kdrive/Makefile.am
++++ b/hw/kdrive/Makefile.am
+@@ -1,6 +1,5 @@
+ if KDRIVEVESA
+-VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \
+- smi via
++VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 smi via
+ endif
+
+ if BUILD_KDRIVEFBDEVLIB
diff --git a/source/x11/xorg-server/1.4-fix-xephyr-link.patch
b/source/x11/xorg-server/1.4-fix-xephyr-link.patch
new file mode 100644
index 0000000..35ca029
--- /dev/null
+++ b/source/x11/xorg-server/1.4-fix-xephyr-link.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.ac b/configure.ac
+index 62fdd78..7a37590 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1802,7 +1802,7 @@ if test "$KDRIVE" = yes; then
+ XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
+ fi
+
+- PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"],
[xephyr="no"])
++ PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp $PIXMAN,
[xephyr="yes"], [xephyr="no"])
+ if test "x$XEPHYR" = xauto; then
+ XEPHYR=$xephyr
+ fi
+diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
+index cc3019f..1738d0f 100644
+--- a/hw/kdrive/ephyr/Makefile.am
++++ b/hw/kdrive/ephyr/Makefile.am
+@@ -28,6 +28,7 @@ Xephyr_LDADD =
\
+ libxephyr-hostx.a \
+ ../../../exa/libexa.la \
+ @KDRIVE_LIBS@ \
++ @XSERVER_LIBS@ \
+ @XEPHYR_LIBS@
+
+ Xephyr_DEPENDENCIES = \
diff --git a/source/x11/xorg-server/FrugalBuild
b/source/x11/xorg-server/FrugalBuild
index e4cc786..7d73d1b 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -2,18 +2,18 @@
# Maintainer: Christian Hamar alias krix <[EMAIL PROTECTED]>
pkgname=xorg-server
-pkgver=1.4
-pkgrel=2
-mesaver=7.0.1
+pkgver=1.4.0.90
+pkgrel=1
+mesaver=7.0.2
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64')
-depends=('libxfont>=1.3.1' 'libx11>=1.1.3' 'xtrans>=1.0.4' 'libxau>=1.0.3-2' \
+depends=('libxfont>=1.3.1' 'libx11>=1.1.3-2' 'xtrans>=1.0.4' 'libxau>=1.0.3-2'
\
'libxext>=1.0.3' 'libxkbfile>=1.0.4-2' 'libxdmcp>=1.0.2-2' 'libxmu>=1.0.3-2'
'libxrender>=0.9.4' \
- 'libxi>=1.1.3' 'freetype2' 'mesa>=7.0.1-2' 'font-cursor-misc>=1.0.0-2'
'font-misc-misc>=1.0.0-2' \
- 'xbitmaps' 'xkeyboard-config>=1.0-2' 'iceauth>=1.0.2' 'rgb>=1.0.1-2'
'xauth>=1.0.2-2' 'xinit>=1.0.5' 'libxaw>=1.0.4' \
+ 'libxi>=1.1.3' 'freetype2' 'mesa>=7.0.2-2' 'font-cursor-misc>=1.0.0-2'
'font-misc-misc>=1.0.0-2' \
+ 'xbitmaps' 'xkeyboard-config>=1.0-2' 'iceauth>=1.0.2' 'rgb>=1.0.1-2'
'xauth>=1.0.2-2' 'xinit>=1.0.7' 'libxaw>=1.0.4' \
'libxpm>=3.5.7' 'libxxf86misc>=1.0.1-2' 'libxxf86vm>=1.0.1-2'
'libxkbui>=1.0.2-2' 'liblbxutil>=1.0.1-2' \
- 'xorg-cf-files' 'libxtst>=1.0.3' 'font-alias' 'libxcb>=1.0-4' 'pixman')
+ 'xorg-cf-files' 'libxtst>=1.0.3' 'font-alias' 'libxcb>=1.0-4' 'pixman'
'libdmx' 'libxres')
makedepends=('randrproto' 'renderproto' 'fixesproto' 'damageproto>=1.1.0'
'xextproto' 'xproto' \
'xf86dgaproto' 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto'
'xf86bigfontproto' \
'compositeproto>=0.4' 'recordproto' 'resourceproto' 'videoproto'
'scrnsaverproto' 'evieext' \
@@ -24,8 +24,8 @@ rodepends=('xf86-input-mouse' 'xf86-input-keyboard'
'xf86-video-vga' 'xf86-video
provides=('xorg-compat')
replaces=('xorg-compat')
backup=('etc/sysconfig/desktop')
-Finclude xorg
-source=([EMAIL PROTECTED]
http://dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$mesaver.tar.bz2 \
+Finclude sourceforge xorg
+source=([EMAIL PROTECTED]
http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$mesaver.tar.bz2
\
01-kernel-headers-fix.patch \
02-access_c_skip_null_addresses.patch \
03-black-background.patch \
@@ -35,7 +35,11 @@ source=([EMAIL PROTECTED]
http://dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$mesav
mesa-build-config.patch \
F-xorg-x11-server-0.99.3-init-origins-fix.patch0 \
xprint-rc-files-fix.patch \
- no-aiglx.patch)
+ no-aiglx.patch \
+ 1.4-fix-dmx-build.patch \
+ 1.4-fix-dmx-link.patch \
+ 1.4-fix-kdrive-automake.patch \
+ 1.4-fix-xephyr-link.patch)
subpkgs=('libglx')
subdescs=('Glx library for XOrg.')
@@ -64,6 +68,10 @@ build() {
##############
# DISABLED AT 1.4 (we will see whats up ##
# Fpatch bug-9367.patch
+ Fpatch 1.4-fix-xephyr-link.patch
+ Fpatch 1.4-fix-dmx-build.patch
+ Fpatch 1.4-fix-dmx-link.patch
+ Fpatch 1.4-fix-kdrive-automake.patch
## GCC 4.2.0 bug do **NOT** remove this hack or it will kill your box!!
## http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052
echo 'CFLAGS = @CFLAGS@ -O0' >> hw/xfree86/scanpci/Makefile.am
@@ -78,9 +86,13 @@ build() {
--enable-xcsecurity \
--enable-xorg \
--disable-dbus \
- --disable-dmx \
+ --enable-dmx \
--enable-xtrap \
+ --disable-xephyr \
+ --disable-kdrive \
+ --disable-xsdl \
--enable-xevie \
+ --enable-xvfb \
--enable-vfb \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
@@ -96,7 +108,7 @@ build() {
--enable-xcalibrate \
--enable-fontcache \
--enable-multibuffer \
- --disable-config-hal # DISABLED THIS for 0.7 release
+ --disable-config-hal # DISABLED THIS for now , not really
complete now
Fmakeinstall
Ffile /etc/sysconfig/desktop
@@ -110,8 +122,8 @@ build() {
Fsplit libglx usr/lib/xorg/modules/extensions/libglx.*
usr/lib/xorg/modules/libwfb.*
}
-sha1sums=('3aa6327f4def4d33ce2a8d6d7587295db231ab6d' \
- 'deb1002cf377ba8bd9407bd3cf573f8c8be31671' \
+sha1sums=('7c492ac32bd83b521f5c016e4728fccf9cba55db' \
+ 'd16eaeb1d9d95d11d3b6d289b1ba87108b88da90' \
'f31702e0029b2d68018598e73ed55c4d6c58367b' \
'859b98a4049400be152032fc09ceff2afe9e6dcf' \
'863ad92892785c3785b122bf54d0def4d4d2732c' \
@@ -121,5 +133,9 @@ sha1sums=('3aa6327f4def4d33ce2a8d6d7587295db231ab6d' \
'f7f706ec568a80543c6d6096b3d8a833b80399ed' \
'2937d6a50155cc16f73ae44b1e5b6e26cabbb86a' \
'0eb64d46172b6f2f4462c02dad7964c6d7656076' \
- 'f53de93da5e110867db8b1655b5798d2049f43ae')
+ 'f53de93da5e110867db8b1655b5798d2049f43ae' \
+ '0b627c0d98e50f0d29dacc3fa7e8e9d8b1ad3faf' \
+ '41f686ef462e179f6c7e73a1babb7c0f2312d337' \
+ 'f21a54aed8eae1e718f2f0c262c37c36ccccd152' \
+ '352c55be4b91b29c84b192d806a90834d887fc22')
# optimization OK
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
