Gitweb links:
...log
http://git.netsurf-browser.org/ttf2f.git/shortlog/2e59fe9f9dda4cdc99913402e871bb97676e4e05
...commit
http://git.netsurf-browser.org/ttf2f.git/commit/2e59fe9f9dda4cdc99913402e871bb97676e4e05
...tree
http://git.netsurf-browser.org/ttf2f.git/tree/2e59fe9f9dda4cdc99913402e871bb97676e4e05
The branch, master has been updated
via 2e59fe9f9dda4cdc99913402e871bb97676e4e05 (commit)
via a63a6ba6c09ac5f7778349050081d4dcf2e8bfba (commit)
via b269eab4b8159241c0a335cbd76c184e420c38e3 (commit)
via 29ca302e4f395a18568e65d03dbc60914590be6b (commit)
from 5bb88a810c485b382b501098122806bda13dc7c0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/ttf2f.git/commit/?id=2e59fe9f9dda4cdc99913402e871bb97676e4e05
commit 2e59fe9f9dda4cdc99913402e871bb97676e4e05
Author: John-Mark Bell <j...@netsurf-browser.org>
Commit: John-Mark Bell <j...@netsurf-browser.org>
Bump version
diff --git a/!TTF2f/History b/!TTF2f/History
index 2fc0353..702c78f 100644
--- a/!TTF2f/History
+++ b/!TTF2f/History
@@ -1,6 +1,14 @@
TTF2f Changelog
===============
+0.05 (02-Aug-2021)
+~~~~~~~~~~~~~~~~~~
+No functional changes.
+
+Rebuild against LDREX/STREX-aware UnixLib.
+
+Improve RISC OS-specific Makefile targets.
+
0.04 (05-Mar-2011)
~~~~~~~~~~~~~~~~~~
Output the first 256 glyphs in Acorn Latin1 order so converted fonts
diff --git a/Makefile b/Makefile
index 3d01fed..f6afce3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Component settings
COMPONENT := ttf2f
-COMPONENT_VERSION := 0.0.4
+COMPONENT_VERSION := 0.0.5
# We produce an application binary
COMPONENT_TYPE := binary
commitdiff
http://git.netsurf-browser.org/ttf2f.git/commit/?id=a63a6ba6c09ac5f7778349050081d4dcf2e8bfba
commit a63a6ba6c09ac5f7778349050081d4dcf2e8bfba
Author: John-Mark Bell <j...@netsurf-browser.org>
Commit: John-Mark Bell <j...@netsurf-browser.org>
Add riscos-dist target
diff --git a/Makefile b/Makefile
index 4aea8f0..3d01fed 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,14 @@ $(realoutput): $(OUTPUT)
$(Q)echo " SQUEEZE: $@"
$(Q)$(dir $(CC))squeeze $@
endif
+
+ DISTCLEAN_ITEMS := $(DISTCLEAN_ITEMS) ttf2f.zip
+
+.PHONY: riscos-dist
+riscos-dist: $(realoutput)
+ $(Q)$(CP) $(CPFLAGS) $(realoutput) !TTF2f/!RunImage,ff8
+ $(Q)$(dir $(CC))zip -9r ttf2f.zip !TTF2f
+ $(Q)$(RM) $(RMFLAGS) !TTF2f/!RunImage,ff8
endif
all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
commitdiff
http://git.netsurf-browser.org/ttf2f.git/commit/?id=b269eab4b8159241c0a335cbd76c184e420c38e3
commit b269eab4b8159241c0a335cbd76c184e420c38e3
Author: John-Mark Bell <j...@netsurf-browser.org>
Commit: John-Mark Bell <j...@netsurf-browser.org>
Convert RISC OS binary to AIF and squeeze it
diff --git a/Makefile b/Makefile
index 77f8e2a..4aea8f0 100644
--- a/Makefile
+++ b/Makefile
@@ -45,5 +45,24 @@ endif
include $(NSBUILD)/Makefile.top
+ifeq ($(HOST),arm-unknown-riscos)
+ realoutput := $(OUTPUT)
+ e1f := ,e1f
+ ifeq ($(EXEEXT),$(e1f))
+ ff8 := ,ff8
+ realoutput := $(subst $(EXEEXT),$(ff8),$(OUTPUT))
+
+ POST_TARGETS := $(realoutput) $(POST_TARGETS)
+
+$(realoutput): $(OUTPUT)
+ $(Q)echo " ELF2AIF: $@"
+ $(Q)$(dir $(CC))elf2aif $(OUTPUT) $@
+ $(Q)echo " SQUEEZE: $@"
+ $(Q)$(dir $(CC))squeeze $@
+ endif
+endif
+
+all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
+
# Extra installation rules
commitdiff
http://git.netsurf-browser.org/ttf2f.git/commit/?id=29ca302e4f395a18568e65d03dbc60914590be6b
commit 29ca302e4f395a18568e65d03dbc60914590be6b
Author: John-Mark Bell <j...@netsurf-browser.org>
Commit: John-Mark Bell <j...@netsurf-browser.org>
Fix RISC OS build
5bb88a81 got BUILD and HOST confused, so we were not linking the
RISC OS binary statically.
diff --git a/Makefile b/Makefile
index fd8d629..77f8e2a 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \
# Freetype2
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
ifneq ($(PKGCONFIG),)
- ifeq ($(BUILD),arm-unknown-riscos)
+ ifeq ($(HOST),arm-unknown-riscos)
CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) freetype2 --cflags --static)
LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) freetype2 --libs --static)
else
@@ -37,7 +37,7 @@ endif
# OSLib (RISC OS target only)
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
- ifeq ($(BUILD),arm-unknown-riscos)
+ ifeq ($(HOST),arm-unknown-riscos)
CFLAGS := $(CFLAGS) -I$(PREFIX)/include -static
LDFLAGS := $(LDFLAGS) -lOSLib32 -lOSLibSupport32 -static
endif
diff --git a/src/Makefile b/src/Makefile
index a9e9e5e..0265d3f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ DIR_SOURCES := encoding.c ft.c glyphs.c intmetrics.c outlines.c
utils.c
ifeq ($(FRONTEND),cli)
DIR_SOURCES := $(DIR_SOURCES) cli.c
else
- ifeq ($(BUILD),arm-unknown-riscos)
+ ifeq ($(HOST),arm-unknown-riscos)
DIR_SOURCES := $(DIR_SOURCES) toolbox.c
endif
endif
-----------------------------------------------------------------------
Summary of changes:
!TTF2f/History | 8 ++++++++
Makefile | 33 ++++++++++++++++++++++++++++++---
src/Makefile | 2 +-
3 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/!TTF2f/History b/!TTF2f/History
index 2fc0353..702c78f 100644
--- a/!TTF2f/History
+++ b/!TTF2f/History
@@ -1,6 +1,14 @@
TTF2f Changelog
===============
+0.05 (02-Aug-2021)
+~~~~~~~~~~~~~~~~~~
+No functional changes.
+
+Rebuild against LDREX/STREX-aware UnixLib.
+
+Improve RISC OS-specific Makefile targets.
+
0.04 (05-Mar-2011)
~~~~~~~~~~~~~~~~~~
Output the first 256 glyphs in Acorn Latin1 order so converted fonts
diff --git a/Makefile b/Makefile
index fd8d629..f6afce3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Component settings
COMPONENT := ttf2f
-COMPONENT_VERSION := 0.0.4
+COMPONENT_VERSION := 0.0.5
# We produce an application binary
COMPONENT_TYPE := binary
@@ -22,7 +22,7 @@ CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \
# Freetype2
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
ifneq ($(PKGCONFIG),)
- ifeq ($(BUILD),arm-unknown-riscos)
+ ifeq ($(HOST),arm-unknown-riscos)
CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) freetype2 --cflags --static)
LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) freetype2 --libs --static)
else
@@ -37,7 +37,7 @@ endif
# OSLib (RISC OS target only)
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
- ifeq ($(BUILD),arm-unknown-riscos)
+ ifeq ($(HOST),arm-unknown-riscos)
CFLAGS := $(CFLAGS) -I$(PREFIX)/include -static
LDFLAGS := $(LDFLAGS) -lOSLib32 -lOSLibSupport32 -static
endif
@@ -45,5 +45,32 @@ endif
include $(NSBUILD)/Makefile.top
+ifeq ($(HOST),arm-unknown-riscos)
+ realoutput := $(OUTPUT)
+ e1f := ,e1f
+ ifeq ($(EXEEXT),$(e1f))
+ ff8 := ,ff8
+ realoutput := $(subst $(EXEEXT),$(ff8),$(OUTPUT))
+
+ POST_TARGETS := $(realoutput) $(POST_TARGETS)
+
+$(realoutput): $(OUTPUT)
+ $(Q)echo " ELF2AIF: $@"
+ $(Q)$(dir $(CC))elf2aif $(OUTPUT) $@
+ $(Q)echo " SQUEEZE: $@"
+ $(Q)$(dir $(CC))squeeze $@
+ endif
+
+ DISTCLEAN_ITEMS := $(DISTCLEAN_ITEMS) ttf2f.zip
+
+.PHONY: riscos-dist
+riscos-dist: $(realoutput)
+ $(Q)$(CP) $(CPFLAGS) $(realoutput) !TTF2f/!RunImage,ff8
+ $(Q)$(dir $(CC))zip -9r ttf2f.zip !TTF2f
+ $(Q)$(RM) $(RMFLAGS) !TTF2f/!RunImage,ff8
+endif
+
+all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
+
# Extra installation rules
diff --git a/src/Makefile b/src/Makefile
index a9e9e5e..0265d3f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ DIR_SOURCES := encoding.c ft.c glyphs.c intmetrics.c outlines.c
utils.c
ifeq ($(FRONTEND),cli)
DIR_SOURCES := $(DIR_SOURCES) cli.c
else
- ifeq ($(BUILD),arm-unknown-riscos)
+ ifeq ($(HOST),arm-unknown-riscos)
DIR_SOURCES := $(DIR_SOURCES) toolbox.c
endif
endif
--
Truetype font to RISC OS font converter
_______________________________________________
netsurf-commits mailing list -- netsurf-commits@netsurf-browser.org
To unsubscribe send an email to netsurf-commits-le...@netsurf-browser.org
