commit b17b216227922f4ee580bcd8c83bcfcab9f5e8e7 Author: Tim Biermann <tbier@posteo.de> Date: Sat Mar 5 17:10:30 2022 +0100 jasper: 2.0.33 -> 3.0.2 diff --git a/jasper/.footprint b/jasper/.footprint index db66a9332..5fccb74c8 100644 --- a/jasper/.footprint +++ b/jasper/.footprint @@ -11,16 +11,19 @@ drwxr-xr-x root/root usr/include/jasper/ -rw-r--r-- root/root usr/include/jasper/jas_config.h -rw-r--r-- root/root usr/include/jasper/jas_debug.h -rw-r--r-- root/root usr/include/jasper/jas_dll.h +-rw-r--r-- root/root usr/include/jasper/jas_export_cmake.h -rw-r--r-- root/root usr/include/jasper/jas_fix.h -rw-r--r-- root/root usr/include/jasper/jas_getopt.h -rw-r--r-- root/root usr/include/jasper/jas_icc.h -rw-r--r-- root/root usr/include/jasper/jas_image.h -rw-r--r-- root/root usr/include/jasper/jas_init.h +-rw-r--r-- root/root usr/include/jasper/jas_log.h -rw-r--r-- root/root usr/include/jasper/jas_malloc.h -rw-r--r-- root/root usr/include/jasper/jas_math.h -rw-r--r-- root/root usr/include/jasper/jas_seq.h -rw-r--r-- root/root usr/include/jasper/jas_stream.h -rw-r--r-- root/root usr/include/jasper/jas_string.h +-rw-r--r-- root/root usr/include/jasper/jas_thread.h -rw-r--r-- root/root usr/include/jasper/jas_tmr.h -rw-r--r-- root/root usr/include/jasper/jas_tvp.h -rw-r--r-- root/root usr/include/jasper/jas_types.h @@ -28,9 +31,9 @@ drwxr-xr-x root/root usr/include/jasper/ -rw-r--r-- root/root usr/include/jasper/jasper.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libjasper.a -lrwxrwxrwx root/root usr/lib/libjasper.so -> libjasper.so.4 -lrwxrwxrwx root/root usr/lib/libjasper.so.4 -> libjasper.so.4.0.0 --rwxr-xr-x root/root usr/lib/libjasper.so.4.0.0 +lrwxrwxrwx root/root usr/lib/libjasper.so -> libjasper.so.6 +lrwxrwxrwx root/root usr/lib/libjasper.so.6 -> libjasper.so.6.0.0 +-rwxr-xr-x root/root usr/lib/libjasper.so.6.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/jasper.pc drwxr-xr-x root/root usr/share/ diff --git a/jasper/.signature b/jasper/.signature index 28616b016..2595caefd 100644 --- a/jasper/.signature +++ b/jasper/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/b3/u8mr38NUbo3iA57fNR7z2izgkMN74e3l/rAdx1+CELUoIixyMCNvpZN4rTC9ljeDAs7PCibbLozxf9uLVQc= -SHA256 (Pkgfile) = a584698d0f834649f37d50476e67f7c782cd3bad44baa12983c4b915f8e90337 -SHA256 (.footprint) = 2663af88aeb3fd06c40efc05558af405f50dbda6d410a36f3b02f005e0f0abf0 -SHA256 (jasper-2.0.33.tar.gz) = 38b8f74565ee9e7fec44657e69adb5c9b2a966ca5947ced5717cde18a7d2eca6 -SHA256 (jasper-1.900.1-fix-filename-buffer-overflow.patch) = f51377e9b3e4faaa6b17b2d5fcf6f6d94fe2916a65dc9c78b5a99b891f5726dc -SHA256 (jasper-freeglut.patch) = 1b2d784f48858e03ad64ee632f2a5e64d49c368b8dc3553b01315b52d14d3131 +RWSE3ohX2g5d/QwSSKQB/F37Hp/FCnFOfrO6P728kHrilXeYh/O0GImiPwPTXNBLAYk03EzqIxF9UAdO7Xo2GsM4pTfnFz53ZwE= +SHA256 (Pkgfile) = 0cf1d7028235c783f087688474f2e96d8e3f8e6ff66abcb3da86f4c387b297fb +SHA256 (.footprint) = a271234607ab03afb3b8ced203be71b2c485b6b8d5403a71e94837cd8473fd6b +SHA256 (jasper-3.0.2.tar.gz) = 3280c7b48ad53f956ce22ce719ac23ca7812cdeff0667e3914a5bc22592ad43f diff --git a/jasper/Pkgfile b/jasper/Pkgfile index 06c9f6f93..6da203d6d 100644 --- a/jasper/Pkgfile +++ b/jasper/Pkgfile @@ -4,45 +4,35 @@ # Depends on: freeglut libjpeg-turbo xorg-libxmu name=jasper -version=2.0.33 -release=2 -source=(https://github.com/jasper-software/jasper/archive/version-$version/$name-$ve... - jasper-1.900.1-fix-filename-buffer-overflow.patch - jasper-freeglut.patch) +version=3.0.2 +release=1 +source=(https://github.com/jasper-software/jasper/releases/download/version-$version...) build() { - cd $name-version-$version - - patch -p1 -i $SRC/jasper-1.900.1-fix-filename-buffer-overflow.patch - sed -r 's|(CMAKE_SKIP_BUILD_RPATH) FALSE|\1 TRUE|g' -i CMakeLists.txt - patch -p1 -i $SRC/jasper-freeglut.patch - - mkdir -p build-{shared,static} - local config=" -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_INSTALL_LIBDIR=lib -D CMAKE_BUILD_TYPE=Release +-D CMAKE_SKIP_BUILD_RPATH=ON -D JAS_ENABLE_OPENGL=ON -D JAS_ENABLE_LIBJPEG=ON --D JAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF -D CMAKE_SKIP_RPATH=ON -D OpenGL_GL_PREFERENCE=GLVND" #build static lib - ( cd build-static - cmake .. $config -D JAS_ENABLE_SHARED=OFF - make + ( cmake -S $name-version-$version -B build-static -G Ninja $config \ + -D JAS_ENABLE_SHARED=OFF + cmake --build build-static ) #build shared lib - ( cd build-shared - cmake .. $config -D JAS_ENABLE_SHARED=ON - make + ( cmake -S $name-version-$version -B build-shared -G Ninja $config \ + -D JAS_ENABLE_SHARED=ON + cmake --build build-shared ) - make -C build-static DESTDIR=$PKG install - make -C build-shared DESTDIR=$PKG install + DESTDIR=$PKG cmake --install build-static + DESTDIR=$PKG cmake --install build-shared rm -r $PKG/usr/share/doc }