[arch-commits] Commit in jasper/trunk (PKGBUILD)

[Levente Polyak]

    Date: Wednesday, May 11, 2022 @ 21:04:51
  Author: anthraxx
Revision: 445030

upgpkg: jasper 3.0.3-1

- drop static lib

Modified:
  jasper/trunk/PKGBUILD

----------+
 PKGBUILD |   75 +++++++++++++++++++++++++------------------------------------
 1 file changed, 31 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-11 19:31:11 UTC (rev 445029)
+++ PKGBUILD	2022-05-11 21:04:51 UTC (rev 445030)
@@ -3,83 +3,70 @@
 
 pkgbase=jasper
 pkgname=('jasper' 'jasper-doc')
-pkgver=2.0.33
-pkgrel=2
+pkgver=3.0.3
+pkgrel=1
 pkgdesc='Software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard'
-url='https://www.ece.uvic.ca/~mdadams/jasper/'
+url='https://www.ece.uvic.ca/~frodo/jasper/'
 arch=('x86_64')
 license=('custom:JasPer2.0')
 makedepends=('glibc' 'libjpeg' 'freeglut' 'libxmu' 'glu' 'cmake' 'doxygen')
-options=('staticlibs')
+options=('debug')
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/mdadams/jasper/archive/version-${pkgver}.tar.gz
-        jasper-1.900.1-fix-filename-buffer-overflow.patch
-        fix-opengl-linking.patch)
-sha512sums=('ff88c4b55d52803786520e4f0db10f7cb7cd7642694c866ea7859bc79e409590469fc2c63afe522c7f8b0c00062c155c0fe3b83b8928e319173a3ec9fea3e09e'
-            'b8d798bf75523c5db263783e42c653dd0cb03deee90be32eddf878bb6893cca02abadd94de6a8c737a5b7fe76f7fb245979f010765e6a95fc520b215e3a2a7f0'
-            'e59788285d5def5391eabe07ed934fd2839357c81edf8f016a4a99b935a8ab0d8b54a82071586b3f79125b7317e01bad8d9c678ad808f2b09710d33a29a1b8f1')
-b2sums=('29cd29cf1af285f6054a969991674b12c968b42d70970a1a460fe43e25047b56d2b96a614d0723d9def6c09c9c6b1bdb04289bdcd8cf348449271e5c975074db'
-        '9b1927a437ed9b32491f07a210600b5a7d10711ec954dadc030a8238b67e9c6d1a8e67956fd7a5515e7060f0a1651fa86763e21d6d20592f8f00e9d3260722a1'
-        'f459a8891fae03236bc17695655b2a1e05cdc4456e644c2deb219d82e24472d816b93b44e3cbe73403a82736bb5b36becd2076402341eb0a1c7362aace58f915')
+        jasper-1.900.1-fix-filename-buffer-overflow.patch)
+sha512sums=('e407e24db2c8b279421070feadb71e79e8603729ed8170d84d21bced92eb18a91fb67ec9e99c27366f9afb26b6d5f38ff918c88afb8ce3f3ce87a76189d296c0'
+            'b8d798bf75523c5db263783e42c653dd0cb03deee90be32eddf878bb6893cca02abadd94de6a8c737a5b7fe76f7fb245979f010765e6a95fc520b215e3a2a7f0')
+b2sums=('c6849fe2de6853000ca9e88b3535f82396fa408f0a884459fd433cd3e400de6bd4caf840ad7482742b84d02b29328964f1726ab4b8ad1f9897bee4e8a690a340'
+        '9b1927a437ed9b32491f07a210600b5a7d10711ec954dadc030a8238b67e9c6d1a8e67956fd7a5515e7060f0a1651fa86763e21d6d20592f8f00e9d3260722a1')
 
 prepare() {
   cd ${pkgbase}-version-${pkgver}
   patch -p1 < "${srcdir}/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 < ../fix-opengl-linking.patch # Fix linking to OpenGL libraries
 }
 
 build() {
   cd ${pkgbase}-version-${pkgver}
 
-  local options=(
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects"
-    -DJAS_ENABLE_OPENGL=ON
-    -DJAS_ENABLE_LIBJPEG=ON
-    -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF
-    -DCMAKE_SKIP_RPATH=ON
-  )
-
-  echo "Building static lib..."
   cmake \
-    -B build-static \
-    "${options[@]}" \
-    -DJAS_ENABLE_SHARED=OFF
-  make -C build-static
-
-  echo "Building shared lib..."
-  cmake \
-    -B build-shared \
-    "${options[@]}" \
+    -B buildx \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects" \
+    -DJAS_ENABLE_OPENGL=ON \
+    -DJAS_ENABLE_LIBJPEG=ON \
+    -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF \
+    -DCMAKE_SKIP_RPATH=ON \
     -DJAS_ENABLE_SHARED=ON
-  make -C build-shared
+  cmake --build buildx
 }
 
 check() {
-  cd ${pkgbase}-version-${pkgver}/build-static
-  make -j1 test
+  cd ${pkgbase}-version-${pkgver}
+  export LD_LIBRARY_PATH="$(pwd)/buildx/src/libjasper/"
+  make -C buildx -j1 test
 }
 
 package_jasper() {
-  depends=('glibc' 'libjpeg' 'libjpeg.so')
-  optdepends=('jasper-doc: documentation'
-              'freeglut: jiv support'
-              'glu: jiv support')
+  depends=('glibc' 'libjpeg' 'libjpeg.so' 'freeglut' 'glu')
+  optdepends=('jasper-doc: documentation')
   provides=('libjasper.so')
+
   cd ${pkgbase}-version-${pkgver}
-  make -C build-static DESTDIR="${pkgdir}" install
-  make -C build-shared DESTDIR="${pkgdir}" install
-  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  make -C buildx DESTDIR="${pkgdir}" install
   rm -r "${pkgdir}/usr/share/doc"
+
+  install -Dm 644 NEWS.txt README.md  -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -Dm 644 LICENSE.txt  -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 package_jasper-doc() {
   pkgdesc+=' (documentation)'
   optdepends=('jasper')
+
   cd ${pkgbase}-version-${pkgver}
-  make -C build-shared DESTDIR="${pkgdir}" install
-  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  make -C buildx DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}/usr/"{bin,include,lib,share/man}
+
+  install -Dm 644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 # vim: ts=2 sw=2 et: