diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index 6a443a182d9..2e1bc5c4ed4 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.69 2020/12/08 14:37:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.70 2021/05/26 10:20:06 sthen Exp $ COMMENT= SIMD-accelerated JPEG codec replacement of libjpeg -V= 2.0.6 +V= 2.1.0 DISTNAME= libjpeg-turbo-${V} PKGNAME= jpeg-${V} EPOCH= 0 -SHARED_LIBS+= jpeg 70.0 # 64.0 -SHARED_LIBS+= turbojpeg 0.0 # 2.0.4 +SHARED_LIBS+= jpeg 70.0 +SHARED_LIBS+= turbojpeg 0.1 CATEGORIES= graphics DPB_PROPERTIES= parallel diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo index 61e204c518a..549971be79a 100644 --- a/graphics/jpeg/distinfo +++ b/graphics/jpeg/distinfo @@ -1,2 +1,2 @@ -SHA256 (libjpeg-turbo-2.0.6.tar.gz) = 10uSrDOw42VxI93PZyh4jJDchNy2pSAT11ivPEr0gbs= -SIZE (libjpeg-turbo-2.0.6.tar.gz) = 2192315 +SHA256 (libjpeg-turbo-2.1.0.tar.gz) = vviYA+UG8ncVxWJ7HjIZyVuA/DFGXURS3iqQnTguREQ= +SIZE (libjpeg-turbo-2.1.0.tar.gz) = 2255497 diff --git a/graphics/jpeg/patches/patch-CMakeLists_txt b/graphics/jpeg/patches/patch-CMakeLists_txt index a71bdd4c72a..7c744672dc2 100644 --- a/graphics/jpeg/patches/patch-CMakeLists_txt +++ b/graphics/jpeg/patches/patch-CMakeLists_txt @@ -1,11 +1,11 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.4 2020/12/08 14:37:21 sthen Exp $ +$OpenBSD: patch-CMakeLists_txt,v 1.5 2021/05/26 10:20:06 sthen Exp $ Symbol versioning triggers weird linking problems in dependent ports. Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -470,10 +470,6 @@ endif() +@@ -491,10 +491,6 @@ endif() if(UNIX AND NOT APPLE) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/conftest.map "VERS_1 { global: *; };") diff --git a/graphics/jpeg/pkg/PLIST b/graphics/jpeg/pkg/PLIST index 12aceaa1fde..6e389221dc8 100644 --- a/graphics/jpeg/pkg/PLIST +++ b/graphics/jpeg/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.18 2020/02/05 17:31:09 thfr Exp $ +@comment $OpenBSD: PLIST,v 1.19 2021/05/26 10:20:06 sthen Exp $ @bin bin/cjpeg @bin bin/djpeg @bin bin/jpegtran @@ -10,6 +10,12 @@ include/jerror.h include/jmorecfg.h include/jpeglib.h include/turbojpeg.h +lib/cmake/ +lib/cmake/libjpeg-turbo/ +lib/cmake/libjpeg-turbo/libjpeg-turboConfig.cmake +lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake +lib/cmake/libjpeg-turbo/libjpeg-turboTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake @static-lib lib/libjpeg.a @lib lib/libjpeg.so.${LIBjpeg_VERSION} @static-lib lib/libturbojpeg.a