summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini12
-rw-r--r--conf/distro/angstrom-2008.1.conf2
-rw-r--r--conf/machine/alix.conf2
-rw-r--r--conf/machine/guinness.conf2
-rw-r--r--conf/machine/progear.conf2
-rw-r--r--conf/machine/x86.conf2
-rw-r--r--recipes/asio/asio_1.1.1.bb2
-rw-r--r--recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch27
-rw-r--r--recipes/balsa/balsa_2.4.1.bb7
-rw-r--r--recipes/boost/boost-36.inc2
-rw-r--r--recipes/boost/boost_1.36.0.bb5
-rw-r--r--recipes/boost/files/01-no-serialization-test.patch12
-rw-r--r--recipes/boost/files/02-atomic-count-pthreads-on-arm.patch17
-rw-r--r--recipes/boost/files/03-exception-clone-destructor-fix.patch12
-rw-r--r--recipes/boost/files/arm-intrinsics.patch6
-rw-r--r--recipes/eglibc/eglibc_svn.bb2
-rw-r--r--recipes/gpsd/gpsd.inc8
-rw-r--r--recipes/gpsd/gpsd_2.38.bb2
-rw-r--r--recipes/lame/lame-3.98.2/ldflags-qa.patch43
-rw-r--r--recipes/lame/lame-3.98.2/no-gtk1.patch18
-rw-r--r--recipes/lame/lame/ldflags-qa.patch43
-rw-r--r--recipes/lame/lame_3.96.1.bb5
-rw-r--r--recipes/lame/lame_3.98.2.bb26
-rw-r--r--recipes/linux/linux-rp-2.6.26/defconfig-akita49
-rw-r--r--recipes/linux/linux-rp-2.6.26/defconfig-spitz49
-rw-r--r--recipes/linux/linux-rp_2.6.26.bb2
-rw-r--r--recipes/mplayer/mplayer_svn.bb5
-rw-r--r--recipes/mysql/files/my.cnf2
-rw-r--r--recipes/mysql/mysql_4.1.22.bb6
-rw-r--r--recipes/mythtv/mythplugins_0.21+0.22rc2.bb20
-rw-r--r--recipes/mythtv/mythtv_0.21+0.22rc2.bb6
-rw-r--r--recipes/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/libgps-check.patch57
-rw-r--r--recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb6
-rw-r--r--recipes/transmission/transmission.inc8
-rw-r--r--recipes/transmission/transmission_1.76.bb2
-rw-r--r--recipes/uclibc/uclibc-nptl/uClibc.distro1
-rw-r--r--recipes/uclibc/uclibc_nptl.bb5
-rw-r--r--recipes/vala/vala-native_0.7.8.bb8
-rw-r--r--recipes/vala/vala_0.7.8.bb4
39 files changed, 443 insertions, 46 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index b12faee8e7..d72c2d50a7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13078,6 +13078,10 @@ sha256=f4f093e371c999a2a079607b74582a8ef5c1c3c9b322e3e997a47c1ea2afe2a5
md5=e1206c46a5e276feca11a7149e2fc6ac
sha256=f4f093e371c999a2a079607b74582a8ef5c1c3c9b322e3e997a47c1ea2afe2a5
+[http://downloads.sourceforge.net/lame/lame-398-2.tar.gz]
+md5=719dae0ee675d0c16e0e89952930ed35
+sha256=a17a28569d8ed1e514915c1f12bdf4eedac506e5fbdf9a429ba97d5d42c9af32
+
[http://lasertraq.googlecode.com/files/lasertraq-0.8-r213.tar.bz2]
md5=c24cc9ba196b32134186843324bfe784
sha256=7a2162c783f98a2de9658a217cd0409a7bd16d40040c34a6077df376a2135aea
@@ -25510,6 +25514,10 @@ sha256=edd775e06e66dc775ca8272bbd2e47ac4fef6fcb884ccc1001589343fd9d0866
md5=ec09b76ca941f5c389d8dd4f469f1fa6
sha256=a01bcf7718876d96eeb423a58247b89158bf0bc5d2bed414009e5fb83ff76c9e
+[http://mirrors.m0k.org/transmission/files/transmission-1.76.tar.bz2]
+md5=ac44511ba4c203998be3079626126ede
+sha256=b221d6ecec0c5ca9908f17ae7d56ce139d317faaa0c106e99fb321130280f151
+
[http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2]
md5=3b713239e5e6b269b31cb665563358df
sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
@@ -26326,6 +26334,10 @@ sha256=16971189b3cb95648b9574eb7c4c7cc0dff9978458aff7f3f7c54ab823ada721
md5=7d11fcddb2bd30b9ecbdacfaa20f2769
sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f
+[http://ftp.acc.umu.se/pub/GNOME/sources/vala/0.7/vala-0.7.8.tar.bz2]
+md5=accd0d350c6d6de7527a0a65c40f8be2
+sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
+
[http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2]
md5=9407d33961186814cef0e6ecedfd6318
sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 1429fa0d65..5f6ef768ad 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -167,6 +167,8 @@ PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
PREFERRED_PROVIDER_bluez-libs = "bluez4"
PREFERRED_PROVIDER_bluez-utils = "bluez4"
PREFERRED_PROVIDER_util-linux = "util-linux-ng"
+# The default is too old for linux-libc-headers-2.6.31:
+PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr29789"
ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4"
ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index 10b298c0f0..e116e611ad 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -4,7 +4,7 @@
#
# http://pcengines.ch/alix1c.htm
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
TARGET_ARCH = "i586"
PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index f17451556f..dd21c1ecc2 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -2,7 +2,7 @@
#@NAME: Guinness
#@DESCRIPTION: Machine configuration for Linux running on a tyan 2462 mainboard (codenamed guinness)
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
TARGET_ARCH = "i686"
PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 60716f6153..627bbc1c69 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -2,7 +2,7 @@
#@NAME: Progear
#@DESCRIPTION: Machine configuration for Progear 1050HX+ webpad
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
TARGET_ARCH = "i586"
require conf/machine/include/tune-pentiummmx.inc
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 30eb943cc6..5e43102fb3 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -4,7 +4,7 @@
#@NAME: X86
#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
TARGET_ARCH = "i486"
PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/recipes/asio/asio_1.1.1.bb b/recipes/asio/asio_1.1.1.bb
index a724921676..e0b610d8c9 100644
--- a/recipes/asio/asio_1.1.1.bb
+++ b/recipes/asio/asio_1.1.1.bb
@@ -4,6 +4,8 @@ SECTION = "libs"
PRIORITY = "optional"
LICENSE = "Boost Software License"
+PR = "r1"
+
DEPENDS = "boost"
SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${PN}-${PV}.tar.bz2"
diff --git a/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch b/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch
new file mode 100644
index 0000000000..7e16171ecc
--- /dev/null
+++ b/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch
@@ -0,0 +1,27 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=596309
+Index: balsa-2.4.1/src/balsa-app.c
+===================================================================
+--- balsa-2.4.1.orig/src/balsa-app.c
++++ balsa-2.4.1/src/balsa-app.c
+@@ -436,6 +436,9 @@ balsa_app_init(void)
+ /* Message filing */
+ balsa_app.folder_mru=NULL;
+ balsa_app.fcc_mru=NULL;
++
++ g_object_set (gtk_settings_get_default (),
++ "gtk-fallback-icon-theme", "gnome", NULL);
+ }
+
+ void
+Index: balsa-2.4.1/configure.in
+===================================================================
+--- balsa-2.4.1.orig/configure.in
++++ balsa-2.4.1/configure.in
+@@ -329,6 +329,7 @@ glib-2.0 >= 2.16.0
+ gtk+-2.0 >= 2.14.0
+ gmime-2.4
+ gio-2.0
++gnome-icon-theme
+ $gnome_extras
+ ])
+
diff --git a/recipes/balsa/balsa_2.4.1.bb b/recipes/balsa/balsa_2.4.1.bb
index c66ec5a2bc..59b0b10ac0 100644
--- a/recipes/balsa/balsa_2.4.1.bb
+++ b/recipes/balsa/balsa_2.4.1.bb
@@ -2,9 +2,12 @@ DESCRIPTION = "Robust and configurable e-mail client for GNOME"
HOMEPAGE = "http://pawsa.fedorapeople.org/balsa/"
SECTION = "x11/network"
LICENSE = "GPL"
-SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2"
+SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2 \
+ file://gnome-icon-theme.patch;patch=1"
+PR = "r1"
-DEPENDS = "glib-2.0 libgmime-2.4 gtk+ intltool-native libesmtp libxml-parser-perl-native"
+DEPENDS = "glib-2.0 libgmime-2.4 gnome-icon-theme gtk+ intltool-native libesmtp libxml-parser-perl-native"
+RDEPENDS_${PN} = "gnome-icon-theme"
# FIXME: It is possible to build several variants of balsa: lite (SSL, gqlite/GPE, maybe HTML),
# standard (GNOME, spell checking, HTML), full (Kerberos, LDAP, PGP, Rubrica, X-Face)
diff --git a/recipes/boost/boost-36.inc b/recipes/boost/boost-36.inc
index 4bd065f13a..1200e9a5a6 100644
--- a/recipes/boost/boost-36.inc
+++ b/recipes/boost/boost-36.inc
@@ -128,7 +128,7 @@ BJAM_OPTS = '${BJAM_TOOLS} \
do_configure_prepend() {
cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp
- echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam
+ echo "using gcc : $(${CXX} -dumpversion) : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;" >> ${S}/tools/build/v2/user-config.jam
}
do_compile() {
diff --git a/recipes/boost/boost_1.36.0.bb b/recipes/boost/boost_1.36.0.bb
index 140ab290ba..898d1b1603 100644
--- a/recipes/boost/boost_1.36.0.bb
+++ b/recipes/boost/boost_1.36.0.bb
@@ -1,9 +1,12 @@
include boost-36.inc
-PR = "r6"
+PR = "r7"
SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
file://arm-intrinsics.patch;patch=1 \
+ file://01-no-serialization-test.patch;patch=1 \
+ file://02-atomic-count-pthreads-on-arm.patch;patch=1 \
+ file://03-exception-clone-destructor-fix.patch;patch=1 \
"
BJAM_OPTS = '${BJAM_TOOLS} \
diff --git a/recipes/boost/files/01-no-serialization-test.patch b/recipes/boost/files/01-no-serialization-test.patch
new file mode 100644
index 0000000000..f1c9ca8572
--- /dev/null
+++ b/recipes/boost/files/01-no-serialization-test.patch
@@ -0,0 +1,12 @@
+diff -purN orig/libs/serialization/build/Jamfile.v2 boost_1_36_0/libs/serialization/build/Jamfile.v2
+--- orig/libs/serialization/build/Jamfile.v2 2008-09-11 18:45:03.000000000 -0400
++++ boost_1_36_0/libs/serialization/build/Jamfile.v2 2008-09-11 18:45:40.000000000 -0400
+@@ -8,7 +8,7 @@
+
+ project boost/serialization
+ : source-location ../src
+- : requirements <dependency>../../config/test/all//BOOST_NO_STD_LOCALE
++ : requirements
+ <conditional>@include-spirit
+ ;
+
diff --git a/recipes/boost/files/02-atomic-count-pthreads-on-arm.patch b/recipes/boost/files/02-atomic-count-pthreads-on-arm.patch
new file mode 100644
index 0000000000..c6f2e19685
--- /dev/null
+++ b/recipes/boost/files/02-atomic-count-pthreads-on-arm.patch
@@ -0,0 +1,17 @@
+diff -purN orig/boost/detail/atomic_count.hpp boost_1_36_0/boost/detail/atomic_count.hpp
+--- orig/boost/detail/atomic_count.hpp 2008-09-12 11:48:45.000000000 -0400
++++ boost_1_36_0/boost/detail/atomic_count.hpp 2008-09-12 14:36:33.000000000 -0400
+@@ -93,6 +93,13 @@ typedef long atomic_count;
+
+ # include <boost/detail/atomic_count_pthreads.hpp>
+
++#elif defined(BOOST_HAS_PTHREADS) && defined(__arm__) && !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_6J__)
++
++// MLC: need this on ARM, otherwise it'll attempt to use atomic_count_sync,
++// which has no ARM implementation.
++# define BOOST_AC_USE_PTHREADS
++# include <boost/detail/atomic_count_pthreads.hpp>
++
+ #elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) )
+
+ # include <boost/detail/atomic_count_gcc_x86.hpp>
diff --git a/recipes/boost/files/03-exception-clone-destructor-fix.patch b/recipes/boost/files/03-exception-clone-destructor-fix.patch
new file mode 100644
index 0000000000..d78759b5e3
--- /dev/null
+++ b/recipes/boost/files/03-exception-clone-destructor-fix.patch
@@ -0,0 +1,12 @@
+diff -purN orig/boost/exception/enable_current_exception.hpp boost_1_36_0/boost/exception/enable_current_exception.hpp
+--- orig/boost/exception/enable_current_exception.hpp 2008-09-12 11:48:45.000000000 -0400
++++ boost_1_36_0/boost/exception/enable_current_exception.hpp 2008-09-12 15:13:06.000000000 -0400
+@@ -96,6 +96,8 @@ boost
+ *be1 = *be2;
+ }
+
++ ~exception_clone() throw() { }
++
+ private:
+
+ detail::atomic_count mutable count_;
diff --git a/recipes/boost/files/arm-intrinsics.patch b/recipes/boost/files/arm-intrinsics.patch
index 860b6df67c..1f1eed684a 100644
--- a/recipes/boost/files/arm-intrinsics.patch
+++ b/recipes/boost/files/arm-intrinsics.patch
@@ -5,7 +5,7 @@ diff -Nurd boost_1_36_0.orig/boost/detail/atomic_count_sync.hpp boost_1_36_0.arm
void operator++()
{
-+#ifdef __ARM_ARCH_7A__
++#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6J__)
+ int v1, tmp;
+ asm volatile ("1: \n\t"
+ "ldrex %0, %1 \n\t"
@@ -22,7 +22,7 @@ diff -Nurd boost_1_36_0.orig/boost/detail/atomic_count_sync.hpp boost_1_36_0.arm
long operator--()
{
-+#ifdef __ARM_ARCH_7A__
++#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6J__)
+ int v1, tmp;
+ asm volatile ("1: \n\t"
+ "ldrex %0, %1 \n\t"
@@ -40,7 +40,7 @@ diff -Nurd boost_1_36_0.orig/boost/detail/atomic_count_sync.hpp boost_1_36_0.arm
operator long() const
{
-+#if __ARM_ARCH_7A__
++#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6J__)
+ return value_;
+#else
return __sync_fetch_and_add( &value_, 0 );
diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb
index 3376839040..08f280a8bf 100644
--- a/recipes/eglibc/eglibc_svn.bb
+++ b/recipes/eglibc/eglibc_svn.bb
@@ -1,7 +1,7 @@
require eglibc.inc
DEPENDS += "gperf-native"
-SRCREV = "9170"
+SRCREV = "9191"
DEFAULT_PREFERENCE = "-1"
FILESPATHPKG =. "eglibc-svn:"
PV = "2.10+svnr${SRCREV}"
diff --git a/recipes/gpsd/gpsd.inc b/recipes/gpsd/gpsd.inc
index 1022091c6c..0bd2b207f5 100644
--- a/recipes/gpsd/gpsd.inc
+++ b/recipes/gpsd/gpsd.inc
@@ -19,7 +19,7 @@ SRC_URI_append_om-gta01 = " \
file://restart_gllin.sh \
"
-inherit autotools update-rc.d
+inherit autotools_stage update-rc.d
INITSCRIPT_NAME = "gpsd"
INITSCRIPT_PARAMS = "defaults 35"
@@ -39,12 +39,6 @@ do_install_prepend() {
export HOST_SYS="${HOST_SYS}"
}
-do_stage() {
- oe_libinstall -so libgps ${STAGING_LIBDIR}
- install -m 0644 ${S}/gps.h ${STAGING_INCDIR}
- install -m 0644 ${S}/gpsd.h ${STAGING_INCDIR}
-}
-
do_install_append() {
install -d ${D}/${sysconfdir}/init.d
install -d ${D}/dev
diff --git a/recipes/gpsd/gpsd_2.38.bb b/recipes/gpsd/gpsd_2.38.bb
index 95260ff2be..fb7f57d980 100644
--- a/recipes/gpsd/gpsd_2.38.bb
+++ b/recipes/gpsd/gpsd_2.38.bb
@@ -1,5 +1,5 @@
require gpsd.inc
-PR = "r0"
+PR = "r1"
# make attempts to link gpspacket.so without waiting for all compiler tasks:
PARALLEL_MAKE = ""
diff --git a/recipes/lame/lame-3.98.2/ldflags-qa.patch b/recipes/lame/lame-3.98.2/ldflags-qa.patch
new file mode 100644
index 0000000000..c4df610bb2
--- /dev/null
+++ b/recipes/lame/lame-3.98.2/ldflags-qa.patch
@@ -0,0 +1,43 @@
+https://sourceforge.net/tracker/?func=detail&aid=2892273&group_id=290&atid=300290
+
+Depending on configure arguments libmp3lame may be built only as a
+shared library. But lame frntends link command using this library
+has -static.
+
+Such clash may cause ugly libtool behavior.
+
+In context of lame, linking should probably respect configure flags
+and link frontend dynamically if shared linking is enabled.
+
+As a consequence of bug in libtool, this combination
+with --disable-static may create incorrect binary. For more see:
+http://lists.gnu.org/archive/html/bug-libtool/2009-11/msg00004.html
+
+Signed-off-by: Stanislav Brabec <utx@penguin.cz>
+
+Index: lame-398-2/frontend/Makefile.am
+===================================================================
+--- lame-398-2.orig/frontend/Makefile.am
++++ lame-398-2/frontend/Makefile.am
+@@ -52,7 +52,7 @@ mp3x_SOURCES = mp3x.c gtkanal.c gpkplott
+ endif
+
+ CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
+-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
+
+ INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
+
+Index: lame-398-2/frontend/Makefile.in
+===================================================================
+--- lame-398-2.orig/frontend/Makefile.in
++++ lame-398-2/frontend/Makefile.in
+@@ -152,7 +152,7 @@ LDADD = @LDADD@ \
+ $(top_builddir)/libmp3lame/libmp3lame.la \
+ @FRONTEND_LDADD@
+
+-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/recipes/lame/lame-3.98.2/no-gtk1.patch b/recipes/lame/lame-3.98.2/no-gtk1.patch
new file mode 100644
index 0000000000..3cc06308f5
--- /dev/null
+++ b/recipes/lame/lame-3.98.2/no-gtk1.patch
@@ -0,0 +1,18 @@
+Index: lame-398-2/configure.in
+===================================================================
+--- lame-398-2.orig/configure.in
++++ lame-398-2/configure.in
+@@ -385,7 +385,12 @@ CONFIG_MATH_LIB="${USE_LIBM}"
+
+ dnl configure use of features
+
+-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
++dnl AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
++HAVE_GTK="no"
++GTK_CFLAGS=""
++GTK_LIBS=""
++AC_SUBST(GTK_CFLAGS)
++AC_SUBST(GTK_LIBS)
+
+ dnl ElectricFence malloc debugging
+ AC_MSG_CHECKING(use of ElectricFence malloc debugging)
diff --git a/recipes/lame/lame/ldflags-qa.patch b/recipes/lame/lame/ldflags-qa.patch
new file mode 100644
index 0000000000..b92f9ca0cd
--- /dev/null
+++ b/recipes/lame/lame/ldflags-qa.patch
@@ -0,0 +1,43 @@
+https://sourceforge.net/tracker/?func=detail&aid=2892273&group_id=290&atid=300290
+
+Depending on configure arguments libmp3lame may be built only as a
+shared library. But lame frntends link command using this library
+has -static.
+
+Such clash may cause ugly libtool behavior.
+
+In context of lame, linking should probably respect configure flags
+and link frontend dynamically if shared linking is enabled.
+
+As a consequence of bug in libtool, this combination
+with --disable-static may create incorrect binary. For more see:
+http://lists.gnu.org/archive/html/bug-libtool/2009-11/msg00004.html
+
+Signed-off-by: Stanislav Brabec <utx@penguin.cz>
+
+Index: lame-3.96.1/frontend/Makefile.am
+===================================================================
+--- lame-3.96.1.orig/frontend/Makefile.am
++++ lame-3.96.1/frontend/Makefile.am
+@@ -50,7 +50,7 @@ mp3x__EXEEXT__SOURCES = mp3x.c gtkanal.c
+ endif
+
+ CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@
+-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
+
+ INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
+
+Index: lame-3.96.1/frontend/Makefile.in
+===================================================================
+--- lame-3.96.1.orig/frontend/Makefile.in
++++ lame-3.96.1/frontend/Makefile.in
+@@ -91,7 +91,7 @@ LDADD = @LDADD@ \
+ $(top_builddir)/libmp3lame/libmp3lame.la \
+ @FRONTEND_LDADD@
+
+-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/recipes/lame/lame_3.96.1.bb b/recipes/lame/lame_3.96.1.bb
index ab9a99c064..9507032307 100644
--- a/recipes/lame/lame_3.96.1.bb
+++ b/recipes/lame/lame_3.96.1.bb
@@ -1,11 +1,12 @@
SECTION = "console/utils"
DESCRIPTION = "Not an MP3 encoder"
LICENSE = "LGPL"
-PR = "r4"
+PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
file://no-gtk1.patch;patch=1 \
- file://Makefile-lm.patch;patch=1"
+ file://Makefile-lm.patch;patch=1 \
+ file://ldflags-qa.patch;patch=1"
inherit autotools
diff --git a/recipes/lame/lame_3.98.2.bb b/recipes/lame/lame_3.98.2.bb
new file mode 100644
index 0000000000..f279857810
--- /dev/null
+++ b/recipes/lame/lame_3.98.2.bb
@@ -0,0 +1,26 @@
+SECTION = "console/utils"
+DESCRIPTION = "Not an MP3 encoder"
+LICENSE = "LGPL"
+PR = "r0"
+
+S = "${WORKDIR}/${PN}-398-2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-398-2.tar.gz \
+ file://no-gtk1.patch;patch=1 \
+ file://ldflags-qa.patch;patch=1"
+
+inherit autotools_stage
+
+PACKAGES += "libmp3lame libmp3lame-dev"
+FILES_${PN} = "${bindir}/lame"
+FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
+FILES_libmp3lame-dev = "${includedir} ${libdir}/*"
+FILES_${PN}-dev = ""
+
+do_configure() {
+ # no autoreconf please
+ aclocal
+ autoconf
+ libtoolize --force
+ gnu-configize --force
+ oe_runconf
+}
diff --git a/recipes/linux/linux-rp-2.6.26/defconfig-akita b/recipes/linux/linux-rp-2.6.26/defconfig-akita
index f863b28483..a8308e92e8 100644
--- a/recipes/linux/linux-rp-2.6.26/defconfig-akita
+++ b/recipes/linux/linux-rp-2.6.26/defconfig-akita
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.26
-# Tue Feb 3 01:08:10 2009
+# Tue Nov 3 13:06:26 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -330,7 +330,7 @@ CONFIG_IP_FIB_HASH=y
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
+# CONFIG_SYN_COOKIES is not set
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
@@ -376,21 +376,44 @@ CONFIG_NETFILTER_ADVANCED=y
#
# CONFIG_NETFILTER_NETLINK_QUEUE is not set
# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NF_CONNTRACK is not set
+CONFIG_NF_CONNTRACK=m
+# CONFIG_NF_CT_ACCT is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+CONFIG_NF_CONNTRACK_SIP=m
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CT_NETLINK is not set
CONFIG_NETFILTER_XTABLES=m
# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
# CONFIG_NETFILTER_XT_TARGET_MARK is not set
# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
@@ -404,6 +427,7 @@ CONFIG_NETFILTER_XTABLES=m
# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
# CONFIG_NETFILTER_XT_MATCH_REALM is not set
# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
# CONFIG_NETFILTER_XT_MATCH_STRING is not set
# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
@@ -414,7 +438,9 @@ CONFIG_NETFILTER_XTABLES=m
#
# IP: Netfilter Configuration
#
-CONFIG_IP_NF_QUEUE=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -425,9 +451,23 @@ CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_TTL=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
@@ -436,6 +476,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
# IPv6: Netfilter Configuration
#
+# CONFIG_NF_CONNTRACK_IPV6 is not set
# CONFIG_IP6_NF_QUEUE is not set
# CONFIG_IP6_NF_IPTABLES is not set
# CONFIG_IP_DCCP is not set
diff --git a/recipes/linux/linux-rp-2.6.26/defconfig-spitz b/recipes/linux/linux-rp-2.6.26/defconfig-spitz
index fd2285d4fb..f4a2739b22 100644
--- a/recipes/linux/linux-rp-2.6.26/defconfig-spitz
+++ b/recipes/linux/linux-rp-2.6.26/defconfig-spitz
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.26
-# Tue Feb 3 01:16:06 2009
+# Tue Nov 3 13:06:26 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -330,7 +330,7 @@ CONFIG_IP_FIB_HASH=y
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
+# CONFIG_SYN_COOKIES is not set
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
@@ -376,21 +376,44 @@ CONFIG_NETFILTER_ADVANCED=y
#
# CONFIG_NETFILTER_NETLINK_QUEUE is not set
# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NF_CONNTRACK is not set
+CONFIG_NF_CONNTRACK=m
+# CONFIG_NF_CT_ACCT is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+CONFIG_NF_CONNTRACK_SIP=m
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CT_NETLINK is not set
CONFIG_NETFILTER_XTABLES=m
# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
# CONFIG_NETFILTER_XT_TARGET_MARK is not set
# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
@@ -404,6 +427,7 @@ CONFIG_NETFILTER_XTABLES=m
# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
# CONFIG_NETFILTER_XT_MATCH_REALM is not set
# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
# CONFIG_NETFILTER_XT_MATCH_STRING is not set
# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
@@ -414,7 +438,9 @@ CONFIG_NETFILTER_XTABLES=m
#
# IP: Netfilter Configuration
#
-CONFIG_IP_NF_QUEUE=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -425,9 +451,23 @@ CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_TTL=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
@@ -436,6 +476,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
# IPv6: Netfilter Configuration
#
+# CONFIG_NF_CONNTRACK_IPV6 is not set
# CONFIG_IP6_NF_QUEUE is not set
# CONFIG_IP6_NF_IPTABLES is not set
# CONFIG_IP_DCCP is not set
diff --git a/recipes/linux/linux-rp_2.6.26.bb b/recipes/linux/linux-rp_2.6.26.bb
index 2d6c9f6742..c508f27c1f 100644
--- a/recipes/linux/linux-rp_2.6.26.bb
+++ b/recipes/linux/linux-rp_2.6.26.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r11"
+PR = "r12"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_qemuarm = "-1"
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index 1a434a5829..7d2f27aa3a 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -36,7 +36,7 @@ RREPLACES_${PN} = "mplayer-atty"
PV = "0.0+1.0rc2+svnr${SRCREV}"
PR = "r14"
DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_armv7a = "1"
+DEFAULT_PREFERENCE_angstrom = "1"
PARALLEL_MAKE = ""
@@ -188,6 +188,9 @@ EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '--enable-ru
FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
+# FIXME: Temporarily disable debugging to work-around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37987
+DEBUG_OPTIMIZATION_spitz = "-O -fomit-frame-pointer -g"
+DEBUG_OPTIMIZATION_akita = "-O -fomit-frame-pointer -g"
do_configure_prepend_armv7a() {
cp ${WORKDIR}/yuv.S ${S}/libvo
diff --git a/recipes/mysql/files/my.cnf b/recipes/mysql/files/my.cnf
index 15a8b1b4ab..46f5316bc5 100644
--- a/recipes/mysql/files/my.cnf
+++ b/recipes/mysql/files/my.cnf
@@ -10,7 +10,7 @@ err-log = /var/log/mysql.err
user = mysql
port = 3306
socket = /tmp/mysql.sock
-pid-file = /var/run/mysqld.pid
+pid-file = /var/run/mysql/mysqld.pid
log-error = /var/log/mysqld.err
basedir = /usr
datadir = /var/mysql
diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb
index b6718cb0cb..dae1dd6701 100644
--- a/recipes/mysql/mysql_4.1.22.bb
+++ b/recipes/mysql/mysql_4.1.22.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/"
SECTION = "libs"
LICENSE = "GPL"
DEPENDS = "ncurses"
-PR = "r4"
+PR = "r5"
SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
file://autofoo.patch;patch=1 \
@@ -63,7 +63,8 @@ pkg_postinst_mysql-server () {
#Install the database
test -d /usr/bin || mkdir -p /usr/bin
test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname
- chmod go+rw /var/run
+ mkdir /var/run/mysql
+ chown mysql.nogroup /var/run/mysql
mysql_install_db
@@ -74,6 +75,7 @@ pkg_postrm_mysql-server () {
}
PACKAGES = "${PN}-dbg ${PN} libmysqlclient libmysqlclient-dev mysql-client mysql-server ${PN}-leftovers"
+CONFFILES_mysql-server = "${sysconfdir}/my.cnf"
FILES_${PN} = " "
RDEPENDS_${PN} = "mysql-client mysql-server"
diff --git a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb
index 31025329a3..82b61db469 100644
--- a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb
+++ b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb
@@ -1,9 +1,9 @@
# todo: add mythweb
DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia"
RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery \
- mythgame mythmusic mythmovies mythnews mythvideo mythweather"
+ mythgame mythmusic mythmovies mythnews mythvideo mythweather mythzoneminder"
PV = "0.21+0.22rc2"
-PR = "r3"
+PR = "r4"
QMAKE_PROFILES = "mythplugins.pro"
@@ -47,7 +47,8 @@ PACKAGES =+ "mytharchive mytharchive-dbg \
mythmusic mythmusic-dbg \
mythnews mythnews-dbg \
mythvideo mythvideo-dbg \
- mythweather mythweather-dbg"
+ mythweather mythweather-dbg \
+ mythzoneminder mythzoneminder-dbg"
FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \
${bindir}/mytharchivehelper \
@@ -256,3 +257,16 @@ FILES_mythweather = "${libdir}/mythtv/plugins/libmythweather.so \
${datadir}/mythtv/weather_settings.xml \
"
FILES_mythweather-dbg = "${libdir}/mythtv/plugins/.debug/libmythweather.so"
+
+FILES_mythzoneminder = "${libdir}/mythtv/plugins/libmythzoneminder.so \
+ ${datadir}/mythtv/zonemindermenu.xml \
+ ${datadir}/mythtv/i18n/mythzoneminder* \
+ ${datadir}/mythtv/themes/default/zoneminder-ui.xml \
+ ${datadir}/mythtv/themes/default/mz_black.png \
+ ${datadir}/mythtv/themes/default/mz_browser_back_sel.png \
+ ${datadir}/mythtv/themes/default/mz_browser_back_reg.png \
+ ${datadir}/mythtv/themes/default/mz_function_popup.png \
+ ${datadir}/mythtv/themes/default/mz_testcard.png \
+ ${datadir}/mythtv/themes/default-wide/zoneminder-ui.xml \
+ "
+FILES_mythzoneminder-dbg = "${libdir}/mythtv/plugins/.debug/libmythzoneminder.so"
diff --git a/recipes/mythtv/mythtv_0.21+0.22rc2.bb b/recipes/mythtv/mythtv_0.21+0.22rc2.bb
index 38608797eb..3ba8ff725c 100644
--- a/recipes/mythtv/mythtv_0.21+0.22rc2.bb
+++ b/recipes/mythtv/mythtv_0.21+0.22rc2.bb
@@ -1,11 +1,13 @@
require mythtv.inc
RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
+RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16"
+
PV = "0.21+0.22rc2"
-PR = "r0"
+PR = "r2"
REALPV = "0.22"
-#DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE = "-1"
ALLOW_EMPTY_${PN} = "1"
QMAKE_PROFILES = "mythtv.pro"
diff --git a/recipes/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/libgps-check.patch b/recipes/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/libgps-check.patch
new file mode 100644
index 0000000000..613adb2255
--- /dev/null
+++ b/recipes/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/libgps-check.patch
@@ -0,0 +1,57 @@
+Index: prismstumbler-0.7.4pre1/configure.ac
+===================================================================
+--- prismstumbler-0.7.4pre1.orig/configure.ac
++++ prismstumbler-0.7.4pre1/configure.ac
+@@ -137,51 +137,11 @@ AC_ARG_ENABLE(static-libgps,
+ ], [ static_libgps="no"]
+ )
+
+-AC_MSG_CHECKING(for libgps)
+-AC_ARG_WITH(libgps,
+-[ --with-libgps=DIR use libgps in DIR],
+-[ case "$withval" in
+- *)
+- AC_MSG_RESULT($withval)
+- if test -f $withval/include/gps.h -a -f $withval/lib/libgps.a; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- libgps_dir=${withval}
+- GPSD_CFLAGS="-I$withval/include"
+- if test "x$static_libgps" = "xyes"; then
+- GPSD_LIBS="-lm -lpthread $withval/lib/libgps.a"
+- else
+- GPSD_LIBS="-L$withval/lib -lgps"
+- fi
+- else
+- AC_ERROR(libgps not found in $withval prefix)
+- fi
+- ;;
+- esac ],
+-[
+- for dir in ${prefix} ${prefix}/local /usr /usr/local; do
+- if test -f ${dir}/include/gps.h -a -f ${dir}/lib/libgps.a; then
+- libgps_dir=${dir}
+- GPSD_CFLAGS="-I${dir}/include"
+- if test "x$static_libgps" = "xyes"; then
+- GPSD_LIBS="-lm -lpthread ${dir}/lib/libgps.a"
+- else
+- GPSD_LIBS="-L${dir}/lib -lgps"
+- fi
+- fi
+- done
+- if test -z ${libgps_dir}; then
+- AC_MSG_RESULT(no)
+- AC_ERROR(libgps not found)
+- fi
+- AC_MSG_RESULT(yes) ]
+-)
++PKG_CHECK_MODULES([GPSD], [libgps])
+
+ if test -z "$GPSD_CFLAGS"; then
+ AC_ERROR("libgps not found")
+ fi
+-AC_SUBST(GPSD_CFLAGS)
+-AC_SUBST(GPSD_LIBS)
+
+
+ dnl Checks for wireless lib
diff --git a/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
index bc23824e42..fb444e2f01 100644
--- a/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
+++ b/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
@@ -1,5 +1,5 @@
SECTION = "x11/network"
-PR = "r3"
+PR = "r4"
PACKAGES = "${PN}-dbg prismstumbler prismstumbler-frontend prismstumbler-doc"
DESCRIPTION = "Prismstumbler wireless LAN scanner"
@@ -14,7 +14,8 @@ RRECOMMENDS = "gpsd"
SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz \
file://gpsapi.patch;patch=1 \
${@['', 'file://wireless.patch;patch=1'][bb.data.getVar('PREFERRED_VERSION_linux-libc-headers', d, 1) and bb.data.getVar('PREFERRED_VERSION_linux-libc-headers', d, 1).split('.')[2] < '30']} \
- file://fix-includes.patch;patch=1;pnum=0"
+ file://fix-includes.patch;patch=1;pnum=0 \
+ file://libgps-check.patch;patch=1"
S = "${WORKDIR}/${PN}-0.7.4pre1"
@@ -22,7 +23,6 @@ inherit autotools pkgconfig
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
- --with-libgps=${STAGING_EXECPREFIXDIR} \
--with-libpcap=${STAGING_EXECPREFIXDIR} \
--with-sqlite-includes=${STAGING_INCDIR} \
--with-sqlite-libs=${STAGING_LIBDIR} \
diff --git a/recipes/transmission/transmission.inc b/recipes/transmission/transmission.inc
index 1601f09ec2..7f3ca2a035 100644
--- a/recipes/transmission/transmission.inc
+++ b/recipes/transmission/transmission.inc
@@ -3,7 +3,7 @@ SECTION = "network"
HOMEPAGE = "www.transmissionbt.com/"
DEPENDS = "gtk+ gnutls openssl gettext libtool intltool-native curl glib-2.0-native"
LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \
file://init \
file://config"
@@ -21,8 +21,12 @@ do_install_append() {
install -d ${D}${localstatedir}/lib/transmission-daemon
}
+PACKAGES =+ "${PN}-daemon ${PN}-client"
+
+FILES_${PN}-daemon = "${bindir}/transmission-daemon ${datadir}/transmission ${sysconfdir} ${localstatedir}/lib/${PN}-daemon"
+FILES_${PN}-client = "${bindir}/transmissioncli ${bindir}/transmission-remote"
FILES_${PN} += "${datadir}/icons"
-CONFFILES_${PN} = "${sysconfdir}/default/transmission-daemon"
+CONFFILES_${PN}-daemon = "${sysconfdir}/default/transmission-daemon"
# No need for online check, since update-rc.d will prepend it to here
pkg_postinst_${PN}() {
diff --git a/recipes/transmission/transmission_1.76.bb b/recipes/transmission/transmission_1.76.bb
new file mode 100644
index 0000000000..4472d06cf1
--- /dev/null
+++ b/recipes/transmission/transmission_1.76.bb
@@ -0,0 +1,2 @@
+require transmission.inc
+
diff --git a/recipes/uclibc/uclibc-nptl/uClibc.distro b/recipes/uclibc/uclibc-nptl/uClibc.distro
index cd1ee359fc..ebd16563f0 100644
--- a/recipes/uclibc/uclibc-nptl/uClibc.distro
+++ b/recipes/uclibc/uclibc-nptl/uClibc.distro
@@ -29,6 +29,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
COMPAT_ATEXIT=y
UCLIBC_SUSV3_LEGACY=y
UCLIBC_SUSV3_LEGACY_MACROS=y
+UCLIBC_SUSV4_LEGACY=y
UCLIBC_HAS_SHADOW=y
UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
UCLIBC_HAS___PROGNAME=y
diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
index aee29d86a5..d5d6d1ab20 100644
--- a/recipes/uclibc/uclibc_nptl.bb
+++ b/recipes/uclibc/uclibc_nptl.bb
@@ -7,7 +7,7 @@
# on whether the base patches apply to the selected (SRCDATE) svn release.
#
UCLIBC_BASE ?= "0.9.30"
-SRCREV="af694a224ba5aa069d533931e10725c45295148d"
+SRCREV="8a6a88f5032ccbc3bfb8836c783a55316b156481"
PV = "${UCLIBC_BASE}+gitr${SRCREV}"
DEFAULT_PREFERENCE = "-1"
#DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
@@ -37,3 +37,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \
"
S = "${WORKDIR}/git"
+
+ARM_INSTRUCTION_SET = "arm"
+
diff --git a/recipes/vala/vala-native_0.7.8.bb b/recipes/vala/vala-native_0.7.8.bb
new file mode 100644
index 0000000000..0be4626488
--- /dev/null
+++ b/recipes/vala/vala-native_0.7.8.bb
@@ -0,0 +1,8 @@
+require vala.inc
+inherit native
+
+PR = "r0"
+
+DEPENDS = "glib-2.0-native"
+
+SRC_URI = "http://download.gnome.org/sources/vala/0.7/vala-${PV}.tar.bz2"
diff --git a/recipes/vala/vala_0.7.8.bb b/recipes/vala/vala_0.7.8.bb
new file mode 100644
index 0000000000..0b93248116
--- /dev/null
+++ b/recipes/vala/vala_0.7.8.bb
@@ -0,0 +1,4 @@
+require vala.inc
+PR = "r0"
+
+SRC_URI = "http://download.gnome.org/sources/vala/0.7/vala-${PV}.tar.bz2"