SOURCES: splashutils-makefile.patch - updated for 1.1.9.6.
pluto
pluto at pld-linux.org
Mon Jun 13 19:54:51 CEST 2005
Author: pluto Date: Mon Jun 13 17:54:51 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.1.9.6.
---- Files affected:
SOURCES:
splashutils-makefile.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/splashutils-makefile.patch
diff -u SOURCES/splashutils-makefile.patch:1.3 SOURCES/splashutils-makefile.patch:1.4
--- SOURCES/splashutils-makefile.patch:1.3 Wed Feb 9 18:50:06 2005
+++ SOURCES/splashutils-makefile.patch Mon Jun 13 19:54:46 2005
@@ -1,19 +1,21 @@
---- splashutils-0.9.1.orig/Makefile 2005-01-26 22:08:12.000000000 +0100
-+++ splashutils-0.9.1/Makefile 2005-02-09 19:47:57.724675704 +0100
-@@ -11,12 +11,6 @@
+--- splashutils-1.1.9.6/Makefile.orig 2005-05-15 20:39:25.000000000 +0200
++++ splashutils-1.1.9.6/Makefile 2005-06-13 19:51:52.000000000 +0200
+@@ -9,14 +9,6 @@
- PKG_VERSION = 0.9.1
+ PKG_VERSION = 1.1.9.6
DEBUG = false # set to true to prevent stripping
-K_SHARED = false # set to true if you want to link to a shared klibc
+-QUIET = true
-
-JPEGSRC = libs/jpeg-6b
-LPNGSRC = libs/libpng-1.2.8
-ZLIBSRC = libs/zlib-1.2.1
--LIBCSRC = libs/klibc-0.179/klibc
+-FT2SRC = libs/freetype-2.1.9
+-LIBCSRC = libs/klibc-1.0.8/klibc
prefix =
sbindir = ${prefix}/sbin
-@@ -28,38 +22,12 @@
+@@ -28,89 +20,26 @@
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROG}
@@ -27,6 +29,12 @@
- K_LDFLAGS = --gc-sections
-endif
-
+-ifeq ($(strip $(QUIET)),true)
+- OUTPUT = /dev/null
+-else
+- OUTPUT = /dev/stdout
+-endif
+-
LIBGCC = $(shell $(CC) --print-libgcc)
ROOT = $(shell pwd)
ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
@@ -34,32 +42,85 @@
-include $(LIBCSRC)/arch/$(ARCH)/MCONFIG
-
-# flags for the kernel utils
--K_CFLAGS = -w $(OPTFLAGS) $(ARCHREQFLAGS) -nostdinc -iwithprefix include -I${ROOT}/$(LIBCSRC)/../ \
+-K_CFLAGS = -w $(shell grep REQFLAGS $(LIBCSRC)/../klibc.config | cut -d= -f2-) \
+- $(shell grep OPTFLAGS $(LIBCSRC)/../klibc.config | cut -d= -f2-) \
- -I${ROOT}/$(LIBCSRC)/../include/arch/$(ARCH) \
- -I${ROOT}/$(LIBCSRC)/../include/bits$(BITSIZE) \
-- -D__KLIBC__ -DBITSIZE=$(BITSIZE) -I${ROOT}/$(LIBCSRC)/../include -I${ROOT}/linux/include $(MISCINCS) \
-- -DWITH_ERRLIST -I${ROOT}/$(ZLIBSRC) -I/usr/include -ffunction-sections -fdata-sections -DTARGET_KERNEL
+- -I${ROOT}/$(LIBCSRC)/../include \
+- -I${ROOT}/linux/include \
+- -I${ROOT}/linux/include2 \
+- $(MISCINCS) \
+- -DWITH_ERRLIST -I${ROOT}/$(ZLIBSRC) -I${ROOT}/$(FT2SRC)/include -I/usr/include -ffunction-sections \
+- -fdata-sections -DTARGET_KERNEL -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-PNGDEFS = -DPNG_NO_WRITE_TIME -DPNG_NO_FLOATING_POINT_SUPPORTED -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_READ_iTXt \
- -DPNG_LEGACY_SUPPORTED -DPNG_NO_PROGRESSIVE_READ -DPNG_NO_MNG_FEATURES -DPNG_NO_CONSOLE_IO \
- -DPNG_NO_ERROR_NUMBERS -DPNG_READ_GRAY_TO_RGB_SUPPORTED -DPNG_READ_16_TO_8_SUPPORTED \
- -DPNG_READ_STRIP_ALPHA_SUPPORTED -DPNG_NO_INFO_IMAGE -DPNG_NO_READ_TRANSFORMS -DPNG_NO_READ_ANCILLARY_CHUNKS
-
--K_LDLIBS = $(JPEGSRC)/libjpeg.a $(LPNGSRC)/libpng.a $(ZLIBSRC)/libz.a
+-K_LDLIBS = $(JPEGSRC)/libjpeg.a
+-K_OBJS = $(KOUT)/kernel.o $(KOUT)/dev.o $(KOUT)/parse.o $(KOUT)/render.o $(KOUT)/image.o \
+- $(KOUT)/cmd.o $(KOUT)/common.o $(KOUT)/list.o $(KOUT)/effects.o
+-K_DEPS =
+-
+ # flags for the user utils
+-CFLAGS = -Wall -g
+-LDLIBS = -ljpeg -lm
++CFLAGS = -Wall
++LDLIBS = -ljpeg -lpng -lm -lfreetype -lz
+ LDFLAGS =
+-INCLUDES = -I${ROOT}/linux/include -I/usr/include/freetype2
+-OBJS = splash.o parse.o render.o image.o cmd.o common.o daemon.o list.o effects.o
++INCLUDES = -I/usr/include/freetype2
++OBJS = splash.o parse.o render.o image.o cmd.o common.o daemon.o list.o effects.o ttf.o
+
+ # checks whether an opton is set in config.h
+ config_opt = $(shell if [[ -n "`egrep '^\#define[[:space:]]+$(1)([[:space:]]+|$$)' config.h`" ]]; then echo true ; fi)
+
+-ifeq ($(call config_opt,CONFIG_TTF),true)
+- OBJS += ttf.o
+- LDLIBS += -lfreetype -lz
+-endif
-
- # flags for the user utills
--CFLAGS = -Wall -g -I${ROOT}/linux/include
-+CFLAGS = -Wall -g
- LDLIBS = -ljpeg -lpng -lz -lm
- LDFLAGS =
-
-@@ -92,77 +60,22 @@
+-ifeq ($(call config_opt,CONFIG_MNG),true)
+- OBJS += mng_render.o mng_callbacks.o
+- LDLIBS += -lmng -llcms -ljpeg -lz
+-endif
+-
+-ifeq ($(call config_opt,CONFIG_TTF_KERNEL),true)
+- K_LDLIBS += $(FT2SRC)/objs/.libs/libfreetype.a
+- K_OBJS += $(KOUT)/ttf.o
+- K_DEPS += ft2
+-endif
+-
+-ifeq ($(call config_opt,CONFIG_PNG),true)
+- K_LDLIBS += $(LPNGSRC)/libpng.a $(ZLIBSRC)/libz.a
+- K_DEPS += libpng
+- LDLIBS += -lpng -lz -lm
+-endif
+-
+ ifeq ($(strip $(DEBUG)),true)
+ STRIP = true
+ else
+ STRIP = strip --strip-all -R .comment -R .note
+ endif
+
+-KOUT = kernel
+ dotg = \e[32;01m*\e[0m
+ info = printf " %-7s %s\n" $(1) $(2)
+ install_script = $(call info,INSTALL,$(1)) ; $(INSTALL_PROG) -D scripts/$(1) $(DESTDIR)$(usrbindir)/$(1) ; \
+@@ -134,102 +63,18 @@
@$(CC) $+ $(LDLIBS) -o $@
@$(CC) $+ $(LDLIBS) -static -o $@.static
-linux:
-- @if [ ! -e linux ]; then \
-- ln -s /lib/modules/`uname -r`/source/ linux; \
+- @if [ ! -e "$(ROOT)/linux" ]; then \
+- ln -s /lib/modules/`uname -r`/source/ "$(ROOT)/linux"; \
+- fi
+-
+-kdir:
+- @if [ ! -d "$(ROOT)/$(KOUT)" ]; then \
+- mkdir "$(ROOT)/$(KOUT)" ; \
- fi
-
-klibc: linux
@@ -69,73 +130,93 @@
- fi
- @cd $(LIBCSRC) ; \
- if ! make -q; then $(call info,MAKE,klibc) ; fi ; \
-- make > /dev/null
+- make > $(OUTPUT)
+- @cd $(LIBCSRC)/.. ; \
+- make klibc.config > $(OUTPUT)
-
--zlib:
--# @$(call info,BUILD,zlib)
+-zlib: config.h
- @cd $(ZLIBSRC) ; \
- if [ ! -e ./Makefile ]; then \
- $(call info,CONF,zlib) ; \
-- ./configure > /dev/null; \
+- ./configure > $(OUTPUT); \
- sed -i 's#^CFLAGS=\(.*\)#CFLAGS=\1 $(K_CFLAGS)#' Makefile ; \
- fi ; \
- if ! make -q libz.a; then $(call info,MAKE,zlib) ; fi ; \
-- make libz.a > /dev/null
+- make libz.a > $(OUTPUT)
-
--libpng: zlib
--# @$(call info,BUILD,libpng)
+-libpng: zlib config.h
- @cd $(LPNGSRC) ; \
- if [ ! -e ./Makefile ]; then \
- $(call info,CONF,libpng) ; \
-- cp scripts/makefile.linux Makefile > /dev/null; \
+- cp scripts/makefile.linux Makefile > $(OUTPUT); \
- sed -i -e '/^CFLAGS/ { N ; s#^CFLAGS=.*#CFLAGS=$(K_CFLAGS) $(PNGDEFS)# ; P ; D }' \
- -e 's#^ZLIBINC=.*#ZLIBINC=$(ZLIBSRC)#' \
- -e 's#^ZLIBLIB=.*#ZLIBLIB=$(ZLIBSRC)#' Makefile ; \
- fi ; \
- if ! make -q libpng.a; then $(call info,MAKE,libpng) ; fi ; \
-- make libpng.a > /dev/null
+- make libpng.a > $(OUTPUT)
-
-jpeglib:
--# @$(call info,BUILD,libjpeg)
- @cd $(JPEGSRC) ; \
- if [ ! -e ./Makefile ]; then \
- $(call info,CONF,libjpeg) ; \
-- ./configure > /dev/null ; \
+- ./configure > $(OUTPUT) ; \
- echo "#define NO_GETENV 1" >> jconfig.h ; \
- sed -i "s#CFLAGS=.*#CFLAGS=$(K_CFLAGS)#" Makefile ; \
- sed -i "s:#define JMESSAGE.*::" jerror.c ; \
- fi ; \
- if ! make -q libjpeg.a; then $(call info,MAKE,libjpeg) ; fi ; \
-- make libjpeg.a > /dev/null
+- make libjpeg.a > $(OUTPUT)
-
--splash_kern: klibc jpeglib libpng $(SP_HELPER) $(LIBC) config.h $(K_LDLIBS)
+-ft2: config.h
+- @cd $(FT2SRC) ; \
+- if [ ! -e ./config.mk ]; then \
+- $(call info,CONF,freetype2) ; \
+- ./configure --disable-shared > $(OUTPUT) ; \
+- fi ; \
+- if ! make -q library; then $(call info,MAKE,freetype2) ; fi ; \
+- make CFLAGS="-c $(K_CFLAGS)" library > $(OUTPUT)
+-
+-splash_kern: klibc jpeglib kdir $(K_DEPS) $(SP_HELPER) $(LIBC) config.h $(K_LDLIBS)
+splash_kern: $(SP_HELPER) config.h
- $(SP_HELPER): $(KOUT)/splash_kernel.o $(KOUT)/splash_dev.o $(KOUT)/splash_parse.o $(KOUT)/splash_render.o $(KOUT)/splash_unpack.o $(KOUT)/splash_cmd.o $(KOUT)/splash_common.o
+-$(SP_HELPER): $(K_OBJS)
++$(SP_HELPER): $(OBJS)
@$(call info,LD,$@)
-ifeq ($(strip $(K_SHARED)),true)
- @ld $(K_LDFLAGS) -o $@ -e main $(CRT0) $+ $(K_LDLIBS) -R $(LIBC) $(LIBGCC)
+-ifeq ($(strip $(QUIET)),false)
+- @echo ld $(K_LDFLAGS) -o $@ -e main $(CRT0) $+ $(K_LDLIBS) -R $(LIBC) $(LIBGCC)
+-endif
-else
- @ld $(K_LDFLAGS) -o $@ $(CRT0) $+ $(K_LDLIBS) $(LIBC) $(LIBGCC)
+-ifeq ($(strip $(QUIET)),false)
+- @echo ld $(K_LDFLAGS) -o $@ $(CRT0) $+ $(K_LDLIBS) $(LIBC) $(LIBGCC)
-endif
-+ @$(CC) -o $@ -e main $+ $(LDLIBS) -static
+-endif
++ ld $(LDFLAGS) -o $@ $(CRT0) $+ $(LDLIBS) $(LIBC) $(LIBGCC)
@$(STRIP) $@
- $(KOUT)/%.o: %.c config.h
- @$(call info,CC,$@)
+-$(KOUT)/%.o: %.c config.h splash.h
+- @$(call info,CC,$@)
- @$(CC) $(K_CFLAGS) -c -o $@ $<
-+ @$(CC) $(CFLAGS) -c -o $@ $<
-
- %.o: %.c config.h
+-ifeq ($(strip $(QUIET)),false)
+- @echo $(CC) $(K_CFLAGS) -c -o $@ $<
+-endif
+-
+ %.o: %.c config.h splash.h
@$(call info,CC,$@)
- @$(CC) $(CFLAGS) -DPKG_VERSION=\"$(PKG_VERSION)\" -c -o $@ $<
+ @$(CC) $(CFLAGS) $(INCLUDES) -DPKG_VERSION=\"$(PKG_VERSION)\" -c -o $@ $<
+-ifeq ($(strip $(QUIET)),false)
+- @echo $(CC) $(CFLAGS) $(INCLUDES) -DPKG_VERSION=\"$(PKG_VERSION)\" -c -o $@ $<
+-endif
--clean: clean_klibc clean_jpg clean_png clean_zlib clean_splash
+-clean: clean_klibc clean_jpg clean_png clean_zlib clean_ft2 clean_splash
+clean: clean_splash
clean_splash:
@$(call info,CLEAN,splash)
-@@ -171,35 +84,6 @@
+@@ -238,43 +83,6 @@
@rm -f splash_helper splash_util splash_util.static
@rm -f linux
@@ -143,7 +224,7 @@
- @cd $(JPEGSRC) ; \
- if [ -e Makefile ]; then \
- $(call info,CLEAN,libjpeg) ; \
-- make clean > /dev/null ; \
+- make clean > $(OUTPUT) ; \
- rm Makefile ; \
- fi
-
@@ -151,7 +232,7 @@
- @cd $(LPNGSRC) ; \
- if [ -e Makefile ]; then \
- $(call info,CLEAN,libpng) ; \
-- make clean > /dev/null ; \
+- make clean > $(OUTPUT) ; \
- rm Makefile ; \
- fi
-
@@ -159,14 +240,22 @@
- @cd $(ZLIBSRC) ; \
- if [ -e Makefile ]; then \
- $(call info,CLEAN,zlib) ; \
-- make clean > /dev/null ; \
+- make clean > $(OUTPUT) ; \
- rm Makefile ; \
- fi
-
+-clean_ft2:
+- @cd $(FT2SRC) ; \
+- if [ -e ./config.mk ]; then \
+- $(call info,CLEAN,freetype2) ; \
+- make clean > $(OUTPUT) ; \
+- rm config.mk ; \
+- fi
+-
-clean_klibc:
- @cd $(LIBCSRC) ; \
- $(call info,CLEAN,klibc) ; \
-- make clean > /dev/null 2> /dev/null
+- make clean > $(OUTPUT) 2>/dev/null
-
install: all
@$(call info,INSTALL,$(SP_HELPER)) ; $(INSTALL_PROG) -D $(SP_HELPER) $(DESTDIR)$(sbindir)/$(SP_HELPER)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/splashutils-makefile.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list