summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/freetype/freetype-2.3.12/no-hardcode.patch (renamed from meta/packages/freetype/freetype-2.3.5/no-hardcode.patch)0
-rw-r--r--meta/packages/freetype/freetype-2.3.5/configure.patch47
-rw-r--r--meta/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch26
-rw-r--r--meta/packages/freetype/freetype_2.3.12.bb (renamed from meta/packages/freetype/freetype_2.3.5.bb)16
4 files changed, 11 insertions, 78 deletions
diff --git a/meta/packages/freetype/freetype-2.3.5/no-hardcode.patch b/meta/packages/freetype/freetype-2.3.12/no-hardcode.patch
index 44ae450a14..44ae450a14 100644
--- a/meta/packages/freetype/freetype-2.3.5/no-hardcode.patch
+++ b/meta/packages/freetype/freetype-2.3.12/no-hardcode.patch
diff --git a/meta/packages/freetype/freetype-2.3.5/configure.patch b/meta/packages/freetype/freetype-2.3.5/configure.patch
deleted file mode 100644
index f11cf96be0..0000000000
--- a/meta/packages/freetype/freetype-2.3.5/configure.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6Index: freetype-2.1.8/builds/unix/configure.ac
7===================================================================
8--- freetype-2.1.8.orig/builds/unix/configure.ac 2004-04-14 04:49:11.000000000 -0400
9+++ freetype-2.1.8/builds/unix/configure.ac 2005-03-12 03:14:23.000000000 -0500
10@@ -111,8 +111,8 @@
11 # Check for system zlib
12
13 AC_ARG_WITH([zlib],
14- dnl don't quote AS_HELP_STRING!
15- AS_HELP_STRING([--without-zlib],
16+ dnl don't quote AC_HELP_STRING!
17+ AC_HELP_STRING([--without-zlib],
18 [use internal zlib instead of system-wide]))
19 if test x$with_zlib != xno && test -z "$LIBZ"; then
20 AC_CHECK_LIB([z], [gzsetparams], [AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])])
21@@ -127,7 +127,7 @@
22 # Whether to use Mac OS resource-based fonts or not
23
24 AC_ARG_WITH([old-mac-fonts],
25- dnl don't quote AS_HELP_STRING!
26- AS_HELP_STRING([--with-old-mac-fonts],
27+ dnl don't quote AC_HELP_STRING!
28+ AC_HELP_STRING([--with-old-mac-fonts],
29 [allow Mac resource-based fonts to be used]))
30 if test x$with_old_mac_fonts = xyes; then
31Index: freetype-2.1.8/builds/unix/unix-cc.in
32===================================================================
33--- freetype-2.1.8.orig/builds/unix/unix-cc.in 2003-11-09 03:37:13.000000000 -0500
34+++ freetype-2.1.8/builds/unix/unix-cc.in 2005-03-12 18:37:24.613693760 -0500
35@@ -14,9 +14,11 @@
36
37 CC := @CC@
38 COMPILER_SEP := $(SEP)
39+SHELL := @SHELL@
40+top_builddir := $(BUILD_DIR)
41
42 ifndef LIBTOOL
43- LIBTOOL := $(BUILD_DIR)/libtool
44+ LIBTOOL := @LIBTOOL@
45 endif
46
47
diff --git a/meta/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch b/meta/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch
deleted file mode 100644
index ae504dcb0b..0000000000
--- a/meta/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Index: freetype-2.3.1/builds/unix/configure.raw
2===================================================================
3--- freetype-2.3.1.orig/builds/unix/configure.raw
4+++ freetype-2.3.1/builds/unix/configure.raw
5@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT)
6 # checks for native programs to generate building tool
7
8 if test ${cross_compiling} = yes; then
9- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
10+ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
11 test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
12 test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
13 test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
14Index: freetype-2.3.1/builds/unix/configure.ac
15===================================================================
16--- freetype-2.3.1.orig/builds/unix/configure.ac
17+++ freetype-2.3.1/builds/unix/configure.ac
18@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT)
19 # checks for native programs to generate building tool
20
21 if test ${cross_compiling} = yes; then
22- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
23+ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
24 test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
25 test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
26 test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
diff --git a/meta/packages/freetype/freetype_2.3.5.bb b/meta/packages/freetype/freetype_2.3.12.bb
index 5bbbd7d657..da62ffb3b2 100644
--- a/meta/packages/freetype/freetype_2.3.5.bb
+++ b/meta/packages/freetype/freetype_2.3.12.bb
@@ -1,12 +1,18 @@
1DESCRIPTION = "Freetype font rendering library" 1DESCRIPTION = "Freetype font rendering library"
2HOMEPAGE = "http://www.freetype.org/"
3BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype"
4
5LICENSE = "FreeTypeLicense | GPLv2+"
6LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=8bc1a580aeb518100d00a2dd29e68edf \
7 file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \
8 file://docs/GPL.TXT;md5=8ef380476f642c20ebf40fecb0add2ec"
9
2SECTION = "libs" 10SECTION = "libs"
3LICENSE = "freetype" 11
4PR = "r3" 12PR = "r0"
5 13
6SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ 14SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
7 file://fix-x86_64-build.patch;patch=1 \ 15 file://no-hardcode.patch"
8 file://no-hardcode.patch;patch=1 \
9 "
10 16
11S = "${WORKDIR}/freetype-${PV}" 17S = "${WORKDIR}/freetype-${PV}"
12 18
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-21 20:14:04 +0000