* Applied stippi's no-patents patch, but without the ffmpeg part, as that one

is obviously already configured not to use patented code.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32577 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-08-21 17:20:23 +00:00
parent c53744492d
commit 67838392dc
3 changed files with 27 additions and 2 deletions

View File

@ -322,6 +322,18 @@ if $(DEBUG_PRINTF) {
HAIKU_C++FLAGS += [ FDefines DEBUG_PRINTF=$(DEBUG_PRINTF) ] ;
}
# If the environment variable HAIKU_INCLUDE_PATENTED_CODE is defined, we
# define an equally named macro to the variable value. Some components use the
# macro to allow compilation of code known to implemented patented ideas and/or
# techniques, for example the Freetype bytecode hinter or sub-pixel rendering
# as well as some problematic media codecs.
if $(HAIKU_INCLUDE_PATENTED_CODE) {
HAIKU_CCFLAGS += [ FDefines
HAIKU_INCLUDE_PATENTED_CODE=$(HAIKU_INCLUDE_PATENTED_CODE) ] ;
HAIKU_C++FLAGS += [ FDefines
HAIKU_INCLUDE_PATENTED_CODE=$(HAIKU_INCLUDE_PATENTED_CODE) ] ;
}
# warning flags
HAIKU_WARNING_CCFLAGS = -Wall -Wno-trigraphs -Wmissing-prototypes
-Wpointer-arith -Wcast-align -Wsign-compare -Wno-multichar ;

9
configure vendored
View File

@ -57,6 +57,12 @@ options:
default -- any other distro (default value).
--help Prints out this help.
--include-gpl-addons Include GPL licensed add-ons.
--include-patented-code Enable code that is known to implemented patented
ideas and techniques. If this option is not
specified, the resulting distribution may still
implement patented ideas and techniques. This
option only disables code that is currently known
to be problematic.
--include-3rdparty Include 3rdparty/ in the build system.
--enable-multiuser Enable experimental multiuser support.
--target=TARGET Select build target platform. [default=${target}]
@ -259,6 +265,7 @@ haikuCxxHeadersDir=
hostGCCVersion=`gcc -dumpversion`
bochsDebug=0
includeGPLAddOns=0
includePatentedCode=0
include3rdParty=0
enableMultiuser=0
distroCompatibility=default
@ -328,6 +335,7 @@ while [ $# -gt 0 ] ; do
;;
--help | -h) usage; exit 0;;
--include-gpl-addons) includeGPLAddOns=1; shift 1;;
--include-patented-code) includePatentedCode=1; shift 1;;
--include-3rdparty) include3rdParty=1; shift 1;;
--enable-multiuser) enableMultiuser=1; shift 1;;
--distro-compatibility)
@ -462,6 +470,7 @@ HOST_PLATFORM ?= "${buildPlatform}" ;
BOCHS_DEBUG_HACK ?= "${bochsDebug}" ;
INCLUDE_GPL_ADDONS ?= "${includeGPLAddOns}" ;
HAIKU_INCLUDE_PATENTED_CODE ?= "${includePatentedCode}" ;
HAIKU_INCLUDE_3RDPARTY ?= "${include3rdParty}" ;
HAIKU_ENABLE_MULTIUSER ?= "${enableMultiuser}" ;
HAIKU_DISTRO_COMPATIBILITY ?= "${distroCompatibility}" ;

View File

@ -92,7 +92,9 @@ FT_BEGIN_HEADER
/* This is done to allow FreeType clients to run unmodified, forcing */
/* them to display normal gray-level anti-aliased glyphs. */
/* */
/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
#if HAIKU_INCLUDE_PATENTED_CODE
# define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
#endif
/*************************************************************************/
@ -480,7 +482,9 @@ FT_BEGIN_HEADER
/* Do not #undef this macro here, since the build system might */
/* define it for certain configurations only. */
/* */
#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
#if HAIKU_INCLUDE_PATENTED_CODE
# define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
#endif
/*************************************************************************/