Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

libfreetype_automake_lcms2.patch

By: cmsigler on Sep 27th, 2013  |  syntax: None  |  size: 4.60 KB  |  views: 156  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. --- ./common.mk.orig    2011-06-12 17:43:39.000000000 -0400
  2. +++ ./common.mk 2013-09-13 18:33:58.277987599 -0400
  3. @@ -1,6 +1,6 @@
  4.  QUIET ?= true
  5.  
  6. -LIBFREETYPE2_SOURCE_INTERNAL = libs/freetype-2.3.5
  7. +LIBFREETYPE2_SOURCE_INTERNAL = libs/freetype-2.5.0.1
  8.  LIBJPEG_SOURCE_INTERNAL      = libs/jpeg-6b
  9.  LIBPNG_SOURCE_INTERNAL       = libs/libpng-1.2.18
  10.  LIBZ_SOURCE_INTERNAL         = libs/zlib-1.2.3
  11. --- ./configure.ac.orig 2011-06-12 17:43:39.000000000 -0400
  12. +++ ./configure.ac      2013-09-09 12:20:56.906862587 -0400
  13. @@ -20,7 +20,7 @@
  14.  AC_SUBST([libfbsplash_version], [1:0:0])
  15.  AC_SUBST([libfbsplashrender_version], [1:0:0])
  16.  
  17. -AM_INIT_AUTOMAKE([1.10 -Wno-portability])
  18. +AM_INIT_AUTOMAKE([1.10 -Wno-portability subdir-objects])
  19.  AC_CONFIG_MACRO_DIR([m4])
  20.  
  21.  AC_PREREQ(2.59)
  22. @@ -538,7 +538,8 @@
  23.              MNG_LIBS="${MNG_LIBS} -lmng"
  24.              MNG_LIBS="${MNG_LIBS} ${JPEG_LIBS}"
  25.              AC_CHECK_LIB([z],    [zlibVersion],    [MNG_LIBS="${MNG_LIBS} -lz"   ])
  26. -            AC_CHECK_LIB([lcms], [cmsCloseProfile],[MNG_LIBS="${MNG_LIBS} -llcms"])
  27. +            AC_CHECK_LIB([lcms2], [cmsCloseProfile],[MNG_LIBS="${MNG_LIBS} -llcms2"])
  28. +            AC_CHECK_LIB([lcms2], [cmsFreeToneCurve],[MNG_LIBS="${MNG_LIBS} -llcms2"])
  29.            ],
  30.            [AC_MSG_ERROR(['libmng' library file was not found.])]
  31.          )
  32. --- ./libs/Makefile.am.orig     2011-06-12 17:43:39.000000000 -0400
  33. +++ ./libs/Makefile.am  2013-09-19 09:00:41.979468808 -0400
  34. @@ -30,10 +30,11 @@
  35.  if CONFIG_PNG
  36.  noinst_LIBRARIES += libpng.a libz.a
  37.  endif
  38. -if CONFIG_TTF_KERNEL
  39. -noinst_LIBRARIES += libfreetype.a
  40.  endif
  41.  endif
  42. +
  43. +if CONFIG_TTF_KERNEL
  44. +noinst_LIBRARIES += libfreetype.a
  45.  endif
  46.  
  47.  libjpeg_a_SOURCES =
  48. @@ -41,6 +42,8 @@
  49.  libz_a_SOURCES =
  50.  libfreetype_a_SOURCES =
  51.  
  52. +if CONFIG_TTF_KERNEL
  53. +if CONFIG_KLIBC
  54.  libfreetype.a: klibc_compat.h
  55.         $(Q)$(MKDIR_P) libfreetype
  56.         $(Q)cd libfreetype ; \
  57. @@ -56,6 +59,23 @@
  58.         $(MAKE) $(AM_MAKEFLAGS) CFLAGS="-c $(K_CFLAGS)" CCexe="$(BUILD_CC)" ANSIFLAGS="" library $(OUTPUT)
  59.         $(Q)$(MKDIR_P) $(@D)
  60.         $(Q)cp -f libfreetype/.libs/libfreetype.a $@
  61. +else
  62. +libfreetype.a:
  63. +       $(Q)$(MKDIR_P) libfreetype
  64. +       $(Q)cd libfreetype ; \
  65. +       if test ! -e ./config.mk ; then \
  66. +               $(call infmsg,CONF,libfreetype.a) ; \
  67. +               CPPFLAGS="-I$(LIBZ_SOURCE)" \
  68. +               $(LIBFREETYPE2_SOURCE)/configure --host=$(host) --build=$(build_triplet) --disable-shared $(OUTPUT) ; \
  69. +       fi ; \
  70. +       if ! $(MAKE) --question $(AM_MAKEFLAGS) library ; then \
  71. +               $(call infmsg,MAKE,libfreetype.a) ; \
  72. +       fi ; \
  73. +       $(MAKE) $(AM_MAKEFLAGS) CCexe="$(BUILD_CC)" ANSIFLAGS="" library $(OUTPUT)
  74. +       $(Q)$(MKDIR_P) $(@D)
  75. +       $(Q)cp -f libfreetype/.libs/libfreetype.a $@
  76. +endif
  77. +endif
  78.  
  79.  libjpeg.a:
  80.         $(Q)$(MKDIR_P) libjpeg
  81. --- ./src/Makefile.am.orig      2011-06-12 17:43:39.000000000 -0400
  82. +++ ./src/Makefile.am   2013-09-25 11:28:26.803528507 -0400
  83. @@ -50,7 +50,7 @@
  84.  # All
  85.  ################################################################################
  86.  
  87. -INCLUDES = -I$(top_srcdir) -I$(top_builddir)
  88. +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
  89.  
  90.  AM_MAKEFLAGS     =
  91.  AM_LIBTOOLFLAGS  =
  92. @@ -190,7 +190,7 @@
  93.  fbsplashctl_CFLAGS          = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS) $(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD
  94.  fbsplashctl_CPPFLAGS        = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS)
  95.  fbsplashctl_LDFLAGS         = $(AM_LDFLAGS) -all-static
  96. -fbsplashctl_LDADD           = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS)
  97. +fbsplashctl_LDADD           = -L$(abs_top_builddir)/libs libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS)
  98.  
  99.  if CONFIG_FBCON_DECOR
  100.  fbsplashctl_SOURCES += $(fbcondecor_ctl_SOURCES)
  101. @@ -284,7 +284,7 @@
  102.  fbcondecor_helper-%.o: %.c
  103.         @$(call infmsg,CC,$@)
  104.         $(Q)$(MKDIR_P) $(@D)
  105. -       $(Q)$(KLCC) $(fbcondecor_helper_CPPFLAGS) $(fbcondecor_helper_CFLAGS) $(INCLUDES) -c $< -o $@
  106. +       $(Q)$(KLCC) $(fbcondecor_helper_CPPFLAGS) $(fbcondecor_helper_CFLAGS) $(AM_CPPFLAGS) -c $< -o $@
  107.  else
  108.  fbcondecor_helper_SOURCES = \
  109.         kernel.c \
  110. @@ -303,11 +303,13 @@
  111.         common.h \
  112.         render.h \
  113.         fbsplash.h
  114. -if CONFIG_TTF_KERNEL
  115. -fbcondecor_helper_SOURCES  += ttf.c ttf.h
  116. -endif
  117.  fbcondecor_helper_CPPFLAGS = $(AM_CPPFLAGS) -DTARGET_KERNEL
  118.  fbcondecor_helper_CFLAGS   = $(AM_CFLAGS) $(libfbsplashrender_la_CFLAGS)
  119.  fbcondecor_helper_LDFLAGS  = $(AM_LDFLAGS)
  120.  fbcondecor_helper_LDADD    = $(libfbsplashrender_la_LIBADD)
  121. +if CONFIG_TTF_KERNEL
  122. +fbcondecor_helper_SOURCES  += ttf.c ttf.h fbsplash.h
  123. +fbcondecor_helper_CFLAGS   += -I$(LIBFREETYPE2_SOURCE)/include -I$(LIBZ_SOURCE)
  124. +fbcondecor_helper_LDADD    += $(top_builddir)/libs/libfreetype.a
  125. +endif
  126.  endif