Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d822a9fd8c4e6baa8173372538cb7f8c537cede

commit 8d822a9fd8c4e6baa8173372538cb7f8c537cede
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sat Jul 11 13:25:43 2009 +0200

xorg-server-1.6.1-8-i686

* Remove unused patches.

diff --git a/source/x11/xorg-server/1.4-fix-kdrive-automake.patch 
b/source/x11/xorg-server/1.4-fix-kdrive-automake.patch
deleted file mode 100644
index cdc436e..0000000
--- a/source/x11/xorg-server/1.4-fix-kdrive-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/FrugalBuild 
b/source/x11/xorg-server/FrugalBuild
index 7953857..195d5ce 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -39,11 +39,8 @@ source=(${sour...@]} \
03-black-background.patch \
desktop \
rc.xprint \
-       change-default-dri-driver-dir-X7.1.patch \
-       mesa-build-config.patch \
F-xorg-x11-server-0.99.3-init-origins-fix.patch0 \
xprint-rc-files-fix.patch \
-       1.4-fix-kdrive-automake.patch \
xfree86-Makefile.patch)

sha1sums=('aef6d1cd1cbb97fa3214fde6fbefb03a45578132' \
@@ -53,11 +50,8 @@ sha1sums=('aef6d1cd1cbb97fa3214fde6fbefb03a45578132' \
'863ad92892785c3785b122bf54d0def4d4d2732c' \
'1456207203932404752e2519c5b7fe830a913cf4' \
'4713d46b31eafbde58a1fafe8269642df6a12d77' \
-          '426b0b08617ec19cba41ab20f3891cab82f205a2' \
-          'f7f706ec568a80543c6d6096b3d8a833b80399ed' \
'2937d6a50155cc16f73ae44b1e5b6e26cabbb86a' \
'0eb64d46172b6f2f4462c02dad7964c6d7656076' \
-          'f21a54aed8eae1e718f2f0c262c37c36ccccd152' \
'39e73e83ff7ac99a87773a3f45f2f0e11bad1f3e')

subpkgs=('libdri' 'libglx' \
@@ -81,11 +75,6 @@ subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' \
'i686 x86_64 ppc' 'i686 !x86_64 !ppc' 'i686 !x86_64 !ppc' 'i686 x86_64 ppc')

build() {
-       #cd $Fsrcdir/Mesa-$mesaver || Fdie
-       # Mesa specific patches from the mesa package
-       #Fpatch change-default-dri-driver-dir-X7.1.patch
-       #Fpatch mesa-build-config.patch
-
cd $Fsrcdir/$_F_xorg_name-$pkgver || Fdie
Fpatch 01-kernel-headers-fix.patch
Fpatch 02-access_c_skip_null_addresses.patch
@@ -94,7 +83,6 @@ build() {
Fpatch F-xorg-x11-server-0.99.3-init-origins-fix.patch0
# Hack for init scripts and wrong install stuff for xprint
#Fpatch xprint-rc-files-fix.patch
-       #Fpatch 1.4-fix-kdrive-automake.patch
## fixes from 1.4-branch
Fpatch bug13511.patch

@@ -173,16 +161,6 @@ build() {

## -fbdev
Fsplit $pkgname-fbdev usr/bin/Xfbdev
-
-       ## all the other - i686 only
-
-       ## following files not present in xorg-server 1.6.1
-       ## if [ "$CARCH" == "i686" ]; then
-       ##      for i in ati chips epson i810 mach64 mga nvidia pm2 r128 smi 
vesa via
-       ##      do
-       ##              Fsplit $pkgname-$i usr/bin/X${i}
-       ##      done
-       ## fi
}

# optimization OK
diff --git a/source/x11/xorg-server/change-default-dri-driver-dir-X7.1.patch 
b/source/x11/xorg-server/change-default-dri-driver-dir-X7.1.patch
deleted file mode 100644
index 66495bf..0000000
--- a/source/x11/xorg-server/change-default-dri-driver-dir-X7.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Mesa-6.5.1.orig/src/glx/x11/dri_glx.c 
Mesa-6.5.1/src/glx/x11/dri_glx.c
---- Mesa-6.5.1.orig/src/glx/x11/dri_glx.c      2006-09-16 11:50:59.000000000 
+0200
-+++ Mesa-6.5.1/src/glx/x11/dri_glx.c   2006-09-16 11:51:29.000000000 +0200
-@@ -58,7 +58,7 @@
-
- #ifndef DEFAULT_DRIVER_DIR
- /* this is normally defined in Mesa/configs/default with 
DRI_DRIVER_SEARCH_PATH */
--#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri"
-+#define DEFAULT_DRIVER_DIR "/usr/lib/dri"
- #endif
-
- static __DRIdriver *Drivers = NULL;
diff --git a/source/x11/xorg-server/mesa-build-config.patch 
b/source/x11/xorg-server/mesa-build-config.patch
deleted file mode 100644
index a8dd83a..0000000
--- a/source/x11/xorg-server/mesa-build-config.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur Mesa-6.5.1.orig/configs/default Mesa-6.5.1/configs/default
---- Mesa-6.5.1.orig/configs/default    2006-10-07 12:12:00.000000000 +0200
-+++ Mesa-6.5.1/configs/default 2006-10-07 12:13:12.000000000 +0200
-@@ -80,7 +80,7 @@
-
- # Installation directories (for make install)
- INSTALL_DIR = /usr/local
--DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
-+DRI_DRIVER_INSTALL_DIR = /usr/lib/dri
-
- # Where libGL will look for DRI hardware drivers
- DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
-diff -Naur Mesa-6.5.1.orig/configs/linux-dri Mesa-6.5.1/configs/linux-dri
---- Mesa-6.5.1.orig/configs/linux-dri  2006-10-07 12:12:00.000000000 +0200
-+++ Mesa-6.5.1/configs/linux-dri       2006-10-07 12:18:37.000000000 +0200
-@@ -9,7 +9,7 @@
- CC = gcc
- CXX = g++
-
--#MKDEP = /usr/X11R6/bin/makedepend
-+MKDEP = /usr/bin/makedepend
- #MKDEP = gcc -M
- #MKDEP_OPTIONS = -MF depend
-
-@@ -24,7 +24,7 @@
-       -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-       -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-
--X11_INCLUDES = -I/usr/X11R6/include
-+X11_INCLUDES =
-
- CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
-       $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
-@@ -35,7 +35,7 @@
- ASM_SOURCES =
-
- # Library/program dependencies
--EXTRA_LIB_PATH=-L/usr/X11R6/lib
-+EXTRA_LIB_PATH=-L/usr/lib
-
- LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
- LIBDRM_LIB = `pkg-config --libs libdrm`
-diff -Naur Mesa-6.5.1.orig/configs/linux-dri-x86-64 
Mesa-6.5.1/configs/linux-dri-x86-64
---- Mesa-6.5.1.orig/configs/linux-dri-x86-64   2006-10-07 12:12:00.000000000 
+0200
-+++ Mesa-6.5.1/configs/linux-dri-x86-64        2006-10-07 12:19:07.000000000 
+0200
-@@ -11,14 +11,14 @@
- ASM_SOURCES = $(X86-64_SOURCES)
- ASM_API = $(X86-64_API)
-
--LIB_DIR = lib64
-+LIB_DIR = lib
-
- # Library/program dependencies
--EXTRA_LIB_PATH=-L/usr/X11R6/lib64
-+EXTRA_LIB_PATH=-L/usr/lib
-
- # ffb, gamma, and sis are missing because they have not be converted to use
- # the new interface.  i810 are missing because there is no x86-64
- # system where they could *ever* be used.
- #
--DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome 
savage r300
-+DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome 
savage r300 nouveau
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to