* [PATCH 1/7] gssdp: upgrade to version 0.9.0
2010-12-07 7:10 [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Dongxiao Xu
@ 2010-12-07 6:02 ` Dongxiao Xu
2010-12-07 6:08 ` [PATCH 2/7] gst-ffmpeg: upgrade to version 0.10.11 Dongxiao Xu
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Dongxiao Xu @ 2010-12-07 6:02 UTC (permalink / raw)
To: poky
Derive introspection.m4 from gobject-introspection package to solve the
autoreconf issue.
Add option "--disable-introspection" since gobject-introspection breaks
cross compile.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../gupnp/gssdp-0.9.0/introspection.patch | 101 ++++++++++++++++++++
.../gupnp/{gssdp_0.7.1.bb => gssdp_0.9.0.bb} | 12 ++-
2 files changed, 112 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-connectivity/gupnp/gssdp-0.9.0/introspection.patch
rename meta/recipes-connectivity/gupnp/{gssdp_0.7.1.bb => gssdp_0.9.0.bb} (66%)
diff --git a/meta/recipes-connectivity/gupnp/gssdp-0.9.0/introspection.patch b/meta/recipes-connectivity/gupnp/gssdp-0.9.0/introspection.patch
new file mode 100644
index 0000000..15de41f
--- /dev/null
+++ b/meta/recipes-connectivity/gupnp/gssdp-0.9.0/introspection.patch
@@ -0,0 +1,101 @@
+Copied from gobject-introspection/m4/introspection.m4
+By Dongxiao Xu <dongxiao.xu@intel.com>
+
+diff -ruN gssdp-0.9.0-orig/m4/introspection.m4 gssdp-0.9.0/m4/introspection.m4
+--- gssdp-0.9.0-orig/m4/introspection.m4 1970-01-01 08:00:00.000000000 +0800
++++ gssdp-0.9.0/m4/introspection.m4 2010-12-06 11:08:16.000000000 +0800
+@@ -0,0 +1,94 @@
++dnl -*- mode: autoconf -*-
++dnl Copyright 2009 Johan Dahlin
++dnl
++dnl This file is free software; the author(s) gives unlimited
++dnl permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++
++# serial 1
++
++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
++[
++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
++
++ dnl enable/disable introspection
++ m4_if([$2], [require],
++ [dnl
++ enable_introspection=yes
++ ],[dnl
++ AC_ARG_ENABLE(introspection,
++ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
++ [Enable introspection for this build]),,
++ [enable_introspection=auto])
++ ])dnl
++
++ AC_MSG_CHECKING([for gobject-introspection])
++
++ dnl presence/version checking
++ AS_CASE([$enable_introspection],
++ [no], [dnl
++ found_introspection="no (disabled, use --enable-introspection to enable)"
++ ],dnl
++ [yes],[dnl
++ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
++ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
++ found_introspection=yes,
++ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
++ ],dnl
++ [auto],[dnl
++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
++ ],dnl
++ [dnl
++ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
++ ])dnl
++
++ AC_MSG_RESULT([$found_introspection])
++
++ INTROSPECTION_SCANNER=
++ INTROSPECTION_COMPILER=
++ INTROSPECTION_GENERATE=
++ INTROSPECTION_GIRDIR=
++ INTROSPECTION_TYPELIBDIR=
++ if test "x$found_introspection" = "xyes"; then
++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++ fi
++ AC_SUBST(INTROSPECTION_SCANNER)
++ AC_SUBST(INTROSPECTION_COMPILER)
++ AC_SUBST(INTROSPECTION_GENERATE)
++ AC_SUBST(INTROSPECTION_GIRDIR)
++ AC_SUBST(INTROSPECTION_TYPELIBDIR)
++ AC_SUBST(INTROSPECTION_CFLAGS)
++ AC_SUBST(INTROSPECTION_LIBS)
++ AC_SUBST(INTROSPECTION_MAKEFILE)
++
++ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
++])
++
++
++dnl Usage:
++dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
++
++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
++[
++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
++])
++
++dnl Usage:
++dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
++
++
++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
++[
++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
++])
diff --git a/meta/recipes-connectivity/gupnp/gssdp_0.7.1.bb b/meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb
similarity index 66%
rename from meta/recipes-connectivity/gupnp/gssdp_0.7.1.bb
rename to meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb
index 2143984..09bcc38 100644
--- a/meta/recipes-connectivity/gupnp/gssdp_0.7.1.bb
+++ b/meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb
@@ -4,10 +4,20 @@ LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
DEPENDS = "glib-2.0 libsoup-2.4 libglade"
-SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz"
+SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz \
+ file://introspection.patch"
inherit autotools pkgconfig
PACKAGES =+ "gssdp-tools"
FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade"
+
+EXTRA_OECONF = "--disable-introspection"
+
+PR = "r0"
+
+SRC_URI[md5sum] = "8605138eac1e7fb8ec8cf502a928ea81"
+SRC_URI[sha256sum] = "6e4de2ecc90d2ac8b3694af1954984d04de25fb01dd2f2748d7221add8ead9e0"
+
+
--
1.6.3.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/7] gst-ffmpeg: upgrade to version 0.10.11
2010-12-07 7:10 [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Dongxiao Xu
2010-12-07 6:02 ` [PATCH 1/7] gssdp: upgrade to version 0.9.0 Dongxiao Xu
@ 2010-12-07 6:08 ` Dongxiao Xu
2010-12-09 12:40 ` Richard Purdie
2010-12-07 6:09 ` [PATCH 3/7] gst-fluendo-mp3: upgrade to version 0.10.15 Dongxiao Xu
` (5 subsequent siblings)
7 siblings, 1 reply; 10+ messages in thread
From: Dongxiao Xu @ 2010-12-07 6:08 UTC (permalink / raw)
To: poky
Derived the recipe from openembedded.
For poky, we use the ffmpeg lib contained in the package, while
openembedded use the system ffmpeg library.
Update recipe metadata.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/conf/distro/poky.conf | 3 +-
.../gst-ffmpeg-0.10.1/configure_fix.patch | 13 -----
.../gstreamer/gst-ffmpeg-0.10.1/no_beos.patch | 55 --------------------
.../gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff | 14 +++++
.../gstreamer/gst-ffmpeg_0.10.1.bb | 35 ------------
.../gstreamer/gst-ffmpeg_0.10.11.bb | 39 ++++++++++++++
6 files changed, 55 insertions(+), 104 deletions(-)
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb
create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index dcb21f7..eacdfd0 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -129,7 +129,8 @@ LGPLv2_WHITELIST_GPLv3 = "libassuan gnutls libtasn1 libidn"
# This is a list of packages that require a commercial license to ship
# product. If shipped as part of an image these packages may have
# implications so they are disabled by default
-COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
+COMMERCIAL_LICENSE ?= ""
+#COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
COMMERCIAL_AUDIO_PLUGINS ?= ""
# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
COMMERCIAL_VIDEO_PLUGINS ?= ""
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
deleted file mode 100644
index 15f5649..0000000
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/configure.ac
-===================================================================
---- gst-ffmpeg-0.10.1.orig/gst-libs/ext/ffmpeg/configure.ac 2008-03-19 23:21:04.000000000 +0000
-+++ gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/configure.ac 2008-03-19 23:21:31.000000000 +0000
-@@ -775,7 +775,7 @@
-
- dnl Check for SDL, used in ffplay, and ffserver
- AC_FF_ALLOW_DISABLE(CONFIG_FFPLAY, ffplay, ffmpeg media player,[
-- AM_PATH_SDL(, CONFIG_FFPLAY=yes, CONFIG_FPFLAY=no)
-+ CONFIG_FPFLAY=no
- ])
-
- dnl media server or not?
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
deleted file mode 100644
index 9ffcaff..0000000
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-The AC_LANG sections upset libtool 2.2.2, easiest fix is to remove them.
-Using a .cpp file in a Makefile means configure.ac must use AC_PROG_CXX
-so patch out the section from the makefile too.
-
-RP - 14/4/08
-
-Index: gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/configure.ac
-===================================================================
---- gst-ffmpeg-0.10.1.orig/gst-libs/ext/ffmpeg/configure.ac 2008-04-14 23:55:25.000000000 +0100
-+++ gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/configure.ac 2008-04-14 23:56:18.000000000 +0100
-@@ -742,26 +742,7 @@
-
- dnl Beos Audio
- AC_FF_ALLOW_DISABLE(CONFIG_AUDIO_BEOS, audio-beos, BeOS audio support,[
-- if test x$TARGET_OS = xbeos; then
-- AC_LANG_CPLUSPLUS
-- AC_CHECK_HEADER(SoundPlayer.h,[
-- OLD_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS="$CXXFLAGS -lbe -lmedia"
-- AC_MSG_CHECKING(For BeOS audio libraries)
-- AC_TRY_COMPILE([
--#include <Application.h>
--#include <SoundPlayer.h>
-- ],[
-- BSoundPlayer *p = new BSoundPlayer(NULL,NULL,NULL);
-- ],[ CONFIG_AUDIO_BEOS=yes && AC_MSG_RESULT(yes) ],[
-- CONFIG_AUDIO_BEOS=no && AC_MSG_RESULT(no)
-- ])
-- CXXFLAGS="$OLD_CXXFLAGS"
-- ], CONFIG_AUDIO_BEOS=no)
-- AC_LANG_C
-- else
- CONFIG_AUDIO_BEOS=no
-- fi
- ])
-
- dnl Check for freetype2, used in vook/libdrawtext.so
-Index: gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/libavformat/Makefile.am
-===================================================================
---- gst-ffmpeg-0.10.1.orig/gst-libs/ext/ffmpeg/libavformat/Makefile.am 2008-04-14 23:58:44.000000000 +0100
-+++ gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/libavformat/Makefile.am 2008-04-14 23:58:55.000000000 +0100
-@@ -24,13 +24,6 @@
- audiooss_SRC = audio.c
- endif
-
--if CONFIG_AUDIO_BEOS
--audiobeos_SRC = beosaudio.cpp
--audiobeos_LIBS = \
-- -lbe \
-- -lmedia
--endif
--
- if CONFIG_VIDEO4LINUX
- v4l_SRC = grab.c v4l2.c
- endif
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
new file mode 100644
index 0000000..bffdb8a
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
@@ -0,0 +1,14 @@
+Lower the rank of ffmpeg plugin so codecs that hook into accelerated pieces (e.g. dsp or hw engines) can get picked over this
+Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+
+--- /tmp/gstffmpegdec.c 2009-03-05 09:31:15.000000000 +0100
++++ gst-ffmpeg-0.10.6/ext/ffmpeg/gstffmpegdec.c 2009-03-05 09:33:09.000000000 +0100
+@@ -2588,7 +2588,7 @@
+ case CODEC_ID_MSMPEG4V3:
+ case CODEC_ID_H264:
+ case CODEC_ID_COOK:
+- rank = GST_RANK_PRIMARY;
++ rank = GST_RANK_SECONDARY;
+ break;
+ case CODEC_ID_DVVIDEO:
+ /* we have a good dv decoder, fast on both ppc as well as x86. they say
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb
deleted file mode 100644
index 599492f..0000000
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "FFmpeg-based GStreamer plug-in"
-SECTION = "multimedia"
-PRIORITY = "optional"
-LICENSE = "LGPLv2+ & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://gst-libs/ext/ffmpeg/libavcodec/libpostproc/postprocess.h;beginline=1;endline=17;md5=a0c398349079dbd0ce70f03de8bc193a \
- file://gst-libs/ext/ffmpeg/ffserver.c;beginlin=1;endline=18;md5=49bde48d6d5c631f6f49d74ed491ea08"
-HOMEPAGE = "http://www.gstreamer.net/"
-DEPENDS = "gstreamer zlib gst-plugins-base"
-PR = "r4"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
- file://no_beos.patch;patch=1 \
- file://configure_fix.patch;patch=1"
-
-FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
-
-EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \
- --disable-vorbis --disable-vorbistest --disable-encoders \
- --disable-v4l --disable-audio-oss --disable-dv1394 \
- --disable-vhook --disable-ffmpeg --disable-ffserver \
- --enable-pp --disable-decoder-vorbis --with-pic=no --disable-altivec"
-
-# We do this because the install program is called with -s which causes it to
-# call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin:"
-
-# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
-CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}"
-
-acpaths = "-I ${S}/common/m4"
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
new file mode 100644
index 0000000..96f08b6
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "FFmpeg-based GStreamer plug-in"
+SECTION = "multimedia"
+PRIORITY = "optional"
+LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://ext/libpostproc/gstpostproc.c;beginline=1;endline=18;md5=5896e445e41681324381f5869ee33d38 \
+ file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
+ file://ext/ffmpeg/gstffmpeg.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9 \
+ file://gst-libs/ext/ffmpeg/LICENSE;md5=524b5ee4bdbbf755ebbb76727ba80b0d \
+ file://gst-libs/ext/ffmpeg/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://gst-libs/ext/ffmpeg/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+ file://gst-libs/ext/ffmpeg/COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
+ file://gst-libs/ext/ffmpeg/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
+HOMEPAGE = "http://www.gstreamer.net/"
+DEPENDS = "gstreamer gst-plugins-base zlib"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
+ file://lower-rank.diff \
+"
+
+PR = "r0"
+
+EXTRA_OECONF = " --with-ffmpeg-extra-configure=\"--target-os=linux\" "
+
+FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
+
+# We do this because the install program is called with -s which causes it to
+# call "strip" and it then mangles cross compiled stuff..
+PATH_prepend := "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
+
+# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
+CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
+
+SRC_URI[md5sum] = "0d23197ba7ac06ea34fa66d38469ebe5"
+SRC_URI[sha256sum] = "ff36a138e5af4ed8dcc459d6d6521fe66ed31ec29ba9a924dc3675c6749a692e"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/7] gst-fluendo-mp3: upgrade to version 0.10.15
2010-12-07 7:10 [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Dongxiao Xu
2010-12-07 6:02 ` [PATCH 1/7] gssdp: upgrade to version 0.9.0 Dongxiao Xu
2010-12-07 6:08 ` [PATCH 2/7] gst-ffmpeg: upgrade to version 0.10.11 Dongxiao Xu
@ 2010-12-07 6:09 ` Dongxiao Xu
2010-12-07 6:10 ` [PATCH 4/7] gst-fluendo-mpegdemux: upgrade to version 0.10.62 Dongxiao Xu
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Dongxiao Xu @ 2010-12-07 6:09 UTC (permalink / raw)
To: poky
Remove configure_fix.patch since the original logic is not exist in
upstream code.
Fix recipe metadata.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../gstreamer/gst-fluendo-mp3/configure_fix.patch | 16 ----------------
.../gstreamer/gst-fluendo-mp3_0.10.15.bb | 13 +++++++++++++
.../gstreamer/gst-fluendo-mp3_0.10.2.bb | 12 ------------
3 files changed, 13 insertions(+), 28 deletions(-)
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mp3/configure_fix.patch
create mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.15.bb
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.2.bb
diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3/configure_fix.patch b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3/configure_fix.patch
deleted file mode 100644
index d8b213b..0000000
--- a/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3/configure_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gst-fluendo-mp3-0.10.2/configure.ac
-===================================================================
---- gst-fluendo-mp3-0.10.2.orig/configure.ac 2008-03-19 23:00:15.000000000 +0000
-+++ gst-fluendo-mp3-0.10.2/configure.ac 2008-03-19 23:00:31.000000000 +0000
-@@ -19,10 +19,9 @@
- AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
-
- dnl check for tools
--AS_LIBTOOL_TAGS
- AM_PROG_LIBTOOL
- dnl AC_PROG_CC
--dnl AC_PROG_LIBTOOL
-+AC_PROG_LIBTOOL
-
- dnl decide on error flags
- AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.15.bb b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.15.bb
new file mode 100644
index 0000000..da9cb2b
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.15.bb
@@ -0,0 +1,13 @@
+require gst-fluendo.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=98326cbb1723a5a97e9b1db62e9faa05"
+
+acpaths = "-I ${S}/common/m4 -I ${S}/m4"
+
+PR = "r0"
+
+DESCRIPTION = "Fluendo closed-format mp3 GStreamer plug-in"
+
+SRC_URI[md5sum] = "dac7a9fa988650ec1be6c4c743a86cd4"
+SRC_URI[sha256sum] = "b444e6f3f87f5b819c1327ff3ed1afe9c09c195ba79ecf7e7409b375fa81cb06"
diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.2.bb b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.2.bb
deleted file mode 100644
index 3000d71..0000000
--- a/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require gst-fluendo.inc
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=086bf92d974e459276adbfd808c615b4"
-
-acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-
-SRC_URI += "file://configure_fix.patch;patch=1"
-
-PR = "r1"
-
-DESCRIPTION = "Fluendo closed-format mp3 GStreamer plug-in"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/7] gst-fluendo-mpegdemux: upgrade to version 0.10.62
2010-12-07 7:10 [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Dongxiao Xu
` (2 preceding siblings ...)
2010-12-07 6:09 ` [PATCH 3/7] gst-fluendo-mp3: upgrade to version 0.10.15 Dongxiao Xu
@ 2010-12-07 6:10 ` Dongxiao Xu
2010-12-07 6:29 ` [PATCH 5/7] pulseaudio: upgrade to version 0.9.21 Dongxiao Xu
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Dongxiao Xu @ 2010-12-07 6:10 UTC (permalink / raw)
To: poky
Add m4 path from common folder.
Fix recipe metadata.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../gstreamer/gst-fluendo-mpegdemux_0.10.62.bb | 13 +++++++++++++
.../gstreamer/gst-fluendo-mpegdemux_0.10.7.bb | 6 ------
2 files changed, 13 insertions(+), 6 deletions(-)
create mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.62.bb
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb
diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.62.bb b/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.62.bb
new file mode 100644
index 0000000..b0b4bc2
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.62.bb
@@ -0,0 +1,13 @@
+require gst-fluendo.inc
+DESCRIPTION = "Fluendo closed-format mpeg video GStreamer plug-in"
+
+LICENSE = "MPLv1.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=be282f1c3cc9a98cc0dc5c2b25dfc510 \
+ file://src/gstmpegdemux.h;beginline=1;endline=19;md5=a9e90033f59897b91664d9f2a2ff01dd"
+
+acpaths = "-I ${S}/common/m4 -I ${S}/m4"
+
+PR = "r0"
+
+SRC_URI[md5sum] = "de2a22760f73ba678b7cb51e9f94bc21"
+SRC_URI[sha256sum] = "c4ba24502f59849fc2f3948389213c99e23a0986506111cc22cce3a64a33ac05"
diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb b/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb
deleted file mode 100644
index 3757c58..0000000
--- a/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require gst-fluendo.inc
-DESCRIPTION = "Fluendo closed-format mpeg video GStreamer plug-in"
-
-LICENSE = "MPLv1.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=be282f1c3cc9a98cc0dc5c2b25dfc510 \
- file://src/gstmpegdemux.h;beginline=1;endline=19;md5=3321040ac920ff350d21dc3a62587882"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/7] pulseaudio: upgrade to version 0.9.21
2010-12-07 7:10 [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Dongxiao Xu
` (3 preceding siblings ...)
2010-12-07 6:10 ` [PATCH 4/7] gst-fluendo-mpegdemux: upgrade to version 0.10.62 Dongxiao Xu
@ 2010-12-07 6:29 ` Dongxiao Xu
2010-12-07 7:08 ` [PATCH 6/7] gupnp: upgrade to version 0.14.0 Dongxiao Xu
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Dongxiao Xu @ 2010-12-07 6:29 UTC (permalink / raw)
To: poky
There is a bug in pulseaudio uptream which uses new instructions on old
arm platform. So we keep arm version of pulseaudio unchanged.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/conf/distro/include/poky-fixed-revisions.inc | 4 +
.../pulseaudio/pulseaudio-0.9.21/armv4+v5asm.patch | 59 ++++++++++++++++++++
.../pulseaudio-0.9.21/autoconf_version.patch | 15 +++++
.../pulseaudio/pulseaudio-0.9.21/buildfix.patch | 15 +++++
.../pulseaudio-0.9.21/configure_silent_rules.patch | 31 ++++++++++
.../pulseaudio-0.9.21/gcc4-compile-fix.patch | 20 +++++++
.../pulseaudio/pulseaudio-0.9.21/tls_m4.patch | 32 +++++++++++
.../pulseaudio-0.9.21/volatiles.04_pulse | 2 +
.../pulseaudio/pulseaudio_0.9.21.bb | 28 +++++++++
9 files changed, 206 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/armv4+v5asm.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/autoconf_version.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/buildfix.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/configure_silent_rules.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/gcc4-compile-fix.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/tls_m4.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/volatiles.04_pulse
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.21.bb
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index c437a1c..db348ca 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -8,6 +8,10 @@ PREFERRED_VERSION_hal-info ?= "20091130"
PREFERRED_VERSION_udev ?= "158"
PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
+PULSEAUDIOVERSION ?= "0.9.21"
+PULSEAUDIOVERSION_arm ?= "0.9.15"
+PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}"
+
# Force the python versions in one place
PYTHON_BASEVERSION ?= "2.6"
PREFERRED_VERSION_python ?= "2.6.6"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/armv4+v5asm.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/armv4+v5asm.patch
new file mode 100644
index 0000000..f07ee67
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/armv4+v5asm.patch
@@ -0,0 +1,59 @@
+Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+
+Index: pulseaudio-0.9.21/src/pulsecore/svolume_arm.c
+===================================================================
+--- pulseaudio-0.9.21.orig/src/pulsecore/svolume_arm.c
++++ pulseaudio-0.9.21/src/pulsecore/svolume_arm.c
+@@ -37,6 +37,14 @@
+
+ #if defined (__arm__)
+
++/*
++ the code below uses armv6 instructions; we can safely ifdef this away as the code is only
++ called if the arm architecture is v6 or higher
++*/
++#if (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \
++ && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \
++ && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__))
++
+ #define MOD_INC() \
+ " subs r0, r6, %2 \n\t" \
+ " addcs r0, %1 \n\t" \
+@@ -179,11 +187,15 @@ static void run_test (void) {
+ }
+ #endif
+
++#endif /* (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) ... */
+ #endif /* defined (__arm__) */
+
+
+ void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) {
+ #if defined (__arm__)
++#if (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \
++ && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \
++ && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__))
+ pa_log_info("Initialising ARM optimized functions.");
+
+ #ifdef RUN_TEST
+@@ -191,5 +203,6 @@ void pa_volume_func_init_arm (pa_cpu_arm
+ #endif
+
+ pa_set_volume_func (PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_arm);
++#endif /* (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) ... */
+ #endif /* defined (__arm__) */
+ }
+Index: pulseaudio-0.9.21/src/modules/bluetooth/sbc_math.h
+===================================================================
+--- pulseaudio-0.9.21.orig/src/modules/bluetooth/sbc_math.h
++++ pulseaudio-0.9.21/src/modules/bluetooth/sbc_math.h
+@@ -47,7 +47,9 @@ typedef int32_t sbc_fixed_t;
+
+ #define SBC_FIXED_0(val) { val = 0; }
+ #define MUL(a, b) ((a) * (b))
+-#ifdef __arm__
++#if (defined(__arm__) && !defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \
++ && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \
++ && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__))
+ #define MULA(a, b, res) ({ \
+ int tmp = res; \
+ __asm__( \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/autoconf_version.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/autoconf_version.patch
new file mode 100644
index 0000000..80d0003
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/autoconf_version.patch
@@ -0,0 +1,15 @@
+Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+
+Index: pulseaudio-0.9.15/configure.ac
+===================================================================
+--- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100
++++ pulseaudio-0.9.15/configure.ac 2009-05-22 11:32:50.000000000 +0100
+@@ -20,7 +20,7 @@
+ # along with PulseAudio; if not, write to the Free Software Foundation,
+ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+-AC_PREREQ(2.63)
++AC_PREREQ(2.61)
+
+ m4_define(pa_major, [0])
+ m4_define(pa_minor, [9])
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/buildfix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/buildfix.patch
new file mode 100644
index 0000000..ea8d769
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/buildfix.patch
@@ -0,0 +1,15 @@
+Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+
+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 */
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/configure_silent_rules.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/configure_silent_rules.patch
new file mode 100644
index 0000000..fd5abd5
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/configure_silent_rules.patch
@@ -0,0 +1,31 @@
+Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+
+Index: pulseaudio-0.9.19/configure.ac
+===================================================================
+--- pulseaudio-0.9.19.orig/configure.ac 2009-10-31 11:40:00.000000000 +0000
++++ pulseaudio-0.9.19/configure.ac 2009-10-31 11:50:35.000000000 +0000
+@@ -27,12 +27,13 @@
+ AC_CONFIG_SRCDIR([src/daemon/main.c])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADERS([config.h])
+-AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
++AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax])
+
+ m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
+ m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
+ m4_define(pa_micro, `echo $VERSION | cut -d. -f3 | cut -d- -f1`)
+
++
+ AC_SUBST(PA_MAJOR, pa_major)
+ AC_SUBST(PA_MINOR, pa_minor)
+ AC_SUBST(PA_MICRO, pa_micro)
+@@ -80,7 +81,8 @@
+ ;;
+ esac
+
+-AM_SILENT_RULES([yes])
++# only use if available
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+ #### Checks for programs. ####
+
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/gcc4-compile-fix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/gcc4-compile-fix.patch
new file mode 100644
index 0000000..2969cba
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/gcc4-compile-fix.patch
@@ -0,0 +1,20 @@
+| fix for more strict syntax compliance in gcc4.x
+| pulsecore/core-util.c: In function 'pa_raise_priority':
+| pulsecore/core-util.c:547: error: label at end of compound statement
+| Signed off: mickey@openmoko.org
+|
+Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+
+Index: pulseaudio-0.9.6/src/pulsecore/core-util.c
+===================================================================
+--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
++++ pulseaudio-0.9.6/src/pulsecore/core-util.c
+@@ -535,7 +535,7 @@ void pa_raise_priority(void) {
+ pa_log_info("Successfully gained high priority class.");
+ #endif
+
+-fail:
++fail:;
+
+ #if defined(HAVE_SYS_CAPABILITY_H)
+ if (caps) {
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/tls_m4.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/tls_m4.patch
new file mode 100644
index 0000000..a8292b2
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/tls_m4.patch
@@ -0,0 +1,32 @@
+Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+
+Index: pulseaudio-0.9.15/m4/tls.m4
+===================================================================
+--- pulseaudio-0.9.15.orig/m4/tls.m4 2008-08-19 23:25:02.000000000 +0200
++++ pulseaudio-0.9.15/m4/tls.m4 2009-07-10 09:55:25.266365511 +0200
+@@ -1,12 +1,19 @@
+ AC_DEFUN([CC_CHECK_TLS], [
+ AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage],
+ cc_cv_tls___thread,
+- [AC_COMPILE_IFELSE(
+- AC_LANG_PROGRAM(
+- [[static __thread int a = 6;]],
+- [[a = 5;]]),
+- [cc_cv_tls___thread=yes],
+- [cc_cv_tls___thread=no])
++ [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }],
++ [chktls_save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS"
++ chktls_save_CFLAGS="$CFLAGS"
++ CFLAGS="-fPIC $CFLAGS"
++ dnl If -shared works, test if TLS works in a shared library.
++ AC_LINK_IFELSE([int f() { return 0; }],
++ AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }],
++ [cc_cv_tls___thread=yes],
++ [cc_cv_tls___thread=no]),
++ [cc_cv_tls___thread=yes])
++ CFLAGS="$chktls_save_CFLAGS"
++ LDFLAGS="$chktls_save_LDFLAGS"], [cc_cv_tls___thread=no])
+ ])
+
+ AS_IF([test "x$cc_cv_tls___thread" = "xyes"],
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/volatiles.04_pulse b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/volatiles.04_pulse
new file mode 100644
index 0000000..5b19980
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/volatiles.04_pulse
@@ -0,0 +1,2 @@
+# <type> <owner> <group> <mode> <path> <linksource>
+d pulse pulse 0755 /var/run/pulse none
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.21.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.21.bb
new file mode 100644
index 0000000..d2c21c4
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.21.bb
@@ -0,0 +1,28 @@
+require pulseaudio.inc
+
+PR = "r0"
+
+DEPENDS += "gdbm speex"
+
+DEFAULT_PREFERENCE_om-gta01 = "-1"
+DEFAULT_PREFERENCE_om-gta02 = "-1"
+DEFAULT_PREFERENCE_motorola-ezx = "-1"
+
+inherit gettext
+
+SRC_URI += "\
+ file://buildfix.patch \
+ file://autoconf_version.patch \
+ file://tls_m4.patch \
+ file://configure_silent_rules.patch \
+ file://armv4+v5asm.patch \
+"
+
+do_compile_prepend() {
+ cd ${S}
+ mkdir -p ${S}/libltdl
+ cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
+}
+
+SRC_URI[md5sum] = "76e623c4c72e2258bc8bdeb1599bad74"
+SRC_URI[sha256sum] = "94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/7] gupnp: upgrade to version 0.14.0
2010-12-07 7:10 [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Dongxiao Xu
` (4 preceding siblings ...)
2010-12-07 6:29 ` [PATCH 5/7] pulseaudio: upgrade to version 0.9.21 Dongxiao Xu
@ 2010-12-07 7:08 ` Dongxiao Xu
2010-12-07 7:08 ` [PATCH 7/7] distro_tracking: update gupnp, gst-ffmpeg, gst-fluendo-mp3, etc Dongxiao Xu
2010-12-07 8:34 ` [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Saul Wold
7 siblings, 0 replies; 10+ messages in thread
From: Dongxiao Xu @ 2010-12-07 7:08 UTC (permalink / raw)
To: poky
Derive introspection.m4 from gobject-introspection package to solve the
autoreconf issue.
Add option "--disable-introspection" since gobject-introspection breaks
cross compile.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../gupnp/gupnp-0.14.0/introspection.patch | 101 ++++++++++++++++++++
.../gupnp/{gupnp_0.13.2.bb => gupnp_0.14.0.bb} | 10 ++-
2 files changed, 109 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/gupnp/gupnp-0.14.0/introspection.patch
rename meta/recipes-connectivity/gupnp/{gupnp_0.13.2.bb => gupnp_0.14.0.bb} (81%)
diff --git a/meta/recipes-connectivity/gupnp/gupnp-0.14.0/introspection.patch b/meta/recipes-connectivity/gupnp/gupnp-0.14.0/introspection.patch
new file mode 100644
index 0000000..15de41f
--- /dev/null
+++ b/meta/recipes-connectivity/gupnp/gupnp-0.14.0/introspection.patch
@@ -0,0 +1,101 @@
+Copied from gobject-introspection/m4/introspection.m4
+By Dongxiao Xu <dongxiao.xu@intel.com>
+
+diff -ruN gssdp-0.9.0-orig/m4/introspection.m4 gssdp-0.9.0/m4/introspection.m4
+--- gssdp-0.9.0-orig/m4/introspection.m4 1970-01-01 08:00:00.000000000 +0800
++++ gssdp-0.9.0/m4/introspection.m4 2010-12-06 11:08:16.000000000 +0800
+@@ -0,0 +1,94 @@
++dnl -*- mode: autoconf -*-
++dnl Copyright 2009 Johan Dahlin
++dnl
++dnl This file is free software; the author(s) gives unlimited
++dnl permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++
++# serial 1
++
++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
++[
++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
++
++ dnl enable/disable introspection
++ m4_if([$2], [require],
++ [dnl
++ enable_introspection=yes
++ ],[dnl
++ AC_ARG_ENABLE(introspection,
++ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
++ [Enable introspection for this build]),,
++ [enable_introspection=auto])
++ ])dnl
++
++ AC_MSG_CHECKING([for gobject-introspection])
++
++ dnl presence/version checking
++ AS_CASE([$enable_introspection],
++ [no], [dnl
++ found_introspection="no (disabled, use --enable-introspection to enable)"
++ ],dnl
++ [yes],[dnl
++ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
++ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
++ found_introspection=yes,
++ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
++ ],dnl
++ [auto],[dnl
++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
++ ],dnl
++ [dnl
++ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
++ ])dnl
++
++ AC_MSG_RESULT([$found_introspection])
++
++ INTROSPECTION_SCANNER=
++ INTROSPECTION_COMPILER=
++ INTROSPECTION_GENERATE=
++ INTROSPECTION_GIRDIR=
++ INTROSPECTION_TYPELIBDIR=
++ if test "x$found_introspection" = "xyes"; then
++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++ fi
++ AC_SUBST(INTROSPECTION_SCANNER)
++ AC_SUBST(INTROSPECTION_COMPILER)
++ AC_SUBST(INTROSPECTION_GENERATE)
++ AC_SUBST(INTROSPECTION_GIRDIR)
++ AC_SUBST(INTROSPECTION_TYPELIBDIR)
++ AC_SUBST(INTROSPECTION_CFLAGS)
++ AC_SUBST(INTROSPECTION_LIBS)
++ AC_SUBST(INTROSPECTION_MAKEFILE)
++
++ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
++])
++
++
++dnl Usage:
++dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
++
++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
++[
++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
++])
++
++dnl Usage:
++dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
++
++
++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
++[
++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
++])
diff --git a/meta/recipes-connectivity/gupnp/gupnp_0.13.2.bb b/meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb
similarity index 81%
rename from meta/recipes-connectivity/gupnp/gupnp_0.13.2.bb
rename to meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb
index 1a3517b..2fa2f7b 100644
--- a/meta/recipes-connectivity/gupnp/gupnp_0.13.2.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb
@@ -5,8 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://libgupnp/gupnp.h;beginline=1;endline=20;md5=28c49b17d623afc3335efc2e511879e1"
DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2 gnome-icon-theme"
-SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz"
-PR = "r1"
+SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz \
+ file://introspection.patch"
+PR = "r0"
+
+EXTRA_OECONF = "--disable-introspection"
inherit autotools pkgconfig
@@ -19,3 +22,6 @@ gupnp_sysroot_preprocess () {
install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/
install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/
}
+
+SRC_URI[md5sum] = "8598922256faa5adb28657d0c10a3e3e"
+SRC_URI[sha256sum] = "6ac13efe46c6f1e5d05e48e1041bf37dfa702839ce5fbb01e0f314f3904b6a16"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 7/7] distro_tracking: update gupnp, gst-ffmpeg, gst-fluendo-mp3, etc.
2010-12-07 7:10 [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Dongxiao Xu
` (5 preceding siblings ...)
2010-12-07 7:08 ` [PATCH 6/7] gupnp: upgrade to version 0.14.0 Dongxiao Xu
@ 2010-12-07 7:08 ` Dongxiao Xu
2010-12-07 8:34 ` [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Saul Wold
7 siblings, 0 replies; 10+ messages in thread
From: Dongxiao Xu @ 2010-12-07 7:08 UTC (permalink / raw)
To: poky
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 35 ++++++++++++++------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 43a92e1..18ff320 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -1957,9 +1957,12 @@ RECIPE_STATUS_pn-empathy = "red"
RECIPE_LATEST_VERSION_pn-empathy = "2.31.2"
RECIPE_MAINTAINER_pn-empathy = "Dongxiao Xu <dongxiao.xu@intel.com>"
-RECIPE_STATUS_pn-gupnp = "red"
-RECIPE_LATEST_VERSION_pn-gupnp = "0.13.3"
-RECIPE_MAINTAINER_pn-gupnp = "Dongxiao Xu <dongxiao.xu@intel.com>"
+RECIPE_STATUS_pn-gupnp = "green"
+RECIPE_LATEST_VERSION_pn-gupnp = "0.14.0"
+RECIPE_NO_OF_PATCHES_pn-gupnp= "1"
+RECIPE_LATEST_RELEASE_DATE_pn-gupnp= "2010/09/16"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gupnp= "1 month"
+RECIPE_MAINTAINER_pn-gupnp= "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_STATUS_pn-gupnp-av = "green"
RECIPE_LATEST_VERSION_pn-gupnp-av = "0.7.0"
@@ -2427,9 +2430,12 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-openmax= "18 months"
RECIPE_MAINTAINER_pn-gst-openmax = "Dongxiao Xu <dongxiao.xu@intel.com>"
DISTRO_PN_ALIAS_pn-gst-openmax="OSPDT upstream=http://cgit.freedesktop.org/gstreamer/gst-openmax"
-RECIPE_STATUS_pn-gst-ffmpeg = "red"
+RECIPE_STATUS_pn-gst-ffmpeg = "green"
DISTRO_PN_ALIAS_pn-gst-ffmpeg = "Mandriva=gstreamer0.10-ffmpeg Debian=gstreamer0.10-ffmpeg"
-RECIPE_LATEST_VERSION_pn-gst-ffmpeg = "0.10.10"
+RECIPE_LATEST_VERSION_pn-gst-ffmpeg = "0.10.11"
+RECIPE_NO_OF_PATCHES_pn-gst-ffmpeg = "1"
+RECIPE_LATEST_RELEASE_DATE_pn-gst-ffmpeg = "2010/07/15"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-ffmpeg = "4 months"
RECIPE_MAINTAINER_pn-gst-ffmpeg = "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_STATUS_pn-alsa-oss = "red"
@@ -2441,8 +2447,11 @@ DISTRO_PN_ALIAS_pn-libsndfile1 = "Meego=libsndfile Fedora=libsndfile OpenSuSE=li
RECIPE_LATEST_VERSION_pn-libsndfile1 = "1.0.21 "
RECIPE_MAINTAINER_pn-libsndfile1 = "Dongxiao Xu <dongxiao.xu@intel.com>"
-RECIPE_STATUS_pn-pulseaudio = "red"
+RECIPE_STATUS_pn-pulseaudio = "green"
RECIPE_LATEST_VERSION_pn-pulseaudio = "0.9.21"
+RECIPE_NO_OF_PATCHES_pn-pulseaudio = "5"
+RECIPE_LATEST_RELEASE_DATE_pn-pulseaudio = "2009/10/23"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-pulseaudio = "12 days"
RECIPE_MAINTAINER_pn-pulseaudio = "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_STATUS_pn-taglib = "green"
@@ -2456,13 +2465,19 @@ RECIPE_STATUS_pn-libnice = "red"
RECIPE_LATEST_VERSION_pn-libnice = "0.0.12"
RECIPE_MAINTAINER_pn-libnice = "Dongxiao Xu <dongxiao.xu@intel.com>"
-RECIPE_STATUS_pn-gst-fluendo-mp3 = "red"
-RECIPE_LATEST_VERSION_pn-gst-fluendo-mp3 = "0.10.10"
+RECIPE_STATUS_pn-gst-fluendo-mp3 = "green"
+RECIPE_LATEST_VERSION_pn-gst-fluendo-mp3 = "0.10.15"
+RECIPE_NO_OF_PATCHES_pn-gst-fluendo-mp3 = "1"
+RECIPE_LATEST_RELEASE_DATE_pn-gst-fluendo-mp3 = "2010/10/21"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-fluendo-mp3 = "3 months"
RECIPE_MAINTAINER_pn-gst-fluendo-mp3 = "Dongxiao Xu <dongxiao.xu@intel.com>"
DISTRO_PN_ALIAS_pn-gst-fluendo-mp3 = "Debian=gstreamer0.10-fluendo-mp3 Ubuntu=gstreamer0.10-fluendo-mp3"
-RECIPE_STATUS_pn-gst-fluendo-mpegdemux = "red"
-RECIPE_LATEST_VERSION_pn-gst-fluendo-mpegdemux = "0.10.23"
+RECIPE_STATUS_pn-gst-fluendo-mpegdemux = "green"
+RECIPE_LATEST_VERSION_pn-gst-fluendo-mpegdemux = "0.10.20"
+RECIPE_NO_OF_PATCHES_pn-gst-fluendo-mpegdemux = "0"
+RECIPE_LATEST_RELEASE_DATE_pn-gst-fluendo-mpegdemux = "2010/10/20"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-fluendo-mpegdemux = "1 months"
RECIPE_MAINTAINER_pn-gst-fluendo-mpegdemux = "Dongxiao Xu <dongxiao.xu@intel.com>"
DISTRO_PN_ALIAS_pn-gst-fluendo-mpegdemux = "Ubuntu=gstreamer0.10-fluendo-mpegdemux Debian=gstreamer0.10-fluendo-mpegdemux"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao
@ 2010-12-07 7:10 Dongxiao Xu
2010-12-07 6:02 ` [PATCH 1/7] gssdp: upgrade to version 0.9.0 Dongxiao Xu
` (7 more replies)
0 siblings, 8 replies; 10+ messages in thread
From: Dongxiao Xu @ 2010-12-07 7:10 UTC (permalink / raw)
To: poky
Hi Saul,
This pull request upgrades the recipe in connectivity and multimedia part.
Please help to review and pull.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dxu4/distro
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/distro
Thanks,
Dongxiao Xu <dongxiao.xu@intel.com>
---
Dongxiao Xu (7):
gssdp: upgrade to version 0.9.0
gst-ffmpeg: upgrade to version 0.10.11
gst-fluendo-mp3: upgrade to version 0.10.15
gst-fluendo-mpegdemux: upgrade to version 0.10.62
pulseaudio: upgrade to version 0.9.21
gupnp: upgrade to version 0.14.0
distro_tracking: update gupnp, gst-ffmpeg, gst-fluendo-mp3, etc.
.../conf/distro/include/distro_tracking_fields.inc | 35 +++++--
meta/conf/distro/include/poky-fixed-revisions.inc | 4 +
meta/conf/distro/poky.conf | 3 +-
.../gupnp/gssdp-0.9.0/introspection.patch | 101 ++++++++++++++++++++
.../gupnp/{gssdp_0.7.1.bb => gssdp_0.9.0.bb} | 12 ++-
.../gupnp/gupnp-0.14.0/introspection.patch | 101 ++++++++++++++++++++
.../gupnp/{gupnp_0.13.2.bb => gupnp_0.14.0.bb} | 10 ++-
.../gst-ffmpeg-0.10.1/configure_fix.patch | 13 ---
.../gstreamer/gst-ffmpeg-0.10.1/no_beos.patch | 55 -----------
.../gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff | 14 +++
.../gstreamer/gst-ffmpeg_0.10.1.bb | 35 -------
.../gstreamer/gst-ffmpeg_0.10.11.bb | 39 ++++++++
.../gstreamer/gst-fluendo-mp3/configure_fix.patch | 16 ---
.../gstreamer/gst-fluendo-mp3_0.10.15.bb | 13 +++
.../gstreamer/gst-fluendo-mp3_0.10.2.bb | 12 ---
.../gstreamer/gst-fluendo-mpegdemux_0.10.62.bb | 13 +++
.../gstreamer/gst-fluendo-mpegdemux_0.10.7.bb | 6 -
.../pulseaudio/pulseaudio-0.9.21/armv4+v5asm.patch | 59 ++++++++++++
.../pulseaudio-0.9.21/autoconf_version.patch | 15 +++
.../pulseaudio/pulseaudio-0.9.21/buildfix.patch | 15 +++
.../pulseaudio-0.9.21/configure_silent_rules.patch | 31 ++++++
.../pulseaudio-0.9.21/gcc4-compile-fix.patch | 20 ++++
.../pulseaudio/pulseaudio-0.9.21/tls_m4.patch | 32 ++++++
.../pulseaudio-0.9.21/volatiles.04_pulse | 2 +
.../pulseaudio/pulseaudio_0.9.21.bb | 28 ++++++
25 files changed, 533 insertions(+), 151 deletions(-)
create mode 100644 meta/recipes-connectivity/gupnp/gssdp-0.9.0/introspection.patch
rename meta/recipes-connectivity/gupnp/{gssdp_0.7.1.bb => gssdp_0.9.0.bb} (66%)
create mode 100644 meta/recipes-connectivity/gupnp/gupnp-0.14.0/introspection.patch
rename meta/recipes-connectivity/gupnp/{gupnp_0.13.2.bb => gupnp_0.14.0.bb} (81%)
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb
create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mp3/configure_fix.patch
create mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.15.bb
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.2.bb
create mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.62.bb
delete mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/armv4+v5asm.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/autoconf_version.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/buildfix.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/configure_silent_rules.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/gcc4-compile-fix.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/tls_m4.patch
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/volatiles.04_pulse
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.21.bb
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao
2010-12-07 7:10 [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Dongxiao Xu
` (6 preceding siblings ...)
2010-12-07 7:08 ` [PATCH 7/7] distro_tracking: update gupnp, gst-ffmpeg, gst-fluendo-mp3, etc Dongxiao Xu
@ 2010-12-07 8:34 ` Saul Wold
7 siblings, 0 replies; 10+ messages in thread
From: Saul Wold @ 2010-12-07 8:34 UTC (permalink / raw)
To: Dongxiao Xu; +Cc: poky@yoctoproject.org
On 12/06/2010 11:10 PM, Dongxiao Xu wrote:
> Hi Saul,
>
> This pull request upgrades the recipe in connectivity and multimedia part.
> Please help to review and pull.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: dxu4/distro
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/distro
>
> Thanks,
> Dongxiao Xu<dongxiao.xu@intel.com>
> ---
>
>
> Dongxiao Xu (7):
> gssdp: upgrade to version 0.9.0
> gst-ffmpeg: upgrade to version 0.10.11
> gst-fluendo-mp3: upgrade to version 0.10.15
> gst-fluendo-mpegdemux: upgrade to version 0.10.62
> pulseaudio: upgrade to version 0.9.21
> gupnp: upgrade to version 0.14.0
> distro_tracking: update gupnp, gst-ffmpeg, gst-fluendo-mp3, etc.
>
> .../conf/distro/include/distro_tracking_fields.inc | 35 +++++--
> meta/conf/distro/include/poky-fixed-revisions.inc | 4 +
> meta/conf/distro/poky.conf | 3 +-
I don't think that you should be commenting this out.
> .../gupnp/gssdp-0.9.0/introspection.patch | 101 ++++++++++++++++++++
> .../gupnp/{gssdp_0.7.1.bb => gssdp_0.9.0.bb} | 12 ++-
> .../gupnp/gupnp-0.14.0/introspection.patch | 101 ++++++++++++++++++++
Are the two introspection patches the same? Can the be shared via the
"gupnp/files" directory instead of having 2 copies of the same patch?
If so, please send an updated patch
> .../gupnp/{gupnp_0.13.2.bb => gupnp_0.14.0.bb} | 10 ++-
> .../gst-ffmpeg-0.10.1/configure_fix.patch | 13 ---
> .../gstreamer/gst-ffmpeg-0.10.1/no_beos.patch | 55 -----------
Why are you deleting these patches, please explain more fully.
> .../gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff | 14 +++
> .../gstreamer/gst-ffmpeg_0.10.1.bb | 35 -------
> .../gstreamer/gst-ffmpeg_0.10.11.bb | 39 ++++++++
> .../gstreamer/gst-fluendo-mp3/configure_fix.patch | 16 ---
> .../gstreamer/gst-fluendo-mp3_0.10.15.bb | 13 +++
> .../gstreamer/gst-fluendo-mp3_0.10.2.bb | 12 ---
> .../gstreamer/gst-fluendo-mpegdemux_0.10.62.bb | 13 +++
> .../gstreamer/gst-fluendo-mpegdemux_0.10.7.bb | 6 -
> .../pulseaudio/pulseaudio-0.9.21/armv4+v5asm.patch | 59 ++++++++++++
> .../pulseaudio-0.9.21/autoconf_version.patch | 15 +++
> .../pulseaudio/pulseaudio-0.9.21/buildfix.patch | 15 +++
> .../pulseaudio-0.9.21/configure_silent_rules.patch | 31 ++++++
> .../pulseaudio-0.9.21/gcc4-compile-fix.patch | 20 ++++
> .../pulseaudio/pulseaudio-0.9.21/tls_m4.patch | 32 ++++++
> .../pulseaudio-0.9.21/volatiles.04_pulse | 2 +
> .../pulseaudio/pulseaudio_0.9.21.bb | 28 ++++++
> 25 files changed, 533 insertions(+), 151 deletions(-)
> create mode 100644 meta/recipes-connectivity/gupnp/gssdp-0.9.0/introspection.patch
> rename meta/recipes-connectivity/gupnp/{gssdp_0.7.1.bb => gssdp_0.9.0.bb} (66%)
> create mode 100644 meta/recipes-connectivity/gupnp/gupnp-0.14.0/introspection.patch
> rename meta/recipes-connectivity/gupnp/{gupnp_0.13.2.bb => gupnp_0.14.0.bb} (81%)
> delete mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
> delete mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
> create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
> delete mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb
> create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
> delete mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mp3/configure_fix.patch
> create mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.15.bb
> delete mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.2.bb
> create mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.62.bb
> delete mode 100644 meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb
> create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/armv4+v5asm.patch
> create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/autoconf_version.patch
> create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/buildfix.patch
> create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/configure_silent_rules.patch
> create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/gcc4-compile-fix.patch
> create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/tls_m4.patch
> create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.21/volatiles.04_pulse
> create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.21.bb
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/7] gst-ffmpeg: upgrade to version 0.10.11
2010-12-07 6:08 ` [PATCH 2/7] gst-ffmpeg: upgrade to version 0.10.11 Dongxiao Xu
@ 2010-12-09 12:40 ` Richard Purdie
0 siblings, 0 replies; 10+ messages in thread
From: Richard Purdie @ 2010-12-09 12:40 UTC (permalink / raw)
To: Dongxiao Xu; +Cc: poky
Hi,
On Tue, 2010-12-07 at 14:08 +0800, Dongxiao Xu wrote:
> diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
> new file mode 100644
> index 0000000..96f08b6
> --- /dev/null
> +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
> @@ -0,0 +1,39 @@
[...]
> +# We do this because the install program is called with -s which causes it to
> +# call "strip" and it then mangles cross compiled stuff..
> +PATH_prepend := "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
> +
> +# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
> +CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
> +
> +SRC_URI[md5sum] = "0d23197ba7ac06ea34fa66d38469ebe5"
> +SRC_URI[sha256sum] = "ff36a138e5af4ed8dcc459d6d6521fe66ed31ec29ba9a924dc3675c6749a692e"
Whilst Saul included this in distro/master I'm not going to take it as
this PATH_prepend workaround is rather risky e.g. if anyone ever uses
BBCLASSEXTEND with the recipe or the recipe ever tries to find the
native compiler for some native tool used in the build process. Please
patch the package to take out the -s option used in the install
commands.
Cheers,
Richard
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-12-09 12:40 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-07 7:10 [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Dongxiao Xu
2010-12-07 6:02 ` [PATCH 1/7] gssdp: upgrade to version 0.9.0 Dongxiao Xu
2010-12-07 6:08 ` [PATCH 2/7] gst-ffmpeg: upgrade to version 0.10.11 Dongxiao Xu
2010-12-09 12:40 ` Richard Purdie
2010-12-07 6:09 ` [PATCH 3/7] gst-fluendo-mp3: upgrade to version 0.10.15 Dongxiao Xu
2010-12-07 6:10 ` [PATCH 4/7] gst-fluendo-mpegdemux: upgrade to version 0.10.62 Dongxiao Xu
2010-12-07 6:29 ` [PATCH 5/7] pulseaudio: upgrade to version 0.9.21 Dongxiao Xu
2010-12-07 7:08 ` [PATCH 6/7] gupnp: upgrade to version 0.14.0 Dongxiao Xu
2010-12-07 7:08 ` [PATCH 7/7] distro_tracking: update gupnp, gst-ffmpeg, gst-fluendo-mp3, etc Dongxiao Xu
2010-12-07 8:34 ` [PATCH 0/7][PULL] connectivity/multimedia, recipe upgrade, Dongxiao Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.