mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-01 13:40:04 +00:00
liblbxutil: remove obsolete library
This is the client-side library for the LBX extension, which was removed from xserver 1.2 (released 2007). Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -595,7 +595,6 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\
|
||||
font-cursor-misc \
|
||||
font-misc-misc \
|
||||
xorg-fonts-100dpi \
|
||||
liblbxutil \
|
||||
libxaw6 \
|
||||
libxkbui \
|
||||
libxpresent \
|
||||
|
||||
-36
@@ -1,36 +0,0 @@
|
||||
From 95ed4b743f197e20f1884a326d5a7128187a7ba6 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 13 Aug 2020 17:56:30 -0700
|
||||
Subject: [PATCH] lbx_zlib: Mark declration with extern
|
||||
|
||||
Fixes build with gcc10/-fno-common
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/lbx_zlib/lbx_zlib.h | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/lbx_zlib/lbx_zlib.h b/src/lbx_zlib/lbx_zlib.h
|
||||
index 8ae8956..bec3b96 100644
|
||||
--- a/src/lbx_zlib/lbx_zlib.h
|
||||
+++ b/src/lbx_zlib/lbx_zlib.h
|
||||
@@ -136,9 +136,9 @@ extern void Xfree(pointer /*ptr*/);
|
||||
#endif
|
||||
|
||||
/* lbx_zlib.c */
|
||||
-unsigned long stream_out_compressed;
|
||||
-unsigned long stream_out_uncompressed;
|
||||
-unsigned long stream_out_plain;
|
||||
-unsigned long stream_in_compressed;
|
||||
-unsigned long stream_in_uncompressed;
|
||||
-unsigned long stream_in_plain;
|
||||
+extern unsigned long stream_out_compressed;
|
||||
+extern unsigned long stream_out_uncompressed;
|
||||
+extern unsigned long stream_out_plain;
|
||||
+extern unsigned long stream_in_compressed;
|
||||
+extern unsigned long stream_in_uncompressed;
|
||||
+extern unsigned long stream_in_plain;
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac
|
||||
--- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 23:52:04.000000000 +0100
|
||||
+++ liblbxutil-1.1.0/configure.ac 2009-12-16 10:45:00.000000000 +0100
|
||||
@@ -50,4 +50,5 @@
|
||||
|
||||
AC_OUTPUT([Makefile
|
||||
src/Makefile
|
||||
+ src/image/Makefile
|
||||
lbxutil.pc])
|
||||
diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am
|
||||
--- liblbxutil-1.1.0.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ liblbxutil-1.1.0/src/image/Makefile.am 2009-12-16 10:45:00.000000000 +0100
|
||||
@@ -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 -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am
|
||||
--- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-16 10:48:11.000000000 +0100
|
||||
+++ liblbxutil-1.1.0/src/Makefile.am 2009-12-16 10:46:47.000000000 +0100
|
||||
@@ -3,10 +3,7 @@
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
|
||||
INCLUDES = -I$(top_srcdir)/include
|
||||
|
||||
-noinst_PROGRAMS = mkg3states
|
||||
-
|
||||
-mkg3states_SOURCES = \
|
||||
- $(srcdir)/image/mkg3states.c
|
||||
+SUBDIRS = image
|
||||
|
||||
liblbxutil_la_SOURCES = \
|
||||
$(srcdir)/lbx_zlib/reqstats.h \
|
||||
@@ -38,9 +35,8 @@
|
||||
|
||||
$(srcdir)/image/dfaxg42d.c: g3states.h
|
||||
|
||||
-g3states.h: mkg3states
|
||||
- -rm -f g3states.h
|
||||
- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
|
||||
+g3states.h: image/mkg3states
|
||||
+ $(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
|
||||
|
||||
liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
require recipes-graphics/xorg-lib/xorg-lib-common.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b0d5bdc98f7ebab3b6c3791d9bf40907"
|
||||
|
||||
SUMMARY = "XFIXES Extension"
|
||||
DEPENDS += " xorgproto zlib"
|
||||
PE = "1"
|
||||
PR = "r11"
|
||||
|
||||
XORG_EXT = "tar.bz2"
|
||||
|
||||
SRC_URI += "file://mkg3states-1.1.patch \
|
||||
file://0001-lbx_zlib-Mark-declration-with-extern.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "273329a78c2e9ea189ac416c7fde94a1"
|
||||
SRC_URI[sha256sum] = "c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae"
|
||||
|
||||
export CC_FOR_BUILD = "gcc"
|
||||
Reference in New Issue
Block a user