* [PATCH 1/2] flac: upgrade to 1.3.1
2015-02-05 18:24 [PATCH 0/2] Various comms and multimedia PUs Cristian Iorga
@ 2015-02-05 18:24 ` Cristian Iorga
2015-02-05 18:24 ` [PATCH 2/2] neard: upgrade to 0.15 Cristian Iorga
1 sibling, 0 replies; 4+ messages in thread
From: Cristian Iorga @ 2015-02-05 18:24 UTC (permalink / raw)
To: openembedded-core
- 0001-Fix-Makefile.am-altivec-logic.patch patch removed,
included upstream.
- Copyright years updated, triggered new checksums for copyright files.
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
.../0001-Fix-Makefile.am-altivec-logic.patch | 35 ----------------------
.../flac/{flac_1.3.0.bb => flac_1.3.1.bb} | 18 +++++------
2 files changed, 7 insertions(+), 46 deletions(-)
delete mode 100644 meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch
rename meta/recipes-multimedia/flac/{flac_1.3.0.bb => flac_1.3.1.bb} (77%)
diff --git a/meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch b/meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch
deleted file mode 100644
index d086cc9..0000000
--- a/meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1b3597cdc7b5e604ea37db29b2a65aab91e263e6 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Wed, 4 Dec 2013 13:31:28 -0300
-Subject: [PATCH] Fix Makefile.am altivec logic
-
-Upstream-Status: Backport
-
-Besides SPE (FSL e500v? cores) there are other powerpc processors
-that don't support altivec instructions so only enable them when it's
-100% sure that the target has it.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
-Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
----
- src/libFLAC/Makefile.am | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
-index 247e33c..258de40 100644
---- a/src/libFLAC/Makefile.am
-+++ b/src/libFLAC/Makefile.am
-@@ -47,8 +47,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
- else
- # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
- CPUCFLAGS =
--if FLaC__CPU_PPC_SPE
--else
-+if FLaC__USE_ALTIVEC
- CPUCFLAGS += -maltivec -mabi=altivec
- endif
- #@@@ PPC optimizations temporarily disabled
---
-1.8.3.2
-
diff --git a/meta/recipes-multimedia/flac/flac_1.3.0.bb b/meta/recipes-multimedia/flac/flac_1.3.1.bb
similarity index 77%
rename from meta/recipes-multimedia/flac/flac_1.3.0.bb
rename to meta/recipes-multimedia/flac/flac_1.3.1.bb
index ba9b628..f25271f 100644
--- a/meta/recipes-multimedia/flac/flac_1.3.0.bb
+++ b/meta/recipes-multimedia/flac/flac_1.3.1.bb
@@ -5,23 +5,19 @@ BUGTRACKER = "http://sourceforge.net/p/flac/bugs/"
SECTION = "libs"
LICENSE = "GFDL-1.2 & GPLv2+ & LGPLv2.1+ & BSD"
LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \
- file://src/Makefile.am;beginline=1;endline=17;md5=59575c1aa8f5f70d9361b776c2e2bdb5 \
+ file://src/Makefile.am;beginline=1;endline=17;md5=0a853b81d9d43d8aad3b53b05cfcc37e \
file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://src/flac/main.c;beginline=1;endline=18;md5=d36a16abc38d5ffd346ac4ba1be1932b \
+ file://src/flac/main.c;beginline=1;endline=18;md5=d03a766558d233f9cc3ac5dfafd49deb \
file://COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24 \
- file://src/plugin_common/all.h;beginline=1;endline=18;md5=e33e281151e7f40db2d3d170d9b0c1bb \
- file://COPYING.Xiph;md5=755582d124a03e3001afea59fc02b61b \
+ file://src/plugin_common/all.h;beginline=1;endline=18;md5=7c8a3b9e1e66ed0aba765bc6f35da85d \
+ file://COPYING.Xiph;md5=a2c4b71c0198682376d483eb5bcc9197 \
file://include/FLAC/all.h;beginline=65;endline=70;md5=64474f2b22e9e77b28d8b8b25c983a48"
DEPENDS = "libogg"
-SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \
- file://0001-Fix-Makefile.am-altivec-logic.patch \
- "
+SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz"
-SRC_URI[md5sum] = "13b5c214cee8373464d3d65dee362cdd"
-SRC_URI[sha256sum] = "fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc"
-
-PR = "r1"
+SRC_URI[md5sum] = "b9922c9a0378c88d3e901b234f852698"
+SRC_URI[sha256sum] = "4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c"
inherit autotools gettext
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] neard: upgrade to 0.15
2015-02-05 18:24 [PATCH 0/2] Various comms and multimedia PUs Cristian Iorga
2015-02-05 18:24 ` [PATCH 1/2] flac: upgrade to 1.3.1 Cristian Iorga
@ 2015-02-05 18:24 ` Cristian Iorga
1 sibling, 0 replies; 4+ messages in thread
From: Cristian Iorga @ 2015-02-05 18:24 UTC (permalink / raw)
To: openembedded-core
- parallel-build.patch patch removed,
included upstream;
- systemd unit files provided by neard,
YP-provided removed;
- improved systemd support.
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
meta/recipes-connectivity/neard/neard.inc | 10 +++---
.../neard/neard/parallel-build.patch | 40 ----------------------
meta/recipes-connectivity/neard/neard_0.14.bb | 12 -------
meta/recipes-connectivity/neard/neard_0.15.bb | 9 +++++
4 files changed, 13 insertions(+), 58 deletions(-)
delete mode 100644 meta/recipes-connectivity/neard/neard/parallel-build.patch
delete mode 100644 meta/recipes-connectivity/neard/neard_0.14.bb
create mode 100644 meta/recipes-connectivity/neard/neard_0.15.bb
diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc
index 76640d8..31bc6dd 100644
--- a/meta/recipes-connectivity/neard/neard.inc
+++ b/meta/recipes-connectivity/neard/neard.inc
@@ -11,6 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
inherit autotools pkgconfig systemd update-rc.d
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+
+PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd"
+
EXTRA_OECONF += "--enable-tools"
do_install() {
@@ -26,12 +30,6 @@ do_install_append() {
chmod 0755 ${D}${sysconfdir}/init.d/neard
fi
- if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
- install -d ${D}${systemd_unitdir}/system
- sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \
- > ${D}${systemd_unitdir}/system/neard.service
- fi
-
# Install the tests for neard-tests
install -d ${D}${libdir}/neard
install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
diff --git a/meta/recipes-connectivity/neard/neard/parallel-build.patch b/meta/recipes-connectivity/neard/neard/parallel-build.patch
deleted file mode 100644
index 5624749..0000000
--- a/meta/recipes-connectivity/neard/neard/parallel-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 488e898300f7a4ab9ba73307967ae9e02b7a6511 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Fri, 13 Jun 2014 17:49:45 +0100
-Subject: [PATCH] Makefile: add missing binaries to dependency on
- local_headers
-
-seeld and snap_send were missing from the rule that generates the header symlink
-farm, resulting in headers not being available in highly parallel builds.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
----
- Makefile.am | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c51351f..8e58ac1 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -254,7 +254,14 @@ se/plugin.$(OBJEXT): se/builtin.h
- se/builtin.h: src/genbuiltin $(builtin_se_sources)
- $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_se_modules) > $@
-
--$(src_neard_OBJECTS) $(tools_nfctool_nfctool_OBJECTS) $(plugin_objects): $(local_headers)
-+$(src_neard_OBJECTS) \
-+$(tools_nfctool_nfctool_OBJECTS) \
-+$(plugin_objects) \
-+$(se_seeld_OBJECTS) \
-+$(unit_test_ndef_parse_OBJECTS) \
-+$(unit_test_ndef_build_OBJECTS) \
-+$(unit_test_snep_read_OBJECTS) \
-+$(tools_snep_send_OBJECTS): $(local_headers)
-
- include/near/version.h: include/version.h
- $(AM_V_at)$(MKDIR_P) include/near
---
-1.7.10.4
-
diff --git a/meta/recipes-connectivity/neard/neard_0.14.bb b/meta/recipes-connectivity/neard/neard_0.14.bb
deleted file mode 100644
index 7a1096b..0000000
--- a/meta/recipes-connectivity/neard/neard_0.14.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require neard.inc
-
-SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \
- file://parallel-build.patch \
- file://neard.in \
- file://neard.service.in \
- file://Makefile.am-fix-parallel-issue.patch \
- "
-SRC_URI[md5sum] = "692ba2653d60155255244c87396c486b"
-SRC_URI[sha256sum] = "6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca"
-
-PR = "r1"
diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/meta/recipes-connectivity/neard/neard_0.15.bb
new file mode 100644
index 0000000..c92a171
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard_0.15.bb
@@ -0,0 +1,9 @@
+require neard.inc
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \
+ file://neard.in \
+ file://Makefile.am-fix-parallel-issue.patch \
+ "
+SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c"
+SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353"
+
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread