This patch update rrdtool to version 1.4.7. Two version of the package
are provided:
rrdtool, which supports the graph command and links with pango and cairo
(from the xorg feed)
rrdtool-lite, which does NOT support the graph command and thus do not
requires pango and cairo
The first version requires also a font to be installed on openwrt, the
patched makefile requires a font to be placed in the data directory of
the package, however I'm not sure how I should post the font (attachment?)
Signed-off-by: Roberto Riggio <[email protected]>
--
Index: utils/rrdtool/Makefile
===================================================================
--- utils/rrdtool/Makefile (revision 31050)
+++ utils/rrdtool/Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=rrdtool
-PKG_VERSION:=1.2.30
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.7
+PKG_RELEASE:=1
PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=19b24f7184a8dbf7b48c1bbb565ad9fb
+PKG_MD5SUM:=ffe369d8921b4dfdeaaf43812100c38f
PKG_BUILD_DEPENDS:=python
@@ -26,6 +26,8 @@
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
$(call include_mk, python-package.mk)
define Package/rrdtool/Default
@@ -39,28 +41,42 @@
$(call Package/rrdtool/Default)
SECTION:=libs
CATEGORY:=Libraries
- TITLE+= management library (v1.2.x)
- DEPENDS+= +libart +libfreetype +libpng +zlib
+ TITLE+= library (v1.4.x)
+ DEPENDS+= +cairo +pango +libxml2
endef
+define Package/librrd-lite
+$(call Package/rrdtool/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE+= library (v1.4.x, no graph)
+ DEPENDS+= +libxml2
+endef
+
define Package/rrdcgi
$(call Package/rrdtool/Default)
- TITLE+= CGI graphing tool (v1.2.x)
+ TITLE+= CGI graphing tool (v1.4.x)
DEPENDS+= +librrd +cgilib
endef
define Package/rrdtool
$(call Package/rrdtool/Default)
- TITLE+= management tools (v1.2.x)
+ TITLE+= tools (v1.4.x)
DEPENDS+= +librrd
endef
+define Package/rrdtool-lite
+$(call Package/rrdtool/Default)
+ TITLE+= tools (v1.4.x, no graph)
+ DEPENDS+= +librrd-lite
+endef
+
define Package/python-rrd
$(call Package/rrdtool/Default)
SUBMENU:=Python
SECTION:=lang
CATEGORY:=Languages
- TITLE+= python bindings (v1.2.x)
+ TITLE+= python bindings (v1.4.x)
DEPENDS+= +python-mini +librrd
endef
@@ -73,14 +89,19 @@
--disable-perl \
--disable-tcl \
--disable-ruby \
- --without-x \
- --with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf" \
+ --disable-lua \
CONFIGURE_VARS += \
rd_cv_ieee_works=yes \
rd_cv_null_realloc=nope \
ac_cv_func_mmap_fixed_mapped=yes \
+ifneq ($(SDK)$(CONFIG_PACKAGE_rrdtool-lite),)
+ CONFIGURE_ARGS += \
+ --disable-rrd_graph \
+ --with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono.ttf"
+endif
+
ifneq ($(SDK)$(CONFIG_PACKAGE_rrdcgi),)
CONFIGURE_ARGS += --enable-rrdcgi
else
@@ -102,19 +123,24 @@
endef
define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.2/include/
- $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} $(1)/usr/lib/rrdtool-1.2/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.4/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.4/include/
+ $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.4/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} $(1)/usr/lib/rrdtool-1.4/lib/
endef
define Package/librrd/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/
+endef
+
+define Package/librrd-lite/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/share/rrdtool/fonts
- $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
- $(1)/usr/share/rrdtool/fonts/
+ $(CP) ./data/DejaVuSansMono.ttf $(1)/usr/share/rrdtool/fonts/
endef
define Package/rrdcgi/install
@@ -128,6 +154,12 @@
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
endef
+define Package/rrdtool-lite/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
+endef
+
define PyPackage/python-rrd/install
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
$(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/
@@ -137,5 +169,8 @@
$(eval $(call BuildPackage,rrdcgi))
$(eval $(call BuildPackage,rrdtool))
+$(eval $(call BuildPackage,librrd-lite))
+$(eval $(call BuildPackage,rrdtool-lite))
+
$(eval $(call PyPackage,python-rrd))
$(eval $(call BuildPackage,python-rrd))
Index: utils/rrdtool/patches/020-x86-float-cast.patch
===================================================================
--- utils/rrdtool/patches/020-x86-float-cast.patch (revision 31050)
+++ utils/rrdtool/patches/020-x86-float-cast.patch (working copy)
@@ -1,13 +0,0 @@
-Index: rrdtool-1.2.30/src/rrd_format.h
-===================================================================
---- rrdtool-1.2.30.orig/src/rrd_format.h
-+++ rrdtool-1.2.30/src/rrd_format.h
-@@ -22,7 +22,7 @@
- /* #define RRD_VERSION "0002" */
- /* changed because microsecond precision requires another field */
- #define RRD_VERSION "0003"
--#define FLOAT_COOKIE 8.642135E130
-+#define FLOAT_COOKIE ((double)8.642135E130)
-
- #include "rrd_nan_inf.h"
-
Index: utils/rrdtool/patches/010-dont-add-host-include-paths.patch
===================================================================
--- utils/rrdtool/patches/010-dont-add-host-include-paths.patch (revision 31050)
+++ utils/rrdtool/patches/010-dont-add-host-include-paths.patch (working copy)
@@ -1,34 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -26319,9 +26319,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ex_check_save_LIBS=${LIBS}
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
-- if test "x/usr/include/libart-2.0" != "x"; then
-- CPPFLAGS="$CPPFLAGS -I/usr/include/libart-2.0"
-- fi
- { echo "$as_me:$LINENO: checking for art_vpath_add_point in -lart_lgpl_2" >&5
- echo $ECHO_N "checking for art_vpath_add_point in -lart_lgpl_2... $ECHO_C" >&6; }
- if test "${ac_cv_lib_art_lgpl_2_art_vpath_add_point+set}" = set; then
-@@ -27915,9 +27912,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ex_check_save_LIBS=${LIBS}
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
-- if test "x/usr/include/freetype2" != "x"; then
-- CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-- fi
- { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
- echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; }
- if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -20,9 +20,6 @@ AC_DEFUN([EX_CHECK_ALL],
- ex_check_save_LIBS=${LIBS}
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
-- if test "x$7" != "x"; then
-- CPPFLAGS="$CPPFLAGS -I$7"
-- fi
- dnl try compiling naked first
- AC_CHECK_LIB($1,$2, [
- AC_CHECK_HEADER($3,[LIBS="-l$1 ${LIBS}";EX_CHECK_STATE=YES],[])],[])
Index: utils/rrdtool/patches/100-get_text_macro_version.patch
===================================================================
--- utils/rrdtool/patches/100-get_text_macro_version.patch (revision 0)
+++ utils/rrdtool/patches/100-get_text_macro_version.patch (revision 0)
@@ -0,0 +1,14 @@
+diff -urN rrdtool-1.4.7.old/po/Makefile.in.in rrdtool-1.4.7/po/Makefile.in.in
+--- rrdtool-1.4.7.old/po/Makefile.in.in 2012-01-24 11:08:54.000000000 +0100
++++ rrdtool-1.4.7/po/Makefile.in.in 2012-03-20 16:35:09.946756742 +0100
+@@ -8,8 +8,8 @@
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+-# Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++# Origin: gettext-0.18
++GETTEXT_MACRO_VERSION = 0.18
+
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
Index: utils/rrdtool/data/DejaVuSansMono.ttf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: utils/rrdtool/data/DejaVuSansMono.ttf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
