mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] Freetype: version bump 2.11.1 -> 2.12.1
@ 2022-05-13  7:54 Linnea Gunnarsson
  2022-05-25  9:45 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Linnea Gunnarsson @ 2022-05-13  7:54 UTC (permalink / raw)
  To: ptxdist

- It now handles OT-SVG fonts, can be controlled with the
FT_CONFIG_OPTION_SVG macro.
- Some improvements on font handling and other things.
- Some bug fixes.
- The internal zlib is in sync with zlib v. 1.2.12.
- In version 2.12.1 there are some fixes for bugs introduced
in version 2.12.0.
- New config option for demo.
- New md5sum for license, its a new url and some text changes,
nothing important.

Signed-off-by: Linnea Gunnarsson <linnea.gunnarsson@t2data.com>
---
 patches/freetype-2.11.1/series                |  4 -
 .../autogen.sh                                |  0
 ...e-config-and-freetype2.pc-correctly.patch} | 98 ++++++++-----------
 patches/freetype-2.12.1/series                |  1 +
 rules/freetype.make                           |  6 +-
 5 files changed, 46 insertions(+), 63 deletions(-)
 delete mode 100644 patches/freetype-2.11.1/series
 rename patches/{freetype-2.11.1 => freetype-2.12.1}/autogen.sh (100%)
 rename patches/{freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch => freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch} (54%)
 create mode 100644 patches/freetype-2.12.1/series

diff --git a/patches/freetype-2.11.1/series b/patches/freetype-2.11.1/series
deleted file mode 100644
index ab166a354..000000000
--- a/patches/freetype-2.11.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-generate-freetype-config-and-freetype2.pc-correctly.patch
-# c59ef464a7fe3a60ef114485523f346e  - git-ptx-patches magic
diff --git a/patches/freetype-2.11.1/autogen.sh b/patches/freetype-2.12.1/autogen.sh
similarity index 100%
rename from patches/freetype-2.11.1/autogen.sh
rename to patches/freetype-2.12.1/autogen.sh
diff --git a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch
similarity index 54%
rename from patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
rename to patches/freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch
index 9f6d6b5fc..1dc42fafe 100644
--- a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
+++ b/patches/freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch
@@ -1,35 +1,48 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 20 Nov 2013 14:06:25 +0100
-Subject: [PATCH] generate freetype-config and freetype2.pc correctly
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- builds/unix/configure.ac       |  4 +++-
- builds/unix/freetype-config.in | 19 ++++++-------------
- builds/unix/freetype2.in       | 14 +++++++-------
- builds/unix/unix-def.in        |  3 ---
- 4 files changed, 16 insertions(+), 24 deletions(-)
-
-diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
-index d1b7f1a78c59..11490364fd51 100644
---- a/builds/unix/configure.ac
-+++ b/builds/unix/configure.ac
-@@ -1094,7 +1094,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
+diff -ruN a/builds/unix/configure.ac b/builds/unix/configure.ac
+--- a/builds/unix/configure.ac	2022-05-11 13:51:49.525055650 +0200
++++ b/builds/unix/configure.ac	2022-05-11 13:52:30.389952135 +0200
+@@ -1147,7 +1147,9 @@
  # and `builds/unix/unix-cc.mk' that will be used by the build system
  #
  AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
 -                 unix-def.mk:unix-def.in])
 +                 unix-def.mk:unix-def.in
-+                 freetype-config:freetype-config.in
-+                 freetype2.pc:freetype2.in])
++		 freetype-config:freetype-config.in
++		 freetype2.pc:freetype2.in])
  
  AC_OUTPUT
  
-diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
-index 4edb092d09c4..f0864cbec48b 100644
---- a/builds/unix/freetype-config.in
-+++ b/builds/unix/freetype-config.in
-@@ -16,13 +16,6 @@ export LC_ALL
+diff -ruN a/builds/unix/freetype2.in b/builds/unix/freetype2.in
+--- a/builds/unix/freetype2.in	2022-05-11 13:52:10.165508453 +0200
++++ b/builds/unix/freetype2.in	2022-05-11 13:52:41.518196259 +0200
+@@ -1,14 +1,14 @@
+-prefix=%prefix%
+-exec_prefix=%exec_prefix%
+-libdir=%libdir%
+-includedir=%includedir%
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ Name: FreeType 2
+ URL: https://freetype.org
+ Description: A free, high-quality, and portable font engine.
+-Version: %ft_version%
+-Requires: %PKGCONFIG_REQUIRES%
+-Requires.private: %PKGCONFIG_REQUIRES_PRIVATE%
+-Libs: %PKGCONFIG_LIBS%
+-Libs.private: %PKGCONFIG_LIBS_PRIVATE%
++Version: @ft_version@
++Requires: @PKGCONFIG_REQUIRES@
++Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
++Libs: @PKGCONFIG_LIBS@
++Libs.private: @PKGCONFIG_LIBS_PRIVATE@
+ Cflags: -I${includedir}/freetype2
+diff -ruN a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
+--- a/builds/unix/freetype-config.in	2022-05-11 13:51:59.341270992 +0200
++++ b/builds/unix/freetype-config.in	2022-05-11 13:52:36.646089382 +0200
+@@ -16,13 +16,6 @@
  # if `pkg-config' is available, use values from `freetype2.pc'
  %PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
  if test $? -eq 0 ; then
@@ -43,7 +56,7 @@ index 4edb092d09c4..f0864cbec48b 100644
    prefix=`%PKG_CONFIG% --variable prefix freetype2`
    exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2`
  
-@@ -35,17 +28,17 @@ if test $? -eq 0 ; then
+@@ -35,17 +28,17 @@
    dynamic_libs=`%PKG_CONFIG% --libs freetype2`
    static_libs=`%PKG_CONFIG% --static --libs freetype2`
  else
@@ -67,37 +80,10 @@ index 4edb092d09c4..f0864cbec48b 100644
    if test "${SYSROOT}$libdir" != "/usr/lib"   &&
       test "${SYSROOT}$libdir" != "/usr/lib64" ; then
      libs_L="-L${SYSROOT}$libdir"
-diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
-index 2d759ecf8bfd..f44f14cabf9a 100644
---- a/builds/unix/freetype2.in
-+++ b/builds/unix/freetype2.in
-@@ -1,14 +1,14 @@
--prefix=%prefix%
--exec_prefix=%exec_prefix%
--libdir=%libdir%
--includedir=%includedir%
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
- 
- Name: FreeType 2
- URL: https://freetype.org
- Description: A free, high-quality, and portable font engine.
--Version: %ft_version%
-+Version: @ft_version@
- Requires:
--Requires.private: %REQUIRES_PRIVATE%
-+Requires.private: @REQUIRES_PRIVATE@
- Libs: -L${libdir} -lfreetype
--Libs.private: %LIBS_PRIVATE%
-+Libs.private: @LIBS_PRIVATE@
- Cflags: -I${includedir}/freetype2
-diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
-index d0c758d03fb2..dbfc40bf303e 100644
---- a/builds/unix/unix-def.in
-+++ b/builds/unix/unix-def.in
-@@ -153,7 +153,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
+diff -ruN a/builds/unix/unix-def.in b/builds/unix/unix-def.in
+--- a/builds/unix/unix-def.in	2022-05-11 13:52:17.861677285 +0200
++++ b/builds/unix/unix-def.in	2022-05-11 13:52:49.614373872 +0200
+@@ -157,7 +157,4 @@
  # defines whether we should install `freetype-config' or not
  INSTALL_FT2_CONFIG = @INSTALL_FT2_CONFIG@
  
diff --git a/patches/freetype-2.12.1/series b/patches/freetype-2.12.1/series
new file mode 100644
index 000000000..e1eb8923e
--- /dev/null
+++ b/patches/freetype-2.12.1/series
@@ -0,0 +1 @@
+generate-freetype-config-and-freetype2.pc-correctly.patch
diff --git a/rules/freetype.make b/rules/freetype.make
index c65a2dbcf..7008ebb78 100644
--- a/rules/freetype.make
+++ b/rules/freetype.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
 #
 # Paths and names
 #
-FREETYPE_VERSION	:= 2.11.1
-FREETYPE_MD5		:= 24e79233d607ded439ef36ff1f3ab68f
+FREETYPE_VERSION	:= 2.12.1
+FREETYPE_MD5		:= 7f7cd7c706d8e402354305c1c59e3ff2
 FREETYPE		:= freetype-$(FREETYPE_VERSION)
 FREETYPE_SUFFIX		:= tar.xz
 FREETYPE_SOURCE		:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
@@ -26,7 +26,7 @@ FREETYPE_LICENSE_FILES	:= \
 	file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \
 	file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \
 	file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
-	file://src/bdf/README;startline=98;endline=140;md5=d0c2c2e2e102c393a12869bc34515be2 \
+	file://src/bdf/README;startline=98;endline=140;md5=fef9416f085f0834b3ba93a5dc5a622c \
 	file://src/pcf/README;startline=69;endline=88;md5=e0f11f550450e58753f2d54ddaf17d34
 
 FREETYPE_URL := \
-- 
2.34.1




^ permalink raw reply	[flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] Freetype: version bump 2.11.1 -> 2.12.1
  2022-05-13  7:54 [ptxdist] [PATCH] Freetype: version bump 2.11.1 -> 2.12.1 Linnea Gunnarsson
@ 2022-05-25  9:45 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2022-05-25  9:45 UTC (permalink / raw)
  To: ptxdist; +Cc: Linnea Gunnarsson

Thanks, applied as 0c27c5f3fbfd85c610405c40a10026551b4cf99f.

Michael

[sent from post-receive hook]

On Wed, 25 May 2022 11:45:13 +0200, Linnea Gunnarsson <linnea.gunnarsson@t2data.com> wrote:
> - It now handles OT-SVG fonts, can be controlled with the
> FT_CONFIG_OPTION_SVG macro.
> - Some improvements on font handling and other things.
> - Some bug fixes.
> - The internal zlib is in sync with zlib v. 1.2.12.
> - In version 2.12.1 there are some fixes for bugs introduced
> in version 2.12.0.
> - New config option for demo.
> - New md5sum for license, its a new url and some text changes,
> nothing important.
> 
> Signed-off-by: Linnea Gunnarsson <linnea.gunnarsson@t2data.com>
> Message-Id: <20220513075442.48049-1-linnea.gunnarsson@t2data.com>
> [mol: cleanup patch]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> similarity index 81%
> rename from patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> rename to patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> index 9f6d6b5fcc91..961b984fe391 100644
> --- a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> +++ b/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> @@ -6,15 +6,15 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>  ---
>   builds/unix/configure.ac       |  4 +++-
>   builds/unix/freetype-config.in | 19 ++++++-------------
> - builds/unix/freetype2.in       | 14 +++++++-------
> + builds/unix/freetype2.in       | 18 +++++++++---------
>   builds/unix/unix-def.in        |  3 ---
> - 4 files changed, 16 insertions(+), 24 deletions(-)
> + 4 files changed, 18 insertions(+), 26 deletions(-)
>  
>  diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
> -index d1b7f1a78c59..11490364fd51 100644
> +index 393ec3bb69a7..c58607c69fbd 100644
>  --- a/builds/unix/configure.ac
>  +++ b/builds/unix/configure.ac
> -@@ -1094,7 +1094,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
> +@@ -1147,7 +1147,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
>   # and `builds/unix/unix-cc.mk' that will be used by the build system
>   #
>   AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
> @@ -26,7 +26,7 @@ index d1b7f1a78c59..11490364fd51 100644
>   AC_OUTPUT
>   
>  diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
> -index 4edb092d09c4..f0864cbec48b 100644
> +index c076bc1f8222..166afc685009 100644
>  --- a/builds/unix/freetype-config.in
>  +++ b/builds/unix/freetype-config.in
>  @@ -16,13 +16,6 @@ export LC_ALL
> @@ -68,7 +68,7 @@ index 4edb092d09c4..f0864cbec48b 100644
>        test "${SYSROOT}$libdir" != "/usr/lib64" ; then
>       libs_L="-L${SYSROOT}$libdir"
>  diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
> -index 2d759ecf8bfd..f44f14cabf9a 100644
> +index fe389f4b6fef..885444efebf7 100644
>  --- a/builds/unix/freetype2.in
>  +++ b/builds/unix/freetype2.in
>  @@ -1,14 +1,14 @@
> @@ -85,19 +85,21 @@ index 2d759ecf8bfd..f44f14cabf9a 100644
>   URL: https://freetype.org
>   Description: A free, high-quality, and portable font engine.
>  -Version: %ft_version%
> +-Requires: %PKGCONFIG_REQUIRES%
> +-Requires.private: %PKGCONFIG_REQUIRES_PRIVATE%
> +-Libs: %PKGCONFIG_LIBS%
> +-Libs.private: %PKGCONFIG_LIBS_PRIVATE%
>  +Version: @ft_version@
> - Requires:
> --Requires.private: %REQUIRES_PRIVATE%
> -+Requires.private: @REQUIRES_PRIVATE@
> - Libs: -L${libdir} -lfreetype
> --Libs.private: %LIBS_PRIVATE%
> -+Libs.private: @LIBS_PRIVATE@
> ++Requires: @PKGCONFIG_REQUIRES@
> ++Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
> ++Libs: @PKGCONFIG_LIBS@
> ++Libs.private: @PKGCONFIG_LIBS_PRIVATE@
>   Cflags: -I${includedir}/freetype2
>  diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
> -index d0c758d03fb2..dbfc40bf303e 100644
> +index 8e298ac59107..519d5958dce5 100644
>  --- a/builds/unix/unix-def.in
>  +++ b/builds/unix/unix-def.in
> -@@ -153,7 +153,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
> +@@ -157,7 +157,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
>   # defines whether we should install `freetype-config' or not
>   INSTALL_FT2_CONFIG = @INSTALL_FT2_CONFIG@
>   
> diff --git a/patches/freetype-2.11.1/autogen.sh b/patches/freetype-2.12.1/autogen.sh
> similarity index 100%
> rename from patches/freetype-2.11.1/autogen.sh
> rename to patches/freetype-2.12.1/autogen.sh
> diff --git a/patches/freetype-2.11.1/series b/patches/freetype-2.12.1/series
> similarity index 100%
> rename from patches/freetype-2.11.1/series
> rename to patches/freetype-2.12.1/series
> diff --git a/rules/freetype.make b/rules/freetype.make
> index c65a2dbcf11a..7008ebb78cfd 100644
> --- a/rules/freetype.make
> +++ b/rules/freetype.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
>  #
>  # Paths and names
>  #
> -FREETYPE_VERSION	:= 2.11.1
> -FREETYPE_MD5		:= 24e79233d607ded439ef36ff1f3ab68f
> +FREETYPE_VERSION	:= 2.12.1
> +FREETYPE_MD5		:= 7f7cd7c706d8e402354305c1c59e3ff2
>  FREETYPE		:= freetype-$(FREETYPE_VERSION)
>  FREETYPE_SUFFIX		:= tar.xz
>  FREETYPE_SOURCE		:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
> @@ -26,7 +26,7 @@ FREETYPE_LICENSE_FILES	:= \
>  	file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \
>  	file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \
>  	file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
> -	file://src/bdf/README;startline=98;endline=140;md5=d0c2c2e2e102c393a12869bc34515be2 \
> +	file://src/bdf/README;startline=98;endline=140;md5=fef9416f085f0834b3ba93a5dc5a622c \
>  	file://src/pcf/README;startline=69;endline=88;md5=e0f11f550450e58753f2d54ddaf17d34
>  
>  FREETYPE_URL := \



^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-25  9:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-13  7:54 [ptxdist] [PATCH] Freetype: version bump 2.11.1 -> 2.12.1 Linnea Gunnarsson
2022-05-25  9:45 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox