Skip to contentSkip to conversation

Build fixes for master

PATCH New Paul Eggleton 1 participant 5 messages Sep 23, 2013

lore
Share & tools
lore
#0 lore raw

cover Build fixes for master

Some fixes for building baryon against master.

Note that this drops ffmpeg but not the other recipes that were there to support it; cleanup of those will happen at a later date.

The following changes since commit 360456720a48f882ca1443519b3e8a9d238e1a93:

samba: sync with meta-oe (2013-03-25 11:44:47 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib paule/baryon-build-fixes
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/baryon-build-fixes

Paul Eggleton (4):
linux-yocto: remove version 3.2 bbappend
mediatomb: add support for building against libav
ffmpeg: remove
samba: fix QA error due to volatiles presence

 recipes-connectivity/samba/samba_3.6.8.bb          |   6 ++
 recipes-kernel/linux/linux-yocto_3.2.bbappend      |   3 -
 recipes-multimedia/ffmpeg/ffmpeg.inc               | 114 ---------------------
 recipes-multimedia/ffmpeg/ffmpeg_0.6.1.bb          |  44 --------
 .../mediatomb/files/libav_0.7_support.patch        |  70 +++++++++++++
 recipes-multimedia/mediatomb/mediatomb_0.12.1.bb   |   3 +-
 6 files changed, 78 insertions(+), 162 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-yocto_3.2.bbappend
 delete mode 100644 recipes-multimedia/ffmpeg/ffmpeg.inc
 delete mode 100644 recipes-multimedia/ffmpeg/ffmpeg_0.6.1.bb
 create mode 100644 recipes-multimedia/mediatomb/files/libav_0.7_support.patch
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/4 linux-yocto: remove version 3.2 bbappend

This is no longer available in master.

---
 recipes-kernel/linux/linux-yocto_3.2.bbappend | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-yocto_3.2.bbappend
recipes-kernel/linux/linux-yocto_3.2.bbappend deleted +0 -3
deleted file mode 100644
index 70bed3b..0000000
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://nfs.cfg"
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/4 mediatomb: add support for building against libav

In reply to Paul Eggleton

Add a Debian patch to support building mediatomb against libav.

---
 .../mediatomb/files/libav_0.7_support.patch        | 70 ++++++++++++++++++++++
 recipes-multimedia/mediatomb/mediatomb_0.12.1.bb   |  3 +-
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 recipes-multimedia/mediatomb/files/libav_0.7_support.patch
recipes-multimedia/mediatomb/files/libav_0.7_support.patch new file +70 -0
new file mode 100644
index 0000000..59c0935
@@ -0,0 +1,70 @@
+Fix mediatomb to build against libav 0.7+
+
+Patch originally from Debian.
+
+Upstream-Status: Pending
+
+=== modified file 'src/metadata/ffmpeg_handler.cc'
+--- old/src/metadata/ffmpeg_handler.cc	2010-08-25 17:07:03 +0000
++++ new/src/metadata/ffmpeg_handler.cc	2011-05-19 04:33:32 +0000
+@@ -89,6 +89,33 @@
+ 
+ 	Ref<StringConverter> sc = StringConverter::m2i();
+     
++	/* Tabs are 4 characters here */
++	typedef struct {const char *avname; metadata_fields_t field;} mapping_t;
++	static const mapping_t mapping[] =
++	{
++		{"title",   M_TITLE},
++		{"artist",  M_ARTIST},
++		{"album",   M_ALBUM},
++		{"date",    M_DATE},
++		{"genre",   M_GENRE},
++		{"comment", M_DESCRIPTION},
++		{"track",   M_TRACKNUMBER},
++		{NULL,      M_MAX},
++	};
++
++	if (!pFormatCtx->metadata)
++		return;
++	for (const mapping_t *m = mapping; m->avname != NULL; m++)
++	{
++		AVMetadataTag *tag = NULL;
++		tag = av_metadata_get(pFormatCtx->metadata, m->avname, NULL, 0);
++		if (tag && tag->value && tag->value[0])
++		{
++			log_debug("Added metadata %s: %s\n", m->avname, tag->value);
++			item->setMetadata(MT_KEYS[m->field].upnp, sc->convert(tag->value));
++		}
++	}
++	/* Old algorithm (doesn't work with libav >= 0.7)
+ 	if (strlen(pFormatCtx->title) > 0) 
+     {
+ 	    log_debug("Added metadata title: %s\n", pFormatCtx->title);
+@@ -131,6 +158,7 @@
+         item->setMetadata(MT_KEYS[M_TRACKNUMBER].upnp, 
+                           sc->convert(String::from(pFormatCtx->track)));
+ 	}
++	*/
+ }
+ 
+ // ffmpeg library calls
+@@ -178,7 +206,7 @@
+ 	for(i=0; i<pFormatCtx->nb_streams; i++) 
+     {
+ 		AVStream *st = pFormatCtx->streams[i];
+-		if((st != NULL) && (videoset == false) && (st->codec->codec_type == CODEC_TYPE_VIDEO))
++		if((st != NULL) && (videoset == false) && (st->codec->codec_type == AVMEDIA_TYPE_VIDEO))
+         {
+             if (st->codec->codec_tag > 0)
+             {
+@@ -209,7 +237,7 @@
+                 *y = st->codec->height;
+ 			}
+ 		} 
+-		if(st->codec->codec_type == CODEC_TYPE_AUDIO) 
++		if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO) 
+         {
+ 			// Increase number of audiochannels
+ 			audioch++;
+
recipes-multimedia/mediatomb/mediatomb_0.12.1.bb +2 -1
index 04191e2..4bd9917 100644
@@ -3,12 +3,13 @@ HOMEPAGE = "http://mediatomb.cc/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0b609ee7722218aa600220f779cb5035 \
                     file://src/main.cc;beginline=14;endline=25;md5=ba9c4cf20a63e18b1626c4c9d794635a"
-DEPENDS = "expat ffmpeg sqlite3 libexif js zlib file taglib ffmpegthumbnailer curl"
+DEPENDS = "expat libav sqlite3 libexif js zlib file taglib ffmpegthumbnailer curl"
 PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz \
 	   file://youtube_warning.patch \
 	   file://size_t_header.patch \
+	   file://libav_0.7_support.patch \
 	   file://init \
 	   file://default \
 	   file://config.xml \
Signature · 1 line
1.8.1.2
#3 lore raw

PATCH 3/4 ffmpeg: remove

In reply to Paul Eggleton

We now use libav provided as part of OE-Core instead.

---
 recipes-multimedia/ffmpeg/ffmpeg.inc      | 114 ------------------------------
 recipes-multimedia/ffmpeg/ffmpeg_0.6.1.bb |  44 ------------
 2 files changed, 158 deletions(-)
 delete mode 100644 recipes-multimedia/ffmpeg/ffmpeg.inc
 delete mode 100644 recipes-multimedia/ffmpeg/ffmpeg_0.6.1.bb
recipes-multimedia/ffmpeg/ffmpeg.inc deleted +0 -114
deleted file mode 100644
index 578963c..0000000
@@ -1,114 +0,0 @@
-DESCRIPTION = "FFmpeg is a complete solution to record, convert and stream audio and video"
-HOMEPAGE = "http://ffmpeg.mplayerhq.hu/"
-AUTHOR = "Fabrice Bellard [email protected]"
-SECTION = "libs"
-LICENSE = "GPLv2+ & LGPLv2.1+"
-
-LICENSE_FLAGS = "commercial"
-
-ARM_INSTRUCTION_SET = "arm"
-
-PE = "2"
-
-DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
-RSUGGESTS_${PN} = "mplayer"
-
-INC_PR = "r17"
-
-inherit autotools pkgconfig
-
-LEAD_SONAME = "libavcodec.so"
-
-EXTRA_OECONF = "\
-        \
-        --enable-pp \
-        --enable-shared \
-        --enable-pthreads \
-        --enable-gpl \
-        \
-        --cross-prefix=${TARGET_PREFIX} \
-        --disable-debug \
-        --disable-ffserver \
-        --disable-ffplay \
-        \
-"
-
-EXTRA_OECONF_append_powerpc += "--${@['disable-altivec','enable-altivec'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce600']]}"
-
-FFMPEG_LIBS = "libavcodec libavdevice libavformat \
-               libavutil libpostproc libswscale libavfilter"
-
-SYSROOT_PREPROCESS_FUNCS = " \
-  ffmpeg_stage_cleanup \
-  ffmpeg_create_compat_links"
-
-ffmpeg_create_compat_links() {
-        rm -rf ${SYSROOT_DESTDIR}${includedir}/ffmpeg
-        mkdir -m 0755 ${SYSROOT_DESTDIR}${includedir}/ffmpeg
-        cd ${SYSROOT_DESTDIR}${includedir}/ffmpeg
-
-        for lib in ${FFMPEG_LIBS}; do
-                ln -s ../$lib/*.h '.' || true
-        done
-}
-
-ffmpeg_stage_cleanup() {
-        rm -rf ${SYSROOT_DESTDIR}${libdir}/vhook \
-        ${SYSROOT_DESTDIR}${datadir}
-}
-
-
-PACKAGES += "${PN}-vhook-dbg ${PN}-vhook"
-
-FILES_${PN} = "${bindir}"
-FILES_${PN}-dev = "${includedir}/${PN}"
-
-FILES_${PN}-vhook = "${libdir}/vhook"
-FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug"
-
-
-PACKAGES += "ffmpeg-x264-presets \
-             libavcodec  libavcodec-dev  libavcodec-dbg \
-             libavdevice libavdevice-dev libavdevice-dbg \
-             libavformat libavformat-dev libavformat-dbg \
-             libavutil   libavutil-dev   libavutil-dbg \
-             libpostproc libpostproc-dev libpostproc-dbg \
-             libswscale  libswscale-dev  libswscale-dbg \
-             libavfilter libavfilter-dev libavfilter-dbg \
-             libavcore   libavcore-dev   libavcore-dbg \
-            "
-
-FILES_ffmpeg-x264-presets = "${datadir}/*.ffpreset"
-
-FILES_${PN}-dev = "${includedir}"
-FILES_libavcodec = "${libdir}/libavcodec*.so.*"
-FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a"
-FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*"
-
-FILES_libavdevice = "${libdir}/libavdevice*.so.*"
-FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a"
-FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*"
-
-FILES_libavformat = "${libdir}/libavformat*.so.*"
-FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a"
-FILES_libavformat-dbg += "${libdir}/.debug/libavformat*"
-
-FILES_libavutil = "${libdir}/libavutil*.so.*"
-FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a"
-FILES_libavutil-dbg += "${libdir}/.debug/libavutil*"
-
-FILES_libpostproc = "${libdir}/libpostproc*.so.*"
-FILES_libpostproc-dev = "${libdir}/libpostproc*.so  ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc"
-FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*"
-
-FILES_libswscale = "${libdir}/libswscale*.so.*"
-FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a"
-FILES_libswscale-dbg += "${libdir}/.debug/libswscale*"
-
-FILES_libavfilter = "${libdir}/libavfilter*.so.*"
-FILES_libavfilter-dev = "${libdir}/libavfilter*.so ${libdir}/pkgconfig/libavfilter.pc ${libdir}/libavfilter*.a"
-FILES_libavfilter-dbg += "${libdir}/.debug/libavfilter*"
-
-FILES_libavcore = "${libdir}/libavcore*.so.*"
-FILES_libavcore-dev = "${libdir}/libavcore*.so ${libdir}/pkgconfig/libavcore.pc ${libdir}/libavcore*.a"
-FILES_libavcore-dbg += "${libdir}/.debug/libavcore*"
recipes-multimedia/ffmpeg/ffmpeg_0.6.1.bb deleted +0 -44

44 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#4 lore raw

PATCH 4/4 samba: fix QA error due to volatiles presence

In reply to Paul Eggleton

Adapted from a meta-oe change by Jonathan Liu <[email protected]>.

---
 recipes-connectivity/samba/samba_3.6.8.bb | 6 ++++++
 1 file changed, 6 insertions(+)
recipes-connectivity/samba/samba_3.6.8.bb +6 -0
index 55bed1e..d2722a3 100644
@@ -58,6 +58,12 @@ do_compile () {
 	base_do_compile
 }
 
+do_install_append() {
+	rmdir "${D}${localstatedir}/lock"
+	rmdir "${D}${localstatedir}/run"
+	rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+}
+
 pkg_postinst_${PN} () {
 	if [ "x$D" != "x" ] ; then
 		exit 1
Signature · 1 line
1.8.1.2