Hi,

This diff below enables turbojpeg header/SO to be built. Bringing this
up because turbojpeg is a build requirement for upcoming port of
hashlink (https://hashlink.haxe.org/).

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/jpeg/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- Makefile    1 Jan 2020 14:24:59 -0000       1.66
+++ Makefile    18 Jan 2020 14:33:06 -0000
@@ -5,9 +5,11 @@ COMMENT=       SIMD-accelerated JPEG codec rep
 V=             2.0.4
 DISTNAME=      libjpeg-turbo-${V}
 PKGNAME=       jpeg-${V}
+REVISION=      0
 EPOCH=         0
 
 SHARED_LIBS+=  jpeg            70.0    # 64.0
+SHARED_LIBS+=  turbojpeg       0.0     # 2.0.4
 
 CATEGORIES=    graphics
 DPB_PROPERTIES=        parallel
@@ -27,8 +29,7 @@ MODULES=      devel/cmake
 BUILD_DEPENDS= devel/yasm
 .endif
 
-CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-                -DWITH_TURBOJPEG=False
+CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX="${PREFIX}"
 DEBUG_PACKAGES=        ${BUILD_PACKAGES}
 
 post-install:
@@ -37,7 +38,5 @@ post-install:
            ${PREFIX}/share/doc/jpeg
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/jpeg
        ${INSTALL_DATA} ${WRKSRC}/example.txt ${PREFIX}/share/examples/jpeg
-       # the turbojpeg wrapper library is disabled
-       rm ${PREFIX}/lib/pkgconfig/libturbojpeg.pc
 
 .include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/jpeg/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST   1 Jan 2020 14:24:59 -0000       1.17
+++ pkg/PLIST   18 Jan 2020 14:33:06 -0000
@@ -3,14 +3,19 @@
 @bin bin/djpeg
 @bin bin/jpegtran
 @bin bin/rdjpgcom
+@bin bin/tjbench
 @bin bin/wrjpgcom
 include/jconfig.h
 include/jerror.h
 include/jmorecfg.h
 include/jpeglib.h
+include/turbojpeg.h
 @static-lib lib/libjpeg.a
 @lib lib/libjpeg.so.${LIBjpeg_VERSION}
+@static-lib lib/libturbojpeg.a
+@lib lib/libturbojpeg.so.${LIBturbojpeg_VERSION}
 lib/pkgconfig/libjpeg.pc
+lib/pkgconfig/libturbojpeg.pc
 @man man/man1/cjpeg.1
 @man man/man1/djpeg.1
 @man man/man1/jpegtran.1

Reply via email to