Fix dependencies for a lot of xorg packages.

[openwrt/svn-archive/archive.git] / XOrg / lib / libXv / Makefile

diff --git a/XOrg/lib/libXv/Makefile b/XOrg/lib/libXv/Makefile
index 5d5e807b9793063bf3d05303abb9039c77823d77..bcfe985246c6e1a411ad7495dc182822766ba433 100644 (file)
--- a/XOrg/lib/libXv/Makefile
+++ b/XOrg/lib/libXv/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=libXv
 PKG_NAME:=libXv
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
@@ -26,12 +26,8 @@ define Package/libXv
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXv,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
 endif
 
 define libX11/Compile
@@ -53,16 +49,7 @@ define Build/Compile
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               --enable-malloc0returnsnull; \
-       fi \
-       )
+       $(call Build/Configure/Default, --enable-malloc0returnsnull)
 endef
 
 define Package/libXv/install/Default