summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2010-10-14 07:11:41 -0700
committerTom Rini <tom_rini@mentor.com>2010-10-14 07:11:41 -0700
commit1315d3eea6485be950966ec10839bfae0005a0fa (patch)
tree96f57d8081d3407114259e14766b15de5009cbb8
parent9e605d5dcad19c8e27d9d561494f9f31fd36da82 (diff)
downloadopenembedded-1315d3eea6485be950966ec10839bfae0005a0fa.tar.gz
freetype: Drop old recipes
All of these versions have various security issues to them and are not pinned. Remove. While in here, rename files to freetype. Acks apply to the removal portion. Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Acked-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Tom Rini <tom_rini@mentor.com>
-rw-r--r--recipes/freetype/freetype-2.2.1/configure-using-inodes.patch30
-rw-r--r--recipes/freetype/freetype-2.2.1/configure.patch41
-rw-r--r--recipes/freetype/freetype-2.2.1/no-hardcode.patch11
-rw-r--r--recipes/freetype/freetype-2.3.12/configure-using-inodes.patch30
-rw-r--r--recipes/freetype/freetype-2.3.12/fix-configure.patch13
-rw-r--r--recipes/freetype/freetype-2.3.12/libtool-tag.patch20
-rw-r--r--recipes/freetype/freetype-2.3.6/configure-using-inodes.patch30
-rw-r--r--recipes/freetype/freetype-2.3.6/fix-configure.patch13
-rw-r--r--recipes/freetype/freetype-2.3.6/libtool-tag.patch20
-rw-r--r--recipes/freetype/freetype-native_2.2.1.bb22
-rw-r--r--recipes/freetype/freetype-native_2.3.6.bb20
-rw-r--r--recipes/freetype/freetype/configure.patch (renamed from recipes/freetype/files/configure.patch)0
-rw-r--r--recipes/freetype/freetype/no-hardcode.patch (renamed from recipes/freetype/files/no-hardcode.patch)0
-rw-r--r--recipes/freetype/freetype_2.2.1.bb37
-rw-r--r--recipes/freetype/freetype_2.3.12.bb41
-rw-r--r--recipes/freetype/freetype_2.3.6.bb39
16 files changed, 0 insertions, 367 deletions
diff --git a/recipes/freetype/freetype-2.2.1/configure-using-inodes.patch b/recipes/freetype/freetype-2.2.1/configure-using-inodes.patch
deleted file mode 100644
index c2bff023cf..0000000000
--- a/recipes/freetype/freetype-2.2.1/configure-using-inodes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=75eeb32a2e55ffb3e4102ee56cd913a442d1ac9a
-
-author Werner Lemberg <wl@gnu.org> 2010-10-03 18:17:27 (GMT)
-
-Avoid `configure' issues with symbolic links.
-Based on a patch from Alexander Stohr <Alexander.Stohr@gmx.de>.
-* configure: Compare directories using `ls -id'.
-Check existence of `reference' subdirectory before creating it.
-
---- freetype.orig/configure 2010-10-07 16:46:51.000000000 +0200
-+++ freetype/configure 2010-10-07 16:49:52.000000000 +0200
-@@ -67,10 +67,15 @@
- abs_curr_dir=`pwd`
- abs_ft2_dir=`cd "$ft2_dir" && pwd`
-
--# build a dummy Makefile if we are not building in the source tree
-+# build a dummy Makefile if we are not building in the source tree;
-+# we use inodes to avoid issues with symbolic links
-+inode_src=`ls -id $abs_ft2_dir | sed 's/ .*//'`
-+inode_dst=`ls -id $abs_curr_dir | sed 's/ .*//'`
-
--if test "$abs_curr_dir" != "$abs_ft2_dir"; then
-- mkdir reference
-+if test $inode_src -ne $inode_dst; then
-+ if test ! -d reference; then
-+ mkdir reference
-+ fi
- echo "Copying \`modules.cfg'"
- cp $abs_ft2_dir/modules.cfg $abs_curr_dir
- echo "Generating \`Makefile'"
diff --git a/recipes/freetype/freetype-2.2.1/configure.patch b/recipes/freetype/freetype-2.2.1/configure.patch
deleted file mode 100644
index 2b62ddf8c2..0000000000
--- a/recipes/freetype/freetype-2.2.1/configure.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- freetype-2.2.1/builds/unix/configure.ac.orig 2006-07-10 10:31:58.000000000 +0100
-+++ freetype-2.2.1/builds/unix/configure.ac 2006-07-10 10:33:50.000000000 +0100
-@@ -119,9 +119,9 @@
-
- # Check for system zlib
-
--# don't quote AS_HELP_STRING!
-+# don't quote AC_HELP_STRING!
- AC_ARG_WITH([zlib],
-- AS_HELP_STRING([--without-zlib],
-+ AC_HELP_STRING([--without-zlib],
- [use internal zlib instead of system-wide]))
- if test x$with_zlib != xno && test -z "$LIBZ"; then
- AC_CHECK_LIB([z], [gzsetparams], [AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])])
-@@ -135,9 +135,9 @@
-
- # Whether to use Mac OS resource-based fonts.
-
--# don't quote AS_HELP_STRING!
-+# don't quote AC_HELP_STRING!
- AC_ARG_WITH([old-mac-fonts],
-- AS_HELP_STRING([--with-old-mac-fonts],
-+ AC_HELP_STRING([--with-old-mac-fonts],
- [allow Mac resource-based fonts to be used]))
- if test x$with_old_mac_fonts = xyes; then
- orig_LDFLAGS="${LDFLAGS}"
---- freetype-2.2.1/builds/unix/unix-cc.in.orig 2006-07-10 10:40:41.000000000 +0100
-+++ freetype-2.2.1/builds/unix/unix-cc.in 2006-07-10 10:43:10.000000000 +0100
-@@ -14,8 +14,11 @@
-
- CC := @CC@
- COMPILER_SEP := $(SEP)
-+SHELL := @SHELL@
-+top_builddir := $(BUILD_DIR)
-
--LIBTOOL ?= $(BUILD_DIR)/libtool
-+
-+LIBTOOL ?= @LIBTOOL@
-
-
- # The object file extension (for standard and static libraries). This can be
diff --git a/recipes/freetype/freetype-2.2.1/no-hardcode.patch b/recipes/freetype/freetype-2.2.1/no-hardcode.patch
deleted file mode 100644
index 65289758d5..0000000000
--- a/recipes/freetype/freetype-2.2.1/no-hardcode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- freetype-2.2.1/builds/unix/freetype-config.in.orig 2006-07-10 10:51:47.000000000 +0100
-+++ freetype-2.2.1/builds/unix/freetype-config.in 2006-07-10 10:52:27.000000000 +0100
-@@ -16,7 +16,7 @@
- libdir=@libdir@
- enable_shared=@enable_shared@
- wl=@wl@
--hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'
-+hardcode_libdir_flag_spec=''
-
- usage()
- {
diff --git a/recipes/freetype/freetype-2.3.12/configure-using-inodes.patch b/recipes/freetype/freetype-2.3.12/configure-using-inodes.patch
deleted file mode 100644
index 83dd120359..0000000000
--- a/recipes/freetype/freetype-2.3.12/configure-using-inodes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=75eeb32a2e55ffb3e4102ee56cd913a442d1ac9a
-
-author Werner Lemberg <wl@gnu.org> 2010-10-03 18:17:27 (GMT)
-
-Avoid `configure' issues with symbolic links.
-Based on a patch from Alexander Stohr <Alexander.Stohr@gmx.de>.
-* configure: Compare directories using `ls -id'.
-Check existence of `reference' subdirectory before creating it.
-
---- freetype.orig/configure 2010-10-07 16:46:51.000000000 +0200
-+++ freetype/configure 2010-10-07 16:49:52.000000000 +0200
-@@ -78,10 +78,15 @@
- done
- fi
-
--# build a dummy Makefile if we are not building in the source tree
-+# build a dummy Makefile if we are not building in the source tree;
-+# we use inodes to avoid issues with symbolic links
-+inode_src=`ls -id $abs_ft2_dir | sed 's/ .*//'`
-+inode_dst=`ls -id $abs_curr_dir | sed 's/ .*//'`
-
--if test "$abs_curr_dir" != "$abs_ft2_dir"; then
-- mkdir reference
-+if test $inode_src -ne $inode_dst; then
-+ if test ! -d reference; then
-+ mkdir reference
-+ fi
- if test ! -r $abs_curr_dir/modules.cfg; then
- echo "Copying \`modules.cfg'"
- cp $abs_ft2_dir/modules.cfg $abs_curr_dir
diff --git a/recipes/freetype/freetype-2.3.12/fix-configure.patch b/recipes/freetype/freetype-2.3.12/fix-configure.patch
deleted file mode 100644
index ecd96738d4..0000000000
--- a/recipes/freetype/freetype-2.3.12/fix-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: freetype-2.3.6/builds/unix/configure.ac
-===================================================================
---- freetype-2.3.6.orig/builds/unix/configure.ac
-+++ freetype-2.3.6/builds/unix/configure.ac
-@@ -506,8 +506,6 @@ AC_SUBST([FT2_EXTRA_LIBS])
- AC_SUBST([SYSTEM_ZLIB])
-
-
--LT_INIT(win32-dll)
--
- AC_SUBST([hardcode_libdir_flag_spec])
- AC_SUBST([wl])
- AC_SUBST([build_libtool_libs])
diff --git a/recipes/freetype/freetype-2.3.12/libtool-tag.patch b/recipes/freetype/freetype-2.3.12/libtool-tag.patch
deleted file mode 100644
index 2f096cdd46..0000000000
--- a/recipes/freetype/freetype-2.3.12/libtool-tag.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.3.6/builds/unix/unix-cc.in
-+++ freetype-2.3.6/builds/unix/unix-cc.in
-@@ -88,7 +88,7 @@
- #
- #
- CCraw := $(CC)
--CC := $(LIBTOOL) --mode=compile $(CCraw)
-+CC := $(LIBTOOL) --tag=CC --mode=compile $(CCraw)
-
- # Linker flags.
- #
-@@ -105,7 +105,7 @@
-
- # Library linking
- #
--LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-+LINK_LIBRARY = $(LIBTOOL) --tag=CC --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
- -rpath $(libdir) -version-info $(version_info) \
- $(LDFLAGS) -no-undefined \
- # -export-symbols $(EXPORTS_LIST)
diff --git a/recipes/freetype/freetype-2.3.6/configure-using-inodes.patch b/recipes/freetype/freetype-2.3.6/configure-using-inodes.patch
deleted file mode 100644
index c2bff023cf..0000000000
--- a/recipes/freetype/freetype-2.3.6/configure-using-inodes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=75eeb32a2e55ffb3e4102ee56cd913a442d1ac9a
-
-author Werner Lemberg <wl@gnu.org> 2010-10-03 18:17:27 (GMT)
-
-Avoid `configure' issues with symbolic links.
-Based on a patch from Alexander Stohr <Alexander.Stohr@gmx.de>.
-* configure: Compare directories using `ls -id'.
-Check existence of `reference' subdirectory before creating it.
-
---- freetype.orig/configure 2010-10-07 16:46:51.000000000 +0200
-+++ freetype/configure 2010-10-07 16:49:52.000000000 +0200
-@@ -67,10 +67,15 @@
- abs_curr_dir=`pwd`
- abs_ft2_dir=`cd "$ft2_dir" && pwd`
-
--# build a dummy Makefile if we are not building in the source tree
-+# build a dummy Makefile if we are not building in the source tree;
-+# we use inodes to avoid issues with symbolic links
-+inode_src=`ls -id $abs_ft2_dir | sed 's/ .*//'`
-+inode_dst=`ls -id $abs_curr_dir | sed 's/ .*//'`
-
--if test "$abs_curr_dir" != "$abs_ft2_dir"; then
-- mkdir reference
-+if test $inode_src -ne $inode_dst; then
-+ if test ! -d reference; then
-+ mkdir reference
-+ fi
- echo "Copying \`modules.cfg'"
- cp $abs_ft2_dir/modules.cfg $abs_curr_dir
- echo "Generating \`Makefile'"
diff --git a/recipes/freetype/freetype-2.3.6/fix-configure.patch b/recipes/freetype/freetype-2.3.6/fix-configure.patch
deleted file mode 100644
index ecd96738d4..0000000000
--- a/recipes/freetype/freetype-2.3.6/fix-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: freetype-2.3.6/builds/unix/configure.ac
-===================================================================
---- freetype-2.3.6.orig/builds/unix/configure.ac
-+++ freetype-2.3.6/builds/unix/configure.ac
-@@ -506,8 +506,6 @@ AC_SUBST([FT2_EXTRA_LIBS])
- AC_SUBST([SYSTEM_ZLIB])
-
-
--LT_INIT(win32-dll)
--
- AC_SUBST([hardcode_libdir_flag_spec])
- AC_SUBST([wl])
- AC_SUBST([build_libtool_libs])
diff --git a/recipes/freetype/freetype-2.3.6/libtool-tag.patch b/recipes/freetype/freetype-2.3.6/libtool-tag.patch
deleted file mode 100644
index 2f096cdd46..0000000000
--- a/recipes/freetype/freetype-2.3.6/libtool-tag.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.3.6/builds/unix/unix-cc.in
-+++ freetype-2.3.6/builds/unix/unix-cc.in
-@@ -88,7 +88,7 @@
- #
- #
- CCraw := $(CC)
--CC := $(LIBTOOL) --mode=compile $(CCraw)
-+CC := $(LIBTOOL) --tag=CC --mode=compile $(CCraw)
-
- # Linker flags.
- #
-@@ -105,7 +105,7 @@
-
- # Library linking
- #
--LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-+LINK_LIBRARY = $(LIBTOOL) --tag=CC --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
- -rpath $(libdir) -version-info $(version_info) \
- $(LDFLAGS) -no-undefined \
- # -export-symbols $(EXPORTS_LIST)
diff --git a/recipes/freetype/freetype-native_2.2.1.bb b/recipes/freetype/freetype-native_2.2.1.bb
deleted file mode 100644
index 8a0dc91f3e..0000000000
--- a/recipes/freetype/freetype-native_2.2.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require freetype_${PV}.bb
-inherit native
-DEPENDS = ""
-
-EXTRA_OEMAKE=
-
-DEFAULT_PREFERENCE = "-1"
-
-do_configure() {
- (cd builds/unix && gnu-configize) || die "failure running gnu-configize"
- oe_runconf
-}
-
-do_stage() {
- autotools_stage_includes
- oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-}
-
-do_install() {
- :
-}
-
diff --git a/recipes/freetype/freetype-native_2.3.6.bb b/recipes/freetype/freetype-native_2.3.6.bb
deleted file mode 100644
index 4b969a1188..0000000000
--- a/recipes/freetype/freetype-native_2.3.6.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require freetype_${PV}.bb
-inherit native
-DEPENDS = ""
-
-EXTRA_OEMAKE=
-
-do_configure() {
- (cd builds/unix && gnu-configize) || die "failure running gnu-configize"
- oe_runconf
-}
-
-do_stage() {
- autotools_stage_includes
- oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-}
-
-do_install() {
- :
-}
-
diff --git a/recipes/freetype/files/configure.patch b/recipes/freetype/freetype/configure.patch
index f11cf96be0..f11cf96be0 100644
--- a/recipes/freetype/files/configure.patch
+++ b/recipes/freetype/freetype/configure.patch
diff --git a/recipes/freetype/files/no-hardcode.patch b/recipes/freetype/freetype/no-hardcode.patch
index 44ae450a14..44ae450a14 100644
--- a/recipes/freetype/files/no-hardcode.patch
+++ b/recipes/freetype/freetype/no-hardcode.patch
diff --git a/recipes/freetype/freetype_2.2.1.bb b/recipes/freetype/freetype_2.2.1.bb
deleted file mode 100644
index dbd8efbd2a..0000000000
--- a/recipes/freetype/freetype_2.2.1.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "Freetype font rendering library"
-SECTION = "libs"
-LICENSE = "freetype GPLv2"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
- file://configure.patch \
- file://no-hardcode.patch \
- file://configure-using-inodes.patch"
-S = "${WORKDIR}/freetype-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-DEFAULT_PREFERENCE = "-1"
-
-LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
-EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
-EXTRA_OECONF = "--without-zlib"
-
-do_configure() {
- cd builds/unix
- gnu-configize
- aclocal -I .
- autoconf
- cd ${S}
- oe_runconf
-}
-
-do_compile_prepend() {
- ${BUILD_CC} -o objs/apinames src/tools/apinames.c
-}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}"
-
-SRC_URI[md5sum] = "5b2f827082c544392a7701f7423f0781"
-SRC_URI[sha256sum] = "0e8eb40392752b306d3a3de21f9fa479d53c17bd774b8051771cb258e162e006"
diff --git a/recipes/freetype/freetype_2.3.12.bb b/recipes/freetype/freetype_2.3.12.bb
deleted file mode 100644
index fe567f41bb..0000000000
--- a/recipes/freetype/freetype_2.3.12.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Freetype font rendering library"
-SECTION = "libs"
-LICENSE = "freetype GPLv2"
-PR = "r2"
-DEPENDS = "zlib"
-
-SRC_URI = "\
- ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
- file://no-hardcode.patch \
- file://fix-configure.patch \
- file://libtool-tag.patch \
- file://configure-using-inodes.patch \
-"
-S = "${WORKDIR}/freetype-${PV}"
-
-SRC_URI[md5sum] = "e974a82e5939be8e05ee65f07275d7c5"
-SRC_URI[sha256sum] = "3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92"
-
-inherit autotools pkgconfig binconfig
-
-LIBTOOL = "${HOST_SYS}-libtool"
-EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
-
-do_configure() {
- cd builds/unix
- libtoolize --force --copy
- gnu-configize --force
- aclocal -I .
- autoconf
- cd ${S}
- oe_runconf
-}
-
-do_compile_prepend() {
- ${BUILD_CC} -o objs/apinames src/tools/apinames.c
-}
-
-BBCLASSEXTEND = "native"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}"
diff --git a/recipes/freetype/freetype_2.3.6.bb b/recipes/freetype/freetype_2.3.6.bb
deleted file mode 100644
index 0c93538c14..0000000000
--- a/recipes/freetype/freetype_2.3.6.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-DESCRIPTION = "Freetype font rendering library"
-SECTION = "libs"
-LICENSE = "freetype GPLv2"
-PR = "r0"
-
-SRC_URI = "\
- ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
- file://no-hardcode.patch \
- file://fix-configure.patch \
- file://libtool-tag.patch \
- file://configure-using-inodes.patch \
-"
-S = "${WORKDIR}/freetype-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-LIBTOOL = "${HOST_SYS}-libtool"
-EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
-EXTRA_OECONF = "--without-zlib"
-
-do_configure() {
- cd builds/unix
- libtoolize --force --copy
- gnu-configize --force
- aclocal -I .
- autoconf
- cd ${S}
- oe_runconf
-}
-
-do_compile_prepend() {
- ${BUILD_CC} -o objs/apinames src/tools/apinames.c
-}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}"
-
-SRC_URI[md5sum] = "fb182d508017cb608e9df8c7dca648dc"
-SRC_URI[sha256sum] = "d5a698c30376d14c1ce6540ed6d5627796421e6e97576620ea4562411a110e77"