[oe-commits] org.oe.dev merge of '4f21e6a0ce9a2c97bca701888317b5948bf2c04b'
thesing commit
oe at amethyst.openembedded.net
Fri Jul 25 14:46:04 UTC 2008
merge of '4f21e6a0ce9a2c97bca701888317b5948bf2c04b'
and 'fc9f8d158891edd33f035f3b503d28695ae95419'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 94a4ec462a9595426e6bfa3dea97f08f7e142808
ViewMTN: http://monotone.openembedded.org/revision/info/94a4ec462a9595426e6bfa3dea97f08f7e142808
Files:
1
packages/initrdscripts/initramfs-kexec_1.0.bb
packages/dnsmasq/dnsmasq_2.38.bb
packages/dnsmasq/dnsmasq_2.45.bb
packages/pulseaudio/pulseaudio-0.9.11
packages/pulseaudio/pulseaudio-0.9.11/2113.diff
packages/pulseaudio/pulseaudio-0.9.11/2114.diff
packages/pulseaudio/pulseaudio-0.9.11/buildfix.patch
packages/pulseaudio/pulseaudio-0.9.11/libiconv.patch
packages/pulseaudio/pulseaudio-0.9.11/libpulsedsp-references-libpulsecore.patch
packages/pulseaudio/pulseaudio-0.9.11/libtool2.patch
packages/pulseaudio/pulseaudio-0.9.11/pa-drop-caps-returns-void.patch
packages/pulseaudio/pulseaudio_0.9.11.bb
Diffs:
#
# mt diff -r4f21e6a0ce9a2c97bca701888317b5948bf2c04b -r94a4ec462a9595426e6bfa3dea97f08f7e142808
#
#
#
# patch "packages/initrdscripts/initramfs-kexec_1.0.bb"
# from [887f543ee47d7063adbb65d1337be522ec8c3fd7]
# to [19eebe40da32b895da48037b3aadec5cdda88979]
#
============================================================
--- packages/initrdscripts/initramfs-kexec_1.0.bb 887f543ee47d7063adbb65d1337be522ec8c3fd7
+++ packages/initrdscripts/initramfs-kexec_1.0.bb 19eebe40da32b895da48037b3aadec5cdda88979
@@ -1,12 +1,12 @@ DESCRIPTON = "A init script that mounts
DESCRIPTON = "A init script that mounts a device and kexecs a new kernel from it."
-PR = "r5"
+PR = "r6"
do_compile() {
cat > init.sh << EOF
#!/bin/sh
/bin/mount -t proc proc /proc
/bin/mount -t ${ROOTFS} ${ROOTDEV} /mnt
-/usr/sbin/kexec -l /mnt/zImage
+/usr/sbin/kexec -l /mnt/boot/zImage
/usr/sbin/kexec -e
EOF
}
#
# mt diff -rfc9f8d158891edd33f035f3b503d28695ae95419 -r94a4ec462a9595426e6bfa3dea97f08f7e142808
#
#
#
# rename "packages/dnsmasq/dnsmasq_2.38.bb"
# to "packages/dnsmasq/dnsmasq_2.45.bb"
#
# add_dir "packages/pulseaudio/pulseaudio-0.9.11"
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/2113.diff"
# content [0046507a819e54bd7d7863b060daad48bfb88960]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/2114.diff"
# content [8e4a6ffafeeb9ae461826916e50b44596f3a4c7d]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/buildfix.patch"
# content [b99293dea237d4c20896a58f07a407aa254d865e]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/libiconv.patch"
# content [d592e1582c3efd71bd9ff351ad21eb43951307ef]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/libpulsedsp-references-libpulsecore.patch"
# content [3496051ef5b89fcb9f9aa434e8092d99a3d2e4b1]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/libtool2.patch"
# content [3e84133dc42bed50437a4d5910f0ace625c11e93]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/pa-drop-caps-returns-void.patch"
# content [b5f462c3864f66bdb12757d2e5dd7731d47e1f38]
#
# add_file "packages/pulseaudio/pulseaudio_0.9.11.bb"
# content [ae69d47cf61b4ccc4819ec99c0d7bee736221489]
#
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/2113.diff 0046507a819e54bd7d7863b060daad48bfb88960
+++ packages/pulseaudio/pulseaudio-0.9.11/2113.diff 0046507a819e54bd7d7863b060daad48bfb88960
@@ -0,0 +1,19 @@
+from upstream svn r2113
+
+Index: configure.ac
+===================================================================
+--- configure.ac (wersja 2112)
++++ configure.ac (wersja 2113)
+@@ -172,6 +172,12 @@
+ AC_SUBST(LIBLTDL)
+ AC_CONFIG_SUBDIRS(libltdl)
+
++old_LIBS=$LIBS
++LIBS="$LIBS $LIBLTDL"
++AC_CHECK_FUNCS([lt_dlmutex_register])
++LIBS=$old_LIBS
++AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
++
+ if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
+ AC_MSG_ERROR([[
+
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/2114.diff 8e4a6ffafeeb9ae461826916e50b44596f3a4c7d
+++ packages/pulseaudio/pulseaudio-0.9.11/2114.diff 8e4a6ffafeeb9ae461826916e50b44596f3a4c7d
@@ -0,0 +1,15 @@
+from upstream svn r2114
+
+Index: configure.ac
+===================================================================
+--- configure.ac (wersja 2113)
++++ configure.ac (wersja 2114)
+@@ -176,7 +176,7 @@
+ LIBS="$LIBS $LIBLTDL"
+ AC_CHECK_FUNCS([lt_dlmutex_register])
+ LIBS=$old_LIBS
+-AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
++AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
+
+ if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
+ AC_MSG_ERROR([[
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/buildfix.patch b99293dea237d4c20896a58f07a407aa254d865e
+++ packages/pulseaudio/pulseaudio-0.9.11/buildfix.patch b99293dea237d4c20896a58f07a407aa254d865e
@@ -0,0 +1,13 @@
+Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
+===================================================================
+--- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h
++++ pulseaudio-0.9.11/src/pulsecore/atomic.h
+@@ -40,6 +40,8 @@
+ #error "Please include config.h before including this file!"
+ #endif
+
++#include "macro.h"
++
+ #ifdef HAVE_ATOMIC_BUILTINS
+
+ /* __sync based implementation */
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/libiconv.patch d592e1582c3efd71bd9ff351ad21eb43951307ef
+++ packages/pulseaudio/pulseaudio-0.9.11/libiconv.patch d592e1582c3efd71bd9ff351ad21eb43951307ef
@@ -0,0 +1,22 @@
+Index: pulseaudio-0.9.10/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-07-20 13:16:51.548858829 +0200
++++ pulseaudio-0.9.10/src/Makefile.am 2008-07-20 13:43:39.842031837 +0200
+@@ -551,7 +551,7 @@
+
+ libpulse_la_CFLAGS = $(AM_CFLAGS)
+ libpulse_la_LDFLAGS = -version-info $(LIBPULSE_VERSION_INFO) -Wl,-version-script=$(srcdir)/map-file
+-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV)
++libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV)
+
+ if HAVE_X11
+ libpulse_la_CFLAGS += $(X_CFLAGS)
+@@ -771,7 +771,7 @@
+
+ libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
+ libpulsecore_la_LDFLAGS = -version-info $(LIBPULSECORE_VERSION_INFO)
+-libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
++libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LTLIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
+
+ ###################################
+ # Plug-in support libraries #
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/libpulsedsp-references-libpulsecore.patch 3496051ef5b89fcb9f9aa434e8092d99a3d2e4b1
+++ packages/pulseaudio/pulseaudio-0.9.11/libpulsedsp-references-libpulsecore.patch 3496051ef5b89fcb9f9aa434e8092d99a3d2e4b1
@@ -0,0 +1,24 @@
+upstream: http://pulseaudio.org/ticket/287
+
+Index: pulseaudio-0.9.10/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-03-30 03:43:05.000000000 +0200
++++ pulseaudio-0.9.10/src/Makefile.am 2008-05-03 11:55:46.000000000 +0200
+@@ -605,7 +605,7 @@
+
+ libpulsedsp_la_SOURCES = utils/padsp.c
+ libpulsedsp_la_CFLAGS = $(AM_CFLAGS)
+-libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la
++libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecore.la
+ libpulsedsp_la_LDFLAGS = -avoid-version
+
+ ###################################
+@@ -888,7 +888,7 @@
+
+ libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h
+ libpstream_util_la_LDFLAGS = -avoid-version
+-libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la
++libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la libpulsecore.la
+
+ libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h
+ libpdispatch_la_LDFLAGS = -avoid-version
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/libtool2.patch 3e84133dc42bed50437a4d5910f0ace625c11e93
+++ packages/pulseaudio/pulseaudio-0.9.11/libtool2.patch 3e84133dc42bed50437a4d5910f0ace625c11e93
@@ -0,0 +1,48 @@
+Tell where is libltdl from libtool - was needed to get it built with libtool 2.2.4
+
+---
+ configure.ac | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+--- pulseaudio-0.9.10.orig/configure.ac
++++ pulseaudio-0.9.10/configure.ac
+@@ -242,20 +242,32 @@ if test $ret -eq 0 ; then
+ else
+ AC_MSG_RESULT([no])
+ fi
+
+ #### libtool stuff ####
+-
+-AC_LTDL_ENABLE_INSTALL
+-AC_LIBLTDL_INSTALLABLE
+-AC_LIBTOOL_DLOPEN
+-AC_LIBTOOL_WIN32_DLL
++LT_PREREQ([2.2])
++LT_INIT([dlopen win32-dll])
+ AC_PROG_LIBTOOL
+-AC_SUBST(LTDLINCL)
+-AC_SUBST(LIBLTDL)
++#AC_SUBST(LTDLINCL)
++#AC_SUBST(LIBLTDL)
+ AC_CONFIG_SUBDIRS(libltdl)
+
++AC_ARG_WITH(libltdl-libs,
++ [ --with-libltdl-libs=DIR path to libltdl libs], libltdl_libs_prefix=$withval)
++if test x$libltdl_libs_prefix != x; then
++ LIBLTDL="-L${libltdl_libs_prefix}/libltdl.so -lltdl"
++fi
++AC_SUBST(LIBLTDL)
++
++AC_ARG_WITH(libltdl-includes,
++ [ --with-libltdl-includes=DIR path to libltdl includes], libltdl_prefix=$withval)
++if test x$libltdl_prefix != x; then
++ LTDLINCL="-I${libltdl_prefix} ${libltdl_libs_prefix}/libltdl.so"
++fi
++AC_SUBST(LTDLINCL)
++
++
+ old_LIBS=$LIBS
+ LIBS="$LIBS $LIBLTDL"
+ AC_CHECK_FUNCS([lt_dlmutex_register])
+ LIBS=$old_LIBS
+ AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/pa-drop-caps-returns-void.patch b5f462c3864f66bdb12757d2e5dd7731d47e1f38
+++ packages/pulseaudio/pulseaudio-0.9.11/pa-drop-caps-returns-void.patch b5f462c3864f66bdb12757d2e5dd7731d47e1f38
@@ -0,0 +1,17 @@
+upstream: http://pulseaudio.org/changeset/2213
+
+Index: pulseaudio-0.9.10/src/daemon/caps.c
+===================================================================
+--- pulseaudio-0.9.10.orig/src/daemon/caps.c 2008-05-03 12:10:26.000000000 +0200
++++ pulseaudio-0.9.10/src/daemon/caps.c 2008-05-03 12:10:30.000000000 +0200
+@@ -131,9 +131,8 @@
+ return 0;
+ }
+
+-int pa_drop_caps(void) {
++void pa_drop_caps(void) {
+ pa_drop_root();
+- return 0;
+ }
+
+ #endif
============================================================
--- packages/pulseaudio/pulseaudio_0.9.11.bb ae69d47cf61b4ccc4819ec99c0d7bee736221489
+++ packages/pulseaudio/pulseaudio_0.9.11.bb ae69d47cf61b4ccc4819ec99c0d7bee736221489
@@ -0,0 +1,31 @@
+require pulseaudio.inc
+
+DEPENDS += "dbus gdbm speex"
+PR = "r0"
+
+# work in progress
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "\
+ file://disable-using-glibc-tls.patch;patch=1 \
+ file://buildfix.patch;patch=1 \
+# file://libpulsedsp-references-libpulsecore.patch;patch=1 \
+# file://pa-drop-caps-returns-void.patch;patch=1 \
+# file://libtool2.patch;patch=1 \
+ file://2113.diff;patch=1;pnum=0 \
+ file://2114.diff;patch=1;pnum=0 \
+# file://libiconv.patch;patch=1 \
+"
+
+do_compile_prepend() {
+ cd ${S}
+ mkdir -p ${S}/libltdl
+ cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
+}
+
+
+# problems w/ pulseaudio 0.9.10 atm:
+# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
+# 2.) doesn't build w/ glibc TLS support (hence patched out)
+# 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out)
+
More information about the Openembedded-commits
mailing list