Skip to contentSkip to conversation

Update packages V3

PATCH Applied Kang Kai 2 participants 7 messages Oct 19, 2011 – Oct 20, 2011

lore
Share & tools
lore

Kang Kai

author
#0 lore raw

cover Update packages V3

Hi Saul,

Version 3: remove obsolete patches, and add distro tracking information.

Version 2: only add libsdl update

Update ghostscript, libxml-sax-perl and liburi-perl to latest version.

Regards,

The following changes since commit 3c517bfe6c6d7781658f65bda4e0fdb499ca2b62:

bind 9.8.1: fix build after recent update (2011-10-17 16:58:14 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/update-pkgs
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/update-pkgs

Kang Kai (5):
ghostscript: update to 9.04
libxml-sax-perl: update to 0.99
liburi-perl: update to 1.59
libsdl: update to 1.2.14
distro_tracking_fields: update packages tracking fields

 .../conf/distro/include/distro_tracking_fields.inc |   24 ++
 .../{liburi-perl_1.58.bb => liburi-perl_1.59.bb}   |    6 +-
 .../ghostscript/ghostscript/arm/soobjarch.h        |   40 ---
 .../ghostscript-9.02-prevent_recompiling.patch     |   74 +++---
 .../ghostscript/ghostscript/i586/soobjarch.h       |   41 ---
 .../ghostscript/ghostscript/mips/soobjarch.h       |   40 ---
 .../ghostscript/ghostscript/powerpc/soobjarch.h    |   40 ---
 .../ghostscript/ghostscript/powerpc64/soobjarch.h  |   40 ---
 .../ghostscript/ghostscript/x86_64/soobjarch.h     |   40 ---
 .../{ghostscript_9.02.bb => ghostscript_9.04.bb}   |   24 +-
 ...ml-sax-perl_0.96.bb => libxml-sax-perl_0.99.bb} |    7 +-
 meta/recipes-graphics/libsdl/files/acinclude.m4    |  189 -------------
 .../libsdl/files/configure_tweak.patch             |  281 +++++++++-----------
 .../libsdl/files/kernel-asm-page.patch             |   15 -
 .../libsdl/{libsdl_1.2.11.bb => libsdl_1.2.14.bb}  |   17 +-
 15 files changed, 219 insertions(+), 659 deletions(-)
 rename meta/recipes-devtools/perl/{liburi-perl_1.58.bb => liburi-perl_1.59.bb} (81%)
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc64/soobjarch.h
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h
 rename meta/recipes-extended/ghostscript/{ghostscript_9.02.bb => ghostscript_9.04.bb} (81%)
 rename meta/recipes-extended/perl/{libxml-sax-perl_0.96.bb => libxml-sax-perl_0.99.bb} (85%)
 delete mode 100644 meta/recipes-graphics/libsdl/files/acinclude.m4
 delete mode 100644 meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
 rename meta/recipes-graphics/libsdl/{libsdl_1.2.11.bb => libsdl_1.2.14.bb} (81%)
Signature · 1 line
1.7.5.1.300.gc565c
author
#1 lore raw

PATCH 1/5 ghostscript: update to 9.04

Remove the old version and update ghostscript to 9.04.

* update ghostscript-9.02-prevent_recompiling.patch
* because soobj is not used any more, remove soobj related work
* gs provides a configure option --with-install-cups to install cups related files but disabled by default, so need update post install scripts

---
 .../ghostscript/ghostscript/arm/soobjarch.h        |   40 -----------
 .../ghostscript-9.02-prevent_recompiling.patch     |   74 ++++++++++----------
 .../ghostscript/ghostscript/i586/soobjarch.h       |   41 -----------
 .../ghostscript/ghostscript/mips/soobjarch.h       |   40 -----------
 .../ghostscript/ghostscript/powerpc/soobjarch.h    |   40 -----------
 .../ghostscript/ghostscript/powerpc64/soobjarch.h  |   40 -----------
 .../ghostscript/ghostscript/x86_64/soobjarch.h     |   40 -----------
 .../{ghostscript_9.02.bb => ghostscript_9.04.bb}   |   24 +++---
 8 files changed, 49 insertions(+), 290 deletions(-)
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc64/soobjarch.h
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h
 rename meta/recipes-extended/ghostscript/{ghostscript_9.02.bb => ghostscript_9.04.bb} (81%)
meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h deleted +0 -40
deleted file mode 100644
index e8772cd..0000000
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch +37 -37

122 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h deleted +0 -41

41 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h deleted +0 -40
deleted file mode 100644
index 359097f..0000000
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h deleted +0 -40
deleted file mode 100644
index 359097f..0000000
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/powerpc64/soobjarch.h deleted +0 -40
deleted file mode 100644
index 0d0a16b..0000000
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h deleted +0 -40
deleted file mode 100644
index a05de29..0000000
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
meta/recipes-extended/ghostscript/ghostscript_9.04.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.02.bb +12 -12
similarity index 81%
rename from meta/recipes-extended/ghostscript/ghostscript_9.02.bb
rename to meta/recipes-extended/ghostscript/ghostscript_9.04.bb
index 9b21c66..8dcac90 100644
@@ -15,24 +15,24 @@ SECTION = "console/utils"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
 
-PR = "r4"
+PR = "r0"
 
 DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
 DEPENDS_virtclass-native = ""
 
-SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2"
+SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz"
 
 SRC_URI = "${SRC_URI_BASE} \
            file://ghostscript-9.02-prevent_recompiling.patch \
            file://ghostscript-9.02-genarch.patch \
            file://objarch.h \
-           file://soobjarch.h \
            file://ghostscript-9.02-parallel-make.patch \
            "
+
 SRC_URI_virtclass-native = "${SRC_URI_BASE}"
 
-SRC_URI[md5sum] = "f67151444bd56a7904579fc75a083dd6"
-SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb25409ee05a"
+SRC_URI[md5sum] = "9c2fb4af1eb609d09dba5bb0fa76173a"
+SRC_URI[sha256sum] = "f1e333738c41c3bf2b47ceb9806abb8045bcdc7353002c32736150425a7c1ef4"
 
 EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper --with-fontpath=${datadir}/fonts"
 
@@ -47,15 +47,13 @@ do_configure () {
     mkdir -p obj
     mkdir -p soobj
     cp ${WORKDIR}/objarch.h obj/arch.h
-    cp ${WORKDIR}/soobjarch.h soobj/arch.h
 
     oe_runconf
 
     # copy tools from the native ghostscript build
-    mkdir -p obj soobj
+    mkdir -p obj/aux soobj
     for i in genarch genconf mkromfs echogs gendev genht; do
-        cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/$i
-        cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i soobj/$i
+        cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i
     done
 }
 
@@ -64,7 +62,9 @@ do_install_append () {
     cp -r Resource ${D}${datadir}/ghostscript/${PV}/
     cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/
 
-    chown -R root:lp ${D}${sysconfdir}/cups
+    if [ -f ${D}${sysconfdir}/cups ]; then
+        chown -R root:lp ${D}${sysconfdir}/cups
+    fi
 }
 
 python do_patch_virtclass-native () {
@@ -78,14 +78,14 @@ do_configure_virtclass-native () {
 do_compile_virtclass-native () {
     mkdir -p obj
     for i in genarch genconf mkromfs echogs gendev genht; do
-        oe_runmake obj/$i
+        oe_runmake obj/aux/$i
     done
 }
 
 do_install_virtclass-native () {
     install -d ${D}${bindir}/ghostscript-${PV}
     for i in genarch genconf mkromfs echogs gendev genht; do
-        install -m 755 obj/$i ${D}${bindir}/ghostscript-${PV}/$i
+        install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i
     done
 }
 
Signature · 1 line
1.7.5.1.300.gc565c
author
#2 lore raw

PATCH 2/5 libxml-sax-perl: update to 0.99

In reply to Kang Kai

Update libxml-sax-perl to 0.99

---
 ...ml-sax-perl_0.96.bb => libxml-sax-perl_0.99.bb} |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/perl/{libxml-sax-perl_0.96.bb => libxml-sax-perl_0.99.bb} (85%)
meta/recipes-extended/perl/libxml-sax-perl_0.99.bb renamed from meta/recipes-extended/perl/libxml-sax-perl_0.96.bb +4 -3
similarity index 85%
rename from meta/recipes-extended/perl/libxml-sax-perl_0.96.bb
rename to meta/recipes-extended/perl/libxml-sax-perl_0.99.bb
index 97d2025..ee9ac30 100644
@@ -11,13 +11,14 @@ SECTION = "libs"
 LICENSE = "Artistic|GPLv1+"
 DEPENDS += "libxml-namespacesupport-perl-native"
 RDEPENDS_${PN} += "libxml-namespacesupport-perl perl-module-file-temp"
-PR = "r1"
+PR = "r0"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=65c4cd8f39c24c7135ed70dacbcb09e3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-${PV}.tar.gz"
-SRC_URI[md5sum] = "bdcd4119a62505184e211e9dfaef0ab1"
-SRC_URI[sha256sum] = "9bbef613afa42c46df008d537decc5a61df7e92d65463f3c900769f39e5c8e08"
+
+SRC_URI[md5sum] = "290f5375ae87fdebfdb5bc3854019f24"
+SRC_URI[sha256sum] = "32b04b8e36b6cc4cfc486de2d859d87af5386dd930f2383c49347050d6f5ad84"
 
 S = "${WORKDIR}/XML-SAX-${PV}"
 
Signature · 1 line
1.7.5.1.300.gc565c
author
#3 lore raw

PATCH 3/5 liburi-perl: update to 1.59

In reply to Kang Kai

Update liburi-perl to 1.59

---
 .../{liburi-perl_1.58.bb => liburi-perl_1.59.bb}   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/perl/{liburi-perl_1.58.bb => liburi-perl_1.59.bb} (81%)
meta/recipes-devtools/perl/liburi-perl_1.59.bb renamed from meta/recipes-devtools/perl/liburi-perl_1.58.bb +3 -3
similarity index 81%
rename from meta/recipes-devtools/perl/liburi-perl_1.58.bb
rename to meta/recipes-devtools/perl/liburi-perl_1.59.bb
index 9b84e2c..877b252 100644
@@ -4,7 +4,7 @@ and manipulate the various components that make up these strings."
 
 SECTION = "libs"
 LICENSE = "Artistic | GPLv1+"
-PR = "r2"
+PR = "r0"
 
 LIC_FILES_CHKSUM = "file://README;beginline=26;endline=30;md5=6c33ae5c87fd1c4897714e122dd9c23d"
 
@@ -12,8 +12,8 @@ DEPENDS += "perl"
 
 SRC_URI = "http://www.cpan.org/authors/id/G/GA/GAAS/URI-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "540575aee18616ad9a21e0af7a1e7b18"
-SRC_URI[sha256sum] = "5ddeb8e4707bd4c37a3a60f634de8424e40c85bba98cf6c1053ae5e71c9b8289"
+SRC_URI[md5sum] = "fecebf8fa20e2d26ea4a1649c095e96e"
+SRC_URI[sha256sum] = "cb88d29b589db8d2adbc4713fd082284cba77883488717375f011bbd13b5cac6"
 
 S = "${WORKDIR}/URI-${PV}"
 
Signature · 1 line
1.7.5.1.300.gc565c
author
#4 lore raw

PATCH 4/5 libsdl: update to 1.2.14

In reply to Kang Kai

Update libsdl to 1.2.14
* update configure_tweak.patch
* update bb file, including add configure option --disable-video-ps3, drop acinclude.m4 and kernel-asm-page.patch and remove old libtool macros

---
 meta/recipes-graphics/libsdl/files/acinclude.m4    |  189 -------------
 .../libsdl/files/configure_tweak.patch             |  281 +++++++++-----------
 .../libsdl/files/kernel-asm-page.patch             |   15 -
 .../libsdl/{libsdl_1.2.11.bb => libsdl_1.2.14.bb}  |   17 +-
 4 files changed, 139 insertions(+), 363 deletions(-)
 delete mode 100644 meta/recipes-graphics/libsdl/files/acinclude.m4
 delete mode 100644 meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
 rename meta/recipes-graphics/libsdl/{libsdl_1.2.11.bb => libsdl_1.2.14.bb} (81%)
meta/recipes-graphics/libsdl/files/acinclude.m4 deleted +0 -189
deleted file mode 100644
index ca2df9d..0000000
@@ -1,189 +0,0 @@
-# Local macros for the SDL configure.in script
-
-dnl Function to link an architecture specific file
-dnl LINK_ARCH_SRC(source_dir, arch, source_file)
-AC_DEFUN([COPY_ARCH_SRC],
-[
-  old="$srcdir/$1/$2/$3"
-  new="$1/$3"
-  if test ! -d $1; then
-    echo "Creating directory $1"
-    mkdir -p $1
-  fi
-  echo "Copying $old -> $new"
-  cat >$new <<__EOF__
-/* WARNING:  This file was automatically generated!
- * Original: $old
- */
-__EOF__
-  cat >>$new <$old
-])
-
-#
-# --- esd.m4 ---
-#
-# Configure paths for ESD
-# Manish Singh    98-9-30
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
-dnl
-AC_DEFUN([AM_PATH_ESD],
-[dnl 
-dnl Get the cflags and libraries from the esd-config script
-dnl
-AC_ARG_WITH(esd-prefix,[  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)],
-            esd_prefix="$withval", esd_prefix="")
-AC_ARG_WITH(esd-exec-prefix,[  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
-            esd_exec_prefix="$withval", esd_exec_prefix="")
-AC_ARG_ENABLE(esdtest, [  --disable-esdtest       Do not try to compile and run a test ESD program],
-		    , enable_esdtest=yes)
-
-  if test x$esd_exec_prefix != x ; then
-     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-     if test x${ESD_CONFIG+set} != xset ; then
-        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
-     fi
-  fi
-  if test x$esd_prefix != x ; then
-     esd_args="$esd_args --prefix=$esd_prefix"
-     if test x${ESD_CONFIG+set} != xset ; then
-        ESD_CONFIG=$esd_prefix/bin/esd-config
-     fi
-  fi
-
-  AC_PATH_PROG(ESD_CONFIG, esd-config, no)
-  min_esd_version=ifelse([$1], ,0.2.7,$1)
-  AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
-  no_esd=""
-  if test "$ESD_CONFIG" = "no" ; then
-    no_esd=yes
-  else
-    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
-    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-
-    esd_major_version=`$ESD_CONFIG $esd_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_esdtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $ESD_CFLAGS"
-      LIBS="$LIBS $ESD_LIBS"
-dnl
-dnl Now check if the installed ESD is sufficiently new. (Also sanity
-dnl checks the results of esd-config to some extent
-dnl
-      rm -f conf.esdtest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <esd.h>
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.esdtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_esd_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_esd_version");
-     exit(1);
-   }
-
-   if (($esd_major_version > major) ||
-      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
-      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
-      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
-      printf("*** to point to the correct copy of esd-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_esd" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$ESD_CONFIG" = "no" ; then
-       echo "*** The esd-config script installed by ESD could not be found"
-       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the ESD_CONFIG environment variable to the"
-       echo "*** full path to esd-config."
-     else
-       if test -f conf.esdtest ; then
-        :
-       else
-          echo "*** Could not run ESD test program, checking why..."
-          CFLAGS="$CFLAGS $ESD_CFLAGS"
-          LIBS="$LIBS $ESD_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <esd.h>
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding ESD or finding the wrong"
-          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
-          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
-          echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     ESD_CFLAGS=""
-     ESD_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(ESD_CFLAGS)
-  AC_SUBST(ESD_LIBS)
-  rm -f conf.esdtest
-])
-
meta/recipes-graphics/libsdl/files/configure_tweak.patch +129 -152

794 lines not on this page · raw message

meta/recipes-graphics/libsdl/files/kernel-asm-page.patch deleted +0 -15
deleted file mode 100644
index e698167..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c
-index 4e3d662..de38a3c 100644
---- a/src/video/Xext/Xxf86dga/XF86DGA.c
-+++ b/src/video/Xext/Xxf86dga/XF86DGA.c
-@@ -18,7 +18,7 @@ Copyright (c) 1995,1996  The XFree86 Project, Inc
- #define HAS_MMAP_ANON
- #include <sys/types.h>
- #include <sys/mman.h>
--#include <asm/page.h>   /* PAGE_SIZE */
-+#include <unistd.h>
- #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
- #define HAS_GETPAGESIZE
- #endif /* linux */
meta/recipes-graphics/libsdl/libsdl_1.2.14.bb renamed from meta/recipes-graphics/libsdl/libsdl_1.2.11.bb +10 -7
similarity index 81%
rename from meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
rename to meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 74489b0..6b23344 100644
@@ -13,17 +13,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender"
 DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
 
-PR = "r8"
+PR = "r0"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-	   file://acinclude.m4 \
 	   file://configure_tweak.patch \
-	   file://kernel-asm-page.patch "
+       "
 
 S = "${WORKDIR}/SDL-${PV}"
 
-SRC_URI[md5sum] = "418b42956b7cd103bfab1b9077ccc149"
-SRC_URI[sha256sum] = "6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730"
+SRC_URI[md5sum] = "e52086d1b508fa0b76c52ee30b55bec4"
+SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6"
 
 inherit autotools binconfig pkgconfig
 
@@ -31,7 +30,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
                 --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
                 --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
+                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
                 --disable-video-xbios --disable-video-gem --disable-video-dummy \
                 --enable-input-events --enable-pthreads \
 		${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
@@ -41,7 +40,11 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
 PARALLEL_MAKE = ""
 
 do_configure_prepend() {
-	cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4
+        # Remove old libtool macros.
+        MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
+        for i in ${MACROS}; do
+               rm -f acinclude/$i
+        done
 }
 
 BBCLASSEXTEND = "nativesdk"
Signature · 1 line
1.7.5.1.300.gc565c
author
#5 lore raw

PATCH 5/5 distro_tracking_fields: update packages tracking fields

In reply to Kang Kai

Update packages tracking fields including ghostscript, libsdl, libxml-sax-perl and liburi-perl.

---
 .../conf/distro/include/distro_tracking_fields.inc |   24 ++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +24 -0
index abc2cbf..ef0c49d 100644
@@ -5867,6 +5867,24 @@ RECIPE_MAINTAINER_pn-libnewt = "Kai Kang <[email protected]>"
 RECIPE_LAST_UPDATE_pn-libnewt = "Jul 27, 2011"
 RECIPE_MANUAL_CHECK_DATE_pn-libnewt = "Jul 27, 2011"
 
+RECIPE_STATUS_pn-libxml-sax-perl = "green"
+RECIPE_LATEST_VERSION_pn-libxml-sax-perl = "0.99"
+RECIPE_MAINTAINER_pn-libxml-sax-perl = "Kai Kang <[email protected]>"
+RECIPE_LAST_UPDATE_pn-libxml-sax-perl = "Oct 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libxml-sax-perl = "Oct 19, 2011"
+
+RECIPE_STATUS_pn-liburi-perl = "green"
+RECIPE_LATEST_VERSION_pn-liburi-perl = "1.59"
+RECIPE_MAINTAINER_pn-liburi-perl = "Kai Kang <[email protected]>"
+RECIPE_LAST_UPDATE_pn-liburi-perl = "Oct 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-liburi-perl = "Oct 19, 2011"
+
+RECIPE_STATUS_pn-ghostscript = "red"
+RECIPE_LATEST_VERSION_pn-ghostscript = "9.04"
+RECIPE_MAINTAINER_pn-ghostscript = "Kai Kang <[email protected]>"
+RECIPE_LAST_UPDATE_pn-ghostscript = "Oct 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn = "Oct 19, 2011"
+
 RECIPE_STATUS_pn-createrepo = "green"
 RECIPE_LATEST_VERSION_pn-createrepo = "0.9.9"
 RECIPE_MAINTAINER_pn-createrepo = "Saul Wold <[email protected]>"
@@ -5943,7 +5961,13 @@ RECIPE_MAINTAINER_pn-linux-yocto = "Darren Hart <[email protected]>"
 DISTRO_PN_ALIAS_pn-linux-yocto-rt = "Debian=linux-base Ubuntu=linux"
 RECIPE_MAINTAINER_pn-linux-yocto-rt = "Darren Hart <[email protected]>"
 
+RECIPE_STATUS_pn-libsdl = "green"
+RECIPE_LATEST_VERSION_pn-libsdl = "1.2.14"
+RECIPE_LAST_UPDATE_pn-libsdl = "Oct 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libsdl = "Jul 28, 2011"
+RECIPE_MAINTAINER_pn-libsdl = "Kai Kang <[email protected]>"
 DISTRO_PN_ALIAS_pn-libsdl = "Fedora=SDL Opensuse=SDL"
+
 DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame"
 DISTRO_PN_ALIAS_pn-libiconv = "Fedora=mingw-libiconv Opensuse=cross-mingw-libiconv"
 DISTRO_PN_ALIAS_pn-qt4-native = "Fedora=qt4 Debian=qt4-dev-tools"
Signature · 1 line
1.7.5.1.300.gc565c
Applied
#6 lore raw
In reply to Kang Kai
Quoted 42 lines · Kang Kai

Hi Saul,

Version 3: remove obsolete patches, and add distro tracking information.

Version 2: only add libsdl update

Update ghostscript, libxml-sax-perl and liburi-perl to latest version.

Regards,

The following changes since commit 3c517bfe6c6d7781658f65bda4e0fdb499ca2b62:

bind 9.8.1: fix build after recent update (2011-10-17 16:58:14 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/update-pkgs
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/update-pkgs

Kang Kai (5):
ghostscript: update to 9.04
libxml-sax-perl: update to 0.99
liburi-perl: update to 1.59
libsdl: update to 1.2.14
distro_tracking_fields: update packages tracking fields

  .../conf/distro/include/distro_tracking_fields.inc |   24 ++
  .../{liburi-perl_1.58.bb =>  liburi-perl_1.59.bb}   |    6 +-
  .../ghostscript/ghostscript/arm/soobjarch.h        |   40 ---
  .../ghostscript-9.02-prevent_recompiling.patch     |   74 +++---
  .../ghostscript/ghostscript/i586/soobjarch.h       |   41 ---
  .../ghostscript/ghostscript/mips/soobjarch.h       |   40 ---
  .../ghostscript/ghostscript/powerpc/soobjarch.h    |   40 ---
  .../ghostscript/ghostscript/powerpc64/soobjarch.h  |   40 ---
  .../ghostscript/ghostscript/x86_64/soobjarch.h     |   40 ---
  .../{ghostscript_9.02.bb =>  ghostscript_9.04.bb}   |   24 +-
  ...ml-sax-perl_0.96.bb =>  libxml-sax-perl_0.99.bb} |    7 +-
  meta/recipes-graphics/libsdl/files/acinclude.m4    |  189 -------------
  .../libsdl/files/configure_tweak.patch             |  281 +++++++++-----------
  .../libsdl/files/kernel-asm-page.patch             |   15 -
  .../libsdl/{libsdl_1.2.11.bb =>  libsdl_1.2.14.bb}  |   17 +-
  15 files changed, 219 insertions(+), 659 deletions(-)
Quoted 13 lines

rename meta/recipes-devtools/perl/{liburi-perl_1.58.bb => liburi-perl_1.59.bb} (81%) delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc64/soobjarch.h delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h rename meta/recipes-extended/ghostscript/{ghostscript_9.02.bb => ghostscript_9.04.bb} (81%) rename meta/recipes-extended/perl/{libxml-sax-perl_0.96.bb => libxml-sax-perl_0.99.bb} (85%) delete mode 100644 meta/recipes-graphics/libsdl/files/acinclude.m4
delete mode 100644 meta/recipes-graphics/libsdl/files/kernel-asm-page.patch rename meta/recipes-graphics/libsdl/{libsdl_1.2.11.bb => libsdl_1.2.14.bb} (81%)

Merged into OE-Core

Thanks
Sau!