diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/gtk-webcore/osb-jscore-0.5.0/gcc4-fno-threadsafe-statics.patch | 11 | ||||
-rw-r--r-- | packages/gtk-webcore/osb-jscore-0.5.0/superh-aclocal.patch | 11 | ||||
-rw-r--r-- | packages/gtk-webcore/osb-jscore-0.5.0/superh-ustring-declaration-error.patch | 47 | ||||
-rw-r--r-- | packages/gtk-webcore/osb-jscore_0.5.0.bb | 4 | ||||
-rw-r--r-- | packages/lcms/lcms_1.15.bb | 10 | ||||
-rw-r--r-- | packages/libxine/libxine-1.1.0/gcc41.patch | 13 | ||||
-rw-r--r-- | packages/libxine/libxine_1.1.0.bb | 3 | ||||
-rw-r--r-- | packages/linux/linux-jlime-jornada6xx-2.6.17/io.h-fix.patch | 31 | ||||
-rw-r--r-- | packages/linux/linux-jlime-jornada6xx_2.6.17.bb | 3 | ||||
-rw-r--r-- | packages/opie-freetype/opie-freetype.inc | 3 | ||||
-rw-r--r-- | packages/opie-freetype/opie-freetype_1.2.2.bb | 1 | ||||
-rw-r--r-- | packages/opie-freetype/opie-freetype_cvs.bb | 1 | ||||
-rw-r--r-- | packages/quilt/quilt-native.inc | 5 | ||||
-rw-r--r-- | packages/sysvinit/sysvinit_2.86.bb | 2 |
14 files changed, 142 insertions, 3 deletions
diff --git a/packages/gtk-webcore/osb-jscore-0.5.0/gcc4-fno-threadsafe-statics.patch b/packages/gtk-webcore/osb-jscore-0.5.0/gcc4-fno-threadsafe-statics.patch new file mode 100644 index 0000000000..44e69b2707 --- /dev/null +++ b/packages/gtk-webcore/osb-jscore-0.5.0/gcc4-fno-threadsafe-statics.patch @@ -0,0 +1,11 @@ +--- osb-jscore-0.5.0/configure.in_orig 2006-09-18 00:37:27.000000000 +0000 ++++ osb-jscore-0.5.0/configure.in 2006-09-18 00:37:51.000000000 +0000 +@@ -61,7 +61,7 @@ + fi + changequote([,])dnl + +-CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++" ++CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++ -fno-threadsafe-statics" + LDFLAGS="$LDFLAGS -nodefaultlibs -lgcc -lc -lm" + + CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/kjs -I\$(top_srcdir)/pcre -I\$(top_srcdir)/" diff --git a/packages/gtk-webcore/osb-jscore-0.5.0/superh-aclocal.patch b/packages/gtk-webcore/osb-jscore-0.5.0/superh-aclocal.patch new file mode 100644 index 0000000000..706dead8c3 --- /dev/null +++ b/packages/gtk-webcore/osb-jscore-0.5.0/superh-aclocal.patch @@ -0,0 +1,11 @@ +--- osb-jscore-0.5.0/aclocal.m4_orig 2006-09-18 00:49:32.000000000 +0000 ++++ osb-jscore-0.5.0/aclocal.m4 2006-09-18 00:49:52.000000000 +0000 +@@ -4299,7 +4299,7 @@ + # This must be Linux ELF. + linux-gnu*) + case $host_cpu in +- alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*) ++ alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | sh* | x86_64*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM diff --git a/packages/gtk-webcore/osb-jscore-0.5.0/superh-ustring-declaration-error.patch b/packages/gtk-webcore/osb-jscore-0.5.0/superh-ustring-declaration-error.patch new file mode 100644 index 0000000000..c0c52444c8 --- /dev/null +++ b/packages/gtk-webcore/osb-jscore-0.5.0/superh-ustring-declaration-error.patch @@ -0,0 +1,47 @@ +--- osb-jscore-0.5.0/kjs/ustring.cpp_orig 2006-09-18 01:29:11.000000000 +0000 ++++ osb-jscore-0.5.0/kjs/ustring.cpp 2006-09-18 01:29:46.000000000 +0000 +@@ -132,7 +132,7 @@ + return *this; + } + +-bool KJS::operator==(const KJS::CString& c1, const KJS::CString& c2) ++bool operator==(const KJS::CString& c1, const KJS::CString& c2) + { + int len = c1.size(); + return len == c2.size() && (len == 0 || memcmp(c1.c_str(), c2.c_str(), len) == 0); +@@ -1094,7 +1094,7 @@ + rep->deref(); + } + +-bool KJS::operator==(const UString& s1, const UString& s2) ++bool operator==(const UString& s1, const UString& s2) + { + if (s1.rep->len != s2.rep->len) + return false; +@@ -1103,7 +1103,7 @@ + s1.rep->len * sizeof(UChar)) == 0); + } + +-bool KJS::operator==(const UString& s1, const char *s2) ++bool operator==(const UString& s1, const char *s2) + { + if (s2 == 0) { + return s1.isEmpty(); +@@ -1121,7 +1121,7 @@ + return u == uend && *s2 == 0; + } + +-bool KJS::operator<(const UString& s1, const UString& s2) ++bool operator<(const UString& s1, const UString& s2) + { + const int l1 = s1.size(); + const int l2 = s2.size(); +@@ -1140,7 +1140,7 @@ + return (l1 < l2); + } + +-int KJS::compare(const UString& s1, const UString& s2) ++int compare(const UString& s1, const UString& s2) + { + const int l1 = s1.size(); + const int l2 = s2.size(); diff --git a/packages/gtk-webcore/osb-jscore_0.5.0.bb b/packages/gtk-webcore/osb-jscore_0.5.0.bb index 5e38d59f77..c5d2fc4e9e 100644 --- a/packages/gtk-webcore/osb-jscore_0.5.0.bb +++ b/packages/gtk-webcore/osb-jscore_0.5.0.bb @@ -10,6 +10,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-jscore-${PV}.tar.gz \ file://missing-includes.patch;patch=1 \ file://libm.patch;patch=1" +SRC_URI_append_sh3 = " file://superh-aclocal.patch;patch=1 \ + file://gcc4-fno-threadsafe-statics.patch;patch=1 \ + file://superh-ustring-declaration-error.patch;patch=1" + inherit autotools pkgconfig do_configure () { diff --git a/packages/lcms/lcms_1.15.bb b/packages/lcms/lcms_1.15.bb new file mode 100644 index 0000000000..c8b6ede7fb --- /dev/null +++ b/packages/lcms/lcms_1.15.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Little cms is a small-footprint, speed optimized color management engine." +SECTION = "libs" +LICENSE = "LGPL" +SRC_URI = "http://www.littlecms.com/lcms-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/libxine/libxine-1.1.0/gcc41.patch b/packages/libxine/libxine-1.1.0/gcc41.patch new file mode 100644 index 0000000000..f201a5e38b --- /dev/null +++ b/packages/libxine/libxine-1.1.0/gcc41.patch @@ -0,0 +1,13 @@ +Index: xine-lib-1.1.0/src/libffmpeg/libavcodec/mpegvideo.h +=================================================================== +--- xine-lib-1.1.0.orig/src/libffmpeg/libavcodec/mpegvideo.h ++++ xine-lib-1.1.0/src/libffmpeg/libavcodec/mpegvideo.h +@@ -928,7 +928,7 @@ int ff_mpeg4_get_video_packet_prefix_len + int ff_h263_resync(MpegEncContext *s); + int ff_h263_get_gob_height(MpegEncContext *s); + int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); +-int ff_h263_round_chroma(int x); ++static int ff_h263_round_chroma(int x); + void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code); + int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); + diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index b4ab063063..7b78d2ae51 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext libpng" PROVIDES = "virtual/libxine" -PR = "r0" +PR = "r1" inherit autotools pkgconfig gettext binconfig @@ -22,6 +22,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xine/xine-lib-${PV}.tar.gz \ file://mpegvideo-static-inlinine.patch;patch=1 \ file://no-caca.patch;patch=1 \ file://dont-have-xv.patch;patch=1 \ + file://gcc41.patch;patch=1 \ " DEFAULT_PREFERENCE = "-1" diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.17/io.h-fix.patch b/packages/linux/linux-jlime-jornada6xx-2.6.17/io.h-fix.patch new file mode 100644 index 0000000000..0ae39a8dc5 --- /dev/null +++ b/packages/linux/linux-jlime-jornada6xx-2.6.17/io.h-fix.patch @@ -0,0 +1,31 @@ +--- linux-2.6.17/include/asm-sh/io.h_orig 2006-09-17 22:52:10.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/io.h 2006-09-17 22:54:01.000000000 +0000 +@@ -138,17 +138,17 @@ + #define readl_relaxed(a) readl(a) + + /* Simple MMIO */ +-#define ioread8(a) readb(a) +-#define ioread16(a) readw(a) +-#define ioread16be(a) be16_to_cpu(__raw_readw((a))) +-#define ioread32(a) readl(a) +-#define ioread32be(a) be32_to_cpu(__raw_readl((a))) +- +-#define iowrite8(v,a) writeb((v),(a)) +-#define iowrite16(v,a) writew((v),(a)) +-#define iowrite16be(v,a) __raw_writew(cpu_to_be16((v)),(a)) +-#define iowrite32(v,a) writel((v),(a)) +-#define iowrite32be(v,a) __raw_writel(cpu_to_be32((v)),(a)) ++#define ioread8(a) inb(a) ++#define ioread16(a) inw(a) ++#define ioread16be(a) be16_to_cpu(inw((a))) ++#define ioread32(a) inl(a) ++#define ioread32be(a) be32_to_cpu(inl((a))) ++ ++#define iowrite8(v,a) outb((v),(a)) ++#define iowrite16(v,a) outw((v),(a)) ++#define iowrite16be(v,a) outw(cpu_to_be16((v)),(a)) ++#define iowrite32(v,a) outl((v),(a)) ++#define iowrite32be(v,a) outl(cpu_to_be32((v)),(a)) + + #define ioread8_rep(a,d,c) insb((a),(d),(c)) + #define ioread16_rep(a,d,c) insw((a),(d),(c)) diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb index 68f51b8e08..93f45c80d5 100644 --- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb +++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb @@ -10,7 +10,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://defconfig_jlime \ file://LinuxSH-2.6.17.patch;patch=0 \ file://unexpected-int-fix.patch;patch=0 \ - file://keymap-fix.patch;patch=0" + file://keymap-fix.patch;patch=0 \ + file://io.h-fix.patch;patch=0" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/opie-freetype/opie-freetype.inc b/packages/opie-freetype/opie-freetype.inc index 8d3fcd7ab2..c7cd9428ac 100644 --- a/packages/opie-freetype/opie-freetype.inc +++ b/packages/opie-freetype/opie-freetype.inc @@ -6,9 +6,12 @@ LICENSE = "GPL" DEPENDS = "freetype opie-ttf-support" RDEPENDS = "opie-ttf-support" APPNAME = "freetypefactory" +APPTYPE = "plugin" S = "${WORKDIR}/freetype" inherit opie EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/freetype2" + +DEBIAN_NOAUTONAME_opie-freetype = "1" diff --git a/packages/opie-freetype/opie-freetype_1.2.2.bb b/packages/opie-freetype/opie-freetype_1.2.2.bb index a3fae4aba8..8f99026227 100644 --- a/packages/opie-freetype/opie-freetype_1.2.2.bb +++ b/packages/opie-freetype/opie-freetype_1.2.2.bb @@ -1,4 +1,5 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype" diff --git a/packages/opie-freetype/opie-freetype_cvs.bb b/packages/opie-freetype/opie-freetype_cvs.bb index 0453a7f283..b26315d567 100644 --- a/packages/opie-freetype/opie-freetype_cvs.bb +++ b/packages/opie-freetype/opie-freetype_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/freetype" diff --git a/packages/quilt/quilt-native.inc b/packages/quilt/quilt-native.inc index c8bbdc8e07..b7ddd8bce8 100644 --- a/packages/quilt/quilt-native.inc +++ b/packages/quilt/quilt-native.inc @@ -14,3 +14,8 @@ EXTRA_OECONF = "--disable-nls" do_configure () { oe_runconf } + +do_test() { + oe_runmake check +} + diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index d2b538b1f9..4b8518f37e 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -91,7 +91,7 @@ EOF ln -sf ../init.d/bootlogd ${D}${sysconfdir}/rcS.d/S07bootlogd for level in 2 3 4 5; do install -d ${D}${sysconfdir}/rc$level.d - ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd + ln -sf ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd done mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.${PN} mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${PN} |