summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-02-11 22:17:17 +0000
committerRoss Burton <ross@openedhand.com>2008-02-11 22:17:17 +0000
commit501663a74c099dd496ba4bfce36875585549e763 (patch)
treebfc1c041e1c47e1491f02f989a69c53ad484c494 /meta
parent0f776c5e499f59a77d3c77a7b6156a45cc58fce4 (diff)
downloadpoky-501663a74c099dd496ba4bfce36875585549e763.tar.gz
Remove more stale X patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3769 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch54
-rw-r--r--meta/packages/xorg-lib/libxvmc/drm.patch9
-rw-r--r--meta/packages/xorg-lib/libxvmc/true.patch11
-rw-r--r--meta/packages/xorg-lib/libxvmc/via.patch23
4 files changed, 0 insertions, 97 deletions
diff --git a/meta/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch b/meta/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
deleted file mode 100644
index afa34712e2..0000000000
--- a/meta/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1diff -ruN liblbxutil-X11R7.0-1.0.0_orig/configure.ac liblbxutil-X11R7.0-1.0.0/configure.ac
2--- liblbxutil-X11R7.0-1.0.0_orig/configure.ac 2005-12-15 00:24:36.000000000 +0000
3+++ liblbxutil-X11R7.0-1.0.0/configure.ac 2006-08-21 18:32:04.000000000 +0000
4@@ -60,4 +60,5 @@
5
6 AC_OUTPUT([Makefile
7 src/Makefile
8+ src/image/Makefile
9 lbxutil.pc])
10diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am liblbxutil-X11R7.0-1.0.0/src/Makefile.am
11--- liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am 2005-10-16 02:07:10.000000000 +0000
12+++ liblbxutil-X11R7.0-1.0.0/src/Makefile.am 2006-08-21 18:32:04.000000000 +0000
13@@ -1,9 +1,6 @@
14 lib_LTLIBRARIES = liblbxutil.la
15
16-noinst_PROGRAMS = mkg3states
17-
18-mkg3states_SOURCES = \
19- $(srcdir)/image/mkg3states.c
20+SUBDIRS = image
21
22 liblbxutil_la_SOURCES = \
23 $(srcdir)/lbx_zlib/reqstats.h \
24@@ -28,9 +25,8 @@
25
26 $(srcdir)/image/dfaxg42d.c: g3states.h
27
28-g3states.h: mkg3states
29- -rm -f g3states.h
30- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
31+g3states.h: image/mkg3states
32+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
33
34 liblbxutil_la_LDFLAGS = -version-number 1:0:0
35
36diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am
37--- liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am 1970-01-01 00:00:00.000000000 +0000
38+++ liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am 2006-08-21 18:32:04.000000000 +0000
39@@ -0,0 +1,15 @@
40+# evil hack
41+CFLAGS=$(CFLAGS_FOR_BUILD)
42+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
43+LDFLAGS=$(LDFLAGS_FOR_BUILD)
44+
45+CC=$(CC_FOR_BUILD)
46+LIBTOOL = @LIBTOOL@ --tag=CC
47+
48+noinst_PROGRAMS = mkg3states
49+
50+mkg3states_SOURCES = \
51+ mkg3states.c
52+
53+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
54+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/meta/packages/xorg-lib/libxvmc/drm.patch b/meta/packages/xorg-lib/libxvmc/drm.patch
deleted file mode 100644
index d48cdb3d0b..0000000000
--- a/meta/packages/xorg-lib/libxvmc/drm.patch
+++ /dev/null
@@ -1,9 +0,0 @@
1--- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000
2+++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000
3@@ -1,5 +1,5 @@
4 AM_CFLAGS = $(XVMC_CFLAGS)
5-libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
6+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm
7
8 lib_LTLIBRARIES = libviaXvMC.la
9
diff --git a/meta/packages/xorg-lib/libxvmc/true.patch b/meta/packages/xorg-lib/libxvmc/true.patch
deleted file mode 100644
index 7059295007..0000000000
--- a/meta/packages/xorg-lib/libxvmc/true.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100
2+++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100
3@@ -43,6 +43,8 @@
4 #include <xf86drm.h>
5 #include <pthread.h>
6 #include "vldXvMC.h"
7+
8+#define TRUE 1
9
10 #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \
11 (((CARD8 *)(ctx)->sAreaAddress) + \
diff --git a/meta/packages/xorg-lib/libxvmc/via.patch b/meta/packages/xorg-lib/libxvmc/via.patch
deleted file mode 100644
index 21cdfbdd6b..0000000000
--- a/meta/packages/xorg-lib/libxvmc/via.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1--- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100
2+++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100
3@@ -14,4 +14,5 @@
4 AC_OUTPUT([Makefile
5 hw/Makefile
6 hw/i810/Makefile
7+ hw/via/Makefile
8 xvmc.pc])
9--- /dev/null 2004-06-13 02:32:19.000000000 +0100
10+++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100
11@@ -0,0 +1,7 @@
12+AM_CFLAGS = $(XVMC_CFLAGS)
13+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
14+
15+lib_LTLIBRARIES = libviaXvMC.la
16+
17+libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
18+ viaXvMCPriv.h
19--- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100
20+++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100
21@@ -1 +1 @@
22-SUBDIRS = i810
23+SUBDIRS = i810 via