summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/angstrom.inc5
-rw-r--r--conf/distro/include/preferred-opie-cvs-versions.inc2
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.3.inc2
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.4-pre.inc2
-rw-r--r--packages/liboil/liboil_0.3.15.bb14
-rw-r--r--packages/linux/linux-omap/omap3evm/OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch32
-rw-r--r--packages/linux/linux-omap/omap3evm/defconfig13
-rw-r--r--packages/linux/linux-omap_git.bb3
-rw-r--r--packages/mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty0
-rw-r--r--packages/mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty0
-rw-r--r--packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig67
-rw-r--r--packages/mozilla/firefox-3.0.1+3.1a2/jsautocfg-dontoverwrite.patch23
-rw-r--r--packages/mozilla/firefox-3.0.1+3.1a2/mozconfig66
-rw-r--r--packages/mozilla/firefox-3.0.1+3.1a2/random_to_urandom.diff26
-rw-r--r--packages/mozilla/firefox.inc16
-rw-r--r--packages/mozilla/firefox_3.1a2.bb47
-rw-r--r--packages/mysql/files/autofoo.patch56
-rw-r--r--packages/mysql/files/fix_host_path.patch24
-rw-r--r--packages/mysql/mysql-native_4.1.22.bb (renamed from packages/mysql/mysql-native_4.1.18.bb)10
-rw-r--r--packages/mysql/mysql_4.1.22.bb (renamed from packages/mysql/mysql_4.1.18.bb)16
-rw-r--r--packages/pidgin/pidgin.inc2
-rw-r--r--packages/vlc/vlc_0.9.2.bb56
22 files changed, 424 insertions, 58 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 4ada4a89d4..3375a0089f 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -79,6 +79,11 @@ TARGET_FPU_armv6 ?= "hard"
TARGET_FPU_armv7a ?= "hard"
TARGET_FPU_ppc603e ?= "hard"
+# webkit-gtk and cairo have alignment issues with double instructions on armv5 so
+# disable them here
+TARGET_CC_ARCH_pn-webkit-gtk_armv5te = "-march=armv4t"
+TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
+
#Set the right arch for the feeds
#Alphabetically sorted
diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc
index 8ffad210bb..79fc56c08c 100644
--- a/conf/distro/include/preferred-opie-cvs-versions.inc
+++ b/conf/distro/include/preferred-opie-cvs-versions.inc
@@ -206,4 +206,4 @@ SRCDATE_opie-zkbapplet ?= "${OPIE_VERSION}"
SRCDATE_opie-zlines ?= "${OPIE_VERSION}"
SRCDATE_opie-zsafe ?= "${OPIE_VERSION}"
SRCDATE_opie-zsame ?= "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20060404"
+PREFERRED_VERSION_konqueror-embedded = "20070316"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc
index ffcbbc2217..56bb4fbeaa 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc
@@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20070212"
+PREFERRED_VERSION_konqueror-embedded = "20070316"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
index d6c43a3839..10d0833c6c 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
@@ -221,7 +221,7 @@ PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20070212"
+PREFERRED_VERSION_konqueror-embedded = "20070316"
SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}"
diff --git a/packages/liboil/liboil_0.3.15.bb b/packages/liboil/liboil_0.3.15.bb
new file mode 100644
index 0000000000..d6a29f0c0f
--- /dev/null
+++ b/packages/liboil/liboil_0.3.15.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
+HOMEPAGE = "http://liboil.freedesktop.org/"
+LICENSE = "various"
+
+DEPENDS = "glib-2.0"
+
+SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
+ "
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/linux/linux-omap/omap3evm/OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch b/packages/linux/linux-omap/omap3evm/OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch
new file mode 100644
index 0000000000..aac1151b78
--- /dev/null
+++ b/packages/linux/linux-omap/omap3evm/OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch
@@ -0,0 +1,32 @@
+without this the below error messages were coming continuously
+
+TWL4030 module irq 369 is disabled but can't be masked!
+<2>TWL4030 module irq 369 is disabled but can't be masked!
+
+Signed-off-by: Arun C <arunedarath@mistralsolutions.com>
+---
+ arch/arm/mach-omap2/board-omap3evm.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3evm.c
+b/arch/arm/mach-omap2/board-omap3evm.c
+index 92f70ce..f9fd06b 100644
+--- a/arch/arm/mach-omap2/board-omap3evm.c
++++ b/arch/arm/mach-omap2/board-omap3evm.c
+@@ -22,6 +22,7 @@
+ #include <linux/input.h>
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
++#include <linux/i2c/twl4030.h>
+
+ #include <mach/hardware.h>
+ #include <asm/mach-types.h>
+@@ -176,6 +177,7 @@ static struct omap_kp_platform_data omap3evm_kp_data = {
+ .keymap = omap3evm_keymap,
+ .keymapsize = ARRAY_SIZE(omap3evm_keymap),
+ .rep = 1,
++ .irq = TWL4030_MODIRQ_KEYPAD,
+ };
+
+ static struct platform_device omap3evm_kp_device = {
+
diff --git a/packages/linux/linux-omap/omap3evm/defconfig b/packages/linux/linux-omap/omap3evm/defconfig
index 294324561e..89de12e765 100644
--- a/packages/linux/linux-omap/omap3evm/defconfig
+++ b/packages/linux/linux-omap/omap3evm/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27-rc6-omap1
-# Wed Sep 17 11:04:13 2008
+# Sat Sep 20 13:46:37 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1414,7 +1414,7 @@ CONFIG_USB_DEVICEFS=y
CONFIG_USB_DEVICE_CLASS=y
# CONFIG_USB_DYNAMIC_MINORS is not set
CONFIG_USB_SUSPEND=y
-CONFIG_USB_OTG=y
+# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
CONFIG_USB_MON=y
@@ -1439,10 +1439,10 @@ CONFIG_USB_MUSB_SOC=y
#
# OMAP 343x high speed USB support
#
-# CONFIG_USB_MUSB_HOST is not set
+CONFIG_USB_MUSB_HOST=y
# CONFIG_USB_MUSB_PERIPHERAL is not set
-CONFIG_USB_MUSB_OTG=y
-CONFIG_USB_GADGET_MUSB_HDRC=y
+# CONFIG_USB_MUSB_OTG is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
CONFIG_USB_MUSB_HDRC_HCD=y
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_USB_INVENTRA_DMA=y
@@ -1579,7 +1579,8 @@ CONFIG_USB_GADGET_SELECTED=y
# CONFIG_USB_GADGET_FSL_USB2 is not set
# CONFIG_USB_GADGET_NET2280 is not set
# CONFIG_USB_GADGET_PXA25X is not set
-# CONFIG_USB_GADGET_M66592 is not set
+CONFIG_USB_GADGET_M66592=y
+CONFIG_USB_M66592=y
# CONFIG_USB_GADGET_PXA27X is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_LH7A40X is not set
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index f4a064f595..05448f1c23 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
SRCREV = "de1121fdb899f762"
PV = "2.6.26+2.6.27-rc6+${PR}+git${SRCREV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
file://defconfig"
@@ -42,6 +42,7 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
"
SRC_URI_append_omap3evm = " \
+ file://OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch;patch=1 \
"
S = "${WORKDIR}/git"
diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty b/packages/mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/firefox-3.0.1+3.1a2/.mtn2git_empty
diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty b/packages/mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/firefox-3.0.1+3.1a2/arm/.mtn2git_empty
diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig b/packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig
new file mode 100644
index 0000000000..094a0ff642
--- /dev/null
+++ b/packages/mozilla/firefox-3.0.1+3.1a2/arm/mozconfig
@@ -0,0 +1,67 @@
+. $topsrcdir/browser/config/mozconfig
+
+# use GTK+-2 widget set with XFT font rendering
+#ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+
+# enable minimal profile support
+ac_add_options --disable-profilesharing
+ac_add_options --disable-profilelocking
+ac_add_options --enable-single-profile
+
+ac_add_options --with-system-zlib
+ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+
+ac_add_options --disable-accessibility
+ac_add_options --disable-composer
+#ac_add_options --enable-plaintext-editor-only
+ac_add_options --disable-mailnews
+ac_add_options --disable-ldap
+#ac_add_options --disable-postscript
+ac_add_options --disable-mathml
+ac_add_options --disable-jsd
+ac_add_options --disable-installer
+ac_add_options --disable-xprint
+ac_add_options --disable-necko-disk-cache
+
+# configure necko to allocate smaller network buffers
+ac_add_options --enable-necko-small-buffers
+
+# disable debug logging and tests
+#ac_add_options --disable-dtd-debug
+ac_add_options --disable-logging
+ac_add_options --disable-gtktest
+ac_add_options --disable-tests
+ac_add_options --disable-printing
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+ac_add_options --enable-debugger-info-modules
+
+# build crypto module (PSM + NSS)
+ac_add_options --enable-crypto
+
+# build minimal set of protocol handlers
+ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource
+
+# build minimal set of image decoders
+ac_add_options --enable-image-decoders=png,gif,jpeg
+
+#ac_add_options --enable-reorder
+#ac_add_options --enable-elf-dynstr-gc
+
+# enable static build
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
+ac_add_options --enable-optimize=-O2
+ac_add_options --with-arm-kuser
+
+# Use cairo from system
+ac_add_options --enable-system-cairo
+
+# Disable jemalloc
+ac_add_options --disable-jemalloc
+
+# enable libxul
+ac_add_options --enable-libxul
diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-3.0.1+3.1a2/jsautocfg-dontoverwrite.patch
new file mode 100644
index 0000000000..39978cfd11
--- /dev/null
+++ b/packages/mozilla/firefox-3.0.1+3.1a2/jsautocfg-dontoverwrite.patch
@@ -0,0 +1,23 @@
+--- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000
++++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000
+@@ -319,20 +319,8 @@
+
+ jsopcode.h jsopcode.c: jsopcode.tbl
+
+-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
+ jsautocfg.h:
+ touch $@
+-else
+-ifeq ($(OS_ARCH),WINCE)
+-jsautocfg.h:
+- touch $@
+-else
+-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
+- @rm -f $@ jsautocfg.tmp
+- ./jscpucfg > jsautocfg.tmp
+- mv jsautocfg.tmp $@
+-endif
+-endif
+
+ # jscpucfg is a strange target
+ # Needs to be built with the host compiler but needs to include
diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig b/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig
new file mode 100644
index 0000000000..cd097165ab
--- /dev/null
+++ b/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig
@@ -0,0 +1,66 @@
+. $topsrcdir/browser/config/mozconfig
+
+# use GTK+-2 widget set with XFT font rendering
+#ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+
+# enable minimal profile support
+ac_add_options --disable-profilesharing
+ac_add_options --disable-profilelocking
+ac_add_options --enable-single-profile
+
+ac_add_options --with-system-zlib
+ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+
+ac_add_options --disable-accessibility
+ac_add_options --disable-composer
+#ac_add_options --enable-plaintext-editor-only
+ac_add_options --disable-mailnews
+ac_add_options --disable-ldap
+#ac_add_options --disable-postscript
+ac_add_options --disable-mathml
+ac_add_options --disable-jsd
+ac_add_options --disable-installer
+ac_add_options --disable-xprint
+ac_add_options --disable-necko-disk-cache
+
+# configure necko to allocate smaller network buffers
+ac_add_options --enable-necko-small-buffers
+
+# disable debug logging and tests
+#ac_add_options --disable-dtd-debug
+ac_add_options --disable-logging
+ac_add_options --disable-gtktest
+ac_add_options --disable-tests
+ac_add_options --disable-printing
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+ac_add_options --enable-debugger-info-modules
+
+# build crypto module (PSM + NSS)
+ac_add_options --enable-crypto
+
+# build minimal set of protocol handlers
+ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource
+
+# build minimal set of image decoders
+ac_add_options --enable-image-decoders=png,gif,jpeg
+
+#ac_add_options --enable-reorder
+#ac_add_options --enable-elf-dynstr-gc
+
+# enable static build
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
+ac_add_options --enable-optimize=-O2
+
+# Use cairo from system
+ac_add_options --enable-system-cairo
+
+# Disable jemalloc
+ac_add_options --disable-jemalloc
+
+# enable libxul
+ac_add_options --enable-libxul
diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/random_to_urandom.diff b/packages/mozilla/firefox-3.0.1+3.1a2/random_to_urandom.diff
new file mode 100644
index 0000000000..f969752381
--- /dev/null
+++ b/packages/mozilla/firefox-3.0.1+3.1a2/random_to_urandom.diff
@@ -0,0 +1,26 @@
+# Component manager should not use /dev/random for generation ranodm numbers
+# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy
+# Bug somewhere exists but it is very old
+Index: nsprpub/pr/src/md/unix/uxrng.c
+===================================================================
+--- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig
++++ mozilla/nsprpub/pr/src/md/unix/uxrng.c
+@@ -144,17 +144,17 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+
+ static int fdDevRandom;
+ static PRCallOnceType coOpenDevRandom;
+
+ static PRStatus OpenDevRandom( void )
+ {
+- fdDevRandom = open( "/dev/random", O_RDONLY );
++ fdDevRandom = open( "/dev/urandom", O_RDONLY );
+ return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS );
+ } /* end OpenDevRandom() */
+
+ static size_t GetDevRandom( void *buf, size_t size )
+ {
+ int bytesIn;
+ int rc;
+
diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc
index 5b9acf9580..b45ac683d7 100644
--- a/packages/mozilla/firefox.inc
+++ b/packages/mozilla/firefox.inc
@@ -1,22 +1,24 @@
SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop"
+MOZPV ?= "${PV}"
+
PACKAGES =+ "${PN}-inspector"
PACKAGES += "${PN}-sdk"
-FILES_${PN}-inspector = " ${libdir}/${PN}-${PV}/chrome/inspector* \
- ${libdir}/${PN}-${PV}/components/*nspector* \
- ${libdir}/${PN}-${PV}/extensions/inspector* \
- ${libdir}/${PN}-${PV}/defaults/preferences/inspector* \
+FILES_${PN}-inspector = " ${libdir}/${PN}-${MOZPV}/chrome/inspector* \
+ ${libdir}/${PN}-${MOZPV}/components/*nspector* \
+ ${libdir}/${PN}-${MOZPV}/extensions/inspector* \
+ ${libdir}/${PN}-${MOZPV}/defaults/preferences/inspector* \
"
FILES_${PN} = "${bindir}/${PN} \
${datadir}/applications/ \
${datadir}/pixmaps/ \
- ${libdir}/${PN}-${PV}/* \
- ${libdir}/${PN}-${PV}/.autoreg \
+ ${libdir}/${PN}-${MOZPV}/* \
+ ${libdir}/${PN}-${MOZPV}/.autoreg \
${bindir}/defaults"
FILES_${PN}-dev += "${datadir}/idl ${bindir}/${PN}-config"
-FILES_${PN}-sdk += "${libdir}/${PN}-devel-${PV}"
+FILES_${PN}-sdk += "${libdir}/${PN}-devel-${MOZPV}"
FILES_${PN}-dbg += " ${libdir}/${PN}-*/.debug \
${libdir}/${PN}-*/*/.debug \
${libdir}/${PN}-*/*/*/.debug \
diff --git a/packages/mozilla/firefox_3.1a2.bb b/packages/mozilla/firefox_3.1a2.bb
new file mode 100644
index 0000000000..5e7c996ef1
--- /dev/null
+++ b/packages/mozilla/firefox_3.1a2.bb
@@ -0,0 +1,47 @@
+DEPENDS += "cairo"
+
+PV = "3.0.1+3.1a2"
+MOZPV = "3.1a2"
+
+
+SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/firefox-${MOZPV}-source.tar.bz2 \
+ file://jsautocfg.h \
+ file://jsautocfg-dontoverwrite.patch;patch=1 \
+ file://random_to_urandom.diff;patch=1 \
+"
+
+S = "${WORKDIR}/"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit mozilla
+require firefox.inc
+
+export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+
+do_configure_prepend() {
+ sed -i -e s:'head -1':'head -n1':g client.mk
+ oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
+}
+
+do_compile_prepend() {
+ cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
+ sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \
+ -e s:'$(OS_TEST)':${TARGET_ARCH}:g \
+ ${S}/security/coreconf/Linux.mk
+}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/firefox-${MOZPV}
+ cd dist/sdk/include
+ rm -rf obsolete
+ headers=`find . -name "*.h"`
+ for f in $headers
+ do
+ install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${MOZPV}/
+ done
+ # removes 2 lines that call absent headers
+ sed -e '178,179d' ${STAGING_INCDIR}/firefox-${MOZPV}/nsIServiceManager.h
+}
+
diff --git a/packages/mysql/files/autofoo.patch b/packages/mysql/files/autofoo.patch
index f2d5354572..669393a23b 100644
--- a/packages/mysql/files/autofoo.patch
+++ b/packages/mysql/files/autofoo.patch
@@ -1,10 +1,6 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- mysql-4.1.15/acinclude.m4~autofoo
-+++ mysql-4.1.15/acinclude.m4
+diff -aurp mysql-4.1.22.old/acinclude.m4 mysql-4.1.22/acinclude.m4
+--- mysql-4.1.22.old/acinclude.m4 2008-09-18 13:00:13.000000000 -0500
++++ mysql-4.1.22/acinclude.m4 2008-09-18 12:58:41.000000000 -0500
@@ -1,5 +1,88 @@
# Local macros for automake & autoconf
@@ -94,7 +90,7 @@
AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [
AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared,
-@@ -340,7 +423,7 @@
+@@ -344,7 +427,7 @@ dnl ------------------------------------
AC_DEFUN([MYSQL_CHECK_ULONG],
[AC_MSG_CHECKING(for type ulong)
AC_CACHE_VAL(ac_cv_ulong,
@@ -103,7 +99,7 @@
#include <sys/types.h>
main()
{
-@@ -358,7 +441,7 @@
+@@ -362,7 +445,7 @@ fi
AC_DEFUN([MYSQL_CHECK_UCHAR],
[AC_MSG_CHECKING(for type uchar)
AC_CACHE_VAL(ac_cv_uchar,
@@ -112,7 +108,7 @@
#include <sys/types.h>
main()
{
-@@ -376,7 +459,7 @@
+@@ -380,7 +463,7 @@ fi
AC_DEFUN([MYSQL_CHECK_UINT],
[AC_MSG_CHECKING(for type uint)
AC_CACHE_VAL(ac_cv_uint,
@@ -121,7 +117,7 @@
#include <sys/types.h>
main()
{
-@@ -395,7 +478,7 @@
+@@ -399,7 +482,7 @@ fi
AC_DEFUN([MYSQL_CHECK_IN_ADDR_T],
[AC_MSG_CHECKING(for type in_addr_t)
AC_CACHE_VAL(ac_cv_in_addr_t,
@@ -130,7 +126,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
-@@ -456,7 +539,7 @@
+@@ -460,7 +543,7 @@ fi
AC_DEFUN([MYSQL_CHECK_FP_EXCEPT],
[AC_MSG_CHECKING(for type fp_except)
AC_CACHE_VAL(ac_cv_fp_except,
@@ -139,9 +135,10 @@
#include <sys/types.h>
#include <ieeefp.h>
main()
---- mysql-4.1.15/configure.in~autofoo
-+++ mysql-4.1.15/configure.in
-@@ -234,8 +234,6 @@
+diff -aurp mysql-4.1.22.old/configure.in mysql-4.1.22/configure.in
+--- mysql-4.1.22.old/configure.in 2008-09-18 13:00:14.000000000 -0500
++++ mysql-4.1.22/configure.in 2008-09-18 12:54:00.000000000 -0500
+@@ -236,8 +236,6 @@ then
else
AC_PATH_PROG(AS, as, as)
fi
@@ -150,7 +147,7 @@
# We use libtool
#AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
-@@ -256,44 +254,7 @@
+@@ -258,44 +256,7 @@ AC_PROG_YACC
AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
AC_CHECK_PROG(DVIS, tex, manual.dvi)
@@ -196,12 +193,15 @@
# option, cache_name, variable,
# code to execute if yes, code to exectute if fail
-@@ -870,42 +831,7 @@
+@@ -878,47 +839,7 @@ struct request_info *req;
AC_SUBST(WRAPLIBS)
if test "$TARGET_LINUX" = "true"; then
- AC_MSG_CHECKING([for atomic operations])
-
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
+-
- atom_ops=
- AC_TRY_RUN([
-#include <asm/atomic.h>
@@ -236,11 +236,13 @@
-
- if test -z "$atom_ops"; then atom_ops="no"; fi
- AC_MSG_RESULT($atom_ops)
-+ MYSQL_FUNCS_ATOMIC
+-
+- AC_LANG_RESTORE
++ MYSQL_FUNC_ATOMIC
AC_ARG_WITH(pstack,
[ --with-pstack Use the pstack backtrace library],
-@@ -958,13 +884,13 @@
+@@ -971,13 +892,13 @@ fi
# Later in this script LIBS will be augmented with a threads library.
NON_THREADED_LIBS="$LIBS"
@@ -248,8 +250,7 @@
+AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [
case $SYSTEM_TYPE in
*netware)
-- AC_MSG_RESULT([no])
-+ mysql_cv_type_int8=no
+ AC_MSG_RESULT([no])
;;
*)
-AC_TRY_RUN([
@@ -257,7 +258,7 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-@@ -975,22 +901,21 @@
+@@ -988,22 +909,21 @@ AC_TRY_RUN([
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -288,7 +289,7 @@
#
# Some system specific hacks
#
-@@ -1798,7 +1723,7 @@
+@@ -1814,7 +1734,7 @@ then
AC_MSG_ERROR("MySQL needs a long long type.")
fi
# off_t is not a builtin type
@@ -297,9 +298,10 @@
if test "$ac_cv_sizeof_off_t" -eq 0
then
AC_MSG_ERROR("MySQL needs a off_t type.")
---- mysql-4.1.15/innobase/configure.in~autofoo
-+++ mysql-4.1.15/innobase/configure.in
-@@ -3,6 +3,7 @@
+diff -aurp mysql-4.1.22.old/innobase/configure.in mysql-4.1.22/innobase/configure.in
+--- mysql-4.1.22.old/innobase/configure.in 2008-09-18 13:00:14.000000000 -0500
++++ mysql-4.1.22/innobase/configure.in 2008-09-18 12:55:39.000000000 -0500
+@@ -3,6 +3,7 @@ AC_INIT
AC_CANONICAL_SYSTEM
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(ib_config.h)
@@ -307,7 +309,7 @@
AM_INIT_AUTOMAKE(ib, 0.90)
# This is need before AC_PROG_CC
-@@ -32,7 +33,6 @@
+@@ -32,7 +33,6 @@ CFLAGS="$CFLAGS "
CXXFLAGS="$CXXFLAGS "
AC_PROG_CC
diff --git a/packages/mysql/files/fix_host_path.patch b/packages/mysql/files/fix_host_path.patch
new file mode 100644
index 0000000000..4ba1cc0838
--- /dev/null
+++ b/packages/mysql/files/fix_host_path.patch
@@ -0,0 +1,24 @@
+--- mysql-4.1.22/configure.in.old 2008-09-18 20:11:15.000000000 -0500
++++ mysql-4.1.22/configure.in 2008-09-18 20:12:28.000000000 -0500
+@@ -456,9 +456,9 @@ else
+ fi
+ fi
+
+-AC_SUBST(HOSTNAME)
+-AC_SUBST(PERL)
+-AC_SUBST(PERL5)
++AC_SUBST(HOSTNAME,/bin/hostname)
++AC_SUBST(PERL,$(bindir)/perl)
++AC_SUBST(PERL5,$(bindir)/perl)
+
+ # for build ndb docs
+
+@@ -527,7 +527,7 @@ else
+ AC_MSG_WARN([kill -0 to check for pid seems to fail])
+ CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
+ fi
+-AC_SUBST(CHECK_PID)
++AC_SUBST(CHECK_PID,/bin/kill)
+ AC_MSG_RESULT("$CHECK_PID")
+
+ # We need an ANSI C compiler
diff --git a/packages/mysql/mysql-native_4.1.18.bb b/packages/mysql/mysql-native_4.1.22.bb
index 83f9dac0e3..8946cfe8e9 100644
--- a/packages/mysql/mysql-native_4.1.18.bb
+++ b/packages/mysql/mysql-native_4.1.22.bb
@@ -1,19 +1,15 @@
-SECTION = "console/network"
require mysql_${PV}.bb
inherit native
-PR="r4"
+PR="r0"
-RDEPENDS_${PN} = ""
+SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz"
+RDEPENDS_${PN} = ""
PACKAGES = ""
DEPENDS = "ncurses-native"
EXTRA_OEMAKE = ""
EXTRA_OECONF = " --with-embedded-server "
-do_stage_append() {
- install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/
-}
-
do_install() {
:
}
diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.22.bb
index 2017463c36..c60758b19f 100644
--- a/packages/mysql/mysql_4.1.18.bb
+++ b/packages/mysql/mysql_4.1.22.bb
@@ -2,14 +2,14 @@ DESCRIPTION = "The MySQL Open Source Database System"
HOMEPAGE = "http://www.mysql.com/"
SECTION = "libs"
LICENSE = "GPL"
-DEPENDS += "ncurses mysql-native"
-PR = "r4"
+DEPENDS = "ncurses"
+PR = "r1"
SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
file://autofoo.patch;patch=1 \
- file://gen_lex_hash.patch;patch=1 \
- file://my.cnf \
- file://mysqld.sh"
+ file://fix_host_path.patch;patch=1 \
+ file://my.cnf \
+ file://mysqld.sh"
S = "${WORKDIR}/mysql-${PV}"
@@ -24,9 +24,13 @@ INITSCRIPT_NAME = "mysqld"
INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ."
PARALLEL_MAKE = " "
-EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
+#EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
+do_configure_append() {
+ sed -i /comp_err/d ${S}/sql/share/Makefile
+}
+
do_stage() {
autotools_stage_all
oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR}
diff --git a/packages/pidgin/pidgin.inc b/packages/pidgin/pidgin.inc
index 6eb29233fc..4799dcbfa3 100644
--- a/packages/pidgin/pidgin.inc
+++ b/packages/pidgin/pidgin.inc
@@ -2,7 +2,7 @@ SECTION = "x11/network"
DESCRIPTION = "multi-protocol instant messaging client"
LICENSE = "GPL"
-DEPENDS = "startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
+DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp"
EXTRA_OECONF = " \
diff --git a/packages/vlc/vlc_0.9.2.bb b/packages/vlc/vlc_0.9.2.bb
new file mode 100644
index 0000000000..af42a7c957
--- /dev/null
+++ b/packages/vlc/vlc_0.9.2.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "Video player and streamer - davinci edition"
+HOMEPAGE = "http://www.videolan.org"
+LICENSE = "GPL"
+PRIORITY = "optional"
+SECTION = "multimedia"
+
+DEPENDS = "libtool gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+
+
+SRC_URI = "http://videolan.mirror.technotop.nl/vlc/0.9.2/vlc-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+ --enable-libtool \
+ --with-contrib \
+ --disable-dvdread \
+ --disable-wxwidgets \
+ --enable-x11 --enable-xvideo \
+ --disable-screen --disable-caca \
+ --disable-httpd --disable-vlm \
+ --enable-freetype \
+ --enable-sdl \
+ --enable-png \
+ --enable-live555 --enable-tremor \
+ --enable-v4l2 --disable-aa --enable-wma --disable-faad \
+ --enable-dbus \
+ --without-contrib \
+ ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
+"
+
+
+do_configure() {
+ cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
+ ./bootstrap
+ gnu-configize --force
+ libtoolize --force
+ #autoreconf --force -i
+ cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/
+ oe_runconf
+ rm config.log
+ sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
+ sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+
+FILES_${PN} += "${bindir}/vlc \
+ ${datadir}/applications \
+ ${datadir}/vlc/ \
+ "
+
+FILES_${PN}-dbg += "${libdir}/vlc/*/.debug"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 05:00:08 +0000