summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch8
-rw-r--r--meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb (renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.5.bb)8
2 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
index 82fffe1e68..152db441bc 100644
--- a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
+++ b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
@@ -19,7 +19,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
19index 2bc3458..ea3041e 100644 19index 2bc3458..ea3041e 100644
20--- a/CMakeLists.txt 20--- a/CMakeLists.txt
21+++ b/CMakeLists.txt 21+++ b/CMakeLists.txt
22@@ -189,10 +189,6 @@ endif() 22@@ -191,10 +191,6 @@ endif()
23 report_option(ENABLE_SHARED "Shared libraries") 23 report_option(ENABLE_SHARED "Shared libraries")
24 report_option(ENABLE_STATIC "Static libraries") 24 report_option(ENABLE_STATIC "Static libraries")
25 25
@@ -27,6 +27,6 @@ index 2bc3458..ea3041e 100644
27- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) 27- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
28-endif() 28-endif()
29- 29-
30 if(WITH_12BIT) 30 if(WITH_JPEG8 OR WITH_JPEG7)
31 set(WITH_ARITH_DEC 0) 31 set(WITH_ARITH_ENC 1)
32 set(WITH_ARITH_ENC 0) 32 set(WITH_ARITH_DEC 1)
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.5.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb
index 9729fb5dd5..b6efc6bca0 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.5.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb
@@ -4,8 +4,8 @@ HOMEPAGE = "http://libjpeg-turbo.org/"
4 4
5LICENSE = "BSD-3-Clause" 5LICENSE = "BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8184bcc7c4ac7b9edc6a7bc00f231d0b \ 6LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8184bcc7c4ac7b9edc6a7bc00f231d0b \
7 file://jpeglib.h;endline=16;md5=7ea97dc83b0f59052ee837e61ef0e08f \ 7 file://jpeglib.h;endline=16;md5=52b5eaade8d5b6a452a7693dfe52c084 \
8 file://djpeg.c;endline=11;md5=c59e19811c006cb38f82d6477134d314 \ 8 file://djpeg.c;endline=11;md5=302e980133b5c0c7f4dcb4ca0df41090 \
9" 9"
10DEPENDS_append_x86-64_class-target = " nasm-native" 10DEPENDS_append_x86-64_class-target = " nasm-native"
11DEPENDS_append_x86_class-target = " nasm-native" 11DEPENDS_append_x86_class-target = " nasm-native"
@@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
14 file://0001-libjpeg-turbo-fix-package_qa-error.patch \ 14 file://0001-libjpeg-turbo-fix-package_qa-error.patch \
15 " 15 "
16 16
17SRC_URI[md5sum] = "3a7dc293918775fc933f81e2bce36464" 17SRC_URI[md5sum] = "4cada3f0bdc93d826fa31bf9e4469ef6"
18SRC_URI[sha256sum] = "16f8f6f2715b3a38ab562a84357c793dd56ae9899ce130563c72cd93d8357b5d" 18SRC_URI[sha256sum] = "d74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb"
19UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" 19UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/"
20UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" 20UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
21 21