[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-139-g2e8243f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-139-g2e8243f
|
From: jscheer <js...@us...> - 2013-01-30 10:22:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 2e8243fe1d2a79c616e55b8d70c938a139f63898 (commit)
via 176d05a786fdb6c9d6cd8d3cf666b27ebb873d91 (commit)
from c086375319881a6942eeedf3bcd8e06d93af0d84 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2e8243fe1d2a79c616e55b8d70c938a139f63898
Merge: 176d05a c086375
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Jan 30 11:22:26 2013 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit 176d05a786fdb6c9d6cd8d3cf666b27ebb873d91
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Jan 30 11:21:41 2013 +0100
[BUILDROOT] Update Qwt patch 133 to version 6.0.1 with BR mainline patch.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2012.02/133-qwt-add_package.patch | 262 ++++++++++----------
1 files changed, 125 insertions(+), 137 deletions(-)
diff --git a/patches/buildroot/2012.02/133-qwt-add_package.patch b/patches/buildroot/2012.02/133-qwt-add_package.patch
index 552296a..356a201 100644
--- a/patches/buildroot/2012.02/133-qwt-add_package.patch
+++ b/patches/buildroot/2012.02/133-qwt-add_package.patch
@@ -1,11 +1,19 @@
-Add package QWT 5.2.1 to Buildroot. An option enables the build of the examples.
+From afba84d1fcec911094ba54e1777155fa76913fe1 Mon Sep 17 00:00:00 2001
+From: Laurent GONZALEZ <br...@ge...>
+Date: Sat, 02 Jun 2012 06:14:00 +0000
+Subject: libqwt: new package
-Signed-off-by: Jérémie Scheer <jer...@ar...>
+Patch initially written by Thomas Petazzoni, then reworked and updated
+by Laurent Gonzalez, and finally cleaned up by Thomas again.
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2012-05-04 18:01:25.000000000 +0200
-+++ buildroot/package/Config.in 2012-05-04 18:09:24.000000000 +0200
+[Peter: generic-package, deps, download, rename to qwt, move under Qt]
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+diff --git a/package/Config.in b/package/Config.in
+index ea0586b..4f05665 100644
+--- a/package/Config.in
++++ b/package/Config.in
@@ -140,6 +140,7 @@
comment "other GUIs"
source "package/efl/Config.in"
@@ -14,150 +22,130 @@ Index: buildroot/package/Config.in
source "package/x11r7/Config.in"
comment "X libraries and helper libraries"
-Index: buildroot/package/qwt/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/Config.in 2012-05-04 18:01:25.000000000 +0200
-@@ -0,0 +1,20 @@
-+comment "Qwt requires Qt to be installed"
-+ depends on !BR2_PACKAGE_QT
-+
-+menuconfig BR2_PACKAGE_QWT
-+ bool "Qwt"
-+ depends on BR2_PACKAGE_QT
+diff --git a/package/qwt/Config.in b/package/qwt/Config.in
+new file mode 100644
+index 0000000..d72b30e
+--- /dev/null
++++ b/package/qwt/Config.in
+@@ -0,0 +1,22 @@
++config BR2_PACKAGE_QWT
++ bool "qwt"
++ depends on BR2_PACKAGE_QT_GUI_MODULE
+ help
-+ Qwt for Embedded Linux.
++ Qwt is a graphics extension to the Qt GUI application
++ framework. It provides a 2D plotting widget and more.
+
-+ http://qwt.sourceforge.net/
++ http://http://sourceforge.net/projects/qwt
+
+if BR2_PACKAGE_QWT
+
-+config BR2_PACKAGE_QWT_EXAMPLES
-+ bool "Examples"
++config BR2_PACKAGE_QWT_SVG
++ bool "SVG support"
+ select BR2_PACKAGE_QT_SVG
-+ help
-+ Compile & install the examples.
-+
-+endif #BR2_PACKAGE_QWT
-Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2012-05-04 18:01:25.000000000 +0200
-@@ -0,0 +1,30 @@
-+--- qwt-5.2.1/qwtconfig.pri.orig 2010-09-28 14:34:01.000000000 +0200
-++++ qwt-5.2.1/qwtconfig.pri 2010-09-28 15:37:02.000000000 +0200
-+@@ -115,7 +115,7 @@
-+ # Otherwise you have to build it from the designer directory.
-+ ######################################################################
-+
-+-CONFIG += QwtDesigner
-++#CONFIG += QwtDesigner
-+
-+ ######################################################################
-+ # If you want to auto build the examples, enable the line below
-+
-+--- qwt-5.2.1/src/src.pro.orig 2010-09-28 14:40:39.000000000 +0200
-++++ qwt-5.2.1/src/src.pro 2010-09-28 14:41:29.000000000 +0200
-+@@ -218,9 +218,12 @@
-+ }
-+
-+ # Install directives
-+-
-+-headers.files = $$HEADERS
-+-doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
-++
-++target.path = /usr/lib
-++headers.files = $$HEADERS
-++headers.path = /usr/include/qwt-5.2.1
-++doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
-++doc.path = /usr/doc/qwt-5.2.1
-+ unix {
-+ doc.files += $${QWT_ROOT}/doc/man
-+ }
-Index: buildroot/package/qwt/qwt.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt.mk 2012-05-04 18:03:07.000000000 +0200
-@@ -0,0 +1,82 @@
-+######################################################################
-+#
-+# QWT
-+#
-+######################################################################
-+
-+QWT_VERSION:=5.2.1
-+QWT_SOURCE:=qwt-$(QWT_VERSION).zip
-+QWT_SITE:=http://sourceforge.net/projects/qwt/files/qwt/$(QWT_VERSION)
-+QWT_UNZIP:=unzip
-+QWT_TARGET_DIR:=$(BUILD_DIR)/qwt-$(QWT_VERSION)
-+QWT_CONFIG_FILE:=qwt.pro
-+QWT_EXAMPLES_CONFIG_FILE:=examples.pro
-+QT_HOST_DIR:=$(HOST_DIR)/usr
-+
-+$(DL_DIR)/$(QWT_SOURCE):
-+ $(call DOWNLOAD,$(QWT_SITE),$(QWT_SOURCE))
-+
-+qwt-source: $(DL_DIR)/$(QWT_SOURCE)
+
++config BR2_PACKAGE_QWT_MATHML
++ bool "MathML support"
+
-+$(QWT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QWT_SOURCE)
-+ $(QWT_UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(QWT_SOURCE)
-+ support/scripts/apply-patches.sh $(QWT_TARGET_DIR) package/qwt/ \
-+ qwt-$(QWT_VERSION)-\*.patch \
-+ qwt-$(QWT_VERSION)-\*.patch.$(ARCH)
-+ touch $@
-+
-+$(QWT_TARGET_DIR)/.configured: $(QWT_TARGET_DIR)/.unpacked
-+ -[ -f $(QWT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR) distclean
-+ $(QT_HOST_DIR)/bin/qmake $(QWT_TARGET_DIR)/$(QWT_CONFIG_FILE)
-+ touch $@
-+
-+$(QWT_TARGET_DIR)/.compiled: $(QWT_TARGET_DIR)/.configured
-+ $(MAKE) -C $(QWT_TARGET_DIR)
-+ touch $@
-+
-+$(STAGING_DIR)/usr/lib/libqwt.so: $(QWT_TARGET_DIR)/.compiled
-+ (export INSTALL_ROOT=$(STAGING_DIR); $(MAKE) -C $(QWT_TARGET_DIR) install)
-+
-+$(TARGET_DIR)/usr/lib/libqwt.so: $(STAGING_DIR)/usr/lib/libqwt.so
-+ cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so* $(TARGET_DIR)/usr/lib/
-+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so*
-+
-+$(QWT_TARGET_DIR)/examples/.configured:
-+ -[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
-+ $(QT_HOST_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
-+ touch $@
++endif
+
-+$(QWT_TARGET_DIR)/examples/.compiled: $(QWT_TARGET_DIR)/examples/.configured
-+ $(MAKE) -C $(QWT_TARGET_DIR)/examples
-+ touch $@
++comment "qwt depends on QT gui module"
++ depends on !BR2_PACKAGE_QT_GUI_MODULE
+diff --git a/package/qwt/qwt-remove-installed-check.patch b/package/qwt/qwt-remove-installed-check.patch
+new file mode 100644
+index 0000000..7490a7b
+--- /dev/null
++++ b/package/qwt/qwt-remove-installed-check.patch
+@@ -0,0 +1,32 @@
++Remove useless check at build time
++
++At build time, Qwt looks whether the Qwt libraries are already
++installed in the destination directory, to avoid confusion between
++libraries installed system-wide and locally-built shared
++libraries. However, this behaviour conflicts with how Buildroot builds
++and installs libraries, so get rid of it.
++
++Signed-off-by: Thomas Petazzoni <tho...@fr...>
++
++Index: qwt-6.0.0/qwtbuild.pri
++===================================================================
++--- qwt-6.0.0.orig/qwtbuild.pri 2011-09-12 19:37:35.663275952 +0200
+++++ qwt-6.0.0/qwtbuild.pri 2011-09-12 19:37:41.913275949 +0200
++@@ -53,17 +53,3 @@
++ !debug_and_release {
++ OBJECTS_DIR = obj
++ }
++-
++-unix {
++-
++- exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) {
++-
++- # On some Linux distributions the Qwt libraries are installed
++- # in the same directory as the Qt libraries. Unfortunately
++- # qmake always adds QMAKE_LIBDIR_QT at the beginning of the
++- # linker path, so that the installed libraries will be
++- # used instead of the local ones.
++-
++- error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" )
++- }
++-}
+diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
+new file mode 100644
+index 0000000..1560ea4
+--- /dev/null
++++ b/package/qwt/qwt.mk
+@@ -0,0 +1,52 @@
++#############################################################
++#
++# qwt
++#
++#############################################################
+
-+$(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/bode: $(QWT_TARGET_DIR)/examples/.compiled
-+ mkdir -p $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
-+ cp -f $(QWT_TARGET_DIR)/examples/bin/* $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
++QWT_VERSION = 6.0.1
++QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
++QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
++QWT_INSTALL_STAGING = YES
++QWT_DEPENDENCIES = qt
+
-+$(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin/bode: $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/bode
-+ mkdir -p $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
-+ cp -f $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/* $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
++QWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
++QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDesigner.*$$/\# QWT_CONFIG += QwtDesigner/'
++QWT_CONFIG += -e 's%/features%/mkspecs/features%'
+
-+ifneq ($(BR2_PACKAGE_QWT_EXAMPLES),y)
-+qwt: qt $(TARGET_DIR)/usr/lib/libqwt.so
++ifeq ($(BR2_PACKAGE_QWT_SVG),y)
++ QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/'
+else
-+qwt: qt $(TARGET_DIR)/usr/lib/libqwt.so $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin/bode
++ QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/'
+endif
+
-+qwt-clean:
-+ -$(MAKE) -C $(QWT_TARGET_DIR) clean
-+ -rm $(TARGET_DIR)/usr/lib/libqwt.so.*
-+
-+qwt-dirclean:
-+ rm -rf $(QWT_TARGET_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(BR2_PACKAGE_QWT),y)
-+TARGETS+=qwt
++ifeq ($(BR2_PACKAGE_QWT_MATHML),y)
++ QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtMathML.*$$/QWT_CONFIG += QwtMathML/'
++else
++ QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtMathML.*$$/\# QWT_CONFIG += QwtMathML/'
+endif
++
++define QWT_CONFIGURE_CMDS
++ $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
++ (cd $(@D); $(QT_QMAKE))
++endef
++
++define QWT_BUILD_CMDS
++ $(MAKE) -C $(@D)
++endef
++
++# After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so
++# that when building with qmake, -L$(STAGING_DIR)/usr/lib is used and
++# not -L/usr/lib.
++define QWT_INSTALL_STAGING_CMDS
++ $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR)
++ $(SED) "s%QWT_INSTALL_PREFIX = .*%QWT_INSTALL_PREFIX = $(STAGING_DIR)/usr%" \
++ $(STAGING_DIR)/usr/mkspecs/features/qwtconfig.pri
++endef
++
++define QWT_INSTALL_TARGET_CMDS
++ $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR)
++ rm -Rf $(TARGET_DIR)/usr/mkspecs
++endef
++
++$(eval $(call GENTARGETS,package,qwt))
+--
+cgit v0.9.1
+
hooks/post-receive
--
armadeus
|
