Skip to contentSkip to conversation

owfs: Update to 2.8p20 version

PATCH In review Otavio Salvador 2 participants 6 messages Oct 6, 2012 – Oct 10, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 owfs: Update to 2.8p20 version

---
 .../owfs/{owfs_2.8p15.bb => owfs_2.8p20.bb}        |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-extended/owfs/{owfs_2.8p15.bb => owfs_2.8p20.bb} (94%)
meta-oe/recipes-extended/owfs/owfs_2.8p20.bb renamed from meta-oe/recipes-extended/owfs/owfs_2.8p15.bb +2 -5
similarity index 94%
rename from meta-oe/recipes-extended/owfs/owfs_2.8p15.bb
rename to meta-oe/recipes-extended/owfs/owfs_2.8p20.bb
index d7c5040..d010867 100644
@@ -8,13 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 DEPENDS = "fuse virtual/libusb0"
 
-PR = "r1"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/owfs/owfs-${PV}.tar.gz \
            file://owhttpd \
            file://owserver "
-SRC_URI[md5sum] = "24ec3d04ded1b199831f03e70d9e2f1f"
-SRC_URI[sha256sum] = "5bbc4ff01865e114f52ef75fd7dd3a5ee52b9ad6841504cc6155a353c516ed87"
+SRC_URI[md5sum] = "9aebee6c0e724553f5be6a542494eae5"
+SRC_URI[sha256sum] = "2374ce7864927a430da83691eb994382407e2dba492f9789b560d025841cc8ba"
 
 inherit autotools update-rc.d
 
@@ -69,4 +67,3 @@ INITSCRIPT_NAME_owserver = "owserver"
 INITSCRIPT_NAME_owhttpd = "owhttpd"
 INITSCRIPT_PARAMS_owserver = "defaults 20"
 INITSCRIPT_PARAMS_owhttpd = "defaults 21"
-
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 2/5 yajl: Update to 2.0.4 version

---
 .../yajl/{yajl_2.0.3.bb => yajl_2.0.4.bb}          |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-devtools/yajl/{yajl_2.0.3.bb => yajl_2.0.4.bb} (76%)
meta-oe/recipes-devtools/yajl/yajl_2.0.4.bb renamed from meta-oe/recipes-devtools/yajl/yajl_2.0.3.bb +2 -3
similarity index 76%
rename from meta-oe/recipes-devtools/yajl/yajl_2.0.3.bb
rename to meta-oe/recipes-devtools/yajl/yajl_2.0.4.bb
index 671cad2..7359520 100644
@@ -2,10 +2,9 @@ DESCRIPTION = "Yet Another JSON Library - A Portable JSON parsing and serializat
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=74f541bd9a2b6c8e5d0714bcdc327f32"
 
-inherit cmake
-
-SRCREV = "04a090f32f6bda183317e9336224831b42bf13f9"
+SRCREV = "fee1ebef9fa7dc0e9f5a23f37123b19b68c796ff"
 SRC_URI = "git://github.com/lloyd/yajl.git"
 
 S = "${WORKDIR}/git"
 
+inherit cmake lib_package
Signature · 1 line
1.7.2.5
#2 lore raw

PATCH 3/5 libpostproc: Add git version

In reply to Otavio Salvador

This has been split from libav code during development of 0.9 series.

---
 .../libpostproc/libpostproc_git.bb                 |   49 ++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb
meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb new file +49 -0
new file mode 100644
index 0000000..3620ff0
@@ -0,0 +1,49 @@
+DESCRIPTION = "FFmpeg derived postprocessing library"
+HOMEPAGE = "http://git.videolan.org/?p=libpostproc.git;a=summary"
+SECTION = "libs"
+DEPENDS = "libav"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+PV = "0.0.0+git${SRCPV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRCREV = "3b7053f46dbfe4662063345245cb00b6acbbe969"
+SRC_URI = "git://git.videolan.org/libpostproc.git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools lib_package pkgconfig
+
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
+BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
+
+EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
+EXTRA_FFCONF ?= ""
+
+EXTRA_OECONF = " \
+        --enable-shared \
+        --enable-pthreads \
+        --enable-gpl \
+        --enable-postproc \
+        \
+        --cross-prefix=${TARGET_PREFIX} \
+        --prefix=${prefix} \
+        \
+        --arch=${TARGET_ARCH} \
+        --target-os="linux" \
+        --enable-cross-compile \
+        --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+        --extra-ldflags="${TARGET_LDFLAGS}" \
+        --sysroot="${STAGING_DIR_TARGET}" \
+        ${EXTRA_FFCONF} \
+"
+
+#| yasm not found, use --disable-yasm for a crippled build
+EXTRA_OECONF_append_x86-64 = " --disable-yasm"
+EXTRA_OECONF_append_x86 = " --disable-yasm"
+
+do_configure() {
+    ./configure ${EXTRA_OECONF}
+}
Signature · 1 line
1.7.2.5
#3 lore raw

PATCH 4/5 libav: Update git version to 2012-10-04 snapshot

In reply to Otavio Salvador

This package depends on libpostproc to ensure same set of libraries is provided for runtime.

---
 meta-oe/recipes-multimedia/libav/libav_git.bb |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
meta-oe/recipes-multimedia/libav/libav_git.bb +13 -9
index 5051265..d12bd9d 100644
@@ -2,18 +2,22 @@ require libav.inc
 
 LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
-                    file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-"
+                    file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
+                    file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
-# When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
-SRCREV = "62c473934822afd317dfef27754a0ff71f58ce2a"
-
-PV = "0.6.5"
+DEPENDS += "libpostproc"
+PV = "0.8.99+git${SRCPV}"
 PR = "${INC_PR}.0"
 
-SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.6"
+DEFAULT_PREFERENCE = "-1"
 
-S = "${WORKDIR}/git"
+# When bumping SRCREV make sure you bump PR here and in dependant
+# recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
+# changes
+SRCREV = "4673a5a761f329af0aa56fc84f34ed898188bfa2"
+SRC_URI = "git://git.libav.org/libav.git;protocol=git"
 
+S = "${WORKDIR}/git"
 
+# postproc has been split
+EXTRA_OECONF := "${@oe_filter_out('--enable-postproc', '${EXTRA_OECONF}', d)}"
Signature · 1 line
1.7.2.5
#4 lore raw

PATCH 5/5 libav: Change the PACKAGES_DYNAMIC expression to be more restrict

In reply to Otavio Salvador

Using 'lib*' we end having problem with every other package that generate libraries dynamically thus we changed it to match the library prefixes.

---
 meta-oe/recipes-multimedia/libav/libav.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-oe/recipes-multimedia/libav/libav.inc +1 -1
index aa170c5..4a1716f 100644
@@ -119,4 +119,4 @@ python populate_packages_prepend() {
                       allow_links=True)
 }
 
-PACKAGES_DYNAMIC = "lib*"
+PACKAGES_DYNAMIC = "lib(av(codec|device|filter|format|util)|postproc)*"
Signature · 1 line
1.7.2.5
#5 lore raw

Re: [meta-oe][PATCH 5/5] libav: Change the PACKAGES_DYNAMIC expression to be more restrict

W dniu 06.10.2012 22:18, Otavio Salvador pisze:

Quoted 14 lines

Using 'lib*' we end having problem with every other package that generate libraries dynamically thus we changed it to match the library prefixes.

---
 meta-oe/recipes-multimedia/libav/libav.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-oe/recipes-multimedia/libav/libav.inc +0 -0
index aa170c5..4a1716f 100644

meta-oe/recipes-multimedia/libav/libav.inc python populate_packages_prepend() { · line 122

Quoted 5 lines
meta-oe/recipes-multimedia/libav/libav.inc +1 -1
@@ -119,4 +119,4 @@ python populate_packages_prepend() {
                       allow_links=True)
 }
 
-PACKAGES_DYNAMIC = "lib*"
+PACKAGES_DYNAMIC = "lib(av(codec|device|filter|format|util)|postproc)*"

Can it get merged? Or should we keep copy of libav in external layers?