From a461faf1ee09deaf662a45338be1e41a3249a077 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sun, 14 Jan 2007 23:25:05 +0000 Subject: [PATCH] some pkgconfig hacks to make things somewhat work --- package/cairo/cairo.mk | 2 -- package/xorg/kbproto.pc | 9 +++++++++ package/xorg/x11.pc | 15 +++++++++++++++ package/xorg/xau.pc | 11 +++++++++++ package/xorg/xdmcp.pc | 11 +++++++++++ package/xorg/xext.pc | 12 ++++++++++++ package/xorg/xextproto.pc | 9 +++++++++ package/xorg/xinerama.pc | 12 ++++++++++++ package/xorg/xorg.mk | 5 +++++ package/xorg/xproto.pc | 10 ++++++++++ package/xorg/xrandr.pc | 12 ++++++++++++ 11 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 package/xorg/kbproto.pc create mode 100644 package/xorg/x11.pc create mode 100644 package/xorg/xau.pc create mode 100644 package/xorg/xdmcp.pc create mode 100644 package/xorg/xext.pc create mode 100644 package/xorg/xextproto.pc create mode 100644 package/xorg/xinerama.pc create mode 100644 package/xorg/xproto.pc create mode 100644 package/xorg/xrandr.pc diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 7259c296a4..523c51acbe 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -126,8 +126,6 @@ $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY): $(CAIRO_DIR)/.configured $(STAGING_DIR)/lib/$(CAIRO_BINARY): $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(CAIRO_DIR) install; $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libcairo.la - $(SED) "s, x11 ,,g" $(STAGING_DIR)/lib/pkgconfig/cairo.pc - $(SED) "s, x11 ,,g" $(STAGING_DIR)/lib/pkgconfig/cairo-xlib.pc touch -c $(STAGING_DIR)/lib/$(CAIRO_BINARY) $(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY) diff --git a/package/xorg/kbproto.pc b/package/xorg/kbproto.pc new file mode 100644 index 0000000000..7ce28edbbd --- /dev/null +++ b/package/xorg/kbproto.pc @@ -0,0 +1,9 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: KBProto +Description: KB extension headers +Version: 1.0.3 +Cflags: -I${includedir} diff --git a/package/xorg/x11.pc b/package/xorg/x11.pc new file mode 100644 index 0000000000..c086eccc1c --- /dev/null +++ b/package/xorg/x11.pc @@ -0,0 +1,15 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +xthreadlib=-lpthread + +Name: X11 +Description: X Library +Version: 1.0.3 +Requires: xproto kbproto +Requires.private: xau xdmcp +Cflags: -I${includedir} +Libs: -L${libdir} -lX11 +Libs.private: -lpthread diff --git a/package/xorg/xau.pc b/package/xorg/xau.pc new file mode 100644 index 0000000000..618581d9d1 --- /dev/null +++ b/package/xorg/xau.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Xau +Description: X authorization file management libary +Version: 1.0.1 +Requires: xproto +Cflags: -I${includedir} +Libs: -L${libdir} -lXau diff --git a/package/xorg/xdmcp.pc b/package/xorg/xdmcp.pc new file mode 100644 index 0000000000..dbdf2ae09a --- /dev/null +++ b/package/xorg/xdmcp.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Xdmcp +Description: X Display Manager Control Protocol library +Version: 1.0.1 +Requires: xproto +Cflags: -I${includedir} +Libs: -L${libdir} -lXdmcp diff --git a/package/xorg/xext.pc b/package/xorg/xext.pc new file mode 100644 index 0000000000..8b1799c42b --- /dev/null +++ b/package/xorg/xext.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Xext +Description: Misc X Extension Library +Version: 1.0.1 +Requires: xextproto +Requires.private: x11 xau +Cflags: -I${includedir} +Libs: -L${libdir} -lXext diff --git a/package/xorg/xextproto.pc b/package/xorg/xextproto.pc new file mode 100644 index 0000000000..adc0cf4981 --- /dev/null +++ b/package/xorg/xextproto.pc @@ -0,0 +1,9 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: XExtProto +Description: XExt extension headers +Version: 7.0.2 +Cflags: -I${includedir} diff --git a/package/xorg/xinerama.pc b/package/xorg/xinerama.pc new file mode 100644 index 0000000000..8c3af1ab55 --- /dev/null +++ b/package/xorg/xinerama.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Xinerama +Description: The Xinerama Library +Version: 1.0.1 +Requires: xineramaproto +Requires.private: x11 xext +Cflags: -I${includedir} +Libs: -L${libdir} -lXinerama diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk index 3f913458a7..9f659c9da0 100644 --- a/package/xorg/xorg.mk +++ b/package/xorg/xorg.mk @@ -105,6 +105,11 @@ $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER) ln -fs ../../lib $(STAGING_DIR)$(TARGET_LIBX) ( cd $(XORG_DIR); $(MAKE) \ DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale ) + cp package/xorg/x11.pc package/xorg/xext.pc \ + package/xorg/xproto.pc package/xorg/kbproto.pc \ + package/xorg/xau.pc package/xorg/xdmcp.pc \ + package/xorg/xextproto.pc package/xorg/xrandr.pc \ + package/xorg/xinerama.pc $(STAGING_DIR)/lib/pkgconfig touch -c $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(TARGET_XSERVER): $(XORG_XSERVER) diff --git a/package/xorg/xproto.pc b/package/xorg/xproto.pc new file mode 100644 index 0000000000..25459272ca --- /dev/null +++ b/package/xorg/xproto.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +includex11dir=${prefix}/include/X11 + +Name: Xproto +Description: Xproto headers +Version: 7.0.7 +Cflags: -I${includedir} diff --git a/package/xorg/xrandr.pc b/package/xorg/xrandr.pc new file mode 100644 index 0000000000..db98098837 --- /dev/null +++ b/package/xorg/xrandr.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Xrandr +Description: X RandR Library +Version: 1.1.1 +Requires: xproto randrproto >= 1.1 +Requires.private: x11 xext xrender +Cflags: -I${includedir} +Libs: -L${libdir} -lXrandr -- 2.30.2