Ticket #1356: ziproxy_03.patch

Datei ziproxy_03.patch, 5.1 KB (hinzugefügt von MaxMuster, vor 7 Jahren)

Neuer Patch für Ziproxy und giflib

  • make/ziproxy/Makefile.in

     
     1ifeq ($(strip $(FREETZ_PACKAGE_ZIPROXY)),y) 
     2PACKAGES+=ziproxy 
     3endif 
  • make/ziproxy/Config.in

     
     1config FREETZ_PACKAGE_ZIPROXY 
     2    bool "ziproxy 3.2.0" 
     3    select FREETZ_LIB_libjpeg if ! FREETZ_PACKAGE_ZIPROXY_STATIC 
     4    select FREETZ_LIB_libgif if ! FREETZ_PACKAGE_ZIPROXY_STATIC 
     5    select FREETZ_LIB_libpng12 if ! FREETZ_PACKAGE_ZIPROXY_STATIC 
     6    select FREETZ_LIB_libz if ! FREETZ_PACKAGE_ZIPROXY_STATIC 
     7    default n 
     8    help 
     9        Ziproxy is a forwarding HTTP proxy server aimed to speed up low-bandwidth connections.  
     10        It does so by gzipping HTML and using lossy compression of GIF, PNG and JPEG pictures. 
     11 
     12config FREETZ_PACKAGE_ZIPROXY_STATIC 
     13    bool "Statically link libraries" 
     14    depends on FREETZ_PACKAGE_ZIPROXY 
     15    default n 
     16    help 
     17        Build statically linked binary of ZIPROXY 
     18 
     19 
  • make/ziproxy/ziproxy.mk

     
     1$(call PKG_INIT_BIN, 3.2.0) 
     2$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.bz2 
     3$(PKG)_SITE:=@SF/$(pkg) 
     4$(PKG)_BINARY:=$($(PKG)_DIR)/src/ziproxy 
     5$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/bin/ziproxy 
     6 
     7$(PKG)_DEPENDS_ON += jpeg 
     8$(PKG)_DEPENDS_ON += libpng 
     9$(PKG)_DEPENDS_ON += giflib 
     10$(PKG)_DEPENDS_ON += zlib 
     11 
     12ifeq ($(strip $(FREETZ_PACKAGE_ZIPROXY_STATIC)),y) 
     13$(PKG)_LDFLAGS:= -static 
     14endif 
     15 
     16$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_ZIPROXY_STATIC 
     17 
     18$(PKG)_CONFIGURE_OPTIONS += --with-jasper=no 
     19$(PKG)_CONFIGURE_OPTIONS += --with-sasl2=no 
     20$(PKG)_CONFIGURE_OPTIONS += --sysconfdir=/mod/etc/ziproxy 
     21 
     22$(PKG_SOURCE_DOWNLOAD) 
     23$(PKG_UNPACKED) 
     24$(PKG_CONFIGURED_CONFIGURE) 
     25 
     26$($(PKG)_BINARY): $($(PKG)_DIR)/.configured 
     27    $(SUBMAKE) -C $(ZIPROXY_DIR) \ 
     28        LDFLAGS="$(TARGET_LDFLAGS) $(ZIPROXY_LDFLAGS)" 
     29 
     30$($(PKG)_TARGET_BINARY): $($(PKG)_BINARY) 
     31    $(INSTALL_BINARY_STRIP) 
     32 
     33$(pkg): 
     34 
     35$(pkg)-precompiled: $($(PKG)_TARGET_BINARY) 
     36 
     37$(pkg)-clean: 
     38    -$(SUBMAKE) -C $(ZIPROXY_DIR) clean 
     39    $(RM) $(ZIPROXY_FREETZ_CONFIG_FILE) 
     40 
     41$(pkg)-uninstall: 
     42    $(RM) $(ZIPROXY_TARGET_BINARY) 
     43 
     44$(PKG_FINISH) 
  • make/Config.in

     
    183183source make/xpdf/Config.in 
    184184source make/xrelayd/Config.in 
    185185source make/xsltproc/Config.in 
     186source make/ziproxy/Config.in 
    186187endmenu 
    187188 
    188189menu "Web interfaces" 
  • make/libs/giflib.mk

     
     1$(call PKG_INIT_LIB, 4.1.6) 
     2$(PKG)_LIB_VERSION:=4.1.6 
     3 
     4$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.bz2 
     5$(PKG)_SOURCE_MD5:=7125644155ae6ad33dbc9fc15a14735f 
     6$(PKG)_SITE:=@SF/$(pkg) 
     7$(PKG)_DIR:=$(SOURCE_DIR)/$(pkg)-$($(PKG)_VERSION) 
     8 
     9 
     10$(PKG)_BINARY:=$($(PKG)_DIR)/lib/.libs/libgif.so.$($(PKG)_LIB_VERSION) 
     11$(PKG)_STAGING_BINARY:=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libgif.so.$($(PKG)_LIB_VERSION) 
     12$(PKG)_TARGET_BINARY:=$($(PKG)_TARGET_DIR)/libgif.so.$($(PKG)_LIB_VERSION) 
     13 
     14$(PKG)_CONFIGURE_OPTIONS += --enable-shared 
     15$(PKG)_CONFIGURE_OPTIONS += --enable-static 
     16$(PKG)_CONFIGURE_OPTIONS += --disable-rpath 
     17$(PKG)_CONFIGURE_OPTIONS += --without-libiconv-prefix 
     18$(PKG)_CONFIGURE_OPTIONS += --with-x=no 
     19$(PKG)_CONFIGURE_OPTIONS += --with-xpm=no 
     20$(PKG)_CONFIGURE_OPTIONS += --with-fontconfig=no 
     21 
     22$(call REPLACE_LIBTOOL) 
     23 
     24$(PKG_SOURCE_DOWNLOAD) 
     25$(PKG_UNPACKED) 
     26$(PKG_CONFIGURED_CONFIGURE) 
     27 
     28$($(PKG)_BINARY): $($(PKG)_DIR)/.configured 
     29    $(SUBMAKE) -C $(GIFLIB_DIR) 
     30 
     31$($(PKG)_STAGING_BINARY): $($(PKG)_BINARY) 
     32    $(SUBMAKE) \ 
     33        DESTDIR="$(TARGET_TOOLCHAIN_STAGING_DIR)" \ 
     34        -C $(GIFLIB_DIR) install 
     35    $(PKG_FIX_LIBTOOL_LA) \ 
     36        $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libgif.la  
     37 
     38$($(PKG)_TARGET_BINARY): $($(PKG)_STAGING_BINARY) 
     39    $(INSTALL_LIBRARY_STRIP) 
     40 
     41$(pkg): $($(PKG)_STAGING_BINARY) 
     42 
     43$(pkg)-precompiled: $($(PKG)_TARGET_BINARY) 
     44 
     45$(pkg)-clean: 
     46    -$(SUBMAKE) -C $(GIFLIB_DIR) clean 
     47    $(RM) -r $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libgif.* \ 
     48        $(TARGET_TOOLCHAIN_STAGING_DIR)/include/gif_lib.*  
     49 
     50$(pkg)-uninstall: 
     51    $(RM) $(GIFLIB_TARGET_DIR)/libgif*.so* 
     52 
     53$(PKG_FINISH) 
  • make/libs/Config.in

     
    395395 
    396396        In Freetz, rrdtool and vnstati depends on freetype. 
    397397 
     398config FREETZ_LIB_libgif 
     399    bool "GIF image library (libgif.so)" 
     400    default n 
     401    help 
     402        Giflib is a library for reading and writing gif images.  
     403        It is API and ABI compatible with libungif which was in wide use  
     404        while the LZW compression algorithm was patented. 
     405 
     406        In Freetz, ziproxy depends on giflib. 
     407 
    398408config FREETZ_LIB_libart_lgpl_2 
    399409    bool "Libart 2D graphics (libart.so)" 
    400410    default n