From c411a4ea9f23a55037b2f338b4e8baa9d156a620 Mon Sep 17 00:00:00 2001 From: Guenter Bartsch Date: Sat, 8 Dec 2001 00:37:38 +0000 Subject: osd fonts and interface update CVS patchset: 1174 CVS date: 2001/12/08 00:37:38 --- misc/Makefile.am | 10 +++++++--- misc/fonts/Makefile.am | 18 ++++++++++++++++++ misc/fonts/mono-16.xinefont.gz | Bin 0 -> 3580 bytes misc/fonts/mono-20.xinefont.gz | Bin 0 -> 4621 bytes misc/fonts/mono-24.xinefont.gz | Bin 0 -> 5613 bytes misc/fonts/mono-32.xinefont.gz | Bin 0 -> 7872 bytes misc/fonts/sans-16.xinefont.gz | Bin 0 -> 3977 bytes misc/fonts/sans-20.xinefont.gz | Bin 0 -> 4895 bytes misc/fonts/sans-24.xinefont.gz | Bin 0 -> 5924 bytes misc/fonts/sans-32.xinefont.gz | Bin 0 -> 8349 bytes misc/fonts/serif-16.xinefont.gz | Bin 0 -> 3977 bytes misc/fonts/serif-20.xinefont.gz | Bin 0 -> 4946 bytes misc/fonts/serif-24.xinefont.gz | Bin 0 -> 6430 bytes misc/fonts/serif-32.xinefont.gz | Bin 0 -> 8992 bytes 14 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 misc/fonts/Makefile.am create mode 100644 misc/fonts/mono-16.xinefont.gz create mode 100644 misc/fonts/mono-20.xinefont.gz create mode 100644 misc/fonts/mono-24.xinefont.gz create mode 100644 misc/fonts/mono-32.xinefont.gz create mode 100644 misc/fonts/sans-16.xinefont.gz create mode 100644 misc/fonts/sans-20.xinefont.gz create mode 100644 misc/fonts/sans-24.xinefont.gz create mode 100644 misc/fonts/sans-32.xinefont.gz create mode 100644 misc/fonts/serif-16.xinefont.gz create mode 100644 misc/fonts/serif-20.xinefont.gz create mode 100644 misc/fonts/serif-24.xinefont.gz create mode 100644 misc/fonts/serif-32.xinefont.gz (limited to 'misc') diff --git a/misc/Makefile.am b/misc/Makefile.am index b3c7566fb..9a1813221 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -1,12 +1,13 @@ +SUBDIRS = fonts + EXTRA_DIST = autogen.sh upload.pl SlackBuild.in SlackBuild build_rpms.sh \ xine-lib.spec.in xine-lib.spec guenter.spec.in guenter.spec\ - xine_logo.png vga.xinefont.gz + xine_logo.png bin_SCRIPTS = xine-config datadir = $(XINE_SKINDIR) -#this is just a hack. osd fonts should be installed in another dir -data_DATA = xine_logo.png vga.xinefont.gz +data_DATA = xine_logo.png debug: @@ -20,3 +21,6 @@ maintainer-clean-generic: -@echo "This command is intended for maintainers to use;" -@echo "it deletes files that may require special tools to rebuild." -rm -f Makefile.in + +xine-fontconv: xine-fontconv.c + gcc -g -o xine-fontconv xine-fontconv.c -lfreetype -lz -I/usr/include/freetype2 diff --git a/misc/fonts/Makefile.am b/misc/fonts/Makefile.am new file mode 100644 index 000000000..ffbf09c14 --- /dev/null +++ b/misc/fonts/Makefile.am @@ -0,0 +1,18 @@ +datadir = $(XINE_FONTDIR) +data_DATA = mono-16.xinefont.gz sans-16.xinefont.gz serif-16.xinefont.gz \ + mono-20.xinefont.gz sans-20.xinefont.gz serif-20.xinefont.gz \ + mono-24.xinefont.gz sans-24.xinefont.gz serif-24.xinefont.gz \ + mono-32.xinefont.gz sans-32.xinefont.gz serif-32.xinefont.gz + +debug: + +install-debug: install + +mostlyclean-generic: + -rm -f *~ \#* .*~ .\#* + + +maintainer-clean-generic: + -@echo "This command is intended for maintainers to use;" + -@echo "it deletes files that may require special tools to rebuild." + -rm -f Makefile.in diff --git a/misc/fonts/mono-16.xinefont.gz b/misc/fonts/mono-16.xinefont.gz new file mode 100644 index 000000000..230d1cf0c Binary files /dev/null and b/misc/fonts/mono-16.xinefont.gz differ diff --git a/misc/fonts/mono-20.xinefont.gz b/misc/fonts/mono-20.xinefont.gz new file mode 100644 index 000000000..1df0d23d6 Binary files /dev/null and b/misc/fonts/mono-20.xinefont.gz differ diff --git a/misc/fonts/mono-24.xinefont.gz b/misc/fonts/mono-24.xinefont.gz new file mode 100644 index 000000000..70e6d5257 Binary files /dev/null and b/misc/fonts/mono-24.xinefont.gz differ diff --git a/misc/fonts/mono-32.xinefont.gz b/misc/fonts/mono-32.xinefont.gz new file mode 100644 index 000000000..fd774ecbe Binary files /dev/null and b/misc/fonts/mono-32.xinefont.gz differ diff --git a/misc/fonts/sans-16.xinefont.gz b/misc/fonts/sans-16.xinefont.gz new file mode 100644 index 000000000..246ac1a4d Binary files /dev/null and b/misc/fonts/sans-16.xinefont.gz differ diff --git a/misc/fonts/sans-20.xinefont.gz b/misc/fonts/sans-20.xinefont.gz new file mode 100644 index 000000000..cfb283749 Binary files /dev/null and b/misc/fonts/sans-20.xinefont.gz differ diff --git a/misc/fonts/sans-24.xinefont.gz b/misc/fonts/sans-24.xinefont.gz new file mode 100644 index 000000000..75d7c376d Binary files /dev/null and b/misc/fonts/sans-24.xinefont.gz differ diff --git a/misc/fonts/sans-32.xinefont.gz b/misc/fonts/sans-32.xinefont.gz new file mode 100644 index 000000000..2cab7f729 Binary files /dev/null and b/misc/fonts/sans-32.xinefont.gz differ diff --git a/misc/fonts/serif-16.xinefont.gz b/misc/fonts/serif-16.xinefont.gz new file mode 100644 index 000000000..92a9eb54e Binary files /dev/null and b/misc/fonts/serif-16.xinefont.gz differ diff --git a/misc/fonts/serif-20.xinefont.gz b/misc/fonts/serif-20.xinefont.gz new file mode 100644 index 000000000..9082c6209 Binary files /dev/null and b/misc/fonts/serif-20.xinefont.gz differ diff --git a/misc/fonts/serif-24.xinefont.gz b/misc/fonts/serif-24.xinefont.gz new file mode 100644 index 000000000..8e105dc0f Binary files /dev/null and b/misc/fonts/serif-24.xinefont.gz differ diff --git a/misc/fonts/serif-32.xinefont.gz b/misc/fonts/serif-32.xinefont.gz new file mode 100644 index 000000000..612d35c79 Binary files /dev/null and b/misc/fonts/serif-32.xinefont.gz differ -- cgit v1.2.3