Re: [ptxdist] [PATCH v2] freetype: version bump 2.6.3 -> 2.8

2017-06-20 Thread Michael Olbrich 
On Tue, Jun 20, 2017 at 04:50:27PM +0200, Clemens Gruber wrote:
> On Tue, Jun 20, 2017 at 03:54:05PM +0200, Michael Olbrich wrote:
> > On Sat, Jun 17, 2017 at 07:25:06PM +0200, Clemens Gruber wrote:
> > > Signed-off-by: Clemens Gruber 
> > > ---
> > > Changes from v1:
> > > - Forgot to remove a now obsolete patch and autogen.sh link
> > > 
> > >  ...reetype-config-and-freetype2.pc-correctly.patch | 103 
> > > -
> > 
> > This patch is still needed in some way. Otherwise freetype-config is
> > broken.
> 
> Hmm, wouldn't pkg-config be used instead? Did an application depending
> on freetype break?

Yes, libgd failed to build.

Michael

-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] freetype: version bump 2.6.3 -> 2.8

2017-06-20 Thread Clemens Gruber 
On Tue, Jun 20, 2017 at 03:54:05PM +0200, Michael Olbrich wrote:
> On Sat, Jun 17, 2017 at 07:25:06PM +0200, Clemens Gruber wrote:
> > Signed-off-by: Clemens Gruber 
> > ---
> > Changes from v1:
> > - Forgot to remove a now obsolete patch and autogen.sh link
> > 
> >  ...reetype-config-and-freetype2.pc-correctly.patch | 103 
> > -
> 
> This patch is still needed in some way. Otherwise freetype-config is
> broken.

Hmm, wouldn't pkg-config be used instead? Did an application depending
on freetype break?

Anyway, I'll start preparing a v3. Probably better to have both working.

Clemens

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] freetype: version bump 2.6.3 -> 2.8

2017-06-20 Thread Michael Olbrich 
On Sat, Jun 17, 2017 at 07:25:06PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber 
> ---
> Changes from v1:
> - Forgot to remove a now obsolete patch and autogen.sh link
> 
>  ...reetype-config-and-freetype2.pc-correctly.patch | 103 
> -

This patch is still needed in some way. Otherwise freetype-config is
broken.

Michael

>  patches/freetype-2.6.3/autogen.sh  |   4 -
>  patches/freetype-2.6.3/series  |   4 -
>  rules/freetype.make|  15 ++-
>  4 files changed, 12 insertions(+), 114 deletions(-)
>  delete mode 100644 
> patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
>  delete mode 100755 patches/freetype-2.6.3/autogen.sh
>  delete mode 100644 patches/freetype-2.6.3/series
> 
> diff --git 
> a/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
>  
> b/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> deleted file mode 100644
> index a6a2272c1..0
> --- 
> a/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> +++ /dev/null
> @@ -1,103 +0,0 @@
> -From: Michael Olbrich 
> -Date: Wed, 20 Nov 2013 14:06:25 +0100
> -Subject: [PATCH] generate freetype-config and freetype2.pc correctly
> -
> -Signed-off-by: Michael Olbrich 
> 
> - builds/unix/configure.ac   |  4 +++-
> - builds/unix/freetype-config.in | 12 ++--
> - builds/unix/freetype2.in   | 14 +++---
> - builds/unix/unix-def.in|  3 ---
> - 4 files changed, 16 insertions(+), 17 deletions(-)
> -
> -diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
> -index b568e51e04e2..cdb0df29d72f 100644
>  a/builds/unix/configure.ac
> -+++ b/builds/unix/configure.ac
> -@@ -1006,7 +1006,9 @@ AC_CONFIG_HEADERS([ftconfig.h:ftconfig.in],
> - # 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])
> - 
> - # re-generate the Jamfile to use libtool now
> - #
> -diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
> -index f74707d5aea1..e18f5cd76e77 100644
>  a/builds/unix/freetype-config.in
> -+++ b/builds/unix/freetype-config.in
> -@@ -12,11 +12,11 @@
> - LC_ALL=C
> - export LC_ALL
> - 
> --prefix="%prefix%"
> --exec_prefix="%exec_prefix%"
> -+prefix="@prefix@"
> -+exec_prefix="@exec_prefix@"
> - exec_prefix_set="no"
> --includedir="%includedir%"
> --libdir="%libdir%"
> -+includedir="@includedir@"
> -+libdir="@libdir@"
> - 
> - usage()
> - {
> -@@ -74,7 +74,7 @@ while test $# -gt 0 ; do
> - echo_exec_prefix=yes
> - ;;
> -   --version)
> --echo %ft_version%
> -+echo @ft_version@
> - exit 0
> - ;;
> -   --ftversion)
> -@@ -141,7 +141,7 @@ fi
> - 
> - if test "$echo_libs" = "yes" ; then
> -   libs="-lfreetype"
> --  staticlibs="%LIBSSTATIC_CONFIG%"
> -+  staticlibs="@LIBSSTATIC_CONFIG@"
> -   if test "$show_static" = "yes" ; then
> - libs="$staticlibs"
> -   fi
> -diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
> -index c4dfda4abcca..8c4d7e184293 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: http://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 f7b557fb4094..71bb39cb3959 100644
>  a/builds/unix/unix-def.in
> -+++ b/builds/unix/unix-def.in
> -@@ -142,7 +142,4 @@ $(OBJ_BUILD)/freetype2.pc: 
> $(TOP_DIR)/builds/unix/freetype2.in
> - chmod a-w $@.tmp
> - mv $@.tmp $@
> - 
> --all install: $(OBJ_BUILD)/freetype-config \
> -- $(OBJ_BUILD)/freetype2.pc
> --
> - # EOF
> diff --git a/patches/freetype-2.6.3/autogen.sh 
> b/patches/freetype-2.6.3/autogen.sh
> deleted file mode 100755
> index 1056b101c..0
> --- a/patches/freetype-2.6.3/autogen.sh
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -#!/bin/sh
> -
> -cd builds/unix &&
> -autoconf
> diff --git a/patches/freetype-2.6.3/series b/patches/freetype-2.6.3/series
> deleted file mode 100644
> index ab166a354..0
> --- a/patches/freetype-2.6.3/series
> +++

[ptxdist] [PATCH v2] freetype: version bump 2.6.3 -> 2.8

2017-06-17 Thread Clemens Gruber 
Signed-off-by: Clemens Gruber 
---
Changes from v1:
- Forgot to remove a now obsolete patch and autogen.sh link

 ...reetype-config-and-freetype2.pc-correctly.patch | 103 -
 patches/freetype-2.6.3/autogen.sh  |   4 -
 patches/freetype-2.6.3/series  |   4 -
 rules/freetype.make|  15 ++-
 4 files changed, 12 insertions(+), 114 deletions(-)
 delete mode 100644 
patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
 delete mode 100755 patches/freetype-2.6.3/autogen.sh
 delete mode 100644 patches/freetype-2.6.3/series

diff --git 
a/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
 
b/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
deleted file mode 100644
index a6a2272c1..0
--- 
a/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: Michael Olbrich 
-Date: Wed, 20 Nov 2013 14:06:25 +0100
-Subject: [PATCH] generate freetype-config and freetype2.pc correctly
-
-Signed-off-by: Michael Olbrich 

- builds/unix/configure.ac   |  4 +++-
- builds/unix/freetype-config.in | 12 ++--
- builds/unix/freetype2.in   | 14 +++---
- builds/unix/unix-def.in|  3 ---
- 4 files changed, 16 insertions(+), 17 deletions(-)
-
-diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
-index b568e51e04e2..cdb0df29d72f 100644
 a/builds/unix/configure.ac
-+++ b/builds/unix/configure.ac
-@@ -1006,7 +1006,9 @@ AC_CONFIG_HEADERS([ftconfig.h:ftconfig.in],
- # 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])
- 
- # re-generate the Jamfile to use libtool now
- #
-diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
-index f74707d5aea1..e18f5cd76e77 100644
 a/builds/unix/freetype-config.in
-+++ b/builds/unix/freetype-config.in
-@@ -12,11 +12,11 @@
- LC_ALL=C
- export LC_ALL
- 
--prefix="%prefix%"
--exec_prefix="%exec_prefix%"
-+prefix="@prefix@"
-+exec_prefix="@exec_prefix@"
- exec_prefix_set="no"
--includedir="%includedir%"
--libdir="%libdir%"
-+includedir="@includedir@"
-+libdir="@libdir@"
- 
- usage()
- {
-@@ -74,7 +74,7 @@ while test $# -gt 0 ; do
- echo_exec_prefix=yes
- ;;
-   --version)
--echo %ft_version%
-+echo @ft_version@
- exit 0
- ;;
-   --ftversion)
-@@ -141,7 +141,7 @@ fi
- 
- if test "$echo_libs" = "yes" ; then
-   libs="-lfreetype"
--  staticlibs="%LIBSSTATIC_CONFIG%"
-+  staticlibs="@LIBSSTATIC_CONFIG@"
-   if test "$show_static" = "yes" ; then
- libs="$staticlibs"
-   fi
-diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
-index c4dfda4abcca..8c4d7e184293 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: http://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 f7b557fb4094..71bb39cb3959 100644
 a/builds/unix/unix-def.in
-+++ b/builds/unix/unix-def.in
-@@ -142,7 +142,4 @@ $(OBJ_BUILD)/freetype2.pc: 
$(TOP_DIR)/builds/unix/freetype2.in
-   chmod a-w $@.tmp
-   mv $@.tmp $@
- 
--all install: $(OBJ_BUILD)/freetype-config \
-- $(OBJ_BUILD)/freetype2.pc
--
- # EOF
diff --git a/patches/freetype-2.6.3/autogen.sh 
b/patches/freetype-2.6.3/autogen.sh
deleted file mode 100755
index 1056b101c..0
--- a/patches/freetype-2.6.3/autogen.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd builds/unix &&
-autoconf
diff --git a/patches/freetype-2.6.3/series b/patches/freetype-2.6.3/series
deleted file mode 100644
index ab166a354..0
--- a/patches/freetype-2.6.3/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/rules/freetype.make b/rules/freetype.make
index 2ee85ef15..c306f9466 100644
--- a/rules/freetype.make
+++ b/rules/freetype.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
 #
 # Paths and names
 #