summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-lib
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-03-17 15:37:13 +0000
committerJoshua Lock <josh@linux.intel.com>2010-03-19 12:29:11 +0000
commitb7783b335f58a6a15f2e2b9d5a4e4462e38e1693 (patch)
treea0c180929b2a18d07f9d46c95d81f2d2777a1873 /meta/packages/xorg-lib
parent62cd0ea1a58b7c5a8aa2782d42f2b5754388d510 (diff)
downloadpoky-b7783b335f58a6a15f2e2b9d5a4e4462e38e1693.tar.gz
liblbxutil: Bump version and fix dependencies
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/packages/xorg-lib')
-rw-r--r--meta/packages/xorg-lib/liblbxutil/mkg3states.patch51
-rw-r--r--meta/packages/xorg-lib/liblbxutil_1.1.0.bb (renamed from meta/packages/xorg-lib/liblbxutil_1.0.1.bb)5
2 files changed, 3 insertions, 53 deletions
diff --git a/meta/packages/xorg-lib/liblbxutil/mkg3states.patch b/meta/packages/xorg-lib/liblbxutil/mkg3states.patch
deleted file mode 100644
index 58463db46b..0000000000
--- a/meta/packages/xorg-lib/liblbxutil/mkg3states.patch
+++ /dev/null
@@ -1,51 +0,0 @@
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)
diff --git a/meta/packages/xorg-lib/liblbxutil_1.0.1.bb b/meta/packages/xorg-lib/liblbxutil_1.1.0.bb
index adb7b0513e..a148bae118 100644
--- a/meta/packages/xorg-lib/liblbxutil_1.0.1.bb
+++ b/meta/packages/xorg-lib/liblbxutil_1.1.0.bb
@@ -1,10 +1,11 @@
1require xorg-lib-common.inc 1require xorg-lib-common.inc
2 2
3DESCRIPTION = "XFIXES Extension" 3DESCRIPTION = "XFIXES Extension"
4DEPENDS += " xextproto xproto zlib" 4DEPENDS += " libxext xextproto xproto zlib"
5PROVIDES = "lbxutil" 5PROVIDES = "lbxutil"
6PE = "1" 6PE = "1"
7PR = "r0"
7 8
8SRC_URI += "file://mkg3states.patch;patch=1" 9#SRC_URI += "file://mkg3states.patch;patch=1"
9 10
10export CC_FOR_BUILD = "gcc" 11export CC_FOR_BUILD = "gcc"