From patchwork Sun Jul 15 22:54:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: log4cxx, xcursor-transparent-theme package to add From: Aleksandar Zivkovic X-Patchwork-Id: 171109 Message-Id: To: buildroot@uclibc.org Date: Mon, 16 Jul 2012 00:54:21 +0200 Hi all, this is my first time adding package to community so hope I'm doing all well. This time I'd like to contribute with two projects: * Apache log4cxx (includes additional two depending libraries and log4cxx patch) * xcursor-transparent-theme (includes patch for cross-compile) that I use on my project. My project is based on BR 2011.05 version so I assume patch cannot be applied to latest version directly. I also tested packages only on version 2011.05 including x86 and arm(didn't try with xcursor-transparent-theme) configuration with glibc. I hope BR community will have benefit from this. Regards, Aleksandar diff -Naur a/buildroot-2011.05/package/Config.in b/buildroot-2011.05/package/Config.in --- a/buildroot-2011.05/package/Config.in 2011-05-27 16:18:21.000000000 +0200 +++ b/buildroot-2011.05/package/Config.in 2012-07-02 19:28:38.881268000 +0200 @@ -361,6 +371,12 @@ source "package/xerces/Config.in" endmenu +menu "Apache Portable Runtime Library" +source "package/libapr/Config.in" +source "package/libapr-util/Config.in" +source "package/log4cxx/Config.in" +endmenu + endmenu menu "Miscellaneous" diff -Naur a/buildroot-2011.05/package/libapr/Config.in b/buildroot-2011.05/package/libapr/Config.in --- a/buildroot-2011.05/package/libapr/Config.in 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/libapr/Config.in 2011-06-20 11:03:24.747936000 +0200 @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBAPR + bool "libapr" + help + Apache Portable Runtime library. + + http://apache.easy-webs.de/apr diff -Naur a/buildroot-2011.05/package/libapr/libapr.mk b/buildroot-2011.05/package/libapr/libapr.mk --- a/buildroot-2011.05/package/libapr/libapr.mk 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/libapr/libapr.mk 2011-08-31 14:52:39.059203000 +0200 @@ -0,0 +1,34 @@ +############################################################# +# +# libapr +# +############################################################# +LIBAPR_VERSION = 1.4.2 +LIBAPR_SOURCE = apr-$(LIBAPR_VERSION).tar.gz +LIBAPR_SITE = http://archive.apache.org/dist/apr/ +LIBAPR_DIR = $(BUILD_DIR)/apr-$(LIBAPR_VERSION) +LIBAPR_AUTORECONF = NO +LIBAPR_INSTALL_STAGING = YES +LIBAPR_INSTALL_TARGET = YES + +ifeq ($(BR2_TOOLCHAIN_CTNG_uClibc),y) +LIBAPR_CONF_OPT = \ + ac_cv_file__dev_zero=yes \ + ac_cv_func_setpgrp_void=yes \ + apr_cv_tcp_nodelay_with_cork=yes \ + ac_cv_sizeof_struct_iovec=8 \ + apr_cv_process_shared_works=no \ + LIBS="-lpthread" \ + +LIBAPR_DEPENDENCIES = uclibc +else +LIBAPR_CONF_OPT = \ + ac_cv_file__dev_zero=yes \ + ac_cv_func_setpgrp_void=yes \ + apr_cv_process_shared_works=no \ + apr_cv_tcp_nodelay_with_cork=yes \ + ac_cv_sizeof_struct_iovec=8 \ + apr_cv_mutex_recursive=yes +endif + +$(eval $(call AUTOTARGETS,package,libapr)) diff -Naur a/buildroot-2011.05/package/libapr-util/Config.in b/buildroot-2011.05/package/libapr-util/Config.in --- a/buildroot-2011.05/package/libapr-util/Config.in 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/libapr-util/Config.in 2011-08-31 14:52:39.059203000 +0200 @@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBAPR_UTIL + bool "libapr-util" + depends on BR2_PACKAGE_LIBAPR + help + Apache Portable Runtime library + + http://apache.easy-webs.de/apr + +comment "libapr-util requires libapr" + depends on !BR2_PACKAGE_LIBAPR diff -Naur a/buildroot-2011.05/package/libapr-util/libapr-util.mk b/buildroot-2011.05/package/libapr-util/libapr-util.mk --- a/buildroot-2011.05/package/libapr-util/libapr-util.mk 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/libapr-util/libapr-util.mk 2011-08-31 14:52:39.059203000 +0200 @@ -0,0 +1,23 @@ +############################################################# +# +# libapr-util +# +############################################################# +LIBAPR_UTIL_VERSION = 1.3.10 +LIBAPR_UTIL_SOURCE = apr-util-$(LIBAPR_UTIL_VERSION).tar.gz +LIBAPR_UTIL_SITE = http://archive.apache.org/dist/apr/ +LIBAPR_UTIL_DIR = $(BUILD_DIR)/apr-util-$(LIBAPR_UTIL_VERSION) +LIBAPR_UTIL_AUTORECONF = NO +LIBAPR_UTIL_INSTALL_STAGING = YES +LIBAPR_UTIL_INSTALL_TARGET = YES + +ifeq ($(BR2_TOOLCHAIN_CTNG_uClibc),y) +LIBAPR_UTIL_CONF_OPT = --with-apr=$(LIBAPR_DIR) --with-iconv=$(STAGING_DIR) --with-expat=$(STAGING_DIR) +LIBAPR_UTIL_DEPENDENCIES = uclibc libapr libiconv expat +else +LIBAPR_UTIL_CONF_OPT = --with-apr=$(LIBAPR_DIR) +LIBAPR_UTIL_DEPENDENCIES = libapr +endif + + +$(eval $(call AUTOTARGETS,package,libapr-util)) diff -Naur a/buildroot-2011.05/package/log4cxx/Config.in b/buildroot-2011.05/package/log4cxx/Config.in --- a/buildroot-2011.05/package/log4cxx/Config.in 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/log4cxx/Config.in 2011-06-20 11:03:24.747936000 +0200 @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LOG4CXX + bool "log4cxx" + depends on BR2_PACKAGE_LIBAPR + depends on BR2_PACKAGE_LIBAPR_UTIL + help + Apache log4cxx is a logging framework for C++ patterned after Apache log4j. + Apache log4cxx uses Apache Portable Runtime for most platform-specific code and + should be usable on any platform supported by APR. Apache log4cxx is licensed + under the Apache License, an open source license certified by the Open Source + Initiative. + + http://apache.linux-mirror.org/logging/log4cxx/0.10.0 + +comment "log4cxx requires libapr and libapr-util" + depends on !BR2_PACKAGE_LIBAPR || !BR2_PACKAGE_LIBAPR_UTIL diff -Naur a/buildroot-2011.05/package/log4cxx/log4cxx-0.10.0_01.patch b/buildroot-2011.05/package/log4cxx/log4cxx-0.10.0_01.patch --- a/buildroot-2011.05/package/log4cxx/log4cxx-0.10.0_01.patch 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/log4cxx/log4cxx-0.10.0_01.patch 2011-08-31 14:52:39.059203000 +0200 @@ -0,0 +1,52 @@ +diff -Naur apache-log4cxx-0.10.0_orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0_PRS/src/examples/cpp/console.cpp +--- apache-log4cxx-0.10.0_orig/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200 ++++ apache-log4cxx-0.10.0_PRS/src/examples/cpp/console.cpp 2011-04-06 16:47:25.868866130 +0200 +@@ -16,12 +16,14 @@ + */ + + #include ++#include + #include + #include + #include + #include + #include + #include ++#include + + using namespace log4cxx; + using namespace log4cxx::helpers; +diff -Naur apache-log4cxx-0.10.0_orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0_PRS/src/main/cpp/inputstreamreader.cpp +--- apache-log4cxx-0.10.0_orig/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200 ++++ apache-log4cxx-0.10.0_PRS/src/main/cpp/inputstreamreader.cpp 2009-12-13 02:38:02.000000000 +0100 +@@ -15,6 +15,7 @@ + * limitations under the License. + */ + ++#include + #include + #include + #include +diff -Naur apache-log4cxx-0.10.0_orig/src/main/cpp/socketappenderskeleton.cpp apache-log4cxx-0.10.0_PRS/src/main/cpp/socketappenderskeleton.cpp +--- apache-log4cxx-0.10.0_orig/src/main/cpp/socketappenderskeleton.cpp 2008-04-01 00:34:09.000000000 +0200 ++++ apache-log4cxx-0.10.0_PRS/src/main/cpp/socketappenderskeleton.cpp 2010-01-15 21:20:05.000000000 +0100 +@@ -130,7 +130,7 @@ + void SocketAppenderSkeleton::fireConnector() + { + synchronized sync(mutex); +- if (thread.isActive()) { ++ if (!thread.isActive()) { + thread.run(monitor, this); + } + } +diff -Naur apache-log4cxx-0.10.0_orig/src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0_PRS/src/main/cpp/socketoutputstream.cpp +--- apache-log4cxx-0.10.0_orig/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200 ++++ apache-log4cxx-0.10.0_PRS/src/main/cpp/socketoutputstream.cpp 2009-12-13 02:39:18.000000000 +0100 +@@ -15,6 +15,7 @@ + * limitations under the License. + */ + ++#include + #include + #include + #include diff -Naur a/buildroot-2011.05/package/log4cxx/log4cxx.mk b/buildroot-2011.05/package/log4cxx/log4cxx.mk --- a/buildroot-2011.05/package/log4cxx/log4cxx.mk 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/log4cxx/log4cxx.mk 2011-08-31 14:52:39.059203000 +0200 @@ -0,0 +1,21 @@ +############################################################# +# +# log4cxx +# +############################################################# +LOG4CXX_VERSION = 0.10.0 +LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz +LOG4CXX_SITE = http://apache.linux-mirror.org/logging/log4cxx/0.10.0 +LOG4CXX_AUTORECONF = NO +LOG4CXX_INSTALL_STAGING = YES +LOG4CXX_INSTALL_TARGET = YES + +LOG4CXX_CONF_OPT = --with-apr=$(LIBAPR_DIR) --with-apr-util=$(LIBAPR_UTIL_DIR) + +ifeq ($(BR2_TOOLCHAIN_CTNG_uClibc),y) +LOG4CXX_DEPENDENCIES = uclibc libapr libapr-util +else +LOG4CXX_DEPENDENCIES = libapr libapr-util +endif + +$(eval $(call AUTOTARGETS,package,log4cxx)) diff -Naur a/buildroot-2011.05/package/x11r7/Config.in b/buildroot-2011.05/package/x11r7/Config.in --- a/buildroot-2011.05/package/x11r7/Config.in 2011-05-27 16:18:21.000000000 +0200 +++ b/buildroot-2011.05/package/x11r7/Config.in 2012-07-13 15:12:26.100915000 +0200 @@ -302,6 +302,7 @@ menu "X11R7 Other data" source package/x11r7/xdata_xbitmaps/Config.in source package/x11r7/xdata_xcursor-themes/Config.in + source package/x11r7/xcursor-transparent-theme/Config.in source package/x11r7/xkeyboard-config/Config.in endmenu endif diff -Naur a/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/Config.in b/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/Config.in --- a/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/Config.in 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/Config.in 2012-07-13 15:12:26.100915000 +0200 @@ -0,0 +1,5 @@ +config BR2_PACKAGE_XCURSOR_TRANSPARENT_THEME + bool "xcursor-transparent-theme" + select BR2_PACKAGE_XLIB_LIBXCURSOR + help + No description available diff -Naur a/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/index.theme b/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/index.theme --- a/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/index.theme 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/index.theme 2012-07-13 15:27:22.707961000 +0200 @@ -0,0 +1,2 @@ +[Icon Theme] +Inherits=xcursor-transparent diff -Naur a/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1-cross-compile.patch b/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1-cross-compile.patch --- a/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1-cross-compile.patch 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1-cross-compile.patch 2012-07-13 15:12:26.100915000 +0200 @@ -0,0 +1,23 @@ +diff -Naur a/cursors/Makefile.am b/cursors/Makefile.am +--- a/cursors/Makefile.am 2012-07-13 14:57:56.145019392 +0200 ++++ b/cursors/Makefile.am 2012-07-13 14:58:23.353020866 +0200 +@@ -91,6 +91,6 @@ + $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ + for CURSOR in $(CURSOR_NAMES); do \ + echo '-- Installing cursor '$$CURSOR; \ +- ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ ++ ln -s ./transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ + done + +diff -Naur a/cursors/Makefile.in b/cursors/Makefile.in +--- a/cursors/Makefile.in 2012-07-13 14:57:15.945016700 +0200 ++++ b/cursors/Makefile.in 2012-07-13 14:57:37.981041535 +0200 +@@ -177,7 +177,7 @@ + $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ + for CURSOR in $(CURSOR_NAMES); do \ + echo '-- Installing cursor '$$CURSOR; \ +- ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ ++ ln -s ./transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ + done + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur a/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk --- a/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk 1970-01-01 01:00:00.000000000 +0100 +++ b/buildroot-2011.05/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk 2012-07-13 15:27:22.707961000 +0200 @@ -0,0 +1,20 @@ +############################################################# +# +# xcursor-transparent-theme - No description available +# +############################################################# +XCURSOR_TRANSPARENT_THEME_VERSION = 0.1.1 +XCURSOR_TRANSPARENT_THEME_SOURCE = xcursor-transparent-theme-$(XCURSOR_TRANSPARENT_THEME_VERSION).tar.gz +XCURSOR_TRANSPARENT_THEME_SITE = http://projects.o-hand.com/matchbox/sources/utils +XCURSOR_TRANSPARENT_THEME_AUTORECONF = NO +XCURSOR_TRANSPARENT_THEME_INSTALL_STAGING = NO +XCURSOR_TRANSPARENT_THEME_INSTALL_TARGET = YES +XCURSOR_TRANSPARENT_THEME_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen + +define ICONS_DEFAULT_CONFIG_INSTALL + $(INSTALL) -m 0755 -D package/x11r7/xcursor-transparent-theme/index.theme $(TARGET_DIR)/usr/share/icons/default/index.theme +endef + +XCURSOR_TRANSPARENT_THEME_POST_INSTALL_TARGET_HOOKS += ICONS_DEFAULT_CONFIG_INSTALL + +$(eval $(call AUTOTARGETS,package/x11r7,xcursor-transparent-theme))