Cleanup xorg/libs package makefiles:

    * Add md5sums
    * Use default templates where appropriate
    * Install only required files
    * Add missing dependencies

git-svn-id: svn://svn.openwrt.org/openwrt/packages@13663 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/Xorg/xorg/lib/libICE/Makefile b/Xorg/xorg/lib/libICE/Makefile
index a1e1070..87c7a4b 100644 (file)
--- a/Xorg/xorg/lib/libICE/Makefile
+++ b/Xorg/xorg/lib/libICE/Makefile
@@ -8,14 +8,17 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libICE
 PKG_NAME:=libICE
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.4
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_BUILD_DEPENDS:=xproto
+PKG_MD5SUM:=4ab4e67e0b8845aa201e984153087f4a
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=xproto xtrans
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,27 +26,28 @@ define Package/libICE
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=+xtrans
   TITLE:=libICE
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/ICE}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/ICE/* \
+               $(1)/usr/include/X11/ICE/
 endef
 
 define Package/libICE/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libICE))

diff --git a/Xorg/xorg/lib/libSM/Makefile b/Xorg/xorg/lib/libSM/Makefile
index d903019..84a3876 100644 (file)
--- a/Xorg/xorg/lib/libSM/Makefile
+++ b/Xorg/xorg/lib/libSM/Makefile
@@ -10,12 +10,16 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=libSM
 PKG_NAME:=libSM
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.3
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_BUILD_DEPENDS:=xproto
+PKG_MD5SUM:=184cbf502b3cd5d7ba5f9d1290a99606
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=xproto xtrans
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,27 +27,29 @@ define Package/libSM
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=+xtrans +libICE
+  DEPENDS:=+libICE
   TITLE:=libSM
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/SM}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/SM/* \
+               $(1)/usr/include/X11/SM/
 endef
 
 define Package/libSM/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libSM))

diff --git a/Xorg/xorg/lib/libX11/Makefile b/Xorg/xorg/lib/libX11/Makefile
index 7cac1fb..08290e5 100644 (file)
--- a/Xorg/xorg/lib/libX11/Makefile
+++ b/Xorg/xorg/lib/libX11/Makefile
@@ -10,43 +10,65 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=libX11
 PKG_NAME:=libX11
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.1.5
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_BUILD_DEPENDS:=bigreqsproto xproto xextproto xcmiscproto xf86bigfontproto \
-                   kbproto inputproto
-
+PKG_MD5SUM:=d1512d65dadd4f48c779d4749e7753a8
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=xproto xextproto xf86bigfontproto kbproto inputproto \
+                   xtrans xcmiscproto bigreqsproto
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
 define Package/libX11
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=+xtrans +libXdmcp +libXau
+  DEPENDS:=+libXdmcp +libXau
   TITLE:=libX11
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib 
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+               --enable-xf86bigfont \
+               --without-xcb \
+               --without-launchd \
+       )
+endef
 
 define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       $(MAKE) -C $(PKG_BUILD_DIR)/src/util HOSTCC=$(HOSTCC)
+       $(call Build/Compile/Default)
 endef
 
-define Package/libX11/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so,a}* $(1)/usr/lib/
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la,a} \
+               $(1)/usr/lib/
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/* \
+               $(1)/usr/include/X11/
 endef
 
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+define Package/libX11/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libX11))

diff --git a/Xorg/xorg/lib/libX11/patches/003-cross-compile.patch b/Xorg/xorg/lib/libX11/patches/003-cross-compile.patch
index ed79945..0f3fa73 100644 (file)
--- a/Xorg/xorg/lib/libX11/patches/003-cross-compile.patch
+++ b/Xorg/xorg/lib/libX11/patches/003-cross-compile.patch
@@ -19,7 +19,7 @@
  BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
  BIGFONT_LIBS = @BIGFONT_LIBS@
 -CC = @CC@
-+CC = gcc
++CC = $(HOSTCC)
  CCDEPMODE = @CCDEPMODE@
 -CFLAGS = @CFLAGS@
 +CFLAGS = 

diff --git a/Xorg/xorg/lib/libXau/Makefile b/Xorg/xorg/lib/libXau/Makefile
index a243cb6..1bacb9c 100644 (file)
--- a/Xorg/xorg/lib/libXau/Makefile
+++ b/Xorg/xorg/lib/libXau/Makefile
@@ -10,11 +10,15 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=libXau
 PKG_NAME:=libXau
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.4
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=0f2b88d857e0a3f5898e4759c541af46
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -23,27 +27,28 @@ define Package/libXau
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=
   TITLE:=libXau
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/* \
+               $(1)/usr/include/X11/
 endef
 
 define Package/libXau/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXau))

diff --git a/Xorg/xorg/lib/libXaw/Makefile b/Xorg/xorg/lib/libXaw/Makefile
index a5e6f0d..795db95 100644 (file)
--- a/Xorg/xorg/lib/libXaw/Makefile
+++ b/Xorg/xorg/lib/libXaw/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXaw
 PKG_NAME:=libXaw
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.4
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=73671d8f1cf36fdd81395328cc3539c9
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto xextproto printproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,36 @@ define Package/libXaw
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --disable-xaw6 \
+               --disable-xaw8 \
+       )
+endef
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xaw}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/Xaw/* \
+               $(1)/usr/include/X11/Xaw/
 
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+       $(INSTALL_DIR) $(1)/usr/share/aclocal
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/share/aclocal/* \
+               $(1)/usr/share/aclocal/
 endef
 
 define Package/libXaw/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXaw))

diff --git a/Xorg/xorg/lib/libXcursor/Makefile b/Xorg/xorg/lib/libXcursor/Makefile
index 00c1f71..277c92e 100644 (file)
--- a/Xorg/xorg/lib/libXcursor/Makefile
+++ b/Xorg/xorg/lib/libXcursor/Makefile
@@ -8,13 +8,17 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXcursor
 PKG_NAME:=libXcursor
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.1.9
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=99b7554037a92b260891091e81815a0a
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=fixesproto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,27 +26,29 @@ define Package/libXcursor
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=+libXrender +libXfixes
+  DEPENDS:=+libXrender +libXfixes +libX11
   TITLE:=libXcursor
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xcursor}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/Xcursor/* \
+               $(1)/usr/include/X11/Xcursor
 endef
 
 define Package/libXcursor/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXcursor))

diff --git a/Xorg/xorg/lib/libXdamage/Makefile b/Xorg/xorg/lib/libXdamage/Makefile
index d720bd6..c0f715b 100644 (file)
--- a/Xorg/xorg/lib/libXdamage/Makefile
+++ b/Xorg/xorg/lib/libXdamage/Makefile
@@ -9,17 +9,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libXdamage
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_VERSION:=1.1.1
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=ac0ce6b0063a9858c8f24ddb4c60487d
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto xextproto fixesproto
 
 include $(INCLUDE_DIR)/package.mk
 
-PKG_INSTALL:=1
 
 define Package/libXdamage
   SECTION:=xorg-lib
@@ -30,6 +32,19 @@ define Package/libXdamage
   URL:=http://xorg.freedesktop.org/
 endef
 
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \
+               $(1)/usr/include/X11/extensions/
+endef
+
 define Package/libXdamage/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_DATA) \
@@ -37,9 +52,4 @@ define Package/libXdamage/install
                $(1)/usr/lib/
 endef
 
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
 $(eval $(call BuildPackage,libXdamage))

diff --git a/Xorg/xorg/lib/libXdmcp/Makefile b/Xorg/xorg/lib/libXdmcp/Makefile
index f342def..e96cf04 100644 (file)
--- a/Xorg/xorg/lib/libXdmcp/Makefile
+++ b/Xorg/xorg/lib/libXdmcp/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXdmcp
 PKG_NAME:=libXdmcp
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.2
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=10facf2bc7cbd5e5c1a698b8a210a582
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -23,27 +26,28 @@ define Package/libXdmcp
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=
   TITLE:=libXdmcp
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/* \
+               $(1)/usr/include/X11/
 endef
 
 define Package/libXdmcp/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXdmcp))

diff --git a/Xorg/xorg/lib/libXext/Makefile b/Xorg/xorg/lib/libXext/Makefile
index 726b397..8d532a8 100644 (file)
--- a/Xorg/xorg/lib/libXext/Makefile
+++ b/Xorg/xorg/lib/libXext/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXext
 PKG_NAME:=libXext
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.4
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=a91f1f722ac80c597cf0b75dcb8b48c0
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto xextproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,27 @@ define Package/libXext
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+       )
+endef
 
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libXext/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXext))

diff --git a/Xorg/xorg/lib/libXfixes/Makefile b/Xorg/xorg/lib/libXfixes/Makefile
index 068e8da..e7fe97b 100644 (file)
--- a/Xorg/xorg/lib/libXfixes/Makefile
+++ b/Xorg/xorg/lib/libXfixes/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXfixes
 PKG_NAME:=libXfixes
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=4.0.3
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=1990d19725a3c7f32290037f02d3737f
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto fixesproto xextproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,24 @@ define Package/libXfixes
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \
+               $(1)/usr/include/X11/extensions/
 endef
 
 define Package/libXfixes/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXfixes))

diff --git a/Xorg/xorg/lib/libXfont/Makefile b/Xorg/xorg/lib/libXfont/Makefile
index 80aa9ec..ebcbc52 100644 (file)
--- a/Xorg/xorg/lib/libXfont/Makefile
+++ b/Xorg/xorg/lib/libXfont/Makefile
@@ -8,14 +8,17 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXfont
 PKG_NAME:=libXfont
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.3.3
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_BUILD_DEPENDS:=xproto fontcacheproto fontsproto
+PKG_MD5SUM:=4f174b9613f87cf00d731da428a1b194
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=xproto fontcacheproto fontsproto xtrans
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,27 +26,29 @@ define Package/libXfont
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:= +zlib +xtrans +libfontenc +libfreetype
+  DEPENDS:=+zlib +libfontenc +libfreetype
   TITLE:=libXfont
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/fonts}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/fonts/* \
+               $(1)/usr/include/X11/fonts/
 endef
 
 define Package/libXfont/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXfont))

diff --git a/Xorg/xorg/lib/libXft/Makefile b/Xorg/xorg/lib/libXft/Makefile
index 08488e4..ab1ef82 100644 (file)
--- a/Xorg/xorg/lib/libXft/Makefile
+++ b/Xorg/xorg/lib/libXft/Makefile
@@ -1,21 +1,23 @@
-# 
+#
 # Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXft
 PKG_NAME:=libXft
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_VERSION:=2.1.13
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP=libtool
+PKG_MD5SUM:=bc8881851f3bd8dcc625fac37350a1c6
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,21 +30,24 @@ define Package/libXft
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xft}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/Xft/* \
+               $(1)/usr/include/X11/Xft/
 endef
 
 define Package/libXft/install
        $(INSTALL_DIR) $(1)/usr/lib
-       find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib 
-endef
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXft))

diff --git a/Xorg/xorg/lib/libXi/Makefile b/Xorg/xorg/lib/libXi/Makefile
index f03c48c..2885088 100644 (file)
--- a/Xorg/xorg/lib/libXi/Makefile
+++ b/Xorg/xorg/lib/libXi/Makefile
@@ -7,20 +7,20 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXi
 PKG_NAME:=libXi
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_VERSION:=1.1.3
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=7c510abb0cad8dc20493fb27ff7859d8
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto xextproto inputproto
 
 include $(INCLUDE_DIR)/package.mk
 
-PKG_INSTALL:=1
-
 define Package/libXi
   SECTION:=xorg-libraries
   CATEGORY:=Xorg

diff --git a/Xorg/xorg/lib/libXmu/Makefile b/Xorg/xorg/lib/libXmu/Makefile
index 75b435b..b9b3b61 100644 (file)
--- a/Xorg/xorg/lib/libXmu/Makefile
+++ b/Xorg/xorg/lib/libXmu/Makefile
@@ -8,19 +8,20 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXmu
 PKG_NAME:=libXmu
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_VERSION:=1.0.4
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=fb372a5f3ab42b5ba16d7af4d833a0cb
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=libXt libXext xextproto
 
 include $(INCLUDE_DIR)/package.mk
 
-PKG_INSTALL:=1
 
 define Package/libXmu
   SECTION:=xorg-lib
@@ -40,6 +41,19 @@ define Package/libXmuu
   URL:=http://xorg.freedesktop.org/
 endef
 
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xmu}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/Xmu/* \
+               $(1)/usr/include/X11/Xmu/
+endef
+
 define Package/libXmu/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_DATA) \
@@ -54,9 +68,5 @@ define Package/libXmuu/install
                $(1)/usr/lib/
 endef
 
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
 $(eval $(call BuildPackage,libXmu))
 $(eval $(call BuildPackage,libXmuu))

diff --git a/Xorg/xorg/lib/libXpm/Makefile b/Xorg/xorg/lib/libXpm/Makefile
index 5a2b92d..92f83a0 100644 (file)
--- a/Xorg/xorg/lib/libXpm/Makefile
+++ b/Xorg/xorg/lib/libXpm/Makefile
@@ -8,14 +8,17 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXpm
 PKG_NAME:=libXpm
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=3.5.7
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_BUID_DEPENDS:=xproto
+PKG_MD5SUM:=cd15ee542d9f515538b4462a6f79d977
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUID_DEPENDS:=xproto xextproto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,27 +26,29 @@ define Package/libXpm
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=+libX11
+  DEPENDS:=+libX11 +libXt +libXext
   TITLE:=libXpm
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/* \
+               $(1)/usr/include/X11/
 endef
 
 define Package/libXpm/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXpm))

diff --git a/Xorg/xorg/lib/libXrandr/Makefile b/Xorg/xorg/lib/libXrandr/Makefile
index cfdf3bd..cb83248 100644 (file)
--- a/Xorg/xorg/lib/libXrandr/Makefile
+++ b/Xorg/xorg/lib/libXrandr/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXrandr
 PKG_NAME:=libXrandr
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.2.3
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=5cd67cc02a50c9644ba0a1846ea3b08e
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=randrproto renderproto xextproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,30 @@ define Package/libXrandr
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+       )
+endef
 
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \
+               $(1)/usr/include/X11/extensions/
 endef
 
 define Package/libXrandr/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXrandr))

diff --git a/Xorg/xorg/lib/libXrender/Makefile b/Xorg/xorg/lib/libXrender/Makefile
index 8a66168..5c7cf69 100644 (file)
--- a/Xorg/xorg/lib/libXrender/Makefile
+++ b/Xorg/xorg/lib/libXrender/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXrender
 PKG_NAME:=libXrender
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=0.9.4
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=dc266e850c51368f964e0d67bf5fb5e6
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=renderproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,30 @@ define Package/libXrender
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+       )
+endef
 
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \
+               $(1)/usr/include/X11/extensions/
 endef
 
 define Package/libXrender/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXrender))

diff --git a/Xorg/xorg/lib/libXt/Makefile b/Xorg/xorg/lib/libXt/Makefile
index 6fb2661..d556699 100644 (file)
--- a/Xorg/xorg/lib/libXt/Makefile
+++ b/Xorg/xorg/lib/libXt/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXt
 PKG_NAME:=libXt
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.5
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=f3bdd67785ace8cd0b23249e9d8c9975
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto kbproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,36 @@ define Package/libXt
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+               --without-xcb \
+       )
+endef
 
 define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+       $(MAKE) -C $(PKG_BUILD_DIR)/util HOSTCC=$(HOSTCC)
+       $(call Build/Compile/Default)
 endef
 
-define Package/libXt/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/* \
+               $(1)/usr/include/X11/
 endef
 
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+define Package/libXt/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXt))

diff --git a/Xorg/xorg/lib/libXt/patches/001-cross-compiling.patch b/Xorg/xorg/lib/libXt/patches/001-cross-compiling.patch
index 08a2075..54dc773 100644 (file)
--- a/Xorg/xorg/lib/libXt/patches/001-cross-compiling.patch
+++ b/Xorg/xorg/lib/libXt/patches/001-cross-compiling.patch
@@ -18,7 +18,7 @@
  AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
 -CC = @CC@
-+CC = gcc
++CC = $(HOSTCC)
  CCDEPMODE = @CCDEPMODE@
 -CFLAGS = @CFLAGS@
 +CFLAGS = 

diff --git a/Xorg/xorg/lib/libXtst/Makefile b/Xorg/xorg/lib/libXtst/Makefile
index 957fbae..8a427a0 100644 (file)
--- a/Xorg/xorg/lib/libXtst/Makefile
+++ b/Xorg/xorg/lib/libXtst/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXtst
 PKG_NAME:=libXtst
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.3
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=090c1ad04e34982eada5cf3b1a0792fd
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=recordproto xextproto inputproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,21 @@ define Package/libXtst
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libXtst/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXtst))

diff --git a/Xorg/xorg/lib/libXv/Makefile b/Xorg/xorg/lib/libXv/Makefile
index b846d2e..594e399 100644 (file)
--- a/Xorg/xorg/lib/libXv/Makefile
+++ b/Xorg/xorg/lib/libXv/Makefile
@@ -8,14 +8,17 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXv
 PKG_NAME:=libXv
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.4
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_BUILD_DEPENDS:=videoproto
+PKG_MD5SUM:=723a0275227165383e967a1ca8899b52
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=videoproto xextproto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,27 +26,35 @@ define Package/libXv
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=+libXext
+  DEPENDS:=+libX11 +libXext
   TITLE:=libXv
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+       )
+endef
 
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \
+               $(1)/usr/include/X11/extensions/
 endef
 
 define Package/libXv/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXv))

diff --git a/Xorg/xorg/lib/libXvMC/Makefile b/Xorg/xorg/lib/libXvMC/Makefile
index 9725ba2..2b68d10 100644 (file)
--- a/Xorg/xorg/lib/libXvMC/Makefile
+++ b/Xorg/xorg/lib/libXvMC/Makefile
@@ -8,14 +8,17 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXvMC
 PKG_NAME:=libXvMC
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.4
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_BUILD_DEPENDS:=videoproto
+PKG_MD5SUM:=b54600573daf9d1a29b952e8d35b389e
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=videoproto xextproto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,27 +26,35 @@ define Package/libXvMC
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=+libXext +libXv
+  DEPENDS:=+libXext +libXv +libX11
   TITLE:=libXvMC
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+       )
+endef
 
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \
+               $(1)/usr/include/X11/extensions/
 endef
 
 define Package/libXvMC/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXvMC))

diff --git a/Xorg/xorg/lib/libXxf86misc/Makefile b/Xorg/xorg/lib/libXxf86misc/Makefile
index 5e37c3d..4cde838 100644 (file)
--- a/Xorg/xorg/lib/libXxf86misc/Makefile
+++ b/Xorg/xorg/lib/libXxf86misc/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXxf86misc
 PKG_NAME:=libXxf86misc
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.1
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=7cee0df63903cef7f7a3fb68cdd99eef
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto xextproto xf86miscproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,27 @@ define Package/libXxf86misc
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+       )
+endef
 
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libXxf86misc/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXxf86misc))

diff --git a/Xorg/xorg/lib/libXxf86vm/Makefile b/Xorg/xorg/lib/libXxf86vm/Makefile
index bb152bb..40acdba 100644 (file)
--- a/Xorg/xorg/lib/libXxf86vm/Makefile
+++ b/Xorg/xorg/lib/libXxf86vm/Makefile
@@ -8,17 +8,26 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXxf86vm
 PKG_NAME:=libXxf86vm
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.2
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=304d37bd0a10d9b58aa9b64469ad73e5
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto xextproto xf86vidmodeproto
 
 include $(INCLUDE_DIR)/package.mk
 
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+       )
+endef
+
 define Package/libXxf86vm
   SECTION:=xorg-lib
   CATEGORY:=Xorg
@@ -28,22 +37,21 @@ define Package/libXxf86vm
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libXxf86vm/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXxf86vm))

diff --git a/Xorg/xorg/lib/libfontenc/Makefile b/Xorg/xorg/lib/libfontenc/Makefile
index b87bd03..8edc0e2 100644 (file)
--- a/Xorg/xorg/lib/libfontenc/Makefile
+++ b/Xorg/xorg/lib/libfontenc/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libfontenc
 PKG_NAME:=libfontenc
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.4
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=5cd16a2e51ca7b96a3081c7486ff98b9
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,24 @@ define Package/libfontenc
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/fonts}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/fonts/* \
+               $(1)/usr/include/X11/fonts/
 endef
 
 define Package/libfontenc/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libfontenc))

diff --git a/Xorg/xorg/lib/libpciaccess/Makefile b/Xorg/xorg/lib/libpciaccess/Makefile
index b8b9ff5..29eb47a 100644 (file)
--- a/Xorg/xorg/lib/libpciaccess/Makefile
+++ b/Xorg/xorg/lib/libpciaccess/Makefile
@@ -9,11 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=libpciaccess
 PKG_NAME:=libpciaccess
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_VERSION:=0.10.3
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=6d5468debf76fac84576ca26c9535821
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/Xorg/xorg/lib/libxkbfile/Makefile b/Xorg/xorg/lib/libxkbfile/Makefile
index daa99ce..7eaebe9 100644 (file)
--- a/Xorg/xorg/lib/libxkbfile/Makefile
+++ b/Xorg/xorg/lib/libxkbfile/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libxkbfile
 PKG_NAME:=libxkbfile
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.5
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=0726a845fe5a56551de2718c9f6b0e35
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=kbproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,24 @@ define Package/libxkbfile
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \
+               $(1)/usr/include/X11/extensions/
 endef
 
 define Package/libxkbfile/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libxkbfile))

diff --git a/Xorg/xorg/lib/xtrans/Makefile b/Xorg/xorg/lib/xtrans/Makefile
index 05dcbb1..7a7802e 100644 (file)
--- a/Xorg/xorg/lib/xtrans/Makefile
+++ b/Xorg/xorg/lib/xtrans/Makefile
@@ -8,13 +8,15 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=xtrans
 PKG_NAME:=xtrans
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.2.1
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=96e142331edd498a9364887b2548f1bb
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,27 +24,24 @@ define Package/xtrans
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=
   TITLE:=xtrans
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
-endef
-
-define Package/xtrans/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xtrans}
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/Xtrans/* \
+               $(1)/usr/include/X11/Xtrans/
+
+       $(INSTALL_DIR) $(1)/usr/share/aclocal
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/share/aclocal/* \
+               $(1)/usr/share/aclocal/
 endef
 
 $(eval $(call BuildPackage,xtrans))