add gcc4 fixes, remove the NEC FC20X2JA driver patch from lcd4linux temporary

[openwrt.git] / package / lcd4linux / Makefile

diff --git a/package/lcd4linux/Makefile b/package/lcd4linux/Makefile
index 5586e65..4171521 100644 (file)
--- a/package/lcd4linux/Makefile
+++ b/package/lcd4linux/Makefile
@@ -3,15 +3,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lcd4linux
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lcd4linux

-PKG_VERSION:=0.10.0-RC1
+PKG_VERSION:=0.10.0+cvs20051015

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=bab64ac01ebdce7e46ab367351af839f
+PKG_MD5SUM:=5b5ac629be4bb5c29104fb8f6b7fa444

 
 

-PKG_SOURCE_URL:=@SF/lcd4linux/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/lcd4linux/
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz

 PKG_CAT:=zcat
 
 PKG_CAT:=zcat
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig

 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk


@@ -24,7 +24,6 @@ $(PKG_BUILD_DIR)/.configured:
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \

-               LIBS="-lpng12 -lz" \

                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                  --host=$(GNU_TARGET_NAME) \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                  --host=$(GNU_TARGET_NAME) \


@@ -46,7 +45,7 @@ $(PKG_BUILD_DIR)/.configured:
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
                  --without-x \
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
                  --without-x \

-                 --with-drivers='all,!RouterBoard,!X11' \
+                 --with-drivers='all,!PNG,!RouterBoard,!X11' \

                  --with-plugins=wireless \
        )
        touch $@
                  --with-plugins=wireless \
        )
        touch $@