[Git][archlinux/packaging/packages/usd][main] Simplify package more

[Sven-Hendrik Haase (@svenstaro)]

Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages / 
usd


Commits:
507d2b19 by Sven-Hendrik Haase at 2024-12-23T02:29:50+01:00
Simplify package more

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = usd
        pkgdesc = 3D VFX pipeline interchange file format
        pkgver = 24.11
-       pkgrel = 2
+       pkgrel = 3
        url = https://openusd.org
        arch = x86_64
        license = Apache-2.0


=====================================
PKGBUILD
=====================================
@@ -5,10 +5,9 @@
 # Contributor: Started by https://github.com/qumaciel at 
https://github.com/PixarAnimationStudios/USD/issues/2000
 
 pkgname='usd'
-_pkgname='OpenUSD'
 pkgbase=usd
 pkgver=24.11
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='https://openusd.org'
 pkgdesc='3D VFX pipeline interchange file format'
@@ -37,7 +36,7 @@ depends=(alembic # libAlembic.so
          python-numpy
          python-opengl)
 makedepends=(cmake help2man boost git)
-source=("git+https://github.com/PixarAnimationStudios/$_pkgname.git#tag=v$pkgver";
+source=("git+https://github.com/PixarAnimationStudios/OpenUSD.git#tag=v$pkgver";
         https://openusd.org/images/USDLogoUnsized.svg
         
usd-3392.patch::https://patch-diff.githubusercontent.com/raw/PixarAnimationStudios/OpenUSD/pull/3392.patch
         
usd-embree42.patch::https://patch-diff.githubusercontent.com/raw/PixarAnimationStudios/OpenUSD/pull/2266.patch
@@ -51,7 +50,7 @@ replaces=('usd-extras')
 provides=('usd-extras')
 
 prepare() {
-  cd $_pkgname
+  cd OpenUSD
 
   _pyver=$(python -c 'import sys; print(".".join(map(str, 
sys.version_info[:2])))')
 
@@ -66,17 +65,15 @@ prepare() {
   sed -i 's|lib/python/pxr|/usr/lib/python'$_pyver'/site-packages/pxr|' \
         cmake/macros/{Private,Public}.cmake 
pxr/usdImaging/usdviewq/CMakeLists.txt
 
-  sed -i 's|/pxrConfig.cmake|/lib/cmake/pxr/pxrConfig.cmake|g' \
+  sed -i \
+    -e 's|/pxrConfig.cmake|/lib/cmake/pxr/pxrConfig.cmake|g' \
+    -e 's|${CMAKE_INSTALL_PREFIX}|${CMAKE_INSTALL_PREFIX}/lib/cmake/pxr|g' \
+    -e 's|"cmake"|"lib/cmake/pxr"|g' \
         pxr/CMakeLists.txt
-  sed -i 's|${CMAKE_INSTALL_PREFIX}|${CMAKE_INSTALL_PREFIX}/lib/cmake/pxr|g' \
-        pxr/CMakeLists.txt
-  sed -i 's|"cmake"|"lib/cmake/pxr"|g' \
-        pxr/CMakeLists.txt
-  sed -i 's|${PXR_CMAKE_DIR}/cmake|${PXR_CMAKE_DIR}|g' \
-        pxr/pxrConfig.cmake.in
-  sed -i 's|${PXR_CMAKE_DIR}/include|/usr/include|g' \
-        pxr/pxrConfig.cmake.in
-  sed -i 's|EXACT COMPONENTS|COMPONENTS|g' \
+  sed -i \
+    -e 's|${PXR_CMAKE_DIR}/cmake|${PXR_CMAKE_DIR}|g' \
+    -e 's|${PXR_CMAKE_DIR}/include|/usr/include|g' \
+    -e 's|EXACT COMPONENTS|COMPONENTS|g' \
         pxr/pxrConfig.cmake.in
 
   # Further drop shebangs line for some py files
@@ -85,12 +82,7 @@ prepare() {
         pxr/usd/usdUtils/updateSchemaWithSdrNode.py \
         pxr/usdImaging/usdviewq/usdviewApi.py
 
-  rm -rf docs/doxygen/doxygen-awesome-css/
-
-  # Support Embree4
-  find . -type f -exec gawk '/embree3/ { print FILENAME }' '{}' '+' |
-  xargs -r sed -r -i 's/(embree)3/\14/'
-
+  rm -r docs/doxygen/doxygen-awesome-css/
 }
 
 build() {
@@ -147,8 +139,6 @@ package() {
     sed -r -i '1 s|(#!)(.*python.*)|\1/usr/bin/env -S 
LD_PRELOAD=/usr/lib/libjemalloc.so \2|' "$cmd"
   done
 
-  rm -vrf "$pkgdir/usr/share/usd"
-
   # Remove Google Roboto fonts
   rm -r "$pkgdir"/usr/lib/python$_pyver/site-packages/pxr/Usdviewq/fonts
 
@@ -171,7 +161,6 @@ package() {
   sed -i 's/_IMPORT_PREFIX ""/_IMPORT_PREFIX "\/usr"/' \
         "$pkgdir/usr/lib/cmake/pxr/pxrTargets.cmake"
 
-  install -Dm644 -t "$pkgdir/usr/share/doc/usd" "$srcdir/$_pkgname/NOTICE.txt"
-  install -Dm644 -t "$pkgdir/usr/share/doc/usd" "$srcdir/$_pkgname/README.md"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/usd" 
"$srcdir/$_pkgname/LICENSE.txt"
+  install -Dm644 -t "$pkgdir/usr/share/doc/usd" 
"$srcdir"/OpenUSD/{NOTICE.txt,README.md}
+  install -Dm644 -t "$pkgdir/usr/share/licenses/usd" 
"$srcdir/OpenUSD/LICENSE.txt"
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/usd/-/commit/507d2b1940efcf7d2c810ec48558683c5e354260

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/usd/-/commit/507d2b1940efcf7d2c810ec48558683c5e354260
You're receiving this email because of your account on gitlab.archlinux.org.