openh264: fix build for 32-bit intel arch

PATCH New Trevor Woerner 1 participant 2 messages May 16, 2018

lore

Share & tools

lore

Trevor Woerner

author

2018-05-16 18:09 UTC #0 lore raw

PATCH v4 1/2 openh264: fix build for 32-bit intel arch

Signed-off-by Trevor Woerner <[email protected]>

---
changes since v3:
- v3 does not exist, the previous v2 was supposed to be v3

changes since v2:
- switch += to _append

changes since v1:
- v1 does not exist for this patch, but as patch 2 of 2 for updating SRC_URI away from automatically-generated github archives

---
 .../recipes-multimedia/openh264/openh264_1.7.0.bb        | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb +4 -5

index a7aaab3623..bf56ea1d84 100644
@@ -3,9 +3,8 @@ decoding. It is suitable for use in real time applications such as WebRTC."
 HOMEPAGE = "http://www.openh264.org/"
 SECTION = "libs/multimedia"
 
-DEPENDS = "${@oe.utils.conditional('TARGET_ARCH', 'i386', 'nasm-native', \
-              oe.utils.conditional('TARGET_ARCH', 'x86_64', 'nasm-native', \
-             '', d), d)}"
+DEPENDS_append_x86 = " nasm-native"
+DEPENDS_append_x86-64 = " nasm-native"
 
 LICENSE = "BSD-2-Clause"
 LICENSE_FLAGS = "commercial"

@@ -17,14 +16,14 @@ SRC_URI[sha256sum] = "9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f68957
 
 COMPATIBLE_MACHINE_armv7a = "(.*)"
 COMPATIBLE_MACHINE_aarch64 = "(.*)"
-COMPATIBLE_MACHINE_i386 = "(.*)"
+COMPATIBLE_MACHINE_x86 = "(.*)"
 COMPATIBLE_MACHINE_x86-64 = "(.*)"
 COMPATIBLE_MACHINE_mips = "(.*)"
 COMPATIBLE_MACHINE_mips64 = "(.*)"
 
 EXTRA_OEMAKE_armv7a = "ARCH=arm"
 EXTRA_OEMAKE_aarch64 = "ARCH=arm64"
-EXTRA_OEMAKE_i386 = "ARCH=i386"
+EXTRA_OEMAKE_x86 = "ARCH=i386"
 EXTRA_OEMAKE_x86-64 = "ARCH=x86_64"
 EXTRA_OEMAKE_mips = "ARCH=mips"
 EXTRA_OEMAKE_mips64 = "ARCH=mips64"

Signature · 1 line

2.17.0.rc2.3.gc2a499e6c

Trevor Woerner

author

2018-05-16 18:09 UTC #1 lore raw

PATCH v4 2/2 openh264: switch away from github archive

Since we know that github archives which are automatically generated have a tendency to change their checksums[1], switch to using a git clone.

[1] http://lists.openembedded.org/pipermail/openembedded-devel/2017-September/114916.html

Signed-off-by Trevor Woerner <[email protected]>

---
changes since v3/v2:
- v3 does not exist, but 2 x v2s do
- no change

changes since v1:
- replace the frankenstein variable name "OPENHBRANCH" with the more sensible "BRANCH"

---
 .../recipes-multimedia/openh264/openh264_1.7.0.bb          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb +4 -3

index bf56ea1d84..c044cf33dc 100644
@@ -10,9 +10,10 @@ LICENSE = "BSD-2-Clause"
 LICENSE_FLAGS = "commercial"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf"
 
-SRC_URI = "https://github.com/cisco/openh264/archive/v${PV}.tar.gz"
-SRC_URI[md5sum] = "93da4e76cfda7ede8fd2df51b0021efd"
-SRC_URI[sha256sum] = "9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f6895738653f"
+S = "${WORKDIR}/git"
+SRCREV = "a180c9d4d6f1a4830ca9eed9d159d54996bd63cb"
+BRANCH = "openh264v1.7"
+SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH};"
 
 COMPATIBLE_MACHINE_armv7a = "(.*)"
 COMPATIBLE_MACHINE_aarch64 = "(.*)"

Signature · 1 line

2.17.0.rc2.3.gc2a499e6c