splashutils: New patch

3 files changed, 212 insertions, 9 deletions

diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 9c1d22ed..639047a7 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,24 +1,42 @@
-MD5 df47619f1d3505c4593906da84775dd9 ChangeLog 11735
-RMD160 9a10b29b270552a7f2bf8cd67b5c98942f98acf8 ChangeLog 11735
-SHA256 5f5489b46ea15698a77b08232a5cac90b774a9dc7e220391a8f911b59eef03d5 ChangeLog 11735
-MD5 35cc14c0e9021cf2b900e89588015f07 files/digest-splashutils-1.1.9.10-r2 1774
-RMD160 12af3f46f7d493c35d5411de6ef76478b4d34145 files/digest-splashutils-1.1.9.10-r2 1774
-SHA256 ae313288aa756133eb20f3c3f738003bcdf7176636cabd47918916dae8fbd036 files/digest-splashutils-1.1.9.10-r2 1774
+AUX splashutils-1.1.9.10-linux-2.6.16.diff 456 RMD160 9b725213bde5fe42b61b68017c8852c06d40bbce SHA1 7e03300e5b6f8734d80fc6f22a3cce1da101eed0 SHA256 78074765fa90460b3c0c8e8bdf390d261ece23bcd93bff881d39b2fd42580866
 MD5 1288e7df14cc31b5a1c605f4f7a4bd52 files/splashutils-1.1.9.10-linux-2.6.16.diff 456
 RMD160 9b725213bde5fe42b61b68017c8852c06d40bbce files/splashutils-1.1.9.10-linux-2.6.16.diff 456
 SHA256 78074765fa90460b3c0c8e8bdf390d261ece23bcd93bff881d39b2fd42580866 files/splashutils-1.1.9.10-linux-2.6.16.diff 456
+AUX splashutils-1.1.9.10-makefile.patch 6258 RMD160 cd65e0feeefbaa053161959db5f1bb22120ee43c SHA1 b5a9afbcb97d8218f89926a3e53e8ac1dc6eeecb SHA256 777d5a6f59d49d00573cf4e99510abfc82865a16c27a67190b78b4e4a0e30d78
+MD5 38c4a990c2ad0581666c25da2029f08d files/splashutils-1.1.9.10-makefile.patch 6258
+RMD160 cd65e0feeefbaa053161959db5f1bb22120ee43c files/splashutils-1.1.9.10-makefile.patch 6258
+SHA256 777d5a6f59d49d00573cf4e99510abfc82865a16c27a67190b78b4e4a0e30d78 files/splashutils-1.1.9.10-makefile.patch 6258
+AUX splashutils-1.1.9.10-ppc-2.6.14.patch 749 RMD160 0642a987ff97cc18294840c37a2f88aa4f252450 SHA1 634712549ab4a1111347dcba3e459488fd3ffa0a SHA256 3995fd9d153a80f709882cbafc9c2330061eb0c8b6187b136ce79e956617f000
 MD5 6b70ab6899c37465a35de0f0a89c6365 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
 RMD160 0642a987ff97cc18294840c37a2f88aa4f252450 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
 SHA256 3995fd9d153a80f709882cbafc9c2330061eb0c8b6187b136ce79e956617f000 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
+AUX splashutils-1.1.9.9-external-klibc.patch 10294 RMD160 5fc49641fddfd9fae387c7b7d994110f506f71cf SHA1 5897f30d462fa79abe69f1b5d937d967d7476d88 SHA256 112dab3f2d432949d3110ebb9475b1405171ab196062be6f7dd244815e64f75b
 MD5 c9591cbde5eca614a8e1694ee01c315f files/splashutils-1.1.9.9-external-klibc.patch 10294
 RMD160 5fc49641fddfd9fae387c7b7d994110f506f71cf files/splashutils-1.1.9.9-external-klibc.patch 10294
 SHA256 112dab3f2d432949d3110ebb9475b1405171ab196062be6f7dd244815e64f75b files/splashutils-1.1.9.9-external-klibc.patch 10294
+AUX splashutils-depscan.patch 2197 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 SHA1 6e8406a714b71446089b4337f329c9eeeff0465e SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9
 MD5 d78ee27cab85b59044d8ef3e7e5be4af files/splashutils-depscan.patch 2197
 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 files/splashutils-depscan.patch 2197
 SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9 files/splashutils-depscan.patch 2197
+DIST freetype-2.1.9.tar.bz2 992394 RMD160 1dd8fb6fda8b159ef0d2ebedeca99a67ed65dc72 SHA1 a3c3a0c0d5f8f6e62c774e24817748a941016990 SHA256 4dabc3b38405f5c5f03b8f14d8902a9d506713182baf2baec9dea509515d4b6f
+DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 SHA1 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
+DIST libpng-1.2.8.tar.bz2 384970 RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c SHA1 b6d73493eea4095166118b298efecb54a8e3d2f5 SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
+DIST miscsplashutils-0.1.3.tar.bz2 91825 RMD160 47516ec50225ef18fd42e36d58e90e57bfc0dbac SHA1 844da6370e2a15da842bed109cc2574318bc25a0 SHA256 16fcb4d199e071a822d744bbd9238609a2175d512fc1c019018c05501cb23bdb
+DIST splashutils-gentoo-0.1.14.tar.bz2 7750 RMD160 680efa24119dcf699f37a9f295e3f81faebbdc18 SHA1 55285679ca778c82a5e8363526901689dc7b6cba SHA256 2515416c98bcf8e4e0d217cafc74b507295cb03d915d78b224683577159ae9dc
+DIST splashutils-lite-1.1.9.10.tar.bz2 55094 RMD160 274cfc9a79b69091b0feba8f6d64e3eb965dfb9a SHA1 c4bc383f40bd4f3cf45bd251fa133b59c6bd1d49 SHA256 de38e284103ed569360caf5d555d784309afea7625bad7acd689399d26c3955c
+DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
+EBUILD splashutils-1.1.9.10-r2.ebuild 6973 RMD160 204f7cd94f922a465725e577db7fef2b958524ce SHA1 b0507ad47f8c080e6b8fdcc7b97ffc0e8efcfb2d SHA256 bab694791f8dd4a425bd400b66cfa6d03d5938a7a9e6cb31835cea9b4eb27c91
+MD5 a915eeda7c9202990662b127d40d9efb splashutils-1.1.9.10-r2.ebuild 6973
+RMD160 204f7cd94f922a465725e577db7fef2b958524ce splashutils-1.1.9.10-r2.ebuild 6973
+SHA256 bab694791f8dd4a425bd400b66cfa6d03d5938a7a9e6cb31835cea9b4eb27c91 splashutils-1.1.9.10-r2.ebuild 6973
+MISC ChangeLog 11735 RMD160 9a10b29b270552a7f2bf8cd67b5c98942f98acf8 SHA1 3fd5ea2a3e41191ce655a64a87d16a1970201ce0 SHA256 5f5489b46ea15698a77b08232a5cac90b774a9dc7e220391a8f911b59eef03d5
+MD5 df47619f1d3505c4593906da84775dd9 ChangeLog 11735
+RMD160 9a10b29b270552a7f2bf8cd67b5c98942f98acf8 ChangeLog 11735
+SHA256 5f5489b46ea15698a77b08232a5cac90b774a9dc7e220391a8f911b59eef03d5 ChangeLog 11735
+MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d metadata.xml 220
-MD5 2086b91bb5f72055ac5db7f415e6c32d splashutils-1.1.9.10-r2.ebuild 6807
-RMD160 6ad1512792868de3e537596713272abb460b2a59 splashutils-1.1.9.10-r2.ebuild 6807
-SHA256 688c946cb363fb8aa84e476cbb904fa316f55ab91545b17188957e9b07be9357 splashutils-1.1.9.10-r2.ebuild 6807
+MD5 35cc14c0e9021cf2b900e89588015f07 files/digest-splashutils-1.1.9.10-r2 1774
+RMD160 12af3f46f7d493c35d5411de6ef76478b4d34145 files/digest-splashutils-1.1.9.10-r2 1774
+SHA256 ae313288aa756133eb20f3c3f738003bcdf7176636cabd47918916dae8fbd036 files/digest-splashutils-1.1.9.10-r2 1774
diff --git a/media-gfx/splashutils/files/splashutils-1.1.9.10-makefile.patch b/media-gfx/splashutils/files/splashutils-1.1.9.10-makefile.patch
new file mode 100644
index 00000000..0663a8d3
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.1.9.10-makefile.patch
@@ -0,0 +1,180 @@
+diff -Naurp splashutils-1.1.9.10-orig/Makefile splashutils-1.1.9.10/Makefile
+--- splashutils-1.1.9.10-orig/Makefile	2006-04-16 21:50:51.000000000 +0200
++++ splashutils-1.1.9.10/Makefile	2006-04-16 21:51:01.000000000 +0200
+@@ -101,8 +101,8 @@ endif
+ 
+ KOUT	= kernel
+ dotg    = \e[32;01m*\e[0m
+-info	= if [ "${QUIET}" == "true" ] ; then printf "  %-7s %s\n" $(1) $(2); fi
+-install_script = $(call info,INSTALL,$(1)) ; $(INSTALL_PROG) -D scripts/$(1) $(DESTDIR)$(usrbindir)/$(1) ; \
++infmsg	= if [ "${QUIET}" == "true" ] ; then printf "  %-7s %s\n" $(1) $(2) ; fi
++install_script = $(call infmsg,INSTALL,$(1)) ; $(INSTALL_PROG) -D scripts/$(1) $(DESTDIR)$(usrbindir)/$(1) ; \
+ 		 sed -e 's/%PKG_VERSION%/$(PKG_VERSION)/g' -i $(DESTDIR)$(usrbindir)/$(1)
+ 
+ SP_HELPER = splash_helper
+@@ -119,7 +119,7 @@ all:	splash_kern splash_user
+ splash_user: $(SP_UTIL)
+ 
+ $(SP_UTIL): $(OBJS)
+-	@$(call info,LD,$@)
++	@$(call infmsg,LD,$@)
+ 	$(Q)$(CC) $+ $(LDLIBS) -o $@
+ 	$(Q)$(CC) $+ $(LDLIBS) -static -o $@.static
+ 
+@@ -136,69 +136,69 @@ kdir:
+ zlib:	config.h
+ 	@cd $(ZLIBSRC) ; \
+ 	if [ ! -e ./Makefile ]; then \
+-		$(call info,CONF,zlib) ; \
++		$(call infmsg,CONF,zlib) ; \
+ 		CC=$(KLCC) CFLAGS="$(K_CFLAGS)" \
+ 		./configure > $(OUTPUT); \
+ 		sed -i 's#^CFLAGS=\(.*\)#CFLAGS=\1 $(K_CFLAGS)#' Makefile ; \
+ 	fi ; \
+-	if ! make -q CC=$(KLCC) libz.a; then $(call info,MAKE,zlib) ; fi ; \
++	if ! make -q CC=$(KLCC) libz.a; then $(call infmsg,MAKE,zlib) ; fi ; \
+ 	make CC=$(KLCC) libz.a > $(OUTPUT)
+ 
+ libpng:	zlib config.h
+ 	@cd $(LPNGSRC) ; \
+ 	if [ ! -e ./Makefile ]; then \
+-		$(call info,CONF,libpng) ; \
++		$(call infmsg,CONF,libpng) ; \
+ 		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 CC=$(KLCC) libpng.a; then $(call info,MAKE,libpng) ; fi ; \
++	if ! make -q CC=$(KLCC) libpng.a; then $(call infmsg,MAKE,libpng) ; fi ; \
+ 	make CC=$(KLCC) libpng.a > $(OUTPUT) 
+ 
+ jpeglib:
+ 	@cd $(JPEGSRC) ; \
+ 	if [ ! -e ./Makefile ]; then \
+-		$(call info,CONF,libjpeg) ; \
++		$(call infmsg,CONF,libjpeg) ; \
+ 		CC=$(KLCC) CFLAGS="$(K_CFLAGS)" \
+ 		./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 CC=$(KLCC) libjpeg.a; then $(call info,MAKE,libjpeg) ; fi ; \
++	if ! make -q CC=$(KLCC) libjpeg.a; then $(call infmsg,MAKE,libjpeg) ; fi ; \
+ 	make CC=$(KLCC) libjpeg.a > $(OUTPUT)
+ 
+ ft2:	config.h
+ 	@cd $(FT2SRC) ; \
+ 	if [ ! -e ./config.mk ]; then \
+-		$(call info,CONF,freetype2) ; \
++		$(call infmsg,CONF,freetype2) ; \
+ 		CC=$(KLCC) CPPFLAGS="-I$(ROOT)/$(ZLIBSRC)" \
+ 		CFLAGS="$(K_CFLAGS) -include $(ROOT)/klibc_compat.h" \
+ 		./configure --disable-shared > $(OUTPUT) ; \
+ 	fi ; \
+-	if ! make -q CFLAGS="$(K_CFLAGS)" library; then $(call info,MAKE,freetype2) ; fi ; \
++	if ! make -q CFLAGS="$(K_CFLAGS)" library; then $(call infmsg,MAKE,freetype2) ; fi ; \
+ 	make CFLAGS="-c $(K_CFLAGS)" library > $(OUTPUT)
+ 	
+ splash_kern: linux jpeglib kdir $(K_DEPS) $(SP_HELPER) config.h $(K_LDLIBS)
+ 
+ $(SP_HELPER): $(K_OBJS)
+-	@$(call info,LD,$@)
++	@$(call infmsg,LD,$@)
+ 	$(Q)$(KLCC) $(K_LDFLAGS) -o $@ $+ $(K_LDLIBS)
+ 	$(Q)$(STRIP) $@
+ 
+ $(KOUT)/%.o: %.c config.h splash.h
+-	@$(call info,CC,$@)
++	@$(call infmsg,CC,$@)
+ 	$(Q)$(KLCC) $(K_CFLAGS) -I/usr/include -c -o $@ $<
+ 
+ %.o: %.c config.h splash.h
+-	@$(call info,CC,$@)
++	@$(call infmsg,CC,$@)
+ 	$(Q)$(CC) $(CFLAGS) $(INCLUDES) -DPKG_VERSION=\"$(PKG_VERSION)\" -c -o $@ $<
+ 
+ clean:	clean_jpg clean_png clean_zlib clean_ft2 clean_splash
+ 
+ clean_splash:
+-	@$(call info,CLEAN,splash)
++	@$(call infmsg,CLEAN,splash)
+ 	$(Q)rm -f *.o
+ 	$(Q)rm -f kernel/*.o
+ 	$(Q)rm -f splash_helper splash_util splash_util.static
+@@ -207,7 +207,7 @@ clean_splash:
+ clean_jpg:
+ 	@cd $(JPEGSRC) ; \
+ 	if [ -e Makefile ]; then \
+-		$(call info,CLEAN,libjpeg) ; \
++		$(call infmsg,CLEAN,libjpeg) ; \
+ 		make clean > $(OUTPUT) ; \
+ 		rm -f Makefile ; \
+ 	fi
+@@ -215,7 +215,7 @@ clean_jpg:
+ clean_png:
+ 	@cd $(LPNGSRC) ; \
+ 	if [ -e Makefile ]; then \
+-		$(call info,CLEAN,libpng) ; \
++		$(call infmsg,CLEAN,libpng) ; \
+ 		make clean > $(OUTPUT) ; \
+ 		rm -f Makefile ; \
+ 	fi
+@@ -223,7 +223,7 @@ clean_png:
+ clean_zlib:
+ 	@cd $(ZLIBSRC) ; \
+ 	if [ -e Makefile ]; then \
+-		$(call info,CLEAN,zlib) ; \
++		$(call infmsg,CLEAN,zlib) ; \
+ 		make clean > $(OUTPUT) ; \
+ 		rm -f Makefile ; \
+ 	fi
+@@ -231,17 +231,17 @@ clean_zlib:
+ clean_ft2:
+ 	@cd $(FT2SRC) ; \
+ 	if [ -e ./config.mk ]; then \
+-		$(call info,CLEAN,freetype2) ; \
++		$(call infmsg,CLEAN,freetype2) ; \
+ 		make clean > $(OUTPUT) ; \
+ 		rm -f config.mk ; \
+ 	fi
+ 
+ install: all
+-	@$(call info,INSTALL,$(SP_HELPER))
++	@$(call infmsg,INSTALL,$(SP_HELPER))
+ 	$(Q)$(INSTALL_PROG) -D $(SP_HELPER) $(DESTDIR)$(sbindir)/$(SP_HELPER)
+-	@$(call info,INSTALL,$(SP_UTIL))
++	@$(call infmsg,INSTALL,$(SP_UTIL))
+ 	$(Q)$(INSTALL_PROG) -D $(SP_UTIL) $(DESTDIR)$(sbindir)/$(SP_UTIL)
+-	@$(call info,INSTALL,$(SP_UTIL).static)
++	@$(call infmsg,INSTALL,$(SP_UTIL).static)
+ 	$(Q)$(INSTALL_PROG) -D $(SP_UTIL).static $(DESTDIR)$(sbindir)/$(SP_UTIL).static
+ 	@$(call install_script,$(SP_GIRAM))
+ 	@$(call install_script,$(SP_CONV))
+@@ -249,18 +249,18 @@ install: all
+ 	@$(call install_script,$(SP_MNGR))
+ 
+ uninstall:
+-	@$(call info,UNINSTALL,$(SP_HELPER))
++	@$(call infmsg,UNINSTALL,$(SP_HELPER))
+ 	$(Q)rm -f $(sbindir)/$(SP_HELPER)
+-	@$(call info,UNINSTALL,$(SP_UTIL))
++	@$(call infmsg,UNINSTALL,$(SP_UTIL))
+ 	$(Q)rm -f $(sbindir)/$(SP_UTIL)
+-	@$(call info,UNINSTALL,$(SP_UTIL).static)
++	@$(call infmsg,UNINSTALL,$(SP_UTIL).static)
+ 	$(Q)rm -f $(sbindir)/$(SP_UTIL).static
+-	@$(call info,UNINSTALL,$(SP_GIRAM))
++	@$(call infmsg,UNINSTALL,$(SP_GIRAM))
+ 	$(Q)rm -f $(usrbindir)/$(SP_GIRAM)
+-	@$(call info,UNINSTALL,$(SP_CONV))
++	@$(call infmsg,UNINSTALL,$(SP_CONV))
+ 	$(Q)rm -f $(usrbindir)/$(SP_CONV)
+-	@$(call info,UNINSTALL,$(SP_RESIZE))
++	@$(call infmsg,UNINSTALL,$(SP_RESIZE))
+ 	$(Q)rm -f $(usrbindir)/$(SP_RESIZE)
+-	@$(call info,UNINSTALL,$(SP_MNGR))
++	@$(call infmsg,UNINSTALL,$(SP_MNGR))
+ 	$(Q)rm -f $(usrbindir)/$(SP_MNGR)
+ 	
diff --git a/media-gfx/splashutils/splashutils-1.1.9.10-r2.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10-r2.ebuild
index 5e70963d..b3620aa8 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.10-r2.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.10-r2.ebuild
@@ -93,6 +93,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/splashutils-1.1.9.10-ppc-2.6.14.patch
+	epatch ${FILESDIR}/splashutils-1.1.9.10-makefile.patch
 
 	# Check whether the kernel tree has been patched with fbsplash.
 	if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then
@@ -127,6 +128,7 @@ src_unpack() {
 }
 
 src_compile() {
+	echo "blaaaaaaaaaa 1"
 	spl_conf_use png CONFIG_PNG
 	spl_conf_use truetype CONFIG_TTF
 	spl_conf_use truetype CONFIG_TTF_KERNEL
@@ -137,6 +139,9 @@ src_compile() {
 	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
 	cd ${S}
 	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
+	echo "blaaaaaaaaaa 2"
+	pwd
+	echo "emake -j1 LIB=$(get_libdir) ARCH=$(tc-arch-kernel)"
 	emake -j1 LIB=$(get_libdir) ARCH=$(tc-arch-kernel) || die "failed to build splashutils"
 }