Commit 80a5956d authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

graphite2: new package



[Thomas:
 - tweak description of the patch
 - turn the doc/test removal hook as a post patch hook rather than a
   pre-configure hook.]

Signed-off-by: default avatarGustavo Zacarias <gustavo.zacarias@free-electrons.com>
Reviewed-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 95a111b3
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -803,6 +803,7 @@ menu "Graphics"
	source "package/gdk-pixbuf/Config.in"
	source "package/giblib/Config.in"
	source "package/giflib/Config.in"
	source "package/graphite2/Config.in"
	source "package/harfbuzz/Config.in"
	source "package/ijs/Config.in"
	source "package/imlib2/Config.in"
+20 −0
Original line number Diff line number Diff line
Don't use -Wdouble-promotion gcc option

The warning flag isn't recognized for older GCC versions (blackfin),
so just disable it.

Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>

diff -Nura graphite2-1.3.3.orig/src/CMakeLists.txt graphite2-1.3.3/src/CMakeLists.txt
--- graphite2-1.3.3.orig/src/CMakeLists.txt	2015-09-24 10:06:28.877851596 -0300
+++ graphite2-1.3.3/src/CMakeLists.txt	2015-09-24 10:06:48.201519767 -0300
@@ -111,9 +111,6 @@
         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
         LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" 
         LINKER_LANGUAGE C)
-    if (CMAKE_COMPILER_IS_GNUCXX)
-        add_definitions(-Wdouble-promotion)
-    endif (CMAKE_COMPILER_IS_GNUCXX)
     if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
         target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
     else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+13 −0
Original line number Diff line number Diff line
config BR2_PACKAGE_GRAPHITE2
	bool "graphite2"
	depends on BR2_INSTALL_LIBSTDCPP
	depends on !BR2_STATIC_LIBS
	help
	  Graphite is a project within SIL's scripts and software dev
	  groups to provide cross-platform rendering for complex
	  writing systems.

	  http://sourceforge.net/projects/silgraphite/

comment "graphite2 needs a toolchain w/ C++, dynamic library"
	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
+3 −0
Original line number Diff line number Diff line
# From http://sourceforge.net/projects/silgraphite/files/graphite2
md5	7cda6fc6bc197b216777b15ce52c38a8	graphite2-1.3.3.tgz
sha1	54b04c283bab4695de63ae2dd6cff392dd49d7f0	graphite2-1.3.3.tgz
+23 −0
Original line number Diff line number Diff line
################################################################################
#
# graphite2
#
################################################################################

GRAPHITE2_VERSION = 1.3.3
GRAPHITE2_SOURCE = graphite2-$(GRAPHITE2_VERSION).tgz
GRAPHITE2_SITE = http://downloads.sourceforge.net/project/silgraphite/graphite2
GRAPHITE2_INSTALL_STAGING = YES
GRAPHITE2_LICENSE = LGPLv2.1+
GRAPHITE2_LICENSE_FILES = LICENSE

# Avoid building docs and tests to save time
define GRAPHITE2_DISABLE_TESTS_DOC
	$(SED) '/^add_subdirectory(doc)/d' \
		-e '/^add_subdirectory(tests)/d' \
		-e '/add_subdirectory(gr2fonttest)/d' \
		$(@D)/CMakeLists.txt
endef
GRAPHITE2_POST_PATCH_HOOKS += GRAPHITE2_DISABLE_TESTS_DOC

$(eval $(cmake-package))