summaryrefslogtreecommitdiff
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)
downloadopenembedded-core-b7783b335f58a6a15f2e2b9d5a4e4462e38e1693.tar.gz
openembedded-core-b7783b335f58a6a15f2e2b9d5a4e4462e38e1693.tar.bz2
openembedded-core-b7783b335f58a6a15f2e2b9d5a4e4462e38e1693.tar.xz
openembedded-core-b7783b335f58a6a15f2e2b9d5a4e4462e38e1693.zip
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 58463db46..000000000
--- a/meta/packages/xorg-lib/liblbxutil/mkg3states.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500
-+++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500
-@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION
-
- AC_OUTPUT([Makefile
- src/Makefile
-+ src/image/Makefile
- lbxutil.pc])
---- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500
-+++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500
-@@ -1,9 +1,6 @@
- lib_LTLIBRARIES = liblbxutil.la
-
--noinst_PROGRAMS = mkg3states
--
--mkg3states_SOURCES = \
-- $(srcdir)/image/mkg3states.c
-+SUBDIRS = image
-
- liblbxutil_la_SOURCES = \
- $(srcdir)/lbx_zlib/reqstats.h \
-@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@
-
- $(srcdir)/image/dfaxg42d.c: g3states.h
-
--g3states.h: mkg3states
-- -rm -f g3states.h
-- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-+g3states.h: image/mkg3states
-+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-
- liblbxutil_la_LDFLAGS = -version-number 1:0:0
-
---- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500
-+++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500
-@@ -0,0 +1,15 @@
-+# evil hack
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+
-+CC=$(CC_FOR_BUILD)
-+LIBTOOL = @LIBTOOL@ --tag=CC
-+
-+noinst_PROGRAMS = mkg3states
-+
-+mkg3states_SOURCES = \
-+ mkg3states.c
-+
-+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
-+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 adb7b0513..a148bae11 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 @@
require xorg-lib-common.inc
DESCRIPTION = "XFIXES Extension"
-DEPENDS += " xextproto xproto zlib"
+DEPENDS += " libxext xextproto xproto zlib"
PROVIDES = "lbxutil"
PE = "1"
+PR = "r0"
-SRC_URI += "file://mkg3states.patch;patch=1"
+#SRC_URI += "file://mkg3states.patch;patch=1"
export CC_FOR_BUILD = "gcc"