Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- ./common.mk.orig 2011-06-12 17:43:39.000000000 -0400
- +++ ./common.mk 2013-09-13 18:33:58.277987599 -0400
- @@ -1,6 +1,6 @@
- QUIET ?= true
- -LIBFREETYPE2_SOURCE_INTERNAL = libs/freetype-2.3.5
- +LIBFREETYPE2_SOURCE_INTERNAL = libs/freetype-2.5.0.1
- LIBJPEG_SOURCE_INTERNAL = libs/jpeg-6b
- LIBPNG_SOURCE_INTERNAL = libs/libpng-1.2.18
- LIBZ_SOURCE_INTERNAL = libs/zlib-1.2.3
- --- ./configure.ac.orig 2011-06-12 17:43:39.000000000 -0400
- +++ ./configure.ac 2013-09-09 12:20:56.906862587 -0400
- @@ -20,7 +20,7 @@
- AC_SUBST([libfbsplash_version], [1:0:0])
- AC_SUBST([libfbsplashrender_version], [1:0:0])
- -AM_INIT_AUTOMAKE([1.10 -Wno-portability])
- +AM_INIT_AUTOMAKE([1.10 -Wno-portability subdir-objects])
- AC_CONFIG_MACRO_DIR([m4])
- AC_PREREQ(2.59)
- @@ -538,7 +538,8 @@
- MNG_LIBS="${MNG_LIBS} -lmng"
- MNG_LIBS="${MNG_LIBS} ${JPEG_LIBS}"
- AC_CHECK_LIB([z], [zlibVersion], [MNG_LIBS="${MNG_LIBS} -lz" ])
- - AC_CHECK_LIB([lcms], [cmsCloseProfile],[MNG_LIBS="${MNG_LIBS} -llcms"])
- + AC_CHECK_LIB([lcms2], [cmsCloseProfile],[MNG_LIBS="${MNG_LIBS} -llcms2"])
- + AC_CHECK_LIB([lcms2], [cmsFreeToneCurve],[MNG_LIBS="${MNG_LIBS} -llcms2"])
- ],
- [AC_MSG_ERROR(['libmng' library file was not found.])]
- )
- --- ./libs/Makefile.am.orig 2011-06-12 17:43:39.000000000 -0400
- +++ ./libs/Makefile.am 2013-09-19 09:00:41.979468808 -0400
- @@ -30,10 +30,11 @@
- if CONFIG_PNG
- noinst_LIBRARIES += libpng.a libz.a
- endif
- -if CONFIG_TTF_KERNEL
- -noinst_LIBRARIES += libfreetype.a
- endif
- endif
- +
- +if CONFIG_TTF_KERNEL
- +noinst_LIBRARIES += libfreetype.a
- endif
- libjpeg_a_SOURCES =
- @@ -41,6 +42,8 @@
- libz_a_SOURCES =
- libfreetype_a_SOURCES =
- +if CONFIG_TTF_KERNEL
- +if CONFIG_KLIBC
- libfreetype.a: klibc_compat.h
- $(Q)$(MKDIR_P) libfreetype
- $(Q)cd libfreetype ; \
- @@ -56,6 +59,23 @@
- $(MAKE) $(AM_MAKEFLAGS) CFLAGS="-c $(K_CFLAGS)" CCexe="$(BUILD_CC)" ANSIFLAGS="" library $(OUTPUT)
- $(Q)$(MKDIR_P) $(@D)
- $(Q)cp -f libfreetype/.libs/libfreetype.a $@
- +else
- +libfreetype.a:
- + $(Q)$(MKDIR_P) libfreetype
- + $(Q)cd libfreetype ; \
- + if test ! -e ./config.mk ; then \
- + $(call infmsg,CONF,libfreetype.a) ; \
- + CPPFLAGS="-I$(LIBZ_SOURCE)" \
- + $(LIBFREETYPE2_SOURCE)/configure --host=$(host) --build=$(build_triplet) --disable-shared $(OUTPUT) ; \
- + fi ; \
- + if ! $(MAKE) --question $(AM_MAKEFLAGS) library ; then \
- + $(call infmsg,MAKE,libfreetype.a) ; \
- + fi ; \
- + $(MAKE) $(AM_MAKEFLAGS) CCexe="$(BUILD_CC)" ANSIFLAGS="" library $(OUTPUT)
- + $(Q)$(MKDIR_P) $(@D)
- + $(Q)cp -f libfreetype/.libs/libfreetype.a $@
- +endif
- +endif
- libjpeg.a:
- $(Q)$(MKDIR_P) libjpeg
- --- ./src/Makefile.am.orig 2011-06-12 17:43:39.000000000 -0400
- +++ ./src/Makefile.am 2013-09-25 11:28:26.803528507 -0400
- @@ -50,7 +50,7 @@
- # All
- ################################################################################
- -INCLUDES = -I$(top_srcdir) -I$(top_builddir)
- +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- AM_MAKEFLAGS =
- AM_LIBTOOLFLAGS =
- @@ -190,7 +190,7 @@
- fbsplashctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS) $(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD
- fbsplashctl_CPPFLAGS = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS)
- fbsplashctl_LDFLAGS = $(AM_LDFLAGS) -all-static
- -fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS)
- +fbsplashctl_LDADD = -L$(abs_top_builddir)/libs libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS)
- if CONFIG_FBCON_DECOR
- fbsplashctl_SOURCES += $(fbcondecor_ctl_SOURCES)
- @@ -284,7 +284,7 @@
- fbcondecor_helper-%.o: %.c
- @$(call infmsg,CC,$@)
- $(Q)$(MKDIR_P) $(@D)
- - $(Q)$(KLCC) $(fbcondecor_helper_CPPFLAGS) $(fbcondecor_helper_CFLAGS) $(INCLUDES) -c $< -o $@
- + $(Q)$(KLCC) $(fbcondecor_helper_CPPFLAGS) $(fbcondecor_helper_CFLAGS) $(AM_CPPFLAGS) -c $< -o $@
- else
- fbcondecor_helper_SOURCES = \
- kernel.c \
- @@ -303,11 +303,13 @@
- common.h \
- render.h \
- fbsplash.h
- -if CONFIG_TTF_KERNEL
- -fbcondecor_helper_SOURCES += ttf.c ttf.h
- -endif
- fbcondecor_helper_CPPFLAGS = $(AM_CPPFLAGS) -DTARGET_KERNEL
- fbcondecor_helper_CFLAGS = $(AM_CFLAGS) $(libfbsplashrender_la_CFLAGS)
- fbcondecor_helper_LDFLAGS = $(AM_LDFLAGS)
- fbcondecor_helper_LDADD = $(libfbsplashrender_la_LIBADD)
- +if CONFIG_TTF_KERNEL
- +fbcondecor_helper_SOURCES += ttf.c ttf.h fbsplash.h
- +fbcondecor_helper_CFLAGS += -I$(LIBFREETYPE2_SOURCE)/include -I$(LIBZ_SOURCE)
- +fbcondecor_helper_LDADD += $(top_builddir)/libs/libfreetype.a
- +endif
- endif
Add Comment
Please, Sign In to add comment