From 9aa72212b318c09e2f2373c93e1894ec6d765fb1 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 1 Apr 2008 21:02:22 +0000 Subject: [PATCH] Upgrade wxbase to 2.8.7 (#3279) SVN-Revision: 10702 --- libs/wxbase/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/wxbase/Makefile b/libs/wxbase/Makefile index 5ad2ec9682..930a815c57 100644 --- a/libs/wxbase/Makefile +++ b/libs/wxbase/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wxbase -PKG_VERSION:=2.6.4 +PKG_VERSION:=2.8.7 PKG_RELEASE:=1 -PKG_SOURCE:=wxBase-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=wxGTK-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/wxwindows -PKG_MD5SUM:=6e55324d2a522d23fd8834ad8656e0b6 +PKG_MD5SUM:=b25e85eeee524903214ebb520753f4bd -PKG_BUILD_DIR:=$(BUILD_DIR)/wxBase-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk @@ -114,18 +114,18 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib - $(CP) -L $(PKG_INSTALL_DIR)/usr/bin/wx-config $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.6 $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6-*.so $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* $(1)/usr/lib/ + $(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.8 $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.8-*.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.8.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/ - $(SED) 's,-I$$$${includedir}/wx-2.6,-I$(STAGING_DIR)/usr/include/wx-2.6,g' $(1)/usr/bin/wx-config + $(SED) 's,-I$$$${includedir}/wx-2.8,-I$(STAGING_DIR)/usr/include/wx-2.8,g' $(1)/usr/bin/wx-config $(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config endef define Package/libwxbase/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.8.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libwxbase)) -- 2.30.2