diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sample/Makefile | 11 | ||||
| -rw-r--r-- | sample/syslogo.png | bin | 19847 -> 0 bytes | |||
| -rw-r--r-- | sample/syslogo.ppm.gz | bin | 0 -> 24364 bytes | |||
| -rw-r--r-- | syslinux.spec.in | 2 |
5 files changed, 10 insertions, 4 deletions
@@ -22,6 +22,7 @@ Changes in 3.62: command line. * ISOLINUX: Work around bug in certain Adaptec BIOSes, patch by Bruce Robson. + * pngtopnm dependency removed from samples/ directory. Changes in 3.61: * EXTLINUX: fix crash when accessing an empty file. diff --git a/sample/Makefile b/sample/Makefile index 6894ceca..bd64e906 100644 --- a/sample/Makefile +++ b/sample/Makefile @@ -33,6 +33,8 @@ LDFLAGS = -s OBJCOPY = objcopy PPMTOLSS16 = ../ppmtolss16 LIB = liboldcom32.a +GZIP = gzip +PNGTOPNM = pngtopnm LIBOBJS = conio.o atou.o skipatou.o printf.o c32exit.o @@ -64,10 +66,13 @@ $(LIB): $(LIBOBJS) $(AR) cq $@ $^ $(RANLIB) $@ -syslogo.lss: syslogo.png $(PPMTOLSS16) - pngtopnm syslogo.png | \ +%.lss: %.ppm.gz $(PPMTOLSS16) + $(GZIP) -cd $< | \ $(PPMTOLSS16) \#000000=0 \#d0d0d0=7 \#f6f6f6=15 \ - > syslogo.lss + > $@ + +%.ppm.gz: %.png + $(PNGTOPNM) $< | gzip -9 > $@ tidy: rm -f *.o *.a *.lst *.elf diff --git a/sample/syslogo.png b/sample/syslogo.png Binary files differdeleted file mode 100644 index 45b4b5ec..00000000 --- a/sample/syslogo.png +++ /dev/null diff --git a/sample/syslogo.ppm.gz b/sample/syslogo.ppm.gz Binary files differnew file mode 100644 index 00000000..ee46d9b0 --- /dev/null +++ b/sample/syslogo.ppm.gz diff --git a/syslinux.spec.in b/syslinux.spec.in index d315bf49..32ab4977 100644 --- a/syslinux.spec.in +++ b/syslinux.spec.in @@ -11,7 +11,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{VERSION}.t ExclusiveArch: i386 i486 i586 i686 athlon pentium4 x86_64 Packager: H. Peter Anvin <hpa@zytor.com> Buildroot: %{_tmppath}/%{name}-%{VERSION}-root -BuildPrereq: nasm >= 0.98.39, perl, netpbm-progs +BuildPrereq: nasm >= 0.98.39, perl Autoreq: 0 %ifarch x86_64 Requires: mtools, libc.so.6()(64bit) |
