diff options
| author | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
|---|---|---|
| committer | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
| commit | ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch) | |
| tree | 2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xorg-lib/liblbxutil | |
| parent | c210d01a7ca8c00ddc45d292878b89086b137129 (diff) | |
| download | poky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz | |
Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-lib/liblbxutil')
| -rw-r--r-- | meta/packages/xorg-lib/liblbxutil/mkg3states.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/packages/xorg-lib/liblbxutil/mkg3states.patch b/meta/packages/xorg-lib/liblbxutil/mkg3states.patch new file mode 100644 index 0000000000..58463db46b --- /dev/null +++ b/meta/packages/xorg-lib/liblbxutil/mkg3states.patch | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | --- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500 | ||
| 2 | +++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500 | ||
| 3 | @@ -60,4 +60,5 @@ XORG_RELEASE_VERSION | ||
| 4 | |||
| 5 | AC_OUTPUT([Makefile | ||
| 6 | src/Makefile | ||
| 7 | + src/image/Makefile | ||
| 8 | lbxutil.pc]) | ||
| 9 | --- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500 | ||
| 10 | +++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500 | ||
| 11 | @@ -1,9 +1,6 @@ | ||
| 12 | lib_LTLIBRARIES = liblbxutil.la | ||
| 13 | |||
| 14 | -noinst_PROGRAMS = mkg3states | ||
| 15 | - | ||
| 16 | -mkg3states_SOURCES = \ | ||
| 17 | - $(srcdir)/image/mkg3states.c | ||
| 18 | +SUBDIRS = image | ||
| 19 | |||
| 20 | liblbxutil_la_SOURCES = \ | ||
| 21 | $(srcdir)/lbx_zlib/reqstats.h \ | ||
| 22 | @@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@ | ||
| 23 | |||
| 24 | $(srcdir)/image/dfaxg42d.c: g3states.h | ||
| 25 | |||
| 26 | -g3states.h: mkg3states | ||
| 27 | - -rm -f g3states.h | ||
| 28 | - ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h | ||
| 29 | +g3states.h: image/mkg3states | ||
| 30 | + ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h | ||
| 31 | |||
| 32 | liblbxutil_la_LDFLAGS = -version-number 1:0:0 | ||
| 33 | |||
| 34 | --- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500 | ||
| 35 | +++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500 | ||
| 36 | @@ -0,0 +1,15 @@ | ||
| 37 | +# evil hack | ||
| 38 | +CFLAGS=$(CFLAGS_FOR_BUILD) | ||
| 39 | +CPPFLAGS=$(CPPFLAGS_FOR_BUILD) | ||
| 40 | +LDFLAGS=$(LDFLAGS_FOR_BUILD) | ||
| 41 | + | ||
| 42 | +CC=$(CC_FOR_BUILD) | ||
| 43 | +LIBTOOL = @LIBTOOL@ --tag=CC | ||
| 44 | + | ||
| 45 | +noinst_PROGRAMS = mkg3states | ||
| 46 | + | ||
| 47 | +mkg3states_SOURCES = \ | ||
| 48 | + mkg3states.c | ||
| 49 | + | ||
| 50 | +mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) | ||
| 51 | +mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) | ||